summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/controllers/AuthController.php4
-rw-r--r--application/controllers/PersonController.php14
-rw-r--r--library/Poolctrl/Notifier.php2
-rw-r--r--library/Poolctrl/Pagination.php2
4 files changed, 11 insertions, 11 deletions
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index 1faaab7..c34ce0c 100644
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -57,7 +57,7 @@ class AuthController extends Zend_Controller_Action
$date = new DateTime();
$person->setLogindate($date->getTimestamp());
if($person->getSuspend()) {
- $poolctrlNotifier = new Pool_Notifier();
+ $poolctrlNotifier = new Poolctrl_Notifier();
$this->view->notification = $poolctrlNotifier->notify('Your Account is suspended', 'error');
} else {
$this->personmapper->save($person);
@@ -65,7 +65,7 @@ class AuthController extends Zend_Controller_Action
return;
}
} else {
- $poolctrlNotifier = new Pool_Notifier();
+ $poolctrlNotifier = new Poolctrl_Notifier();
$this->view->notification = $poolctrlNotifier->notify('Wrong Email or Password', 'error');
}
}
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 9f056c8..2a97fac 100644
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -36,13 +36,13 @@ class PersonController extends Zend_Controller_Action
$this->groupMapper = new Application_Model_GroupMapper();
$this->membershipMapper = new Application_Model_MembershipMapper();
$this->memberships = $this->membershipMapper->findBy(array("personID" => $this->person->getID()),true);
-
+
$this->view->apikeys = array();
if(isset($this->memberships)) {
foreach($this->memberships as $membership) {
$group = $this->groupMapper->find($membership['groupID']);
- $this->view->apikeys[$group->getID()] = $membership['apikey'];
+ $this->view->apikeys[$group->getID()] = $membership['apikey'];
$this->groups[] = array (
'groupID' => $group->getID(),
'title' => $group->getTitle(),
@@ -69,12 +69,12 @@ class PersonController extends Zend_Controller_Action
if(isset($userIDsNamespace['membershipID'])) {
$this->_redirect('/');
} else {
- if(count($this->memberships) == 1) {
+ if(count($this->memberships) == 1) {
$myMembership = $this->memberships[0];
- $roleSession = new Zend_Session_Namespace('userIDs');
+ $roleSession = new Zend_Session_Namespace('userIDs');
$roleSession->membershipID = $myMembership['membershipID'];
$roleSession->personID = $myMembership['personID'];
- $roleSession->groupID = $myMembership['groupID'];
+ $roleSession->groupID = $myMembership['groupID'];
$roleSession->apikey = $myMembership['apikey'];
$this->_redirect('/');
} elseif(count($this->memberships) > 1) {
@@ -89,7 +89,7 @@ class PersonController extends Zend_Controller_Action
return;
} else {
$groupMapper = new Application_Model_GroupMapper();
- if(isset($this->memberships)) {
+ if(isset($this->memberships)) {
$suspendlist = array();
foreach($this->memberships as $membership) {
$group = $groupMapper->find($membership['groupID']);
@@ -108,7 +108,7 @@ class PersonController extends Zend_Controller_Action
}
if(count($suspendlist) >=1){
- $poolNotifier = new Pool_Notifier();
+ $poolNotifier = new Poolctrl_Notifier();
$this->view->notification = $poolNotifier->notify("Actually ".count($suspendlist)." Memberships are suspended", 'error' );
}
}
diff --git a/library/Poolctrl/Notifier.php b/library/Poolctrl/Notifier.php
index 77de708..6cc98e4 100644
--- a/library/Poolctrl/Notifier.php
+++ b/library/Poolctrl/Notifier.php
@@ -10,7 +10,7 @@
* General information about OpenSLX can be found at http://openslx.org/
*/
-class Pool_Notifier{
+class Poolctrl_Notifier{
public function notify($action,$result){
diff --git a/library/Poolctrl/Pagination.php b/library/Poolctrl/Pagination.php
index 7f1a596..3d28996 100644
--- a/library/Poolctrl/Pagination.php
+++ b/library/Poolctrl/Pagination.php
@@ -10,7 +10,7 @@
* General information about OpenSLX can be found at http://openslx.org/
*/
-class Pool_Pagination{
+class Poolctrl_Pagination{
private $element;
private $perpage;