summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapplication/controllers/EventController.php678
-rwxr-xr-xsetup/poolctrl.sql6
2 files changed, 364 insertions, 320 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 1221fa1..c60ce69 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -214,53 +214,56 @@ class EventController extends Zend_Controller_Action
}
$event = new Application_Model_Event($params);
$event->setPbs_membershipID($this->userIDsNamespace['membershipID']);
- $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=Poolctrl-Bootmenu for " . $event->getTitle() . "&defaultbootmenu=0&order=0&kcl=0";
- if($event->getPbs_configID()) {
- $bootmenuquery .= "&configID=" . $event->getPbs_configID();
- }
- $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery);
- $bootmenuXMLString = $bootmenuApiResult['http-body'];
- $bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
- $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
- $event->setPbs_bootmenuID($bootmenuID);
- $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'];
- $filterXML = new SimpleXMLElement($filterXMLString);
- $filterID = sprintf("%s", $filterXML->filter->id);
- $event->setPbs_filterID($filterID);
- $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);
- $filterentriesXMLString1 = $filterentriesApiResult1['http-body'];
- $filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1);
- $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
- $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
- $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
- $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
- $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
- if(!$event->getRepeat()) {
- $startDate = date('d.m.Y', strtotime($event->getStart()));
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($event->getCategory() != $shutdownCategory->getID()) {
+ $bootmenuquery = "bootosID=" . $event->getPbs_bootosID() . "&startcounter=0&title=Poolctrl-Bootmenu for " . $event->getTitle() . "&defaultbootmenu=0&order=0&kcl=0";
+ if($event->getPbs_configID()) {
+ $bootmenuquery .= "&configID=" . $event->getPbs_configID();
+ }
+ $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery);
+ $bootmenuXMLString = $bootmenuApiResult['http-body'];
+ $bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
+ $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
+ $event->setPbs_bootmenuID($bootmenuID);
+ $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'];
+ $filterXML = new SimpleXMLElement($filterXMLString);
+ $filterID = sprintf("%s", $filterXML->filter->id);
+ $event->setPbs_filterID($filterID);
+ $startTime = date('H:i', strtotime($event->getStart()));
if($event->getEnd()) {
- $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ $endTime = date('H:i', strtotime($event->getEnd()));
} else {
- $endDate = date('d.m.Y', strtotime($event->getStart()));
+ $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);
+ $filterentriesXMLString1 = $filterentriesApiResult1['http-body'];
+ $filterentriesXML1 = new SimpleXMLElement($filterentriesXMLString1);
+ $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
+ $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
+ $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
+ $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
+ $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
+ if(!$event->getRepeat()) {
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if($event->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
+ }
+ $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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
if($event->getImmediate()) {
- $eventcategoryMapper = new Application_Model_EventcategoryMapper();
- $result = $eventcategoryMapper->fetchAll();
+ $result = $this->eventcategoryMapper->fetchAll();
$eventcategories = array();
foreach($result as $category) {
$eventcategories[$category->getID()] = $category->getTitle();
@@ -469,62 +472,66 @@ class EventController extends Zend_Controller_Action
unset($params['repeatdate']);
unset($params['repeatings']);
}
- $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=" . $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()) {
- $bootmenuquery .= "&configID=" . $event->getPbs_configID();
- }
- $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery);
- $bootmenuXMLString = $bootmenuApiResult['http-body'];
- $bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
- $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
- $event->setPbs_bootmenuID($bootmenuID);
- $filterQuerie = "filterid=" . $event->getPbs_filterID() . "&bootmenuID = " . $bootmenuID;
- $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterQuerie);
- unset($filterApiResult);
- }
- if(isset($diff['start']) || isset($diff['end']) || isset($diff['pbs_poolID'])) {
- if(isset($params['wdh']) || !$oldEvent->getRepeat()) {
- $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID());
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $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=" . $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()) {
+ $bootmenuquery .= "&configID=" . $event->getPbs_configID();
+ }
+ $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['addbootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $bootmenuquery);
+ $bootmenuXMLString = $bootmenuApiResult['http-body'];
+ $bootmenuXML = new SimpleXMLElement($bootmenuXMLString);
+ $bootmenuID = sprintf("%s", $bootmenuXML->bootmenu->id);
+ $event->setPbs_bootmenuID($bootmenuID);
+ $filterQuerie = "filterid=" . $event->getPbs_filterID() . "&bootmenuID = " . $bootmenuID;
+ $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterQuerie);
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'];
- $filterXML = new SimpleXMLElement($filterXMLString);
- $filterID = sprintf("%s", $filterXML->filter->id);
- $event->setPbs_filterID($filterID);
- $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
- $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);
- $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
- $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);
- }
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
- $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
- $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
- $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
- $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
- if(!$event->getRepeat()) {
- $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if(isset($diff['start']) || isset($diff['end']) || isset($diff['pbs_poolID'])) {
+ if(isset($params['wdh']) || !$oldEvent->getRepeat()) {
+ $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'];
+ $filterXML = new SimpleXMLElement($filterXMLString);
+ $filterID = sprintf("%s", $filterXML->filter->id);
+ $event->setPbs_filterID($filterID);
+ $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
+ $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);
+ $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
+ $startTime = date('H:i', strtotime($event->getStart()));
if($event->getEnd()) {
- $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ $endTime = date('H:i', strtotime($event->getEnd()));
} else {
- $endDate = date('d.m.Y', strtotime($event->getStart()));
+ $endTime = date('H:i', strtotime($event->getStart()) + 900);
+ }
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
+ $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
+ $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
+ $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
+ $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
+ if(!$event->getRepeat()) {
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if($event->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
+ }
+ $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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
}
if($event->getRepeat()) {
@@ -718,44 +725,48 @@ class EventController extends Zend_Controller_Action
$newEndDate = date('d.m.Y', $evendTime);
$event->setEnd(date('Y-m-d H:i:s', $evendTime));
}
- if($event->getPbs_filterID()) {
- if(!$oldEvent->getRepeat()) {
- $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'];
- $filterXML = new SimpleXMLElement($filterXMLString);
- $filterID = sprintf("%s", $filterXML->filter->id);
- $event->setPbs_filterID($filterID);
- $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
- $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);
- $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
- $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);
- }
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
- $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
- $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
- $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
- $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
- $startDate = date('d.m.Y', strtotime($event->getStart()));
- if($event->getEnd()) {
- $endDate = date('d.m.Y', strtotime($event->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($event->getStart()));
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getPbs_filterID()) {
+ if(!$oldEvent->getRepeat()) {
+ $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'];
+ $filterXML = new SimpleXMLElement($filterXMLString);
+ $filterID = sprintf("%s", $filterXML->filter->id);
+ $event->setPbs_filterID($filterID);
+ $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
+ $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);
+ $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
+ $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);
+ }
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
+ $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
+ $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
+ $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
+ $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if($event->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
+ }
+ $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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
$this->eventMapper->save($event); //save the event with the new data
}
@@ -803,24 +814,28 @@ class EventController extends Zend_Controller_Action
$event->setEnd($eventEnd);
}
$event->setPbs_poolID($poolID);
- if($event->getPbs_filterID()) {
- if($event->getRepeat()) {
- $repeattypeMapper = new Application_Model_RepeattypeMapper();
- $repeattype = new Application_Model_Repeattype();
- $repeattypeMapper->find($event->getRepeattype(), $repeattype);
- if($repeattype == "Once a week") {
- $oldStartDate = date("N", strototime($oldStartDate));
- $oldEndDate = '';
- $newStartDate = date("N", strototime($newStartDate));
- $newEndDate = '';
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getPbs_filterID()) {
+ if($event->getRepeat()) {
+ $repeattypeMapper = new Application_Model_RepeattypeMapper();
+ $repeattype = new Application_Model_Repeattype();
+ $repeattypeMapper->find($event->getRepeattype(), $repeattype);
+ if($repeattype == "Once a week") {
+ $oldStartDate = date("N", strototime($oldStartDate));
+ $oldEndDate = '';
+ $newStartDate = date("N", strototime($newStartDate));
+ $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;
+ $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=" . 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;
- $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie);
- unset($filterApiResult);
}
$this->eventMapper->save($event); //save the event with the new data
}
@@ -864,44 +879,48 @@ class EventController extends Zend_Controller_Action
$newEndTime = date('H:i', strtotime(substr($evend, 0, 24)));
$event->setEnd(date('Y-m-d H:i:s', strtotime(substr($evend, 0, 24))));
$event->setPbs_poolID($poolID);
- if($event->getPbs_filterID()) {
- if(!$oldEvent->getRepeat()) {
- $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'];
- $filterXML = new SimpleXMLElement($filterXMLString);
- $filterID = sprintf("%s", $filterXML->filter->id);
- $event->setPbs_filterID($filterID);
- $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
- $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);
- $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
- $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);
- }
- $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
- $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
- $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
- $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
- $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
- $startDate = date('d.m.Y', strtotime($event->getStart()));
- if($event->getEnd()) {
- $endDate = date('d.m.Y', strtotime($event->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($event->getStart()));
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getPbs_filterID()) {
+ if(!$oldEvent->getRepeat()) {
+ $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'];
+ $filterXML = new SimpleXMLElement($filterXMLString);
+ $filterID = sprintf("%s", $filterXML->filter->id);
+ $event->setPbs_filterID($filterID);
+ $filterentriesquery1 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=3&filtervalue=" . $event->getPbs_poolID();
+ $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);
+ $filterentriesID1 = sprintf("%s", $filterentriesXML1->filterentry->id);
+ $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);
+ }
+ $filterentriesquery2 = "filterID=" . $event->getPbs_filterID() . "&filtertypeID=7&filtervalue=" . $startTime . "&filtervalue2=" . $endTime;
+ $filterentriesApiResult2 = PostToHost($this->pbs2host, $this->config['pbs2']['addfilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesquery2);
+ $filterentriesXMLString2 = $filterentriesApiResult2['http-body'];
+ $filterentriesXML2 = new SimpleXMLElement($filterentriesXMLString2);
+ $filterentriesID2 = sprintf("%s", $filterentriesXML2->filterentry->id);
+ $startDate = date('d.m.Y', strtotime($event->getStart()));
+ if($event->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($event->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($event->getStart()));
+ }
+ $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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
$this->eventMapper->save($event); //save the event with the new data
}
@@ -933,10 +952,14 @@ class EventController extends Zend_Controller_Action
$eventEnd = date('Y-m-d H:i:s', intval(strtotime($event->getEnd())) + intval($evmindelta*60));
$event->setEnd($eventEnd);
$event->setPbs_poolID($poolID);
- if($event->getPbs_filterID()) {
- $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime;
- $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie);
- unset($filterApiResult);
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getPbs_filterID()) {
+ $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime;
+ $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie);
+ unset($filterApiResult);
+ }
}
$this->eventMapper->save($event); //save the event with the new data
}
@@ -1041,8 +1064,7 @@ class EventController extends Zend_Controller_Action
$updatePeriod = $this->config['event']['updatePeriod'];
$endTime = $startTime + $lookbacktime * 60 + $updatePeriod * 60;
$eventlist = $this->eventMapper->fetchAll();
- $eventcategoryMapper = new Application_Model_EventcategoryMapper();
- $result = $eventcategoryMapper->fetchAll();
+ $result = $this->eventcategoryMapper->fetchAll();
foreach($result as $category) {
$eventcategories[$category->getTitle()] = $category->getID();
}
@@ -1519,8 +1541,7 @@ class EventController extends Zend_Controller_Action
}
}
$data['clients'] = $clients;
- $eventcategoryMapper = new Application_Model_EventcategoryMapper();
- $result = $eventcategoryMapper->fetchAll();
+ $result = $this->eventcategoryMapper->fetchAll();
foreach($result as $category) {
$eventcategories[$category->getTitle()] = $category->getID();
}
@@ -1786,17 +1807,21 @@ class EventController extends Zend_Controller_Action
} else {
$endDate = date('d.m.Y', strtotime($event->getStart()));
}
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
switch($repeattype->getTitle()) {
case 'Daily':
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $filterentriesquery3 = "filterID=" . $newEvent->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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ }
$onedaytime = 24 * 60 * 60;
- $newStartTime = strtotime($event->getStart()) + $onedaytime;
- if($event->getEnd()) {
- $newEndTime = strtotime($event->getEnd()) + $onedaytime;
+ $newStartTime = strtotime($newEvent->getStart()) + $onedaytime;
+ if($newEvent->getEnd()) {
+ $newEndTime = strtotime($newEvent->getEnd()) + $onedaytime;
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
@@ -1837,20 +1862,22 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
} else if($repeatend->getTitle() == 'Date') {
- $repeatendtime = strtotime($event->getRepeatdate());
+ $repeatendtime = strtotime($newEvent->getRepeatdate());
while($newStartTime <= $repeatendtime) {
if($summertimeStart) {
if(!date('I', $newStartTime)) {
@@ -1888,38 +1915,37 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
- }
- if($newEvent->getEnd()) {
- $endTime = date('H:i', strtotime($newEvent->getEnd()));
- } else {
- $endTime = date('H:i', strtotime($newEvent->getStart()) + 900);
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
}
break;
case 'Once a week':
- $weekday = date('N', strtotime($event->getStart()));
- $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 SimpleXMLElement($filterentriesXMLString3);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $weekday = date('N', strtotime($newEvent->getStart()));
+ $filterentriesquery3 = "filterID=" . $newEvent->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 SimpleXMLElement($filterentriesXMLString3);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ }
$oneweektime = 7 * 24 * 60 * 60;
- $newStartTime = strtotime($event->getStart()) + $oneweektime;
- if($event->getEnd()) {
- $newEndTime = strtotime($event->getEnd()) + $oneweektime;
+ $newStartTime = strtotime($newEvent->getStart()) + $oneweektime;
+ if($newEvent->getEnd()) {
+ $newEndTime = strtotime($newEvent->getEnd()) + $oneweektime;
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
@@ -1962,7 +1988,7 @@ class EventController extends Zend_Controller_Action
}
}
} else if($repeatend->getTitle() == 'Date') {
- $repeatendtime = strtotime($event->getRepeatdate());
+ $repeatendtime = strtotime($newEvent->getRepeatdate());
while($newStartTime <= $repeatendtime) {
if($summertimeStart) {
if(!date('I', $newStartTime)) {
@@ -2006,15 +2032,17 @@ class EventController extends Zend_Controller_Action
break;
case 'Every couple of weeks':
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $filterentriesquery3 = "filterID=" . $newEvent->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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ }
$twoweekstime = 14 * 24 * 60 * 60;
- $newStartTime = strtotime($event->getStart()) + $twoweekstime;
- if($event->getEnd()) {
- $newEndTime = strtotime($event->getEnd()) + $twoweekstime;
+ $newStartTime = strtotime($newEvent->getStart()) + $twoweekstime;
+ if($newEvent->getEnd()) {
+ $newEndTime = strtotime($newEvent->getEnd()) + $twoweekstime;
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
@@ -2055,20 +2083,22 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
} else if($repeatend->getTitle() == 'Date') {
- $repeatendtime = strtotime($event->getRepeatdate());
+ $repeatendtime = strtotime($newEvent->getRepeatdate());
while($newStartTime <= $repeatendtime) {
if($summertimeStart) {
if(!date('I', $newStartTime)) {
@@ -2106,31 +2136,35 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
}
break;
case 'Every month':
- $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);
- $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
- $startMonth = date('m', strtotime($event->getStart())) + 1;
- $startDay = date('d', strtotime($event->getStart()));
- $startYear = date('Y', strtotime($event->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $filterentriesquery3 = "filterID=" . $newEvent->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);
+ $filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
+ }
+ $startMonth = date('m', strtotime($newEvent->getStart())) + 1;
+ $startDay = date('d', strtotime($newEvent->getStart()));
+ $startYear = date('Y', strtotime($newEvent->getStart()));
if($startMonth == 13) {
$startMonth = 1;
$startYear++;
@@ -2138,19 +2172,19 @@ class EventController extends Zend_Controller_Action
while(!checkdate($startMonth, $startDay, $startYear)) {
$startMonth++;
if($repeatend->getTitle() == 'After') {
- $event->setRepeatings($event->getRepeatings() - 1);
+ $newEvent->setRepeatings($newEvent->getRepeatings() - 1);
}
if($startMonth == 13) {
$startMonth = 1;
$startYear++;
}
}
- $newStartDate = $startYear . "-" . $startMonth . "-" . $startDay . " " . date('H:i', strtotime($event->getStart()));
+ $newStartDate = $startYear . "-" . $startMonth . "-" . $startDay . " " . date('H:i', strtotime($newEvent->getStart()));
$newStartTime = strtotime($newStartDate);
- if($event->getEnd()) {
- $endMonth = date('m', strtotime($event->getEnd())) + 1;
- $endDay = date('d', strtotime($event->getEnd()));
- $endYear = date('Y', strtotime($event->getEnd()));
+ if($newEvent->getEnd()) {
+ $endMonth = date('m', strtotime($newEvent->getEnd())) + 1;
+ $endDay = date('d', strtotime($newEvent->getEnd()));
+ $endYear = date('Y', strtotime($newEvent->getEnd()));
if($endMonth == 13) {
$endMonth = 1;
$endYear++;
@@ -2162,7 +2196,7 @@ class EventController extends Zend_Controller_Action
$endYear++;
}
}
- $newEndDate = $endYear . "-" . $endMonth . "-" . $endDay . " " . date('H:i', strtotime($event->getEnd()));
+ $newEndDate = $endYear . "-" . $endMonth . "-" . $endDay . " " . date('H:i', strtotime($newEvent->getEnd()));
$newEndTime = strtotime($newEndDate);
}
if($repeatend->getTitle() == 'After') {
@@ -2186,7 +2220,7 @@ class EventController extends Zend_Controller_Action
}
$newStartDate = $startYear . "-" . $startMonth . "-" . $startDay . " " . date('H:i', $newStartTime);
$newStartTime = strtotime($newStartDate);
- if($event->getEnd()) {
+ if($newEvent->getEnd()) {
$newEvent->setEnd($newEndDate);
$endMonth = date('m', $newEndTime) + 1;
$endDay = date('d', $newEndTime);
@@ -2213,20 +2247,22 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
} else if($repeatend->getTitle() == 'Date') {
- $repeatendtime = strtotime($event->getRepeatdate());
+ $repeatendtime = strtotime($newEvent->getRepeatdate());
while($newStartTime <= $repeatendtime) {
$newEvent->setStart($newStartDate);
$startMonth = date('m', $newStartTime) + 1;
@@ -2245,7 +2281,7 @@ class EventController extends Zend_Controller_Action
}
$newStartDate = $startYear . "-" . $startMonth . "-" . $startDay . " " . date('H:i', $newStartTime);
$newStartTime = strtotime($newStartDate);
- if($event->getEnd()) {
+ if($newEvent->getEnd()) {
$newEvent->setEnd($newEndDate);
$endMonth = date('m', $newEndTime) + 1;
$endDay = date('d', $newEndTime);
@@ -2272,17 +2308,19 @@ class EventController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
- if($newEvent->getEnd()) {
- $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
- } else {
- $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ $startDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ if($newEvent->getEnd()) {
+ $endDate = date('d.m.Y', strtotime($newEvent->getEnd()));
+ } else {
+ $endDate = date('d.m.Y', strtotime($newEvent->getStart()));
+ }
+ $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);
+ $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
- $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);
- $filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
}
}
@@ -2305,13 +2343,17 @@ class EventController extends Zend_Controller_Action
$repeattypeMapper = new Application_Model_RepeattypeMapper();
$repeattype = new Application_Model_Repeattype();
$repeattypeMapper->find($newEvent->getRepeattype(), $repeattype);
- if($repeattype == "Once a week") {
- $weekday = date('N', strtotime($diff['start']));
- $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);
+ $result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
+ $shutdownCategory = $result[0];
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($repeattype == "Once a week") {
+ $weekday = date('N', strtotime($diff['start']));
+ $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);
+ }
}
$events = $this->eventMapper->findBy(array('poolctrl_event.repeat' => 1, 'title' => $oldEvent->getTitle()));
if(count($events) > 0) {
@@ -2354,15 +2396,17 @@ class EventController extends Zend_Controller_Action
}
$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 {
- $endDate = date('d.m.Y', strtotime($event->getStart()) + 900);
+ if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ 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 {
+ $endDate = date('d.m.Y', strtotime($event->getStart()) + 900);
+ }
+ $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);
}
- $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);
}
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 920398d..2df20b5 100755
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -14,10 +14,10 @@ CREATE TABLE IF NOT EXISTS `poolctrl_event` (
`category` int(11) NOT NULL,
`pbs_poolID` int(11) NOT NULL,
`pbs_membershipID` int(11) NOT NULL,
- `pbs_bootosID` int(11) NOT NULL,
+ `pbs_bootosID` int(11) DEFAULT NULL,
`pbs_configID` int(11) DEFAULT NULL,
- `pbs_bootmenuID` int(11) NOT NULL,
- `pbs_filterID` int(11) NOT NULL,
+ `pbs_bootmenuID` int(11) DEFAULT NULL,
+ `pbs_filterID` int(11) DEFAULT NULL,
`repeat` bool NOT NULL DEFAULT false,
`repeattype` int(11) NULL,
`repeatend` int(11) NULL,