summaryrefslogtreecommitdiffstats
path: root/application/controllers/EventController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-08 15:44:24 +0200
committerBjörn Geiger2011-09-08 15:44:24 +0200
commit06c9edcd3d6f27617ed051f2e22924185c9093dd (patch)
tree9582c000506c4f9d8fe87d2cbe0376787f572063 /application/controllers/EventController.php
parentverschiedenes (diff)
parentselection and addEvent fix (diff)
downloadpoolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.tar.gz
poolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.tar.xz
poolctrl-06c9edcd3d6f27617ed051f2e22924185c9093dd.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application/controllers/EventController.php')
-rw-r--r--application/controllers/EventController.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 5bf02a0..d431b49 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -226,10 +226,14 @@ class EventController extends Zend_Controller_Action
}
$add = $this->getRequest()->getParam("add");
if($this->getRequest()->getParam('start')) {
- $start = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('start'), 0, 24)));
+ $start = date ('m/d/Y H:i', strtotime($this->getRequest()->getParam('start')));
+ } else if($this->getRequest()->getParam('evstart')) {
+ $start = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evstart'), 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)));
+ $end = date ('m/d/Y H:i', strtotime($this->getRequest()->getParam('end')));
+ } else if($this->getRequest()->getParam('evend')) {
+ $end = date ('m/d/Y H:i', strtotime(substr($this->getRequest()->getParam('evend'), 0, 24)));
} else {$end = 'mm/dd/yyyy H:min';}
if (!isset($add)){
$defaultEventCategory = $this->config['event']['category']['default'];
@@ -284,7 +288,7 @@ class EventController extends Zend_Controller_Action
$filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday;
$filterentriesApiResult3 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery3);
$filterentriesXMLString3 = $filterentriesApiResult3['http-body'];
- $filterentriesXML3 = new SimpleXMLEle/ment($filterentriesXMLString3);
+ $filterentriesXML3 = new SimpleXMLElement($filterentriesXMLString3);
$filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
} else {
$startDate = date('Y-m-d', strtotime($event->getStart()));