summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-11 12:07:53 +0200
committerBjörn Geiger2011-10-11 12:07:53 +0200
commit80a1fb10b4eb2b8662f569ca220be811aa601f32 (patch)
tree96b6c7c411c4ed21e32810d74dd4c2d3a8188fb4 /application
parentdeleteReapeatEvent Funktion wieder gelöscht, nicht benötigt (diff)
downloadpoolctrl-80a1fb10b4eb2b8662f569ca220be811aa601f32.tar.gz
poolctrl-80a1fb10b4eb2b8662f569ca220be811aa601f32.tar.xz
poolctrl-80a1fb10b4eb2b8662f569ca220be811aa601f32.zip
kleine Korrektur
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php15
1 files changed, 3 insertions, 12 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index b180faa..f197f72 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -2231,22 +2231,13 @@ class EventController extends Zend_Controller_Action
$repeattypeMapper->find($newEvent->getRepeattype(), $repeattype);
if($repeattype == "Once a week") {
$weekday = date('N', strtotime($diff['start']));
- $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday;
+ $filterentriesquery1 = "filterID=" . $newEvent->getPbs_filterID() . "&filtertypeID=10&filtervalue=" . $weekday . "&filtervalue2=" . $weekday;
$filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1);
$filterentriesXMLString1 = $filterentriesApiResult1['http-body'];
$filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1);
$filterentriesID = sprintf("%s", $filterentriesXML1->filterentry->id);
- } else {
- $startTime = date('H:i', strtotime($event->getStart()));
- if($event->getEnd()) {
- $endTime = date('H:i', strtotime($event->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($event->getStart()) + 900);
- }
- $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
- $filterentriesApiResult1 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery1);
}
- $events = $this->eventMapper->findBy(array($oldEvent->getTitle()));
+ $events = $this->eventMapper->findBy(array('title' => $oldEvent->getTitle(), repeat => $oldEvent->getRepeat()));
try {
foreach($events as $event) {
$event->setOptions($diff);
@@ -2304,7 +2295,7 @@ class EventController extends Zend_Controller_Action
return;
}
} else {
- $events = $this->eventMapper->findBy(array($oldEvent->getTitle()));
+ $events = $this->eventMapper->findBy(array('title' => $oldEvent->getTitle(), repeat => $oldEvent->getRepeat()));
try {
foreach($events as $event) {
$event->setOptions($diff);