summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-11 15:13:40 +0200
committerSebastian Wagner2011-10-11 15:13:40 +0200
commit594d924f26b6ea10a76c6da3b452b3325778b976 (patch)
treed983e74b176996bc56a595252ff4d6b7cb3fd473 /application
parentcomments (diff)
parentfilter date format umgestelltC (diff)
downloadpoolctrl-594d924f26b6ea10a76c6da3b452b3325778b976.tar.gz
poolctrl-594d924f26b6ea10a76c6da3b452b3325778b976.tar.xz
poolctrl-594d924f26b6ea10a76c6da3b452b3325778b976.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php61
1 files changed, 15 insertions, 46 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index a23adb1..36873e9 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -252,7 +252,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()));
}
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -520,7 +520,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()));
}
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -751,7 +751,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()));
}
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -815,7 +815,7 @@ class EventController extends Zend_Controller_Action
$newEndDate = '';
}
}
- $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartDate . "&oldvalue2=" . $oldEndDate . "&value1=" . $newStartDate . "&value2=" . $newEndDate;
+ $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . strtotime($oldStartDate) . "&oldvalue2=" . strtotime($oldEndDate) . "&value1=" . strtotime($newStartDate) . "&value2=" . strtotime($newEndDate);
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie);
unset($filterApiResult);
$filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime;
@@ -897,7 +897,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()));
}
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -1750,7 +1750,7 @@ class EventController extends Zend_Controller_Action
}
switch($repeattype->getTitle()) {
case 'Daily':
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -1805,13 +1805,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
- }
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -1862,13 +1856,12 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
if($newEvent->getEnd()) {
$endTime = date('H:i', strtotime($newEvent->getEnd()));
} else {
$endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
}
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -1975,7 +1968,7 @@ class EventController extends Zend_Controller_Action
break;
case 'Every couple of weeks':
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -2030,13 +2023,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
- }
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -2087,13 +2074,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
- }
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -2104,7 +2085,7 @@ class EventController extends Zend_Controller_Action
break;
case 'Every month':
- $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery3 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$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 SimpleXMLElement($filterentriesXMLString3);
@@ -2200,13 +2181,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
- }
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -2265,13 +2240,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($newEvent->getStart()));
}
- $startTime = date('H:i', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
- }
- $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery);
$filterentriesXMLString = $filterentriesApiResult['http-body'];
$filterentriesXML = new SimpleXMLElement($filterentriesXMLString);
@@ -2354,7 +2323,7 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()) + 900);
}
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . strtotime($startDate) . "&filtervalue2=" . strtotime($endDate);
$filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
}
$this->eventMapper->save($event);