fixed code style in Cron and Users

SE/se-lib/Route/Cron.php

@@ -225,44 +225,39 @@ class Route_Cron extends RouteBase {
 		}
 		echo "DONE";
 	}
-	
-	
+
 	public function forceSyncUserAction() {
-		$usrLogin = V::get('usrLogin', 0, $_GET, 'word');
+		$usrLogin = V::get('usrLogin', 0, $_GET, 'login');
 		if (!$usrLogin) throw new Exception("Missing usrLogin");
-		
-		
+
 		Lib::loadClass('Router');
 		Lib::loadClass('UsersLdapHelper');
 		$usrStorageDB = UserStorageFactory::getStorage('DB');
 		$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
 		$forceSync = 1;
-		Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
-		
+		Router::getRoute('Users')->syncUser($usrLogin, $usrStorageDB, $usrStorageLdap, $forceSync);
+
 		echo "DONE";
 	}
-	
+
 	public function forceSyncGroupAction() {
 		$idGroup = V::get('idGroup', 0, $_GET, 'int');
 		if (!$idGroup) throw new Exception("Missing idGroup");
-		
-		
+
 		Lib::loadClass('Router');
 		Lib::loadClass('UsersLdapHelper');
 		$usrStorageDB = UserStorageFactory::getStorage('DB');
 		$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
 		$forceSync = 1;
-		Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
-		
+		Router::getRoute('Users')->syncGroup($idGroup, $usrStorageDB, $usrStorageLdap, $forceSync);
+
 		echo "DONE";
 	}
-	
-	
-	public function AddUserAction() {
-		//$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID, 'usrLogin' => $usrLogin , 'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL, 'ADM_NAME' => $ADM_NAME, 'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC, 'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE, 'ADM_PASSWD' => $ADM_PASSWD, 'A_ADM_COMPANY' => $A_ADM_COMPANY, 'A_CLASSIFIED' => $A_CLASSIFIED ]);
 
+	public function addUserAction() {
+		//$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID, 'usrLogin' => $usrLogin , 'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL, 'ADM_NAME' => $ADM_NAME, 'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC, 'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE, 'ADM_PASSWD' => $ADM_PASSWD, 'A_ADM_COMPANY' => $A_ADM_COMPANY, 'A_CLASSIFIED' => $A_CLASSIFIED ]);
 		$idGroup 					= V::get('idGroup', 0, $_GET, 'int');
-		$usrLogin 					= V::get('usrLogin', 0, $_GET, 'word');
+		$usrLogin 					= V::get('usrLogin', 0, $_GET, 'login');
 		$idTelboxes					= V::get('idTelboxes', 0, $_GET, 'int');
 		$ADM_ADMIN_LEVEL 			= V::get('ADM_ADMIN_LEVEL', 0, $_GET, 'int');
 		$ADM_NAME 					= V::get('ADM_NAME', 0, $_GET, 'word');
@@ -273,32 +268,27 @@ class Route_Cron extends RouteBase {
 		$idGroup_A_CLASSIFIED 		= V::get('idGroup_A_CLASSIFIED', 0, $_GET, 'int');
 		$idGroup_DEFAULT_ACL_GROUP	= V::get('idGroup_DEFAULT_ACL_GROUP', 0, $_GET, 'int');
 		if (!$usrLogin) throw new Exception("Missing usrLogin");
-		
-		
+
 		Lib::loadClass('Router');
 		Lib::loadClass('UsersLdapHelper');
-		
-			Lib::loadClass('UsersLdapHelper');
-			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_ADM_COMPANY);
-			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_ADM_COMPANY} not found");
-				foreach ($groupsNetwork as $vGroup) {
-					$A_ADM_COMPANY = $vGroup->cn;
-				}
-			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_CLASSIFIED);
-			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
-				foreach ($groupsNetwork as $vGroup) {
-					$A_CLASSIFIED = $vGroup->cn;
-				}
-				
-			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_DEFAULT_ACL_GROUP);
-			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
-				foreach ($groupsNetwork as $vGroup) {
-					$DEFAULT_ACL_GROUP = $vGroup->cn;
-				}
-		Router::getRoute('Users')->addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP );
-		
+		$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_ADM_COMPANY);
+		if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_ADM_COMPANY} not found");
+		foreach ($groupsNetwork as $vGroup) {
+			$A_ADM_COMPANY = $vGroup->cn;
+		}
+		$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_CLASSIFIED);
+		if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
+		foreach ($groupsNetwork as $vGroup) {
+			$A_CLASSIFIED = $vGroup->cn;
+		}
+		$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_DEFAULT_ACL_GROUP);
+		if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
+		foreach ($groupsNetwork as $vGroup) {
+			$DEFAULT_ACL_GROUP = $vGroup->cn;
+		}
+		Router::getRoute('Users')->addUser($usrLogin, $idGroup, $idTelboxes, $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP);
+
 		echo "DONE";
 	}
 
