From ecb2dbef0226c344adc9ce8622a5f26a818a337e Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 28 Oct 2011 10:09:18 +0200 Subject: some fixes --- application/controllers/EventController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'application/controllers/EventController.php') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 57d8e65..f7754c8 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -765,12 +765,14 @@ class EventController extends Zend_Controller_Action $overlapswithrepeat = array(); $cfeventswithrepeat = array(); + foreach($events['withrepeat'] as $e) { - $evstartTime = intval(strtotime($e['start'])) + $diff; - if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) { - $this->view->past = true; - return; - } + + $evstartTime = intval(strtotime($e['start'])) + $diff; + if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) { + $this->view->past = true; + } + $enewstart = date('Y-m-d H:i:s', strtotime($e['start']) + $diff); $summertimeStart = intval(date('I', strtotime($e['start']))); @@ -971,7 +973,7 @@ class EventController extends Zend_Controller_Action $summertimeEnd = 1; } } - + $cfv = true; // overlap events -- cgit v1.2.3-55-g7522