summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-12 14:18:33 +0200
committerBjörn Geiger2011-09-12 14:18:33 +0200
commitb19f53c8e50f85d3e1c8666c2892bc50f369674a (patch)
tree5cac18d09e0ed6fbe54e4d47a6023506160f56ac
parentminor (diff)
downloadpoolctrl-b19f53c8e50f85d3e1c8666c2892bc50f369674a.tar.gz
poolctrl-b19f53c8e50f85d3e1c8666c2892bc50f369674a.tar.xz
poolctrl-b19f53c8e50f85d3e1c8666c2892bc50f369674a.zip
weitere Korrektur
-rwxr-xr-xapplication/configs/application.ini.dist1
-rwxr-xr-xapplication/controllers/EventController.php10
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() . "<br/>";
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();