Merge branch 'master' of bn.git:plabudda/se

SE/bash_Route_Users_Task_syncGroup.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * 2017-08-16 by a.binder - sync group get name to use in default group A_CLASSIFIED/A_ADM_COMPANY in instalation task
+ * index.php?_route=Users&_task=syncGroup&idGroup=$argv[2]
+ *
+ */
+
+ini_set('max_execution_time', 300);
+ini_set('memory_limit', '512M');
+
+define('DS', DIRECTORY_SEPARATOR);
+define('APP_PATH_ROOT', dirname(__FILE__));
+define('APP_PATH_WWW', dirname(__FILE__));
+define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+
+// set ini to log errors into error log file
+ini_set('display_startup_errors', '0');
+ini_set('log_errors', '1');
+ini_set('error_log', '/var/log/apache2/error_log');// TODO: php.ini ?
+
+require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
+Lib::loadClass('V');
+Lib::loadClass('Config');
+Lib::loadClass('DB');
+Lib::loadClass('User');
+Lib::loadClass('UserStorageFactory');
+
+
+if (isset($_SERVER["argv"][2])) {
+	$_SERVER['SERVER_NAME'] = $_SERVER["argv"][1];
+	$idGroup = $_SERVER["argv"][2];
+}
+
+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);
+
+die(".EOF - OK\n");
+
+?>

SE/bash_Route_Users_Task_syncUser.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * 2017-08-16 by a.binder - bug first user is always not synced
+ * index.php?_route=Users&_task=syncUser&usrLogin=$argv[2]
+ *
+ */
+
+ini_set('max_execution_time', 300);
+ini_set('memory_limit', '512M');
+
+define('DS', DIRECTORY_SEPARATOR);
+define('APP_PATH_ROOT', dirname(__FILE__));
+define('APP_PATH_WWW', dirname(__FILE__));
+define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+
+// set ini to log errors into error log file
+ini_set('display_startup_errors', '0');
+ini_set('log_errors', '1');
+ini_set('error_log', '/var/log/apache2/error_log');// TODO: php.ini ?
+
+require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
+Lib::loadClass('V');
+Lib::loadClass('Config');
+Lib::loadClass('DB');
+Lib::loadClass('User');
+Lib::loadClass('UserStorageFactory');
+
+
+if (isset($_SERVER["argv"][2])) {
+	$_SERVER['SERVER_NAME'] = $_SERVER["argv"][1];
+	$usrLogin = $_SERVER["argv"][2];
+}
+
+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);
+
+die(".EOF - OK\n");
+
+?>

SE/bash_force_classified_table_by_GroupID.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * 2017-08-16 by a.binder - force A_CLASSIFIED/A_ADM_COMPANY by GroupID - use for single table
+ * 
+ *
+ */
+
+ini_set('max_execution_time', 300);
+ini_set('memory_limit', '512M');
+
+define('DS', DIRECTORY_SEPARATOR);
+define('APP_PATH_ROOT', dirname(__FILE__));
+define('APP_PATH_WWW', dirname(__FILE__));
+define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+
+// set ini to log errors into error log file
+ini_set('display_startup_errors', '0');
+ini_set('log_errors', '1');
+ini_set('error_log', '/var/log/apache2/error_log');// TODO: php.ini ?
+
+require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
+Lib::loadClass('V');
+Lib::loadClass('Config');
+Lib::loadClass('DB');
+Lib::loadClass('User');
+Lib::loadClass('UserStorageFactory');
+Lib::loadClass('UsersLdapHelper');
+
+
+if (isset($_SERVER["argv"][3])) {
+	$_SERVER['SERVER_NAME'] = $_SERVER["argv"][1];
+	$groupID = $_SERVER["argv"][2];
+	$Table = $_SERVER["argv"][3];
+}
+
+else {
+	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third idGroup e.g. 3,  and last should be table name e.g. CRM_PROCES \n");
+}
+
+$groupsNetwork=UsersLdapHelper::getGroupsByID($groupID);
+	foreach ($groupsNetwork as $vGroup) {
+		echo "Will try to update table ".$Table." set A_CLASSIFIED='".$vGroup->cn."', A_ADM_COMPANY='".$vGroup->cn."' ; ";
+		$query = "update table `".$Table."` set `A_CLASSIFIED`='".$vGroup->cn."', `A_ADM_COMPANY`='".$vGroup->cn."' ";
+		DB::getPDO()->query($query);
+	}
+
+//print_r($groupsNetwork);
+
+die(".EOF - OK\n");
+
+?>

