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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -635,7 +635,7 @@ $cmd[]['rsh']='cat /etc/sudoers |grep "_www ALL = NOPASSWD: /sbin/pfctl" || echo
 
 
 //@2016-07 kopia bezpieczenstwa bazy danych mysql TODO bzyk
-$cmd[]['rsh']='which mysqldump || exit 0 &&   echo "select 1+1;" | mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' || exit 0 &&   mysqldump -E -R --single-transaction --triggers --allow-keywords -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' \''.$REMOTE_FOLDER_ROOT.'\' > "/var/root/'.$REMOTE_FOLDER_ROOT.'.`date \'+%Y-%m-%d\'`.mysqldump  "';
+$cmd[]['rsh']='which mysqldump || exit 0 &&   echo "select 1+1;" | mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' || exit 0 &&   mysqldump -E -R --single-transaction --triggers --allow-keywords -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' \''.$REMOTE_FOLDER_ROOT.'\' > "/var/root/'.$REMOTE_FOLDER_ROOT.'.`date \'+%Y-%m-%d\'`.mysqldump  "';
 
 //ewentualna proba upgrejdowania instniejacego portu
 
@@ -901,7 +901,7 @@ return $cmd;
 
 //@2016-07-17 TODO
 function INSTALL_GETCOMMANDS_UNINSTALL_WORDPRESS($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']='which mysqladmin && mysqladmin  -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED ';
+$cmd[]['rsh']='which mysqladmin && mysqladmin  -h127.0.0.1 -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED ';
 $cmd[]['rsh']="rm -Rf /Library/Server/Web/Data/Sites/Default/wordpress || echo PASSED";
 
 
@@ -919,9 +919,9 @@ $cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && tar -zxpvf wordpress
 $cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && chown -R _www wordpress";
 
 // moved to UNINSTALL $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED ';
-$cmd[]['rsh']='mysqladmin -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSE';
-$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'127.0.0.1\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
-$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'localhost\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
+$cmd[]['rsh']='mysqladmin -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSE';
+$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'127.0.0.1\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
+$cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON '.$REMOTE_FOLDER_ROOT.'_wordpress.* to \'wordpress\'@\'localhost\' IDENTIFIED BY \''.md5($ADMIN_USERNAME_PASSWD).'\'  WITH GRANT OPTION; flush privileges;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
 
 //@2016-07 aktywowany wordpress z cli nie wstawia .htaccess dobrego
 //teraz wylaczone z uwagi na test wp rewrite structure nizej z CLI
@@ -1106,16 +1106,16 @@ $cmd[]['rsh']='echo "CREATE TABLE IF NOT EXISTS \`wp_p5-BeeCtrl_config\` (
   \`isActive\` tinyint(1) NOT NULL,
   \`created_at\` timestamp NULL DEFAULT NULL,
   \`updated_at\` timestamp NULL DEFAULT NULL
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;" |mysql -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
 
 $cmd[]['rsh']='echo "INSERT IGNORE INTO \`wp_p5-BeeCtrl_config\` (\`id\`, \`property\`, \`value\`, \`isActive\`, \`created_at\`, \`updated_at\`) VALUES
 (1, \'url\', \'https://'.$SERVER_ADDRESS.'/SE/wfs-data.php/default_db/\', 1, NULL, NULL),
-(2, \'onPage\', \'5\', 1, NULL, NULL); " |mysql -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
+(2, \'onPage\', \'5\', 1, NULL, NULL); " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
 
 
-$cmd[]['rsh']='echo "ALTER TABLE `wp_p5-BeeCtrl_config` ADD PRIMARY KEY (`id`);" |mysql -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
+$cmd[]['rsh']='echo "ALTER TABLE `wp_p5-BeeCtrl_config` ADD PRIMARY KEY (`id`);" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
 
-$cmd[]['rsh']='echo "ALTER TABLE `wp_p5-BeeCtrl_config`  MODIFY `id` int(10) unsigned NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;" |mysql -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
+$cmd[]['rsh']='echo "ALTER TABLE `wp_p5-BeeCtrl_config`  MODIFY `id` int(10) unsigned NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D  '.$REMOTE_FOLDER_ROOT.'_wordpress || echo PASSED';
 
 return $cmd;
 
@@ -1153,13 +1153,13 @@ max_allowed_packet = 600M
  $cmd[]['rsh']='launchctl load -w /Library/LaunchDaemons/org.macports.mysql55-server.plist';
  $cmd[]['rsh']='echo "/opt/local/lib/mysql55/bin" >>/etc/paths';
  //@2013-10-03 tu jest bug : - recznie wyzwolona ta sama komenda ruszyła, a skrypt zwrócił error  - sprawdzam z zamiana wykrzyknikow w hasle!
- $cmd[]['rsh']='sleep 10 && mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -e \'select 1+1;\' || /opt/local/lib/mysql55/bin/mysqladmin password \''.$ADMIN_USERNAME_PASSWD.'\' ';
+ $cmd[]['rsh']='sleep 10 && mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -e \'select 1+1;\' || /opt/local/lib/mysql55/bin/mysqladmin password \''.$ADMIN_USERNAME_PASSWD.'\' ';
  $cmd[]['rsh']='[ -d /var/mysql ] || {
   mkdir -p /var/mysql && [ -e /var/mysql/mysql.sock ] || ln -s /opt/local/var/run/mysql55/mysqld.sock /var/mysql/mysql.sock
   }';
 
 
- $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -e "SET PASSWORD FOR \'root\'@\'localhost\' = PASSWORD(\''.$ADMIN_USERNAME_PASSWD.'\')" ';  //@2015-02-28 problem dlugosci hasla - musi byc tak ustawione
+ $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -e "SET PASSWORD FOR \'root\'@\'localhost\' = PASSWORD(\''.$ADMIN_USERNAME_PASSWD.'\')" ';  //@2015-02-28 problem dlugosci hasla - musi byc tak ustawione
 //! MYSQL SERVER INSTALACJA EOF
 
 
@@ -1195,7 +1195,7 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule (.*) /wms/qgis/qgis_mapserv.cgi?MAP=/Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WMS_LAYERS/.maps/.single/\$1.qgs [QSA]" > /Library/Server/Web/Data/Sites/Default/wms/qgis/.htaccess';
  $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi ] || ln -s /Library/WebServer/CGI-Executables/mapserv /Library/Server/Web/Data/Sites/Default/wms/mapserv.cgi';
  $cmd[]['rsh']='[ -f /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi ] || ln -s /Applications/QGIS.app/Contents/MacOS/fcgi-bin/qgis_mapserv.fcgi /Library/Server/Web/Data/Sites/Default/wms/qgis/qgis_mapserv.cgi';
- $cmd[]['rsh']='mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_WMS\',\'on\')"';
+ $cmd[]['rsh']='mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_WMS\',\'on\')"';
 
 return $cmd;
 
@@ -1203,7 +1203,7 @@ 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\')"';
+	$cmd[]['rsh']='mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'module_BiAudit\',\'on\')"';
 
 	return $cmd;
 }
@@ -1214,7 +1214,7 @@ function INSTALL_GETCOMMANDS_BIAUDIT($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_U
 function INSTALL_GETCOMMANDS_WEBMAIL($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']='which mysqladmin && mysqladmin  -f -uroot -p'.$ADMIN_USERNAME_PASSWD.' drop webmail || echo PASSED ';
+ $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -h127.0.0.1 -uroot -p'.$ADMIN_USERNAME_PASSWD.' drop webmail || echo PASSED ';
 
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/webmail && rm -R /Library/Server/Web/Data/Sites/Default/webmail || echo PASSED';
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/roundcube.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/roundcube.tar.gz || echo PASSED';
@@ -1245,11 +1245,11 @@ chown _www logs/ || exit 1
 // $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/isync-1.0.6 && ./configure';
 
 
- $cmd[]['rsh']='mysqladmin -h 127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create webmail';
- $cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON webmail.* to \'webmail\'@\'127.0.0.1\' IDENTIFIED BY \'webmail666\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
- $cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON webmail.* to \'webmail\'@\'localhost\' IDENTIFIED BY \'webmail666\'  WITH GRANT OPTION; flush privileges;" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
+ $cmd[]['rsh']='mysqladmin -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create webmail';
+ $cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON webmail.* to \'webmail\'@\'127.0.0.1\' IDENTIFIED BY \'webmail666\'  WITH GRANT OPTION; flush privileges;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
+ $cmd[]['rsh']='echo "GRANT ALL PRIVILEGES ON webmail.* to \'webmail\'@\'localhost\' IDENTIFIED BY \'webmail666\'  WITH GRANT OPTION; flush privileges;" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\'';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/webmail || exit 1
-  cat ./SQL/mysql.initial.sql | mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -h 127.0.0.1 -Dwebmail || exit 1 ';
+  cat ./SQL/mysql.initial.sql | mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -h 127.0.0.1 -Dwebmail || exit 1 ';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/webmail || exit 1
   rm  -r installer/ || exit 1';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/webmail || exit 1
@@ -1518,11 +1518,6 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/procesy5*','/Library/Server/Web/Data/Sites/Default/SE/');
   $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/przypomnij.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/przypomnij.php','/Library/Server/Web/Data/Sites/Default/SE/');
-  
-  $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/api.php || echo PASSED';
-  $cmd[]['scp_root']=array($INSTALL_ROOT.'/api.php','/Library/Server/Web/Data/Sites/Default/SE/');
-
-  
   $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/se-lib || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/se-lib','/Library/Server/Web/Data/Sites/Default/SE/');
 	$cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/schema || echo PASSED';
@@ -1666,7 +1661,7 @@ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.
 $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS; //dla pewnosci - TODO 
 
 //@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
-$cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+$cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' { '.tell_user_gui_error("System zostal zainstalowany - wejdz przegladarka na adres www https://".$SERVER_ADDRESS." (alternatywnie https://".$SERVER_ADDRESS.".procesy5.pl - jezeli domena ".$SERVER_ADDRESS." nie zostala jeszcze skonfigurowana), zaloguj sie na uzytkownika:".$ADMIN_USERNAME." (administrator uzytkownikow) lub ".$ADMIN_USERNAME_DIRECTORY." (administrator domeny LDAP/systemu) . Powinienes teraz zalozyc uzytkownikow systemu i nadac hasla - jezeli jest to pierwsza instalacja ").'; exit 0; } '; //komunikat dla uzytkownika
 
 
@@ -2061,35 +2056,35 @@ database=\"SES_USERS2\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php
 '; //todo zmienic to wczesniej
 
- $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.' || echo PASSED ';
+ $cmd[]['rsh']='which mysqladmin && mysqladmin -h127.0.0.1 -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.' || echo PASSED ';
 
- $cmd[]['rsh']='mysqladmin  -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create '.$REMOTE_FOLDER_ROOT.' || echo passed' ; //todo przestawic wczesniej
+ $cmd[]['rsh']='mysqladmin  -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' create '.$REMOTE_FOLDER_ROOT.' || echo passed' ; //todo przestawic wczesniej
  $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/config/.config_base_structure.php','/Library/Server/Web/Data/Sites/Default/SE/config/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
 
  //! inicjalizacja bazy SQIX_STRUCTURE_DB_SYNC
   $cmd[]['scp_root']=array(''.$INSTALL_ROOT.'/config/.config_base_structure_dump.sql','/Library/Server/Web/Data/Sites/Default/SE/config/');   //todo do przeniesienia wyzej - struktura musi byc wygenerowana
-  $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql  -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' '.$REMOTE_FOLDER_ROOT.' < /Library/Server/Web/Data/Sites/Default/SE/config/.config_base_structure_dump.sql'; //TODO powinno byc osobne miejsce do bazy i struktur bo kasuje to baze zamiast aktualizacji!
+  $cmd[]['rsh']='/opt/local/lib/mysql55/bin/mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' '.$REMOTE_FOLDER_ROOT.' < /Library/Server/Web/Data/Sites/Default/SE/config/.config_base_structure_dump.sql'; //TODO powinno byc osobne miejsce do bazy i struktur bo kasuje to baze zamiast aktualizacji!
 
 // TODO @2014-06-16 sprawdzic dodawanie struktur DB_STRUCTURES_CREATE - czy jest potrzebne - imho TAK
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-DB_PROCEDURES_CREATE.php\') ; DB_PROCEDURES_CREATE(); " '.$SERVER_ADDRESS.' ';
 
 
- $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 " update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$SERVER_ADDRESS.'\' where \\`DESC\\`=\'biuro.biall-net.pl\' and \\`TYPE\\`=\'SERWER\' and ID=1 " |mysql -h127.0.0.1 -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 -h127.0.0.1 -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 -h127.0.0.1 -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']=' echo " insert ignore into CRM_LISTA_ZASOBOW (\\`ID\\`,\\`PARENT_ID\\`, \\`DESC\\`, \\`TYPE\\`,\\`A_STATUS\\`) VALUES(3,0, \''.$REMOTE_FOLDER_ROOT.'\', \'PODMIOT\',\'NORMAL\') " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; // create default group for process data
 // TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php '.$SERVER_ADDRESS.' 3';
 
 
- $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |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_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 " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -h127.0.0.1 -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_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 																												//addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME,             $ADM_ADMIN_DESC,											 $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP )
 
 // $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
  
- $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'" |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
+ $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'" |mysql -h127.0.0.1 -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 -h127.0.0.1 -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
@@ -2107,7 +2102,7 @@ database=\"SES_USERS2\"
 $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.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+                          where cz.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
 
 
@@ -2124,7 +2119,7 @@ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TAB
 $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.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+                          where cz.TAGS like \'%DEFAULT_ADMIN_ROLE%\' limit 10 " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
 
 
@@ -2132,12 +2127,12 @@ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TAB
 $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
+                          where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa
 
 $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
+                          where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -h127.0.0.1 -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;
@@ -2823,14 +2818,14 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['start_selected']='true';
 
 
-		//! pakiet: INSTALL_GETCOMMANDS_WEBMAIL
+		//! pakiet: INSTALL_GETCOMMANDS_WEBMAIL TODO make uninstall @2017-09-25
 		$packages['pl.procesy5.WEBMAIL']['exit_file']=str_replace('.', '_', $h->ID.".WEBMAIL_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
 		$packages['pl.procesy5.WEBMAIL']['installer_dir_name']=$h->ID.".WEBMAIL_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
 		$packages['pl.procesy5.WEBMAIL']['installer_tmp']="/tmp/pl.procesy5_WEBMAIL_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.WEBMAIL']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_WEBMAIL"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.WEBMAIL']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.WEBMAIL']['xml_choice']['title']='(U+I)Webmail RoundCube';
-		$packages['pl.procesy5.WEBMAIL']['xml_choice']['description']='Additional webmail from roundcube (Use for upgrade and install)';
+		$packages['pl.procesy5.WEBMAIL']['xml_choice']['title']='(I)Webmail RoundCube';
+		$packages['pl.procesy5.WEBMAIL']['xml_choice']['description']='Additional webmail from roundcube (Use for install only)';
 		$packages['pl.procesy5.WEBMAIL']['xml_choice']['start_selected']='true';
 
 		//! pakiet: INSTALL_GETCOMMANDS_SE

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -761,7 +761,8 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 						//trzeba sprawdzic, czy dany typ jest komorka w tabeli
 					
 					//tylko jezeli wszedl z tego importu
-					if(isset($zasoby_to_import_arr[$h->SRC_TABLE_ID])) {
+					/* TODO @2017-09-25 nie dziala funkcja get_cols jak nie ma tabeli ma fatal error
+						if(isset($zasoby_to_import_arr[$h->SRC_TABLE_ID])) {
 					
 						$sql_chk="select t2.`ID` as ID_TABLE, t2.`TYPE`,t2.`DESC` as `TABLE`, t1.`DESC`,t1.`COLUMN_DEFAULT`,t1.`IS_NULLABLE`,t1.`COLUMN_TYPE`,t1.`IS_AUTO_INCREMENT` from CRM_LISTA_ZASOBOW as t1 left join CRM_LISTA_ZASOBOW as t2 on t1.PARENT_ID=t2.ID where t1.ID='".$h->SRC_TABLE_ID."' and t1.`TYPE`='KOMORKA' and t2.`TYPE`='TABELA'";
 						//trzeba sprawdzic, czy taka komorka istnieje w danej tabeli
@@ -800,7 +801,11 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 							//print_r($CONNREMOTE);
 							//die();
 						}
-					} // else echo "<br> id ".$h->SRC_TABLE_ID." nie jest w arrayu";
+					} */
+					
+					
+					
+					// else echo "<br> id ".$h->SRC_TABLE_ID." nie jest w arrayu";
 				          /* if(in_array($h->SRC_TABLE_ID, array_keys($zasoby_to_import_arr))) {
 								$zasobObj = ProcesHelper::getZasobTableInfo($h->DST_TABLE_ID);
 								if ($zasobObj) {