From a08ee3dd84d1b7ca9a0d7e375426e23595dfe5e3 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Thu, 27 Oct 2011 10:16:06 +0200 Subject: kleine Korrektur --- application/controllers/EventController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'application') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 0cb4954..5bc200f 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -284,7 +284,7 @@ class EventController extends Zend_Controller_Action $event->setRunning(false); } $event->setCreated(time()); - $overlapping = false; + $overlapping = 0; if($event->repeat) { $overlapping = $this->repeatEvent($event); } else { @@ -464,13 +464,13 @@ class EventController extends Zend_Controller_Action $params['immediate'] = 0; $event->setOptions($params); $event->setID($eventID); - $overlapping = false; + $overlapping = 0; if($event->getRepeat() == 1 && !isset($params['wdh'])) { $event->setRepeat(2); } else { $overlappingEvents = $this->eventMapper->getOverlappingEvents(date('Y-m-d H:i:s', strtotime($event->getStart())), date('Y-m-d H:i:s', strtotime($event->getEnd())), $event->getPbs_PoolID()); if(count($overlappingEvents) > 0 ) { - $overlapping = true; + $overlapping = 1; } if(!$overlapping) { $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); @@ -2688,12 +2688,12 @@ class EventController extends Zend_Controller_Action break; } - $overlapping = false; + $overlapping = 0; $overlappingEvents = array(); foreach($events as $evt) { $overlappingEvents = $this->eventMapper->getOverlappingEvents(date('Y-m-d H:i:s', strtotime($evt->getStart())), date('Y-m-d H:i:s', strtotime($evt->getEnd())), $evt->getPbs_PoolID(), $event, true); if(count($overlappingEvents) > 0 ) { - $overlapping = true; + $overlapping = 1; break; } } -- cgit v1.2.3-55-g7522