summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 17:31:42 +0200
committerBjörn Geiger2011-10-17 17:31:42 +0200
commit37310f2231812642c87838f73657caa9a6c69db3 (patch)
tree1898b857a3d6f53f449a9af1acaba5ed1a6a6dc1
parentweitere Korrektur (diff)
downloadpoolctrl-37310f2231812642c87838f73657caa9a6c69db3.tar.gz
poolctrl-37310f2231812642c87838f73657caa9a6c69db3.tar.xz
poolctrl-37310f2231812642c87838f73657caa9a6c69db3.zip
minor
-rwxr-xr-xapplication/controllers/EventController.php16
1 files changed, 4 insertions, 12 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 312d11e..48454a2 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1128,23 +1128,15 @@ class EventController extends Zend_Controller_Action
if(count($runningEvents) > 0) {
if($boot) {
$startTime = $startTime + $lookbacktime * 60;
- $betweenStart = ($eventStart - $startTime) / 60;
- if($betweenStart > $updatePeriod) {
- $addStartTime = $updatePeriod * 60;
- } else {
- $addStartTime = $updatePeriod * 60 - $betweenStart * 60;
- }
+ $betweenStart = $eventStart - $startTime;
+ $addStartTime = $updatePeriod * 60 - $betweenStart;
$newStart = date('Y-m-d H:i:s', $eventStart + $addStartTime);
$event->setStart($newStart);
}
if($shutdown) {
$endTime = $endTime - $lookbacktime * 60;
- $betweenEnd = ($eventEnd - $endTime) / 60;
- if($betweenEnd > $updatePeriod) {
- $addEndTime = $updatePeriod * 60;
- } else {
- $addEndTime = $updatePeriod * 60 - $betweenEnd * 60;
- }
+ $betweenEnd = $eventEnd - $endTime;
+ $addEndTime = $updatePeriod * 60 - $betweenEnd * 60;
$newEnd = date('Y-m-d H:i:s', $eventEnd + $addEndTime);
$event->setEnd($newEnd);
}