Drobne poprawki

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -603,7 +603,7 @@ if($SERVER_VERSION=='10.10Yosemite') {
 	$cmd[]['rsh']='port install ImageMagick';
 	$cmd[]['rsh']='port install php55-imagick';
 	$cmd[]['rsh']='port install php55-imagick';
-	$cmd[]['rsh']='cd /usr/lib/php/extensions/no-debug-non-zts-20121212/ && ln -s /opt/local/lib/php55/extensions/no-debug-non-zts-20121212/imagick.so . ';
+	$cmd[]['rsh']='ls -al /usr/lib/php/extensions/no-debug-non-zts-20121212/imagick.so || cd /usr/lib/php/extensions/no-debug-non-zts-20121212/ && ln -s /opt/local/lib/php55/extensions/no-debug-non-zts-20121212/imagick.so . ';
 	$cmd[]['rsh']='cat /etc/php.ini |grep "extension=imagick.so" || echo "\nextension=imagick.so\n" >> /etc/php.ini';
 }
 
@@ -1405,6 +1405,26 @@ 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
+                          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
+                          left join _CRM_PROCES_STATS_proc_wiev as cpi on cpi.ID=cw.ID_PROCES 
+                          left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
+                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.`TYPE`=\'STANOWISKO\'
+                          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
+                          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
+                          left join _CRM_PROCES_STATS_proc_wiev as cpi on cpi.ID=cw.ID_PROCES 
+                          left join CRM_WSKAZNIK as cw1 on cw1.ID_PROCES=cpi.ID_PROCES_INIT
+                          left join CRM_LISTA_ZASOBOW as czp1 on czp1.ID=cw1.ID_ZASOB and czp1.`TYPE`=\'STANOWISKO\'
+                          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
 
  
  /* @2014-03-10 these has been moved to create config_base_structure_dump.sql option - WYKONAJ_REFERENCYJNA_BAZE_DANYCH 
@@ -1816,9 +1836,20 @@ function INSTALL_SES_PROCESY_A() {
 			//polecenia do gita:
 
 			//$ git clone /Library/Server/Web/Data/Sites/SE-production-git/ NOWY_KATALOG
-			$cmd='rm -Rf '.$installer_dir_tar.'/'.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git';
+			$cmd='sudo rm -Rf '.$installer_dir_tar.'/'.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git';
 			DEBUG_S(-3,'Usuwam stare pliki git ',$cmd,__FILE__,__FUNCTION__,__LINE__);
 			exec($cmd);
+
+
+			{ //@2015-01-27 zrobienie gita z repozytorium
+
+			
+			$cmd='cd '.$installer_dir_tar.' && sudo  git clone git@biuro.biall-net.pl:plabudda/se.git '.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git' ;
+			exec($cmd);
+
+			}
+			
+            if (1==0) { //@2015-01-27 - proba zrobienia zwyklego clone
 			$cmd='git clone /Library/Server/Web/Data/Sites/SE-production-git/ '.$installer_dir_tar.'/'.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git';
 			DEBUG_S(-3,'Running command',$cmd,__FILE__,__FUNCTION__,__LINE__);
 			exec($cmd);
@@ -1827,6 +1858,8 @@ function INSTALL_SES_PROCESY_A() {
 			$cmd='cd '.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git && git checkout '.$h->VERSION_GIT;
 			DEBUG_S(-3,'Running command',$cmd,__FILE__,__FUNCTION__,__LINE__);
 			exec($cmd);
+			}
+
 
 			//w taki sposób w katalogu NOWY_KATALOG pojawi się katalog SE z podaną wersją
 			//brakuje tylko katalogu SE/config/

SE/superedit-SYNC_GIS_TABLES.php

@@ -166,8 +166,10 @@ function SYNC_GIS_TABLES() {
 
 				update  "'.$table_to_set.'"  t1
 				set "'.$field_to_set.'"=(
-				select 
+				select case   when round(sum(t2.length'.$sql_price.')) is null then
+				 0 else 
 				 round(sum(t2.length'.$sql_price.')) 
+				 end
 				 from "'.$table_from.'_AGR" as t2 where t2."field_index"=t1."'.$field_index_t1.'"
 				)