summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-05 11:41:15 +0200
committerBjörn Geiger2011-08-05 11:41:15 +0200
commit27cbd9e552412b527e20cd5f7cfc8108f5ed93df (patch)
tree099a06334e85d11fbbf0e93a638b9150817f7407 /application
parentminor (diff)
downloadpoolctrl-27cbd9e552412b527e20cd5f7cfc8108f5ed93df.tar.gz
poolctrl-27cbd9e552412b527e20cd5f7cfc8108f5ed93df.tar.xz
poolctrl-27cbd9e552412b527e20cd5f7cfc8108f5ed93df.zip
Fehler korrigiert
Diffstat (limited to 'application')
-rw-r--r--application/controllers/PersonController.php28
-rw-r--r--application/layouts/default.phtml11
2 files changed, 20 insertions, 19 deletions
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 9553f76..c2f6422 100644
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -27,7 +27,7 @@ class PersonController extends Zend_Controller_Action
$this->config = $bootstrap->getOptions();
$this->pbs2host = $this->config['pbs2']['host'];
$this->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
- if(is_array($this->userIDsNamespace)) {
+ if(count($this->userIDsNamespace)) {
$membershipID = $this->userIDsNamespace['membershipID'];
$this->currentMembership = new Application_Model_Membership();
$this->membershipMapper = new Application_Model_MembershipMapper();
@@ -58,19 +58,17 @@ class PersonController extends Zend_Controller_Action
if(isset($this->memberships)) {
foreach($this->memberships as $membership) {
- $grouprequest = "groupid" . $membership['groupID'];
+ $grouprequest = "groupid=" . $membership['groupID'];
$groupApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getgroup'] . $membership['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $grouprequest);
$groupXMLString = $groupApiResult['http-body'];
if(strlen($groupXMLString) > 0) {
$groupXML = new SimpleXMLElement($groupXMLString);
$group = new Application_Model_Group();
- $group->setID($groupXML->group->id);
- $group->setTitle($groupXML->group->title);
- $group->setDescription($groupXML->group->description);
-
- print_r($group);
-
- $this->view->apikeys[$group->getID()] = $membership['apikey'];
+ $group->setID(sprintf("%s", $groupXML->group->id));
+ $group->setTitle(sprintf("%s", $groupXML->group->title));
+ $group->setDescription(sprintf("%s", $groupXML->group->description));
+
+ $apikeys[$group->getID()] = $membership['apikey'];
$this->groups[] = array (
'groupID' => $group->getID(),
'title' => $group->getTitle(),
@@ -78,6 +76,7 @@ class PersonController extends Zend_Controller_Action
'membershipID' => $membership['membershipID'],
);
}
+ $this->view->apikeys = $apikeys;
}
}
} else {
@@ -120,14 +119,15 @@ class PersonController extends Zend_Controller_Action
if(isset($this->memberships)) {
$suspendlist = array();
foreach($this->memberships as $membership) {
- $groupApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getgroup'] . $membership['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
+ $grouprequest = "groupid=" . $membership['groupID'];
+ $groupApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getgroup'] . $membership['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $grouprequest);
$groupXMLString = $groupApiResult['http-body'];
if(strlen($groupXMLString) > 0) {
- -$groupXML = new SimpleXMLElement($groupXMLString);
+ $groupXML = new SimpleXMLElement($groupXMLString);
$group = new Application_Model_Group();
- $group->setID($groupXML->group->id);
- $group->setTitle($groupXML->group->title);
- $group->setDescription($groupXML->group->description);
+ $group->setID(sprintf("%s", $groupXML->group->id));
+ $group->setTitle(sprintf("%s", $groupXML->group->title));
+ $group->setDescription(sprintf("%s", $groupXML->group->description));
if($membership['suspend'] == 0){
$membershipList[] = array(
'membershipID' => $membership['membershipID'],
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index b1755a6..f9de7ca 100644
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -1,4 +1,4 @@
-<?php
+<?php
$bootstrap = Zend_Controller_Front::getInstance()->getParam('bootstrap');
$config = $bootstrap->getOptions();
$pbs2host = $this->config['pbs2']['host'];
@@ -97,14 +97,15 @@ if(Zend_Auth::getInstance()->hasIdentity()){
}
if(isset($userIDsNamespace['groupID'])){
echo " in group ";
- $groupApiResult = PostToHost($pbs2host, $config['pbs2']['getgroup'] . $userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
+ $grouprequest = "groupid=" . $membership['groupID'];
+ $groupApiResult = PostToHost($pbs2host, $config['pbs2']['getgroup'] . $membership['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $grouprequest);
$groupXMLString = $groupApiResult['http-body'];
if(strlen($groupXMLString) > 0) {
$groupXML = new SimpleXMLElement($groupXMLString);
$group = new Application_Model_Group();
- $group->setID($groupXML->group->id);
- $group->setTitle($groupXML->group->title);
- $group->setDescription($groupXML->group->description);
+ $group->setID(sprintf("%s", $groupXML->group->id));
+ $group->setTitle(sprintf("%s", $groupXML->group->title));
+ $group->setDescription(sprintf("%s", $groupXML->group->description));
echo "<b><i>".$group->getTitle()."</i></b>";
}
}