summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 18:27:03 +0200
committerBjörn Geiger2011-10-17 18:27:03 +0200
commit94bf2054840113eef2e3c7f90db62571a49a7f61 (patch)
treefc373bcb31c5c80c10bb0d18055a74a008b4c625 /application/controllers/EventController.php
parentminor (diff)
downloadpoolctrl-94bf2054840113eef2e3c7f90db62571a49a7f61.tar.gz
poolctrl-94bf2054840113eef2e3c7f90db62571a49a7f61.tar.xz
poolctrl-94bf2054840113eef2e3c7f90db62571a49a7f61.zip
weitere Korrektur
Diffstat (limited to 'application/controllers/EventController.php')
-rwxr-xr-xapplication/controllers/EventController.php22
1 files changed, 17 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 372d0d5..5087452 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1127,15 +1127,27 @@ class EventController extends Zend_Controller_Action
$runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
if(count($runningEvents) > 0) {
if($boot) {
- $startTime = $startTime + $lookbacktime * 60;
- $betweenStart = $eventStart - ceil($startTime);
+ $startSeconds = date('s', $startTime);
+ if($startSeconds < 30) {
+ $startTime = $startTime - $startSeconds + $lookbacktime * 60;
+ } else {
+ $addStartSeconds = 60 - $startSeconds;
+ $startTime = $startTime + $addStartSeconds + $lookbacktime * 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 - ceil($endTime);
+ $endSeconds = date('s', $endTime);
+ if($endSeconds < 30) {
+ $endTime = $endTime - $endSeconds + $lookbacktime * 60;
+ } else {
+ $addEndSeconds = 60 - $endSeconds;
+ $endTime = $endTime + $addEndSeconds + $lookbacktime * 60;
+ }
+ $betweenEnd = $eventEnd - $endTime;
$addEndTime = $updatePeriod * 60 - $betweenEnd;
$newEnd = date('Y-m-d H:i:s', $eventEnd + $addEndTime);
$event->setEnd($newEnd);
@@ -2447,4 +2459,4 @@ class EventController extends Zend_Controller_Action
}
}
}
-}
+} \ No newline at end of file