summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-17 18:30:11 +0200
committerBjörn Geiger2011-10-17 18:30:11 +0200
commitefee1c3a04624ee25580a8f19176a6008a76e1cd (patch)
tree0f076dde8c301d4c854b2c4bddd3edd0bde1978e /application
parentweitere Korrektur (diff)
downloadpoolctrl-efee1c3a04624ee25580a8f19176a6008a76e1cd.tar.gz
poolctrl-efee1c3a04624ee25580a8f19176a6008a76e1cd.tar.xz
poolctrl-efee1c3a04624ee25580a8f19176a6008a76e1cd.zip
minor
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php22
1 files changed, 2 insertions, 20 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 5087452..37d2925 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1127,29 +1127,11 @@ class EventController extends Zend_Controller_Action
$runningEvents = $this->eventMapper->findBy(array('pbs_poolID' => $event->getPbs_PoolID(), 'running' => 1));
if(count($runningEvents) > 0) {
if($boot) {
- $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);
+ $newStart = date('Y-m-d H:i:s', $eventStart + $updatePeriod * 60);
$event->setStart($newStart);
}
if($shutdown) {
- $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);
+ $newEnd = date('Y-m-d H:i:s', $eventEnd + $updatePeriod * 60);
$event->setEnd($newEnd);
}
try {