summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 14:36:39 +0200
committerBjörn Geiger2011-09-08 14:36:39 +0200
commit7fafa407f60327c5c67a007a906ee2bd91c0fb3a (patch)
treeac3473e43f1e788248abb2394941ddae769403c2 /application/controllers/EventController.php
parentweitere Korrektur (diff)
parentminor (diff)
downloadpoolctrl-7fafa407f60327c5c67a007a906ee2bd91c0fb3a.tar.gz
poolctrl-7fafa407f60327c5c67a007a906ee2bd91c0fb3a.tar.xz
poolctrl-7fafa407f60327c5c67a007a906ee2bd91c0fb3a.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application/controllers/EventController.php')
-rw-r--r--application/controllers/EventController.php20
1 files changed, 8 insertions, 12 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index f521de7..9ec5bd3 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -225,16 +225,12 @@ class EventController extends Zend_Controller_Action
}
}
$add = $this->getRequest()->getParam("add");
- if($this->getRequest()->getParam('evstart')) {
- $evstart = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evstart'), 0, 24)));
- } else if($this->getRequest()->getParam('start')) {
- $evstart = $this->getRequest()->getParam('start');
- }
- if($this->getRequest()->getParam('evend')) {
- $evend = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evend'), 0, 24)));
- } else if($this->getRequest()->getParam('end')) {
- $evend = $this->getRequest()->getParam('end');
- }
+ if($this->getRequest()->getParam('start')) {
+ $start = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('start'), 0, 24)));
+ } else {$start = 'mm/dd/yyyy H:min';}
+ if($this->getRequest()->getParam('end')) {
+ $end = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('end'), 0, 24)));
+ } else {$end = 'mm/dd/yyyy H:min';}
if (!isset($add)){
$defaultEventCategory = $this->config['event']['category']['default'];
foreach($eventcategorylist as $eventcategory) {
@@ -243,9 +239,9 @@ class EventController extends Zend_Controller_Action
break;
}
}
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $evstart, 'end' => $evend, 'defaultEventCategoryID' => $defaultEventCategoryID));
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $start, 'end' => $end, 'defaultEventCategoryID' => $defaultEventCategoryID));
} else {
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $evstart, 'end' => $evend, $this->getRequest()->getParams()));
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $start, 'end' => $end, $this->getRequest()->getParams()));
if ($addForm->isValid($this->getRequest()->getParams())) {
$startTimestamp = strtotime($this->getRequest()->getParam('start'));
$this->getRequest()->setParam('start', date ('Y-m-d H:i', $startTimestamp));