API-Key bei Membership & BootOS über API fertig

3 files changed, 21 insertions, 2 deletions

diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 9eca3e3..9db2ccf 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -411,7 +411,11 @@ class User_GroupController extends Zend_Controller_Action
 			$membership->setGroupID($groupRequest->getGroupID());
 			$membership->setPersonID($groupRequest->getPersonID());			
 			$membership->setRoleID($_POST['roleID']);
-			$membership->setSuspended(0);
+			$membership->setSuspended(0);		
+			$apikey = randomString(32);
+			$membership->setApikey($apikey);
+		
+							
 			try {
 				$id = $this->membershipMapper->save($membership);
 
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 4f6b975..4ec8297 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -35,14 +35,28 @@ class user_PersonController extends Zend_Controller_Action
 			$this->groupRequestMapper = new Application_Model_GroupRequestMapper();
 			$this->membershipMapper = new Application_Model_MembershipMapper();
 			$this->memberships = $this->membershipMapper->findBy(array("personID" => $this->person->getID()),true);
+			
+			$rightrolesMapper = new Application_Model_RightRolesMapper();
+			$rightroles = new Application_Model_RightRoles();	
+			$role = new Application_Model_Role();
+			$roleMapper = new Application_Model_RoleMapper();
+			
+			$this->view->apikeys = array();
+				
 			if(isset($this->memberships)) {
 				foreach($this->memberships as $membership) {
 					$group = $this->groupMapper->find($membership['groupID']);
+					@list($rightroles) = $rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $membership['roleID']));
+					$role = $roleMapper->find($membership['roleID']);
+					if($rightroles != null)
+						$this->view->apikeys[$group->getID()] = $membership['apikey'];
+					
 					$this->groups[] = array (
                                         					'groupID'  => $group->getID(),	
                                         					'title' => $group->getTitle(),
                                         					'description' => $group->getDescription(),
-                                        					'membershipID' => $membership['membershipID']
+                                        					'membershipID' => $membership['membershipID'],
+															'role' => $role->getTitle()
 					);
 				}
 			}
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 2c22031..bee6ecf 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -339,6 +339,7 @@ class User_RoleController extends Zend_Controller_Action
 									$rightroles = new Application_Model_RightRoles();
 									$rightroles->setRightID($rightID);
 									$rightroles->setRoleID($roleID);
+										
 									try {
 										$this->rightRolesMapper->save($rightroles);
 									} catch(Zend_Exception $e)