summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
authormichael pereira2011-04-25 17:00:50 +0200
committermichael pereira2011-04-25 17:00:50 +0200
commitfeb2bf1f625a1ea35f69a981cf0e3d468a8f99d2 (patch)
tree946a47221e1c813f8252579b9430f4f55363e39d /application/modules/user
parentdb fix (diff)
downloadpbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.tar.gz
pbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.tar.xz
pbs2-feb2bf1f625a1ea35f69a981cf0e3d468a8f99d2.zip
suspended fix
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/AuthController.php5
-rw-r--r--application/modules/user/controllers/GroupController.php8
-rw-r--r--application/modules/user/controllers/PersonController.php8
-rw-r--r--application/modules/user/views/scripts/group/show.phtml6
-rw-r--r--application/modules/user/views/scripts/person/index.phtml2
-rw-r--r--application/modules/user/views/scripts/person/owndetails.phtml2
-rw-r--r--application/modules/user/views/scripts/person/show.phtml2
7 files changed, 17 insertions, 16 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);
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index fae7b44..7e2eec0 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -110,7 +110,7 @@ if(count($this->membersList)==0)
echo "This hroup has no members."
?> <?php foreach ($this->membersList as $k => $member): ?> <?php
$membershipID = $member['membershipID'];
-$suspended = $member['suspended'];
+$suspend = $member['suspend'];
$person = $member['person'];
$role = $member['role'];
$class='';
@@ -142,7 +142,7 @@ if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (
alt='Revoke Membership' /></a> <?php
endif;
if(Pbs_Acl::checkRight('gsm')) {
- if($suspended == 1)
+ if($suspend == 1)
{
?> <a
href=" <?php echo $this->url(
@@ -179,7 +179,7 @@ if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (
<?php
if(Pbs_Acl::checkRight('gsm')) {
?> <label>Membership suspended</label>
-<div class='item'><?php if($suspended == 1) echo "yes"; else echo "no"; ?></div>
+<div class='item'><?php if($suspend == 1) echo "yes"; else echo "no"; ?></div>
<?php
}
?></div>
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index 515f9da..9899928 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -102,7 +102,7 @@ if($person->getID() == $this->userIDsNamespace['personID']) {
}
}
if($this->suspendRight === true) {
- if($person->getSuspended() == 1) {
+ if($person->getSuspend() == 1) {
?> <a
href=" <?php echo $this->url(
array(
diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
index 60364c0..896a52b 100644
--- a/application/modules/user/views/scripts/person/owndetails.phtml
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -29,7 +29,7 @@ label {
<?php if($this->suspendRight === true)
{
?> <label>Suspended:</label>
- <div class='item'><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></div>
+ <div class='item'><?php if($this->person->getSuspend() == 1) echo "yes"; else echo "no"; ?></div>
<?php
}
?>
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index 6283808..a62557b 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -32,7 +32,7 @@ label {
<?php if($this->suspendRight === true)
{
?> <label>Suspended:</label>
- <div class='item'><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></div>
+ <div class='item'><?php if($this->person->getSuspend() == 1) echo "yes"; else echo "no"; ?></div>
<?php
}
?>