summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/controllers/AuthController.php15
-rw-r--r--application/controllers/EventController.php32
-rw-r--r--application/controllers/PersonController.php4
3 files changed, 19 insertions, 32 deletions
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index 735547b..c1e06c8 100644
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -50,13 +50,14 @@ class AuthController extends Zend_Controller_Action
$count = 0;
foreach($login->membershiplist->membership as $membershipXML)
{
- $membership['membershipID'] = sprintf("%s", $membershipXML->id);
- $membership['personID'] = sprintf("%s", $membershipXML->personid);
- $membership['groupID'] = sprintf("%s", $membershipXML->groupid);
- $membership['roleID'] = sprintf("%s", $membershipXML->roleid);
- $membership['apikey'] = sprintf("%s", $membershipXML->apikey);
- $membership['suspend'] = sprintf("%s", $membershipXML->suspend);
- $membershipID = $membership['membershipID'];
+ $membership = new Application_Model_Membership();
+ $membership->setID() = sprintf("%s", $membershipXML->id);
+ $membership->setPersonID() = sprintf("%s", $membershipXML->personid);
+ $membership->setGroupID() = sprintf("%s", $membershipXML->groupid);
+ $membership->setRoleID() = sprintf("%s", $membershipXML->roleid);
+ $membership->setApikey() = sprintf("%s", $membershipXML->apikey);
+ $membership->setSuspend() = sprintf("%s", $membershipXML->suspend);
+ $membershipID = $membership->getID();
$membershipSession->$membershipID = $membership;
if($count == 0) {
$apikey = sprintf("%s", $membershipXML->apikey);
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index ff4a6a4..96ac0b4 100644
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -83,28 +83,16 @@ class EventController extends Zend_Controller_Action
$event = $eventObj->toArray();
$bootos = new Application_Model_BootOs();
$event['pbs_bootos_title'] = $bootoslist[$event['pbs_bootosID']]->getTitle();
- $membershipsNamespace = Zend_Session::namespaceGet('memberships');
- $membership = new Application_Model_Membership($membershipsNamespace[$event['pbs_membershipID']]);
- $membership->setID($event['pbs_membershipID']);
- $personApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getperson'] . $membership->getApikey(), 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
- $personXMLString = $personApiResult['http-body'];
- if(strlen($personXMLString) > 0) {
- $personXML = new SimpleXMLElement($personXMLString);
- $person = new Application_Model_Person();
- $person->setID(sprintf("%s", $personXML->person->id));
- $person->setCity(sprintf("%s", $personXML->person->city));
- $person->setEmail(sprintf("%s", $personXML->person->email));
- $person->setFirstname(sprintf("%s", $personXML->person->firstname));
- $person->setHousenumber(sprintf("%s", $personXML->person->housenumber));
- $person->setLogin(sprintf("%s", $personXML->person->login));
- $person->setLogindate(sprintf("%s", $personXML->person->logindate));
- $person->setName(sprintf("%s", $personXML->person->name));
- $person->setPostalcode(sprintf("%s", $personXML->person->postalcode));
- $person->setRegisterdate(sprintf("%s", $personXML->person->registerdate));
- $person->setStreet(sprintf("%s", $personXML->person->street));
- $person->setSuspend(sprintf("%s", $personXML->person->suspend));
- $person->setTitle(sprintf("%s", $personXML->person->title));
- $event['pbs_person_name'] = $person->getFirstname() . " " . $person->getName();
+ foreach(Zend_Session::namespaceGet('memberships') as $membership) {
+ if($membership->getID() == $event['pbs_membershipID']) {
+ break;
+ }
+ }
+ foreach(Zend_Session::namespaceGet('persons') as $person) {
+ if($person->getID() == $this->userIDsNamespace['personID']) {
+ $event['pbs_person_name'] = $person->getFirstname() . " " . $person->getName();
+ break;
+ }
}
$eventcategory = new Application_Model_Eventcategory();
$this->eventcategoryMapper->find($event['category'], $eventcategory);
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 68fb93e..40ef456 100644
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -33,9 +33,7 @@ class PersonController extends Zend_Controller_Action
break;
}
}
- foreach(Zend_Session::namespaceGet('memberships') as $membershipArray) {
- $membership = new Application_Model_Membership($membershipArray);
- $membership->setID($membershipArray['membershipID']);
+ foreach(Zend_Session::namespaceGet('memberships') as $membership) {
$this->memberships[$membership->getID()] = $membership;
}
if(count($this->memberships) > 0) {