Merge branch 'master' into fix-acl

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

@@ -783,7 +783,7 @@ class Core_Database_Mysql extends Core_Database {
 		       										 $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.=" )  DEFAULT CHARSET=latin2  ";
+														$sql.=" ) ENGINE=MyISAM DEFAULT CHARSET=latin2 ";
 														 DEBUG_S(-3,"Brak tabeli: ".$TABLE." dodajemy sql:",$sql,__FILE__,__FUNCTION__,__LINE__) ;
 														 $this->query($sql) or die1('\nProblem z CREATE '.$sql);
 		
@@ -810,7 +810,9 @@ class Core_Database_Mysql extends Core_Database {
 	       										if($ARR_TABLE['Table_type']=='VIEW') {
 		       										if(isset($ARR_TABLE['VIEW'])) {
 			       										
-					       										
+					       								if(in_array('SKIP-VIEW', $options)) {
+						   								DEBUG_S(-3,"SKIP-VIEW option set - for ".$TABLE." :",null,__FILE__,__FUNCTION__,__LINE__) ;
+		       											} else {		
 					       									$sql_="show create view `{$TABLE}` ;" ;
 						   									echo $sql_;
 						   									$result_=$this->query($sql_) or die1('\nProblem z '.$sql_);	
@@ -828,7 +830,7 @@ class Core_Database_Mysql extends Core_Database {
 
 									   					    }
 					       										
-			       										
+			       										}
 			       										
 		       										}
 		       										
@@ -1275,7 +1277,7 @@ class Core_Database_Mysql extends Core_Database {
        					  `ID_USERS2` INT( 11 ) NOT NULL , 
        					  `_action_time`  TIMESTAMP NOT NULL, 
        					  `_action_type` varchar(16),
-       					  PRIMARY KEY (  `ID` ) , INDEX (  `ID_USERS2` ) )";
+       					  PRIMARY KEY (  `ID` ) , INDEX (  `ID_USERS2` ) ) ENGINE=MyISAM ";
        				DEBUG_S(-3,'create table hist '.$h[0],array($sql),__FILE__,__FUNCTION__,__LINE__);
        				 self::query($sql) or die1(' Problem ze sql '.$sql);
 					

SE/se-lib/Route/FixZasobPath.php

@@ -42,12 +42,12 @@ jQuery(document).ready(function () {
 		$sql = "
 			select z.`ID`
 				, z.`path` as zasob_path
-				, wsk.`path` as wsk_path
+				, wsk.`path_CRM_LISTA_ZASOBOW` as wsk_path
 				, i.`idx_PATH` as idx_path
 			from `CRM_LISTA_ZASOBOW` z
 				join `_zasob_path_idx` i on(i.`ID`=z.`ID`)
-				left join `CRM_WSKAZNIK` wks on(wsk.`ID_ZASOB`=z.`ID`)
-			where (z.`path`!=i.`idx_PATH` or wsk.`path`!=i.`idx_PATH`)
+				left join `CRM_WSKAZNIK` wsk on(wsk.`ID_ZASOB`=z.`ID`)
+			where (z.`path`!=i.`idx_PATH` or wsk.`path_CRM_LISTA_ZASOBOW`!=i.`idx_PATH`)
 		";
 		$rows = array();
 		$db = DB::getDB();

SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -223,6 +223,8 @@ if((!isset($LOCAL_DB_ZASOB_ID)||isset($REMOTE_DB_ZASOB_ID)||isset($SYNC_OPTIONS)
 		echo "</select></td></tr>";
 		$SYNC_OPTIONS_MENU['CREATE_ZASOBY_STRUCTURES_CONFIG']="from LOCAL -else option - this make base config file for structures";
 		$SYNC_OPTIONS_MENU['SYNC_ZASOBY_STRUCTURES_FROM_CONFIG']="from CONFIG to REMOTE -else option - buduje z konfiga structure i je odswieza dla lokalnej struktury glownych tabel - dziala na zdalnej tabeli";
+		$SYNC_OPTIONS_MENU['SYNC_ZASOBY_STRUCTURES_FROM_CONFIG_WITHOUT_PROCEDURES_AND_VIEWS']="from CONFIG to REMOTE -else option - buduje z konfiga structure i je odswieza dla lokalnej struktury glownych tabel - dziala na zdalnej tabeli - pomija procedury i widoki";
+
 		$SYNC_OPTIONS_MENU['CREATE_ZASOBY_DATABASE_DESC']=" (na CONNREMOTE) jezeli pierwszy raz uruchamiasz system nalezy dodac strukture do zasobow gdzie bedzie znajdowac sie definicja struktur systemu SE";
 		$SYNC_OPTIONS_MENU['FROM_ZASOBY_TO_DATABASE']=" from LOCAL to REMOTE uzupelnia structure z hazy zasobow do BAZY_DANYCH sql";
 		$SYNC_OPTIONS_MENU['SYSTEM_IMPORT_FIX_ZASOB_FIX_PROC_FIX_ALIAS']="Use before FROM_DATABASE_TO_ZASOBY to fix all current resources/processes not to being translated like external ones!!!";
@@ -959,7 +961,7 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
          
          
        				// ! SYNC_ZASOBY_STRUCTURES_FROM_CONFIG
-       }   else    if($SYNC_OPTIONS=='SYNC_ZASOBY_STRUCTURES_FROM_CONFIG') {//budowa struktur w bazie
+       }   else    if($SYNC_OPTIONS=='SYNC_ZASOBY_STRUCTURES_FROM_CONFIG' or $SYNC_OPTIONS=='SYNC_ZASOBY_STRUCTURES_FROM_CONFIG_WITHOUT_PROCEDURES_AND_VIEWS') {//budowa struktur w bazie
 					if(!file_exists(APP_PATH_ROOT."/config/".$config_base_structure)) die1("Brak konfiga w ".APP_PATH_ROOT."/config/".$config_base_structure." , wygeneruj go za pomoca opcji CREATE_ZASOBY_STRUCTURES_CONFIG");
 
 					$handle = fopen(APP_PATH_ROOT."/config/".$config_base_structure, "r");
@@ -968,9 +970,9 @@ $CONNLOCAL->query('set global max_allowed_packet=1000000000');
 					//echo $config_base_structure_serialized;
 					$config_base_structure_unserialized=unserialize($config_base_structure_serialized);
 					//print_r($config_base_structure_unserialized['CRM_AUTH_PROFILE']);
+					if($SYNC_OPTIONS=='SYNC_ZASOBY_STRUCTURES_FROM_CONFIG_WITHOUT_PROCEDURES_AND_VIEWS') $SKIP_OPTIONS=array('SKIP-PROCEDURE','SKIP-VIEW');
 					
-					
-					DEBUG_S(-3,'config_base_structure_unserialized,SKIP_OPTIONS',array($config_base_structure_unserialized,$SKIP_OPTIONS),__FILE__, __FUNCTION__, __LINE__) ;
+					DEBUG_S(-3,'SKIP_OPTIONS,config_base_structure_unserialized',array($SKIP_OPTIONS,$config_base_structure_unserialized),__FILE__, __FUNCTION__, __LINE__) ;
 					$CONNREMOTE->STRUCTURE_GENERATE_PARSE($config_base_structure_unserialized,$SKIP_OPTIONS); //@2014-08-14 TEST IT
 
 					

SE/superedit-SYNC_GIS_TABLES.php

@@ -571,7 +571,7 @@ DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 
 		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "Agr_USERS2_MARKETING_koszt"=round("Agr_USERS2_MARKETING_cena"*"Agr_USERS2_MARKETING_ilosc") where "Agr_USERS2_MARKETING_ilosc">0 '  ;
 		 $gdb->query($sql_cena);
-		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "koszt_na_dom"=round("koszt_wspolny"/"Agr_USERS2_MARKETING_ilosc") where "Agr_USERS2_MARKETING_ilosc">0 '  ;
+		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "koszt_na_mieszkanie"=round("koszt_wspolny"/"Agr_USERS2_MARKETING_ilosc") where "Agr_USERS2_MARKETING_ilosc">0 '  ;
 		 $gdb->query($sql_cena);
 
 		 ///