summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-11 12:49:23 +0200
committerBjörn Geiger2011-10-11 12:49:23 +0200
commitfab4e9d3e07654ff0e81b5970dd0c99cb8a61d49 (patch)
treea1ab74ccf7c7eac1891537b3db0bb2f6a5414e28 /application
parentkleine Korrektur (diff)
downloadpoolctrl-fab4e9d3e07654ff0e81b5970dd0c99cb8a61d49.tar.gz
poolctrl-fab4e9d3e07654ff0e81b5970dd0c99cb8a61d49.tar.xz
poolctrl-fab4e9d3e07654ff0e81b5970dd0c99cb8a61d49.zip
weitere Korrektur
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php104
1 files changed, 52 insertions, 52 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index f197f72..76e7156 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -462,7 +462,7 @@ class EventController extends Zend_Controller_Action
}
$diff = $this->eventMapper->compare($oldEvent, $event);
if(isset($diff['pbs_bootosID']) || isset($diff['title']) || isset($diff['pbs_configID'])) {
- $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletebootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "bootmenuid=" . $event->getPbs_bootmenuID());
+ $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletebootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "bootmenuid=" . $oldEvent->getPbs_bootmenuID());
unset($bootmenuApiResult);
$bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=Poolctrl-Bootmenu for " . $event->getTitle() . "&defaultbootmenu=0&order=0&kcl=0";
if($event->getPbs_configID()) {
@@ -478,10 +478,8 @@ class EventController extends Zend_Controller_Action
unset($filterApiResult);
}
if(isset($diff['start']) || isset($diff['end']) || isset($diff['pbs_poolID'])) {
- if($event->getRepeat()) {
- $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $event->getPbs_filterID());
- unset($filterApiResult);
- }
+ $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID());
+ unset($filterApiResult);
$filterquery = "bootmenuID=" . $event->getPbs_bootmenuID() . "&title=Poolctrl-Filter for " . $event->getTitle() . "&description=This Filter was automatically created by the Poolctrl for Event " . $event->getTitle() . "&created= " . time() . "&priority=100";
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addfilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterquery);
$filterXMLString = $filterApiResult['http-body'];
@@ -2237,65 +2235,67 @@ class EventController extends Zend_Controller_Action
$filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1);
$filterentriesID = sprintf("%s", $filterentriesXML1->filterentry->id);
}
- $events = $this->eventMapper->findBy(array('title' => $oldEvent->getTitle(), repeat => $oldEvent->getRepeat()));
- try {
- foreach($events as $event) {
- $event->setOptions($diff);
- if(isset($diffStart)) {
- $summertimeStart = intval(date('I', strtotime($event->getStart())));
- $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);
- } else {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
- }
- } else {
- if($newSummertimeStart) {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart - 3600);
+ $events = $this->eventMapper->findBy(array('poolctrl_event.repeat' => 1, 'title' => $oldEvent->getTitle()));
+ if(count($events) > 0) {
+ try {
+ foreach($events as $event) {
+ $event->setOptions($diff);
+ if(isset($diffStart)) {
+ $summertimeStart = intval(date('I', strtotime($event->getStart())));
+ $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);
+ } else {
+ $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
+ }
} else {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
+ if($newSummertimeStart) {
+ $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart - 3600);
+ } else {
+ $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())));
- $newSummertimeEnd = intval(date('I', strtotime($event->getEnd()) + $diffEnd));
- if($summertimeEnd) {
- if(!$newSummertimeStart) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd + 3600);
+ if(isset($diffEnd)) {
+ $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
+ $newSummertimeEnd = intval(date('I', strtotime($event->getEnd()) + $diffEnd));
+ if($summertimeEnd) {
+ if(!$newSummertimeEnd) {
+ $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd + 3600);
+ } else {
+ $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
+ }
} else {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnde()) + $diffEnd);
+ if($newSummertimeEnd) {
+ $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd - 3600);
+ } else {
+ $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
+ }
}
- } else {
- if($newSummertimeEnd) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd - 3600);
+ $event->setEnd($newEnd);
+ }
+ if($repeattype != "Once a week") {
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if($event->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
} else {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
+ $endDate = date('d.m.Y', strtotime($event->getStart()) + 900);
}
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $endDate;
+ $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
}
- $event->setEnd($newEnd);
- }
- $startDate = date('Y-m-d', strotime($event->getStart()));
- if($event->getEnd()) {
- $endDate = date('Y-m-d', strotime($event->getEnd()));
- } else {
- $endDate = date('Y-m-d', strotime($event->getStart()) + 900);
- }
- if($repeattype != "Once a week") {
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=11&filtervalue=" . $startDate . "&filtervalue2=" . $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);
}
- $this->eventMapper->save($event);
+ } catch (Zend_Exception $e) {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
}
- } catch (Zend_Exception $e) {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
}
} else {
- $events = $this->eventMapper->findBy(array('title' => $oldEvent->getTitle(), repeat => $oldEvent->getRepeat()));
+ $events = $this->eventMapper->findBy(array('poolctrl_event.repeat' => $oldEvent->getRepeat(), 'title' => $oldEvent->getTitle()));
try {
foreach($events as $event) {
$event->setOptions($diff);