diff options
| author | michael pereira | 2011-04-25 17:00:50 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-25 17:00:50 +0200 |
| commit | feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2 (patch) | |
| tree | 946a47221e1c813f8252579b9430f4f55363e39d /application/modules/user/controllers | |
| parent | db fix (diff) | |
| download | pbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.tar.gz pbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.tar.xz pbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.zip | |
suspended fix
Diffstat (limited to 'application/modules/user/controllers')
3 files changed, 11 insertions, 10 deletions
diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php index 47aa029..9c6faa8 100644 --- a/application/modules/user/controllers/AuthController.php +++ b/application/modules/user/controllers/AuthController.php @@ -52,10 +52,11 @@ class User_AuthController extends Zend_Controller_Action $this->personmapper = new Application_Model_PersonMapper(); $result = $this->personmapper->findBy(array('email' => Zend_Auth::getInstance()->getIdentity()),true); $person = new Application_Model_Person($result[0]); + print_a('case1',$person); $person->setID($result[0]['personID']); $date = new DateTime(); $person->setLogindate($date->getTimestamp()); - if($person->getSuspended()) { + if($person->getSuspend()) { $pbsNotifier = new Pbs_Notifier(); $this->view->notification = $pbsNotifier->notify('Your Account is suspended', 'error'); } else { @@ -103,7 +104,7 @@ class User_AuthController extends Zend_Controller_Action $person = new Application_Model_Person($_POST); $this->personmapper = new Application_Model_PersonMapper(); $date = new DateTime(); - $person->setSuspended(0); + $person->setSuspend(0); $person->setRegisterdate($date->getTimestamp()); $person->setPasswordSalt(MD5($date->getTimestamp())); $person->setPassword(MD5($person->getPassword() . $person->getPasswordSalt())); diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php index 3f7fde0..bb39287 100644 --- a/application/modules/user/controllers/GroupController.php +++ b/application/modules/user/controllers/GroupController.php @@ -275,7 +275,7 @@ class User_GroupController extends Zend_Controller_Action $role = $this->rolemapper->find($membership_tmp->getRoleID()); $membersList[] = array( 'membershipID' => $member['membershipID'], - 'suspended' => $member['suspended'], + 'suspend' => $member['suspend'], 'person' => $person, 'role' => $role ); @@ -422,7 +422,7 @@ class User_GroupController extends Zend_Controller_Action $membership->setGroupID($groupRequest->getGroupID()); $membership->setPersonID($groupRequest->getPersonID()); $membership->setRoleID($_POST['roleID']); - $membership->setSuspended(0); + $membership->setSuspend(0); $apikey = randomString(32); $membership->setApikey($apikey); @@ -504,7 +504,7 @@ class User_GroupController extends Zend_Controller_Action $membershipID = $this->_request->getParam('membershipID'); if(isset($membershipID)) { $membership = $this->membershipMapper->find($membershipID); - $membership->setSuspended(1); + $membership->setSuspend(1); if(isset($membership)) { if($membership->getGroupID() != $this->userIDsNamespace['groupID']) { $pbsNotifier = new Pbs_Notifier(); @@ -533,7 +533,7 @@ class User_GroupController extends Zend_Controller_Action $membershipID = $this->_request->getParam('membershipID'); if(isset($membershipID)) { $membership = $this->membershipMapper->find($membershipID); - $membership->setSuspended(0); + $membership->setSuspend(0); if(isset($membership)) { if($membership->getGroupID() != $this->userIDsNamespace['groupID']) { $pbsNotifier = new Pbs_Notifier(); diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php index cc8a1e2..c51a297 100644 --- a/application/modules/user/controllers/PersonController.php +++ b/application/modules/user/controllers/PersonController.php @@ -330,12 +330,12 @@ class user_PersonController extends Zend_Controller_Action } else { $groupMapper = new Application_Model_GroupMapper(); $roleMapper = new Application_Model_RoleMapper(); - if(isset($this->memberships)) { + if(isset($this->memberships)) { $suspendlist = array(); foreach($this->memberships as $membership) { $group = $groupMapper->find($membership['groupID']); $role = $roleMapper->find($membership['roleID']); - if($membership['suspended'] == 0){ + if($membership['suspend'] == 0){ $membershipList[] = array( 'membershipID' => $membership['membershipID'], 'group' => $group->getTitle(), @@ -463,7 +463,7 @@ class user_PersonController extends Zend_Controller_Action $personID = $this->_request->getParam('personID'); if(isset($personID)) { $person = $this->personmapper->find($personID); - $person->setSuspended(1); + $person->setSuspend(1); if(isset($person)) { try { $this->personmapper->save($person); @@ -487,7 +487,7 @@ class user_PersonController extends Zend_Controller_Action $personID = $this->_request->getParam('personID'); if(isset($personID)) { $person = $this->personmapper->find($personID); - $person->setSuspended(0); + $person->setSuspend(0); if(isset($person)) { try { $this->personmapper->save($person); |
