Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/procesy/ajax.php

@@ -295,6 +295,11 @@ if($DBG){ echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;t
 	echo '<span>';
 		echo $out_link;
 		echo " ";
+		if(strstr("'NARZEDZIE','PLIK','ZASOB_PLIKOW','SOFTWARE','APLIKACJA','SERWER','SERWER_PORT','DOKUMENTY','SEGREGATOR','SKOROSZYT','KUWETA','KUWETA_MAGAZYNOWA','MATERIAL_REKLAMOWY','RESOURCE_CONSUMABLE','MATERIAL_EKSPLOATACYJNY','ALARM-SATEL','ALARM-CZYTNIK-KART','ALARM-KLAWIATURA','DOSTEP-ZAMEK','DOSTEP-KLUCZ','DOSTEP-ZAMEK-ELEKTRONICZNY','DOSTEP-ZAMEK-GRUPA','DOSTEP-ZAMEK-GRUPA-GHZ','DOSTEP-ZAMEK-GRUPA-GS','DOSTEP-ZAMEK-GRUPA-ES','DOSTEP-KARTA','NOTATKA','URZADZENIE','KOMPUTER','WYPOSAZENIE_LOKALU','SZAFA','POLKA','REJESTRATOR','KAMERA','PIECZATKA','PASSWORD','URZADZENIA_I_OZNACZENIA_BHP','OZNACZENIE_LOKALIZACJI','DOSTEP-UPRAWNIENIA'", $zasob->TYPE)
+		) {
+		echo App::link("dodaj", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".ProcesHelper::getZasobTableID('DEVICES')."&ff_A_STATUS=WAITING&ff_T_DEVICE_SERIAL=".date('Y-m-d')."-".$zasob->ID."&ff_T_DEVICE_INFO=".urlencode($zasob->OPIS)."&ff_T_DEVICE_TYPE=".urlencode($zasob->DESC)."&ff_CRM_LISTA_ZASOBOW_ID=".$zasob->ID."#CREATE", array('class'=>'btn-p5', 'title'=>'Dodaj zapotrzebowanie', 'onclick'=>null));
+		echo App::link("szukaj", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".ProcesHelper::getZasobTableID('DEVICES')."&ff_CRM_LISTA_ZASOBOW_ID=".$zasob->ID, array('class'=>'btn-p5', 'title'=>'szukaj', 'onclick'=>null));
+		}
 		echo App::link_ajax("refresh", "ajax_zasob_search_external_ids", array('zasob_id'=>$zasob->ID), array('js_result_type'=>'override_parent', 'js_result'=>'', 'title'=>'refresh IDS', 'ico'=>"refresh.png"));
 	echo '</span>';
 

SE/procesy5.php

@@ -2741,7 +2741,8 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 			}
 		}
 	}
-
+	if($tree->get_param('editable'))
+		echo App::link("↵+", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".$tree->get_param('getZasobTableID')."&ff_PARENT_ID=".$r->ID."#CREATE", array('class'=>'btn-p5', 'title'=>'Dodaj dziecko', 'onclick'=>null));
 	echo'</dt>';
 	echo'</dl>'."\n";
 }

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

