From dcc83f5eb795f5961c691537281248e382b53339 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Tue, 18 Oct 2011 12:19:13 +0200 Subject: event move und resize geht wieder --- application/controllers/EventController.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'application/controllers') diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index b891d47..1499beb 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -668,9 +668,9 @@ class EventController extends Zend_Controller_Action $eventID = $this->getRequest()->getParam('eventID'); $date = intval(strtotime(substr($this->getRequest()->getParam('date'), 0, 24))); $repeat = $this->getRequest()->getParam('repeat'); - + if($repeat) { - $events = $this->eventMapper->getDraggingEvents($eventID); + $events = $this->eventMapper->getDraggingEvents($eventID); } else { $events = $this->eventMapper->getDraggingEvent($eventID); } @@ -742,7 +742,7 @@ class EventController extends Zend_Controller_Action } $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); $shutdownCategory = $result[0]; - if($newEvent->getCategory() != $shutdownCategory->getID()) { + if($event->getCategory() != $shutdownCategory->getID()) { if($event->getPbs_filterID()) { if(!$oldEvent->getRepeat()) { $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID()); @@ -783,7 +783,13 @@ class EventController extends Zend_Controller_Action $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); } } - $this->eventMapper->save($event); //save the event with the new data + try { + $this->eventMapper->save($event); //save the event with the new data + } catch (Zend_Exception $e) { + echo "Caught exception: " . get_class($e) . "
"; + echo "Message: " . $e->getMessage() . "
"; + return; + } } } @@ -831,7 +837,7 @@ class EventController extends Zend_Controller_Action $event->setPbs_poolID($poolID); $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); $shutdownCategory = $result[0]; - if($newEvent->getCategory() != $shutdownCategory->getID()) { + if($event->getCategory() != $shutdownCategory->getID()) { if($event->getPbs_filterID()) { if($event->getRepeat()) { $repeattypeMapper = new Application_Model_RepeattypeMapper(); @@ -896,7 +902,7 @@ class EventController extends Zend_Controller_Action $event->setPbs_poolID($poolID); $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); $shutdownCategory = $result[0]; - if($newEvent->getCategory() != $shutdownCategory->getID()) { + if($event->getCategory() != $shutdownCategory->getID()) { if($event->getPbs_filterID()) { if(!$oldEvent->getRepeat()) { $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID()); @@ -969,7 +975,7 @@ class EventController extends Zend_Controller_Action $event->setPbs_poolID($poolID); $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown')); $shutdownCategory = $result[0]; - if($newEvent->getCategory() != $shutdownCategory->getID()) { + if($event->getCategory() != $shutdownCategory->getID()) { if($event->getPbs_filterID()) { $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime; $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie); -- cgit v1.2.3-55-g7522