From b19f53c8e50f85d3e1c8666c2892bc50f369674a Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Mon, 12 Sep 2011 14:18:33 +0200 Subject: weitere Korrektur --- application/configs/application.ini.dist | 1 + application/controllers/EventController.php | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index 9919ae7..46d9759 100755 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -42,6 +42,7 @@ gearman.worker.updateRate = 1 gearman.worker.ps.blacklist = firefox-bin, chromium-browse, thunderbird-bi, evince, soffice.bin, eclipse gearman.worker.ps.whitelist = gnome-screensav, Kscreensaver event.updatePeriod = 5 +event.lookbacktime = 1 event.category.default = Lecture [staging : production] diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 3dfca3d..d758702 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -319,7 +319,7 @@ class EventController extends Zend_Controller_Action $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id); } if($params['immediate']) { - $this->runEvent($event); + $event->setRunning(true); } else { $event->setRunning(false); } @@ -331,6 +331,9 @@ class EventController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "
"; return; } + if($params['immediate']) { + $this->runEvent($event); + } $this->_redirect('/event/'); } } @@ -672,9 +675,10 @@ class EventController extends Zend_Controller_Action } $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $startTime = time() - 60; + $lookbacktime = $this->config['event']['lookbacktime']; + $startTime = time() - $lookbacktime * 60; $updatePeriod = $this->config['event']['updatePeriod']; - $endTime = $startTime + 60 + $updatePeriod * 60; + $endTime = $startTime + $lookbacktime * 60 + $updatePeriod * 60; $eventlist = $this->eventMapper->fetchAll(); $eventcategoryMapper = new Application_Model_EventcategoryMapper(); $result = $eventcategoryMapper->fetchAll(); -- cgit v1.2.3-55-g7522