SE/bash_sync_perms.php

@@ -458,7 +458,7 @@ class SyncPerms {
 		echo "DBG: UrlAction_WmsGenerate->doGenerate() END\n";
 
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() START...\n";
-		//Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate();
+		Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate();
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() END\n";
 	}
 

SE/se-lib/Core/Database/Mysql.php

@@ -793,7 +793,7 @@ class Core_Database_Mysql extends Core_Database {
 		       									if($ARR_TABLE['Table_type']=='BASE TABLE') {
 		       										//DEBUG_S(-3,"\n BRAK TABELI  dodajemy : ".$TABLE."!!!",null,__FILE__,__FUNCTION__,__LINE__);
 
-		       										 $sql="create table ".$TABLE." ( ".$ARR_TABLE['FIELDS'][0]->Field." ".$ARR_TABLE['FIELDS'][0]->Type ; //  ID int(11) NOT NULL AUTO_INCREMENT,
+		       										 $sql="create table `".$TABLE."` ( ".$ARR_TABLE['FIELDS'][0]->Field." ".$ARR_TABLE['FIELDS'][0]->Type ; //  ID int(11) NOT NULL AUTO_INCREMENT,
 														 if($ARR_TABLE['FIELDS'][0]->Null=='NO') $sql.=" not null "; else $sql.=" null ";
 														 //if($ARR_TABLE['FIELDS'][0]->Extra=='auto_increment') $sql.=" AUTO_INCREMENT "; else $sql.="  ";
 														$sql.=" ) ENGINE=MyISAM DEFAULT CHARSET=latin2 ";
@@ -1163,7 +1163,10 @@ class Core_Database_Mysql extends Core_Database {
 														    	$result=$this->query($sql) or  print_r($FIELDS_CHECKED) &&  die1('\nProblem z '.$sql);
 														    }
 														 } else if($FOUND_INDEX_ARR->Non_unique==1) {
-														    $sql="ALTER TABLE  `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."`  (  ".$FOUND_INDEX_ARR->Column_name." ) ;" ;
+														    if($FOUND_INDEX_ARR->Sub_part > 0)
+														    	$sql="ALTER TABLE  `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."`  (  ".$FOUND_INDEX_ARR->Column_name." (".$FOUND_INDEX_ARR->Sub_part.") ) ;" ;
+														    else 
+														    	$sql="ALTER TABLE  `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."`  (  ".$FOUND_INDEX_ARR->Column_name." ) ;" ;
 														    echo "\n ".$sql;
 														    	$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__)  or die1();
 														 } else {

SE/se-lib/DB.php

@@ -100,6 +100,8 @@ class DB {
 			$dbConfName = "import_db";
 		} else if ($db == 'test_db') {
 			$dbConfName = "test_db";
+		} else if ($db == 'test3_db') {
+			$dbConfName = "test3_db";
 		}  else if ($db == 'billing_db') {
 			$dbConfName = "billing_db";
 		}

SE/se-lib/Route/Install.php

@@ -293,6 +293,7 @@ jQuery(document).ready(function () {
 			//$skipPhpFiles[] = 'se-lib/Route/Install.php';
 			$skipPhpFiles[] = 'se-lib/Route/Msgs.php';
 			$skipPhpFiles[] = 'se-lib/Route/UrlAction/WmsGenerate.php';
+			$skipPhpFiles[] = 'se-lib/Route/UrlAction/BiAuditGenerate.php';
 			$skipPhpFiles[] = 'superedit-DB_PROCEDURES_CREATE.php';
 			//$skipPhpFiles[] = '';
 

SE/se-lib/Route/UrlAction/BiAuditGenerate.php

@@ -291,6 +291,7 @@ Router::getRoute("UrlAction_BiAuditGenerate")->' . $function . ';
 						DB::getDB()->UPDATE_OBJ('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA', array_merge(['ID' => $row['ID']], $sqlArr));
 					}
 				}
+				exit;
 			}
 
 
@@ -328,7 +329,11 @@ Router::getRoute("UrlAction_BiAuditGenerate")->' . $function . ';
 							$generatePowiazaniaResult = file_get_contents($generatePowiazaniaResultFile);
 							if ($generatePowiazaniaResult == "ok") {
 								$generatePowiazaniaSqlFile = "{$tasksDirLocation}/generatePowiazania-{$row['ID']}.sql";
-								if (!file_exists($generatePowiazaniaSqlFile)) $error = "Wystąpił nieznany błąd w przetwarzaniu";
+								if (file_exists($generatePowiazaniaSqlFile)) {
+									$powiazanieDirLocation = $this->getDirectory('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA', $row['ID']);
+									if (!file_exists($powiazanieDirLocation)) mkdir($powiazanieDirLocation, 0777, false);
+									if (!file_exists($powiazanieDirLocation)) $error = "Nie udało się wgrać pliku xml - nie można utworzyć katalogu dla rekordu";
+								} else $error = "Wystąpił nieznany błąd w przetwarzaniu";
 							} else $error = "Wystąpił błąd podczas generowania powiązań ({$generatePowiazaniaResult})";
 						} else $error = "Wystąpił nieznany błąd - plk xml został wygenerowany niepoprawnie";
 					} else $error = "Wystąpił nienzany błąd - nie znaleziono pliku xml";
@@ -345,7 +350,6 @@ Router::getRoute("UrlAction_BiAuditGenerate")->' . $function . ';
 							'FILE_STATUS' => 'GENERATED',
 							'FILE_STATUS_info' => 'Poprawnie wygenerowano powiązania',
 						];
-						$powiazanieDirLocation = $this->getDirectory('BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA', $row['ID']);
 						$destXmlFile = "{$powiazanieDirLocation}/relations.xml";
 						rename($xmlFile, $destXmlFile);
 					}
@@ -509,7 +513,7 @@ Router::getRoute("UrlAction_BiAuditGenerate")->' . $function . ';
 		];
 
 		try {
-			$query = "select BI_analiza_depth, BI_analiza_employees from BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA where ID = '{$ID}' and FILE_STATUS = 'IN_PROGRESS' and BI_analiza_reloadCache != 'Y'";
+			$query = "select BI_analiza_depth, BI_analiza_employees, A_ADM_COMPANY, A_CLASSIFIED from BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA where ID = '{$ID}' and FILE_STATUS = 'IN_PROGRESS' and BI_analiza_reloadCache != 'Y'";
 			$result = DB::getPDO()->fetchAll($query);
 			if (!$result) throw new Exception("Błąd danych");
 			$powiazanie = $result[0];
@@ -544,6 +548,8 @@ Router::getRoute("UrlAction_BiAuditGenerate")->' . $function . ';
 					else $string_concat_path[] = $concat;
 				}
 				$powiazaniaRowSqlArr['string_concat_path'] = implode(' / ', $string_concat_path);
+				$powiazaniaRowSqlArr['A_ADM_COMPANY'] = $powiazanie['A_ADM_COMPANY'];
+				$powiazaniaRowSqlArr['A_CLASSIFIED'] = $powiazanie['A_CLASSIFIED'];
 				$id_row = DB::getPDO()->insert("BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row", $powiazaniaRowSqlArr);
 				if (!$id_row) throw new Exception("Błąd bazy danych");
 				DB::getPDO()->insert('CRM__#REF_TABLE__25', ["PRIMARY_KEY" => $ID, "REMOTE_PRIMARY_KEY" => $id_row]);

SE/se-lib/Route/Users.php

@@ -874,14 +874,14 @@ class Route_Users extends RouteBase {
 		UI::dol();
 	}
 
-	public function syncUser($userName, $usrStorageDB, $usrStorageLdap) {
+	public function syncUser($userName, $usrStorageDB, $usrStorageLdap,$forceSync=null) {
 		if (empty($userName)) throw new Exception("Empty user login");
 		if (!$usrStorageDB) throw new Exception("Error storage DB not exists");
 		if (!$usrStorageLdap) throw new Exception("Error storage Ldap not exists");
 
 		$synUsers = new SyncUsers($usrStorageDB, $usrStorageLdap);
 
-		if ('1' == V::get('_runSync', '', $_POST)) {
+		if ('1' == V::get('_runSync', '', $_POST) or $forceSync) {
 			$synced = $synUsers->syncUser($userName);
 			if (!$synced) {
 				UI::alert('danger', "Nie udało się zsynchronizować uprawnień użytkownika {$userName}.");

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1204,6 +1204,8 @@ return $cmd;
 
 function INSTALL_GETCOMMANDS_BIAUDIT($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
 	$cmd[]['rsh']='mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_BiAudit\',\'on\')"';
+
+	return $cmd;
 }
 
 
@@ -1562,6 +1564,13 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/wfs-qgis.php','/Library/Server/Web/Data/Sites/Default/SE/');
   $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/wfs.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/wfs.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  
+  $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_Route_Users_Task_syncUser.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_Route_Users_Task_syncGroup.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_force_classified_table_by_GroupID.php','/Library/Server/Web/Data/Sites/Default/SE/');
 
 
 
@@ -1719,6 +1728,10 @@ zasob_id=\"2\"
   $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/SKANY/index.html';
  $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WMS_LAYERS';
   $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WMS_LAYERS/index.html';
+ $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/BI_audit_POWIAZANIA';
+  $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/BI_audit_POWIAZANIA/index.html';
+ $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/BI_audit_KW_requested';
+  $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/BI_audit_KW_requested/index.html';
 
    $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WIZJE_LOKALNE';
   $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WIZJE_LOKALNE/index.html';
@@ -1986,6 +1999,16 @@ DEST_FOLDER_FORMAT=\"BI_audit_POWIAZANIA.<VARNAME1>\"
 DEST_FOLDER_VARNAME1="ID"
 
 
+[BI_audit_KW_requested_COLUMN]
+mount_point=\"BI_audit_KW_requested\"
+share_point=\"BI_audit_KW_requested\"
+www_share_point=\"BI_audit_KW_requested\"
+LOOKAT_FOLDER_LOOK_GLOB=\"BI_audit_KW_requested.<VARNAME>\"
+LOOKAT_FOLDER_VARNAME=\"ID\"
+DEST_FOLDER_FORMAT=\"BI_audit_KW_requested.<VARNAME1>\"
+DEST_FOLDER_VARNAME1=\"ID\"
+
+
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
 //! .config_domena_.php
 //LDAP
@@ -2044,7 +2067,10 @@ database=\"SES_USERS2\"
 
  $cmd[]['rsh']=' echo " update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$SERVER_ADDRESS.'\' where \\`DESC\\`=\'biuro.biall-net.pl\' and \\`TYPE\\`=\'SERWER\' and ID=1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //poprawa danych z referencyjnej bazy BIALL-NET
  $cmd[]['rsh']=' echo " update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' where \\`DESC\\`=\'SES_USERS2\' and \\`TYPE\\`=\'BAZA_DANYCH\' and ID=2 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //poprawa danych z referencyjnej bazy BIALL-NET
- $cmd[]['rsh']=' echo " insert ignore into CRM_LISTA_ZASOBOW (ID, \\`DESC\\`, \\`TYPE\\`) VALUES(2, \'BAZA_DANYCH\', \'BAZA_DANYCH\') " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; // create Zasob ID=2 if missing
+ $cmd[]['rsh']=' echo " insert ignore into CRM_LISTA_ZASOBOW (\\`ID\\`, \\`DESC\\`, \\`TYPE\\`) VALUES(2, \'BAZA_DANYCH\', \'BAZA_DANYCH\') " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; // create Zasob ID=2 if missing
+
+ $cmd[]['rsh']=' echo " insert ignore into CRM_LISTA_ZASOBOW (\\`ID\\`,\\`PARENT_ID\\`, \\`DESC\\`, \\`TYPE\\`,\\`A_STATUS\\`) VALUES(3,0, \''.$REMOTE_FOLDER_ROOT.'\', \'PODMIOT\',\'NORMAL\') " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; // create default group for process data
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php '.$SERVER_ADDRESS.' 3';
 
 
 
@@ -2074,6 +2100,27 @@ 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 czp1.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 czp1.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
+
+ //TODO zamienic wyzej na akcje skryptem
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1;
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_DIRECTORY;
+
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_PROCES'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_LISTA_ZASOBOW'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_WSKAZNIK'; //3 to grupa $REMOTE_FOLDER_ROOT
+// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_AUTH_PROFILE'; //3 to grupa $REMOTE_FOLDER_ROOT
+
+ 
+
 
  /* @2014-03-10 these has been moved to create config_base_structure_dump.sql option - WYKONAJ_REFERENCYJNA_BAZE_DANYCH
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'import_db\',\'default_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$SERVER_ADDRESS.' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy
@@ -2409,6 +2456,10 @@ function MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$installer_tmp,
 				$skipPhpFiles[] = 'UI.php';
 				$skipPhpFiles[] = 'Request.php';
 				$skipPhpFiles[] = 'BiAuditGenerate.php';
+				$skipPhpFiles[] = 'bash_Route_Users_Task_syncUser.php';
+				$skipPhpFiles[] = 'bash_Route_Users_Task_syncGroup.php';
+				$skipPhpFiles[] = 'bash_force_classified_table_by_GroupID.php';
+
 
 				$skipFilesSgencoder = (!empty($skipPhpFiles)) ? ' -x ' . implode(' -x ', $skipPhpFiles) : '';
 

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -115,7 +115,7 @@ if(empty($DEBUG_LEVEL)) $DEBUG_LEVEL=0;
 $_SESSION['DEBUG']=$DEBUG_LEVEL;
 
 //todo zczytaz z konfiga @2013-10
-$CNF_ZASOB=array('import_db'=>array('SQL_DATABASE'=>'import_db'),'default_db'=>array('SQL_DATABASE'=>'default_db'),'test_db'=>array('SQL_DATABASE'=>'test_db'));
+$CNF_ZASOB=array('import_db'=>array('SQL_DATABASE'=>'import_db'),'default_db'=>array('SQL_DATABASE'=>'default_db'),'test_db'=>array('SQL_DATABASE'=>'test_db'),'test3_db'=>array('SQL_DATABASE'=>'test3_db'));
 
 $sql="select `ID`,`DESC` from `CRM_LISTA_ZASOBOW` where `TYPE`='DATABASE_MYSQL' or `TYPE`='DATABASE_POSTGRESQL' ;";
 	$db=DB::getdb();
@@ -296,14 +296,14 @@ $TABLES_STRUCTURE_arr['MAIN'] = array('QUALITY_NOTICES','QUALITY_NOTICES_HIST','
 
 $TABLES_STRUCTURE_DATA_arr['MAIN'] = array('CRM_PRZYPADEK','CRM_REF_CONFIG');
 
-
+ 
 $TABLES_STRUCTURE_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_ENERGA_PRACOWNICY','BI_audit_ENERGA_PRACOWNICY_adresy','BI_audit_ENERGA_PRACOWNICY_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI','BI_audit_ENERGA_RUM_KONTRAHENCI_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object','BI_audit_ENERGA_RUM_UMOWY','BI_audit_ENERGA_RUM_UMOWY_HIST','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','BI_audit_KW_requested','BI_audit_KW_requested_HIST','BI_audit_KW_requested_person','CRM__#REF_TABLE__11','CRM__#REF_TABLE__12','CRM__#REF_TABLE__18','CRM__#REF_TABLE__19','CRM__#REF_TABLE__23','CRM__#REF_TABLE__24','CRM__#REF_TABLE__25');
 
-$TABLES_STRUCTURE_DATA_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','CRM__#REF_TABLE__11','CRM__#REF_TABLE__12','CRM__#REF_TABLE__18','CRM__#REF_TABLE__19');
+//$TABLES_STRUCTURE_DATA_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','CRM__#REF_TABLE__11','CRM__#REF_TABLE__12','CRM__#REF_TABLE__18','CRM__#REF_TABLE__19');
 
 
 $TABLES_STRUCTURE = array();
-$TABLES_STRUCTURE_DATA_arr = array();
+$TABLES_STRUCTURE_DATA = array();
 foreach ($TABLES_STRUCTURE_arr as $item) $TABLES_STRUCTURE = array_merge($TABLES_STRUCTURE, $item);
 foreach ($TABLES_STRUCTURE_DATA_arr as $item) $TABLES_STRUCTURE_DATA = array_merge($TABLES_STRUCTURE_DATA, $item);