Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 17 insertions, 5 deletions

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();