summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-11-17 12:45:16 +0100
committerBjörn Geiger2011-11-17 12:45:16 +0100
commitdb5fd084c78cd3a3ba859beb400baf9d7b69a764 (patch)
tree407be60c4790161036f3e766930699ae254b958d
parentmore clean up (diff)
downloadpoolctrl-db5fd084c78cd3a3ba859beb400baf9d7b69a764.tar.gz
poolctrl-db5fd084c78cd3a3ba859beb400baf9d7b69a764.tar.xz
poolctrl-db5fd084c78cd3a3ba859beb400baf9d7b69a764.zip
pbs2Api klasse korrigiert
-rwxr-xr-xapplication/controllers/EventController.php10
-rw-r--r--library/Poolctrl/Pbs2Api.php7
2 files changed, 9 insertions, 8 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ab6f913..bb48528 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1323,9 +1323,9 @@ class EventController extends Zend_Controller_Action
if($event->getPbs_poolID() == 2) {$textColor = 'black';}
else $textColor = 'white';
- $events[] = array(
-
- $events[] = array(
+ $events[] = array(
+
+ $events[] = array(
'id' => $event->getID(),
'title' => $event->getTitle(),
'start' => $event->getStart(),
@@ -1344,8 +1344,8 @@ class EventController extends Zend_Controller_Action
'opacity' => 1,
'immediate' => $event->getImmediate(),
'running' => $event->getRunning(),
- )
- );
+ )
+ );
//}
}
echo json_encode($events);
diff --git a/library/Poolctrl/Pbs2Api.php b/library/Poolctrl/Pbs2Api.php
index 98c4b01..6a88ddb 100644
--- a/library/Poolctrl/Pbs2Api.php
+++ b/library/Poolctrl/Pbs2Api.php
@@ -285,13 +285,14 @@ class Poolctrl_Pbs2Api {
}
public function addFilterentry($filterID, $filterType, $filterValue1, $filterValue2) {
- $filterentriesXML = $this->runApi($this->pbs2host, $this->config['pbs2']['addfilterentry'], $filterentriesquery);
+ $filterentriesQuerie = "filterID=" . $filterID . "&filtertypeID=" . $filterType . "&filtervalue=" . $filterValue1 . "&filtervalue2=" . $filterValue2;
+ $filterentriesXML = $this->runApi($this->pbs2host, $this->config['pbs2']['addfilterentry'], $filterentriesQuerie);
$filterentriesID = sprintf("%s", $filterentriesXML->filterentry->id);
return $filterentriesID;
}
- public function changeFilterentry($oldValue1, $oldValue2, $newValue1, $newValue2) {
- $filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldValue1 . "&oldvalue2=" . $oldValue2 . "&value1=" . $newValue1 . "&value2=" . $newValue2;
+ public function changeFilterentry($filterID, $oldValue1, $oldValue2, $newValue1, $newValue2) {
+ $filterentriesQuerie = "filterid=" . $filterID . "&oldvalue1=" . $oldValue1 . "&oldvalue2=" . $oldValue2 . "&value1=" . $newValue1 . "&value2=" . $newValue2;
$filterentriesXML = $this->runApi($this->pbs2host, $this->config['pbs2']['changefilterentry'], $filterentriesQuerie);
return $filterentriesXML;
}