-
 }

SE/se-lib/Route/Users.php

@@ -691,34 +691,34 @@ class Route_Users extends RouteBase {
 			$added = $usrStorageDB->addUserGroup($usrLogin, $groupToAdd, $idTelboxes);
 		}
 	}
-	
-	public function addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP ) {
+
+	public function addUser($usrLogin, $idGroup, $idTelboxes, $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP) {
 		DBG::_('DBG_NG', '>0', 'post', $_POST, __CLASS__, __FUNCTION__, __LINE__);
 		if (!$usrLogin) throw new Exception("Wrong param user login!");
 		$usrStorageDB = UserStorageFactory::getStorage('DB');
 		if (!$usrStorageDB) throw new Exception("Error storage not exists!");
-		
+
 		$usr = $usrStorageDB->getUser($usrLogin);
 		if ($usr) throw new Exception("Użytkownik {$usrLogin} już istnieje.");
 		if (!$usr) {
-					$acl = ACL::getStorageByNamespace("default_db/ADMIN_USERS/ADMIN_USERS");
-						$usr = $acl->addItem([
-							'ADM_ACCOUNT' => $usrLogin,
-							'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL,
-							'ADM_NAME' => $ADM_NAME,
-							'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC,
-							'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE,
-							'ADM_PASSWD' => $ADM_PASSWD,
-							'A_ADM_COMPANY' => $A_ADM_COMPANY,
-							'A_CLASSIFIED' => $A_CLASSIFIED
-						]);
-						if (!$usr) throw new Exception("Nie udało się utworzyć wpisu użytkownika");
-					
-				if ($idGroup > 0) {
-					$groupToAdd = $usrStorageDB->getGroupWithoutNested($idGroup);
-					if (!$groupToAdd) throw new Exception("Grupa [{$idGroup}] nie istnieje");
-					$added = $usrStorageDB->addUserGroup($usrLogin, $groupToAdd, $idTelboxes);
-				}
+			$acl = ACL::getStorageByNamespace("default_db/ADMIN_USERS/ADMIN_USERS");
+			$usr = $acl->addItem([
+				'ADM_ACCOUNT' => $usrLogin,
+				'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL,
+				'ADM_NAME' => $ADM_NAME,
+				'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC,
+				'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE,
+				'ADM_PASSWD' => $ADM_PASSWD,
+				'A_ADM_COMPANY' => $A_ADM_COMPANY,
+				'A_CLASSIFIED' => $A_CLASSIFIED
+			]);
+			if (!$usr) throw new Exception("Nie udało się utworzyć wpisu użytkownika");
+
+			if ($idGroup > 0) {
+				$groupToAdd = $usrStorageDB->getGroupWithoutNested($idGroup);
+				if (!$groupToAdd) throw new Exception("Grupa [{$idGroup}] nie istnieje");
+				$added = $usrStorageDB->addUserGroup($usrLogin, $groupToAdd, $idTelboxes);
+			}
 		}
 	}