Fixed install sync for cron token user/group - to test

SE/bash_Route_Users_Task_syncGroup.php

@@ -23,7 +23,7 @@ Lib::loadClass('V');
 Lib::loadClass('Config');
 Lib::loadClass('DB');
 Lib::loadClass('User');
-Lib::loadClass('UserStorageFactory');
+// _ Lib::loadClass('UserStorageFactory');
 
 
 if (isset($_SERVER["argv"][2])) {
@@ -35,11 +35,19 @@ else {
 	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third idGroup e.g. 3 \n");
 }
 
-Lib::loadClass('Router');
-			$usrStorageDB = UserStorageFactory::getStorage('DB');
-			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
-			$forceSync = 1;
-Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
+
+$cronTaskName = 'forceSyncGroup';
+$keyToken = 'bash_forceSyncGroup';
+$token = Router::getRoute('Cron')->generateCliAuthToken($keyToken, $cronTaskName, 300 * 10);
+$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID ]);
+echo "DBG: output -----------------------\n{$output}\nEOF output---------------------------------\n";
+
+
+// __ Lib::loadClass('Router');
+// __			$usrStorageDB = UserStorageFactory::getStorage('DB');
+// __			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+// __			$forceSync = 1;
+// __ Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
 
 die(".EOF - OK\n");
 

SE/bash_Route_Users_Task_syncUser.php

@@ -23,7 +23,7 @@ Lib::loadClass('V');
 Lib::loadClass('Config');
 Lib::loadClass('DB');
 Lib::loadClass('User');
-Lib::loadClass('UserStorageFactory');
+// _ Lib::loadClass('UserStorageFactory');
 
 
 if (isset($_SERVER["argv"][2])) {
@@ -35,11 +35,20 @@ else {
 	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third usrLogin e.g. jan.kowalski \n");
 }
 
-Lib::loadClass('Router');
-			$usrStorageDB = UserStorageFactory::getStorage('DB');
-			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
-			$forceSync = 1;
-Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
+
+$cronTaskName = 'forceSyncUser';
+$keyToken = 'bash_forceSyncUser';
+$token = Router::getRoute('Cron')->generateCliAuthToken($keyToken, $cronTaskName, 300 * 10);
+$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'usrLogin' => $usrLogin ]);
+echo "DBG: output -----------------------\n{$output}\nEOF output---------------------------------\n";
+
+
+
+//_ Lib::loadClass('Router');
+//_			$usrStorageDB = UserStorageFactory::getStorage('DB');
+//_			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+//)			$forceSync = 1;
+//_Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
 
 die(".EOF - OK\n");
 

SE/se-lib/Route/Cron.php

@@ -225,5 +225,36 @@ class Route_Cron extends RouteBase {
 		}
 		echo "DONE";
 	}
+	
+	
+	public function forceSyncUserAction() {
+		$usrLogin = V::get('usrLogin', 0, $_GET, 'int');
+		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);
+		
+		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);
+		
+		echo "DONE";
+	}
 
 }

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2082,7 +2082,7 @@ database=\"SES_USERS2\"
  $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_DIRECTORY.'\',\'0\',\''.$ADMIN_USERNAME_PASSWD.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 //dodanie domyslnego uprawnienia admina dla glownego usera na bazie tabeli KONTAKTY_view
- $cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2092,7 +2092,7 @@ database=\"SES_USERS2\"
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
                           where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
- $cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2102,12 +2102,12 @@ database=\"SES_USERS2\"
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa