summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
authorSimon2011-04-05 12:58:56 +0200
committerSimon2011-04-05 12:58:56 +0200
commitd106362ad158554ee09debf48ec0249ef8e2c599 (patch)
treeb52279d6a1ba80ad3417a7ffd8853ee50c061a00 /application/modules/user/controllers
parentUnterstriche in Spaltentitel erlaubt(danke Michi...) (diff)
parentweiteres Recht hinzugefügt (diff)
downloadpbs2-d106362ad158554ee09debf48ec0249ef8e2c599.tar.gz
pbs2-d106362ad158554ee09debf48ec0249ef8e2c599.tar.xz
pbs2-d106362ad158554ee09debf48ec0249ef8e2c599.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/GroupController.php26
-rw-r--r--application/modules/user/controllers/RoleController.php22
2 files changed, 28 insertions, 20 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 76639bd..83358c4 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -2,21 +2,13 @@
class User_GroupController extends Zend_Controller_Action
{
-
protected $groupMapper = null;
-
protected $groupGroupsMapper = null;
-
protected $membershipMapper = null;
-
protected $groupRequestMapper = null;
-
protected $personmapper = null;
-
protected $rolemapper = null;
-
protected $groupList = null;
-
protected $userIDsNamespace = null;
public function init()
@@ -112,7 +104,15 @@ class User_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_redirect($_SERVER['HTTP_REFERER']);
+ if($_SERVER['HTTP_REFERER']) {
+ $this->_redirect($_SERVER['HTTP_REFERER']);
+ } else {
+ if(isset($groupID)) {
+ $this->_redirect('/user/group/show/groupID/' . $groupID);
+ } else {
+ $this->_helper->redirector('', 'group');
+ }
+ }
return;
}
}
@@ -217,12 +217,8 @@ class User_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show')) {
- if(strpos($_SERVER['HTTP_REFERER'], '/groupID/')) {
- $this->_redirect('/user/group/showall');
- } else {
- $this->_helper->redirector('changemembership', 'person');
- }
+ if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show') !== false && strpos($_SERVER['HTTP_REFERER'], '/groupID/') === false) {
+ $this->_helper->redirector('changemembership', 'person');
} else {
$this->_helper->redirector('showall', 'group');
}
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 059d9c4..38c12b0 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -2,7 +2,7 @@
class User_RoleController extends Zend_Controller_Action
{
- protected $userIDsNamespace;
+ protected $userIDsNamespace = null;
public function init()
{
@@ -76,8 +76,8 @@ class User_RoleController extends Zend_Controller_Action
}
}
}
- //$this->_helper->redirector('', 'role');
- //return;
+ $this->_helper->redirector('', 'role');
+ return;
}
}
@@ -127,7 +127,15 @@ class User_RoleController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_redirect($_SERVER['HTTP_REFERER']);
+ if($_SERVER['HTTP_REFERER']) {
+ $this->_redirect($_SERVER['HTTP_REFERER']);
+ } else {
+ if(isset($roleID)) {
+ $this->_redirect('/user/role/show/roleID/' . $roleID);
+ } else {
+ $this->_helper->redirector('', 'role');
+ }
+ }
return;
}
}
@@ -215,7 +223,11 @@ class User_RoleController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_helper->redirector('', 'role');
+ if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show') !== false && strpos($_SERVER['HTTP_REFERER'], '/roleID/') === false) {
+ $this->_helper->redirector('changemembership', 'person');
+ } else {
+ $this->_helper->redirector('', 'role');
+ }
return;
} else {
$pbsNotifier = new Pbs_Notifier();