@@ -211,7 +211,7 @@ class Core_Database_Mysql extends Core_Database {
 		       				
 		       				
 		       						$sql="show full tables like   '".$TABLE."' ;" ;
-			   						$result=$this->query($sql) or die1('\nProblem z '.$sql);     
+			   						$result=$this->query($sql) or die1('\n214:Problem z '.$sql);     
 			   						while($h=mysql_fetch_object($result)) {		       				
 				   						$TABLES_IMPORT[$TABLE]['Table_type']=$h->{'Table_type'};
 				       					DEBUG_S(-3,'//! Reading to conf if table is WIEV or not :sql/result',array($sql,$h->{'Table_type'}),__FILE__,__FUNCTION__,__LINE__);
@@ -1133,7 +1133,7 @@ class Core_Database_Mysql extends Core_Database {
 								       				unset($FIELDS_CHECKED);
 								       				if(in_array('SKIP-PROCEDURE', $options)) { 
 										   				DEBUG_S(-3,'SKIP-PROCEDURES option',null,__FILE__,__FUNCTION__,__LINE__);
-										   				continue;
+										   				
 												   		} else {
 								       				$sql=" show triggers like '".$TABLE."' ;" ; //listujemy nasze triggery z tej tabeli
 									       			DEBUG_S(-3,'Looking for triggers in '.$TABLE,$sql,__FILE__,__FUNCTION__,__LINE__);

SE/stuff/postgis2/org.postgres.plist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Disabled</key><false/>
+  <key>KeepAlive</key><true/>
+  <key>Label</key><string>org.postgres</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>/Applications/Postgres.app/Contents/Versions/9.4/bin/postgres</string>
+    <string>-D</string>
+    <string>/var/db/postgres</string>
+  </array>
+  <key>UserName</key><string>_postgres</string>
+  <key>RunAtLoad</key><true/>
+  <key>LaunchOnlyOnce</key><false/>
+</dict>
+</plist>

SE/superedit-GRAPH_VIEW_PROCES.php

@@ -449,7 +449,7 @@ class GraphViewProcessParser {
 				left join CRM_LISTA_ZASOBOW as czp on(czp.ID=cz.PARENT_ID)
 			where cw.ID_PROCES in(".implode(',', array_keys($id_proces_obj)).")
 				and cw.A_STATUS in ('NORMAL','WAITING')
-				and czp.`TYPE` in ('TABELA')
+			--	and czp.`TYPE` in ('TABELA')
 				{$filter}
 		";
 		$res = $db->query($sql);

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -670,6 +670,7 @@ $cmd[]['rsh']='cd /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.pl
 
 
 // postgis by BZYK
+/*
 $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis/PostgreSQL-9.3.4-1.dmg','/tmp/PostgreSQL-9.3.4-1.dmg');
 
 $cmd[]['rsh']='hdiutil mount /tmp/PostgreSQL-9.3.4-1.dmg -mountpoint /Volumes/PostgreSQL';
@@ -697,6 +698,10 @@ $cmd[]['rsh']='hdiutil mount /tmp/JavaForOSX2014-001.dmg -mountpoint /Volumes/Ja
 $cmd[]['rsh']='installer -package "/Volumes/JavaForOSX/JavaForOSX.pkg" -target "/" -verbose';
 $cmd[]['rsh']='hdiutil unmount /Volumes/JavaForOSX';
 
+$cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis/org.postgresql.postgres.plist','/Library/LaunchDaemons/org.postgresql.postgres.plist');
+$cmd[]['rsh']='launchctl load /Library/LaunchDaemons/org.postgresql.postgres.plist';
+$cmd[]['rsh']='launchctl start org.postgresql.postgres';
+
 $cmd[]['rsh']='/usr/local/pgsql/bin/psql -U postgres -c "create user root with password \''.$ADMIN_USERNAME_PASSWD.'\'" || echo PASSED';
 
 $cmd[]['rsh']='sudo -u _postgres /usr/local/pgsql/bin/createdb -U postgres -O "root" "'.$REMOTE_FOLDER_ROOT.'" || echo PASSED'; 
@@ -704,8 +709,33 @@ $cmd[]['rsh']='/usr/local/pgsql/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'
 $cmd[]['rsh']='/usr/local/pgsql/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION postgis_topology;" || echo PASSED';
 $cmd[]['rsh']='/usr/local/pgsql/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION fuzzystrmatch;" || echo PASSED';
 $cmd[]['rsh']='/usr/local/pgsql/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION postgis_tiger_geocoder;" || echo PASSED';
+*/
+
+// Nowy postgres/postgis by Bzyk @ 2015-06-05
+$cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis2/Postgres-9.4.2.0.zip','/tmp/Postgres-9.4.2.0.zip');
+$cmd[]['rsh']='unzip -o -d /Applications /tmp/Postgres-9.4.2.0.zip';
+$cmd[]['rsh']='ls /var/db/postgres || mkdir /var/db/postgres';
+$cmd[]['rsh']='chown _postgres /var/db/postgres';
+$cmd[]['rsh']='cd /tmp 
+sudo -u _postgres /Applications/Postgres.app/Contents/Versions/9.4/bin/initdb -U postgres -D /var/db/postgres --encoding=UTF8 --locale=C || echo PASSED';
+$cmd[]['rsh']='cat /var/db/postgres/pg_hba.conf |grep "host    all             all             0.0.0.0/0            md5" || echo \'host    all             all             0.0.0.0/0            md5\' >> /var/db/postgres/pg_hba.conf';
+$cmd[]['rsh']='sed -i ".bak" "s/.*listen_address.*#/listen_addresses = \'0.0.0.0\'            #/g" /var/db/postgres/postgresql.conf';
+$cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis2/org.postgres.plist','/Library/LaunchDaemons/org.postgres.plist');
+$cmd[]['rsh']='launchctl load /Library/LaunchDaemons/org.postgres.plist';
+
+$cmd[]['rsh']='/Applications/Postgres.app/Contents/Versions/9.4/bin/psql -U postgres -c "create user root with password \''.$ADMIN_USERNAME_PASSWD.'\'" || echo PASSED';
+
+$cmd[]['rsh']='sudo -u _postgres /Applications/Postgres.app/Contents/Versions/9.4/bin/createdb -U postgres -O "root" "'.$REMOTE_FOLDER_ROOT.'" || echo PASSED';
+$cmd[]['rsh']='/Applications/Postgres.app/Contents/Versions/9.4/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION postgis;" || echo PASSED';
+$cmd[]['rsh']='/Applications/Postgres.app/Contents/Versions/9.4/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION postgis_topology;" || echo PASSED';
+$cmd[]['rsh']='/Applications/Postgres.app/Contents/Versions/9.4/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION fuzzystrmatch;" || echo PASSED';
+$cmd[]['rsh']='/Applications/Postgres.app/Contents/Versions/9.4/bin/psql -U postgres -d "'.$REMOTE_FOLDER_ROOT.'" -c "CREATE EXTENSION postgis_tiger_geocoder;" || echo PASSED';
+
 //TODO jakis test dodania bazy danych i czy dziala?
 
+
+
+
 $cmd[]['rsh']='rm -Rf /Library/Server/Web/Data/Sites/Default/pg || echo PASSED';
 $cmd[]['rsh']='mkdir -p /Library/Server/Web/Data/Sites/Default/pg';
 $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis/phpPgAdmin-5.1.zip','/Library/Server/Web/Data/Sites/Default/pg/phpPgAdmin-5.1.zip');
@@ -714,10 +744,6 @@ $cmd[]['rsh']='mv /Library/Server/Web/Data/Sites/Default/pg/phpPgAdmin-5.1/* /Li
 $cmd[]['rsh']='sed -i.bak "s/\\\'extra_login_security\\\'\].*=.*true/\\\'extra_login_security\\\'\]\ =\ false/" /Library/Server/Web/Data/Sites/Default/pg/conf/config.inc.php';
 
 
-$cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis/org.postgresql.postgres.plist','/Library/LaunchDaemons/org.postgresql.postgres.plist');
-$cmd[]['rsh']='launchctl load /Library/LaunchDaemons/org.postgresql.postgres.plist';
-$cmd[]['rsh']='launchctl start org.postgresql.postgres';
-
 //PGADMIN - to nie pg phpmyadmin!
 //$cmd[]['rsh']='port install wxWidgets-3.0';
 //$cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/postgis/pgadmin3-1.18.1.tar.gz','/usr/src/pgadmin3-1.18.1.tar.gz');
@@ -1894,7 +1920,7 @@ function INSTALL_SES_PROCESY_A() {
 
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of3/4/2 SYNC_ZASOBY_STRUCTURES_FROM_CONFIG',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);flush();$out="";$exit="";
 
-	 	$exec="/opt/local/bin/mysqldump5 -utest test >{$OPTIONS->SE_config}/config/.config_base_structure_dump.sql"; //TODO piotr - moze jakies lepsze miejsce na tego dumpa
+	 	$exec="/opt/local/bin/mysqldump -utest test >{$OPTIONS->SE_config}/config/.config_base_structure_dump.sql"; //TODO piotr - moze jakies lepsze miejsce na tego dumpa
 	 	exec($exec,$out,$exit);	 	DEBUG_S(-3,$command_id.':out of4/4 mysqldump',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);$out="";$exit="";
 
 

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -1,6 +1,6 @@
 <?php
 //@2014-01-20 added joining structure without loos data for CHAR->CHAR - only resize to bigger field if needed in new structure (sqix)
-echo "version @2015-05-21 added TYPESPECIAL/TYPESPECIALS/VARIABLE/VARIABLES FIX DUBLES
+echo "version @2015-05-25 @2015-05-21 added TYPESPECIAL/TYPESPECIALS/VARIABLE/VARIABLES FIX DUBLES
 version: @2014-01-21 added joining structure without loos data for ENUM->ENUM, SET->SET - try to add item in enum(sqix)<br>";
 //
 //[0] =>  alter table `SES_TV_A` CHANGE `P_DEVICE` `P_DEVICE` enum('BRAK','DEKODER SD','DEKODER HD','MODUL CAM','MULTIROOM') ; 
@@ -427,6 +427,8 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 						  						DEBUG_S(2,'(CRM_LISTA_ZASOBOW->ALIAS_ID) NARZUCAM INNY PARENT ID '.$TABLE.' dla ID="'.$h->ID.'" "'.$h->ALIAS_ID.'" na "'.$CRM_IMPORT_TRANSLATE[$TABLE][$h->ALIAS_ID].'"','',__FILE__,__FUNCTION__,__LINE__);
 						  						$h->ALIAS_ID=$CRM_IMPORT_TRANSLATE[$TABLE][$h->ALIAS_ID];
 						  		}
+						  		if(isset($h->A_CLASSIFIED)) $h->A_CLASSIFIED='';
+						  		if(isset($h->A_ADM_COMPANY)) $h->A_ADM_COMPANY='';
 						  	}
 						  	
 						  
@@ -574,6 +576,7 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 		     $search = explode(',',$SYSTEM_PROFILE_STRING_IMPORT_EXPORT);
 		     foreach($search as $string) {
 		     	$sql.=" or `TAGS` like '".$string."' ";
+		     	$sql.=" or `ID` like '".$string."' ";
 		     }
 		}