summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-10 16:36:17 +0200
committerBjörn Geiger2011-10-10 16:36:17 +0200
commit81b89a3e970be7e37bfd3a936b827f6128c24960 (patch)
treea2421c2ab7bc2ac406ce39f4d169deaa7e313a19 /application
parentweitere Korrektur (diff)
downloadpoolctrl-81b89a3e970be7e37bfd3a936b827f6128c24960.tar.gz
poolctrl-81b89a3e970be7e37bfd3a936b827f6128c24960.tar.xz
poolctrl-81b89a3e970be7e37bfd3a936b827f6128c24960.zip
Korrektur
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ce35d86..b7e335b 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -532,7 +532,7 @@ class EventController extends Zend_Controller_Action
return;
}
}
- $this->_redirect('/event/');
+ //$this->_redirect('/event/');
}
} else {
$this->getRequest()->setParam('title', $event->getTitle());
@@ -2226,16 +2226,17 @@ class EventController extends Zend_Controller_Action
$diffStart = intval(strtotime($newEvent->getStart())) - intval(strtotime($oldEvent->getStart()));
unset($diff['start']);
}
- if($diff['end']) {
+ if(isset($diff['end'])) {
$diffEnd = intval(strtotime($newEvent->getEnd())) - intval(strtotime($oldEvent->getEnd()));
unset($diff['end']);
}
+ $events = $this->eventMapper->findBy(array($oldEvent->getTitle()));
try {
foreach($events as $event) {
$event->setOptions($diff);
if(isset($diffStart)) {
$summertimeStart = intval(date('I', strtotime($event->getStart())));
- $newSummertimeStart = intval(date('I', strtotime($vent->getStart()) + $diffStart));
+ $newSummertimeStart = intval(date('I', strtotime($event->getStart()) + $diffStart));
if($summertimeStart) {
if(!$newSummertimeStart) {
$newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart + 3600);
@@ -2249,7 +2250,7 @@ class EventController extends Zend_Controller_Action
$newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
}
}
- $event->setStart(newStart);
+ $event->setStart($newStart);
}
if(isset($diffEnd)) {
$summertimeEnd = intval(date('I', strtotime($event->getEnd())));
@@ -2267,7 +2268,7 @@ class EventController extends Zend_Controller_Action
$newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
}
}
- $event->setEnd(newEnd);
+ $event->setEnd($newEnd);
}
$this->eventMapper->save($event);
}