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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -677,9 +677,7 @@ if($SERVER_VERSION=='10.11-ElCapitan') {
  $cmd[]['rsh']='which joe || port install joe';
  $cmd[]['rsh']='which gnutar || port install gnutar';
  $cmd[]['rsh']='ln -s /opt/local/bin/gnutar /usr/sbin/gnutar || echo PASSED';
-
-
-
+ $cmd[]['rsh']='which apache-ant || port install apache-ant';
  return $cmd;
 
 
@@ -2483,17 +2481,26 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5']['installer_tmp']="/tmp/pl.procesy5_".$h->ID.".".$h->SERVER_ADDRESS; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5']['CMD_FUNCTION']="INSTALL_GETCOMMANDS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5']['xml_choice']['visible']='true';
-		$packages['pl.procesy5']['xml_choice']['title']='Procesy5';
-		$packages['pl.procesy5']['xml_choice']['description']='Main Procesy5 install components and scripts - use only first time - just part of OSX Server and OSX system config';
+		$packages['pl.procesy5']['xml_choice']['title']='(I)Procesy5';
+		$packages['pl.procesy5']['xml_choice']['description']='(use for Install mainly, also safe upgrade) Main Procesy5 install components and scripts - use only first time - just part of OSX Server and OSX system config';
 		$packages['pl.procesy5']['xml_choice']['start_selected']='true';
+		//! pakiet : INSTALL_GETCOMMANDS_DITA
+		$packages['pl.procesy5.DITA']['exit_file']=str_replace('.', '_', $h->ID.".DITA_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
+		$packages['pl.procesy5.DITA']['installer_dir_name']=$h->ID.".DITA_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
+		$packages['pl.procesy5.DITA']['installer_tmp']="/tmp/pl.procesy5_DITA_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.DITA']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_DITA"; //miejsce do ktorego installer odpakuje wszystko instalator
+		$packages['pl.procesy5.DITA']['xml_choice']['visible']='true';
+		$packages['pl.procesy5.DITA']['xml_choice']['title']='(I+U)DITA components';
+		$packages['pl.procesy5.DITA']['xml_choice']['description']='Needed utilities and libraries use DITA docs';
+		$packages['pl.procesy5.DITA']['xml_choice']['start_selected']='true';
 		//! pakiet : INSTALL_GETCOMMANDS_COMP_PORT
 		$packages['pl.procesy5.COMP_PORT']['exit_file']=str_replace('.', '_', $h->ID.".COMP_PORT_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
 		$packages['pl.procesy5.COMP_PORT']['installer_dir_name']=$h->ID.".COMP_PORT_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
 		$packages['pl.procesy5.COMP_PORT']['installer_tmp']="/tmp/pl.procesy5_COMP_PORT_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.COMP_PORT']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_COMP_PORT"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.COMP_PORT']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.COMP_PORT']['xml_choice']['title']='MacPorts,Xcode,Licence(decrypt)';
-		$packages['pl.procesy5.COMP_PORT']['xml_choice']['description']='Needed utilities and libraries to install Procesy5 and Database, decrypt';
+		$packages['pl.procesy5.COMP_PORT']['xml_choice']['title']='(I+U)MacPorts,Xcode,Licence(decrypt)';
+		$packages['pl.procesy5.COMP_PORT']['xml_choice']['description']='(install and update) Needed utilities and libraries to install Procesy5 and Database, decrypt';
 		$packages['pl.procesy5.COMP_PORT']['xml_choice']['start_selected']='true';
 		//! pakiet: INSTALL_GETCOMMANDS_MYSQL55
 		$packages['pl.procesy5.MYSQL55']['exit_file']=str_replace('.', '_', $h->ID.".MYSQL55_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
@@ -2501,8 +2508,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.MYSQL55']['installer_tmp']="/tmp/pl.procesy5_MYSQL55_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.MYSQL55']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_MYSQL55"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.MYSQL55']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.MYSQL55']['xml_choice']['title']='Mysql-55';
-		$packages['pl.procesy5.MYSQL55']['xml_choice']['description']='Required Mysql55 database from MacPorts (it is safe no uninstall, use for install and update - sets power management and etc)';
+		$packages['pl.procesy5.MYSQL55']['xml_choice']['title']='(I)Mysql-55';
+		$packages['pl.procesy5.MYSQL55']['xml_choice']['description']='(use for install only) Required Mysql55 database from MacPorts';
 		$packages['pl.procesy5.MYSQL55']['xml_choice']['start_selected']='true';
 
 		//! pakiet: INSTALL_GETCOMMANDS_POSTGIS
@@ -2511,8 +2518,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.POSTGIS']['installer_tmp']="/tmp/pl.procesy5_POSTGIS_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.POSTGIS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_POSTGIS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.POSTGIS']['xml_choice']['title']='Postgres-postgis';
-		$packages['pl.procesy5.POSTGIS']['xml_choice']['description']='Required Postgis database for qGIS';
+		$packages['pl.procesy5.POSTGIS']['xml_choice']['title']='(I)Postgres-postgis';
+		$packages['pl.procesy5.POSTGIS']['xml_choice']['description']='Required Postgis database for qGIS (Use for install)';
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['start_selected']='true';
 
 
@@ -2522,8 +2529,8 @@ function INSTALL_SES_PROCESY_A() {
 		$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']='Webmail RoundCube';
-		$packages['pl.procesy5.WEBMAIL']['xml_choice']['description']='Additional webmail from roundcube';
+		$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']['start_selected']='true';
 
 		//! pakiet: INSTALL_GETCOMMANDS_SE
@@ -2532,8 +2539,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.SE']['installer_tmp']="/tmp/pl.procesy5_SE_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.SE']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_SE"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.SE']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.SE']['xml_choice']['title']='Procesy5 main application';
-		$packages['pl.procesy5.SE']['xml_choice']['description']='Main application and install scripts for Procesy5';
+		$packages['pl.procesy5.SE']['xml_choice']['title']='(U+I)Procesy5 main application';
+		$packages['pl.procesy5.SE']['xml_choice']['description']='Main application and install scripts for Procesy5 (Use for upgrade and install)';
 		$packages['pl.procesy5.SE']['xml_choice']['start_selected']='true';
 		$packages['pl.procesy5.SE']['encrypt']=true;
 
@@ -2543,8 +2550,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.SE_DB_DOMAIN']['installer_tmp']="/tmp/pl.procesy5_SE_DB_DOMAIN_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.SE_DB_DOMAIN']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_SE_DB_DOMAIN"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['title']='Procesy5 install db and config for domain one ';
-		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['description']='Only installs DB and settings for domain ('.$h->SERVER_ADDRESS.') (used on existing install for add virtual domain)';
+		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['title']='(I)Procesy5 install db and config for domain one ';
+		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['description']='(Use only for install) Only installs DB and settings for domain ('.$h->SERVER_ADDRESS.') (used on existing install for add virtual domain)';
 		$packages['pl.procesy5.SE_DB_DOMAIN']['xml_choice']['start_selected']='true';
 		$packages['pl.procesy5.SE_DB_DOMAIN']['encrypt']=true;
 
@@ -2555,8 +2562,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.MYADMIN']['installer_tmp']="/tmp/pl.procesy5_MYADMIN_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.MYADMIN']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_MYADMIN"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.MYADMIN']['xml_choice']['title']='php MyAdmin';
-		$packages['pl.procesy5.MYADMIN']['xml_choice']['description']='Component located at /garbage URL, to manage database';
+		$packages['pl.procesy5.MYADMIN']['xml_choice']['title']='(I+U)php MyAdmin';
+		$packages['pl.procesy5.MYADMIN']['xml_choice']['description']='Component located at /garbage URL, to manage database(Upgrade/Install)';
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['start_selected']='true';
 
 //! pakiet: INSTALL_GETCOMMANDS_UNINSTALL_WORDPRESS
@@ -2565,7 +2572,7 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['installer_tmp']="/tmp/pl.procesy5_UNINSTALL_WORDPRESS".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_UNINSTALL_WORDPRESS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['title']='uninstall wordpress current';
+		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['title']='(U)uninstall wordpress current';
 		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['description']='Warning - it drops database for Wordpress- do not use for upgrade!';
 		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['start_selected']='false';
 
@@ -2576,7 +2583,7 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.WORDPRESS']['installer_tmp']="/tmp/pl.procesy5_WORDPRESS_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.WORDPRESS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_WORDPRESS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.WORDPRESS']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.WORDPRESS']['xml_choice']['title']='wordpress current';
+		$packages['pl.procesy5.WORDPRESS']['xml_choice']['title']='(U+I)wordpress current';
 		$packages['pl.procesy5.WORDPRESS']['xml_choice']['description']='Wordpress configured site with admin access. Warning - it drops database - do not use for upgrade!';
 		$packages['pl.procesy5.WORDPRESS']['xml_choice']['start_selected']='true';
 
@@ -2586,8 +2593,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['installer_tmp']="/tmp/pl.procesy5_WMS_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_WMS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['title']='WMS server and utilities';
-		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['description']='Special scripts and utilities to maintain WMS spatial server and provide tools to administer drone mapping.';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['title']='(U+I)WMS server and utilities';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['description']='Special scripts and utilities to maintain WMS spatial server and provide tools to administer drone mapping. (Use for upgrade and install)';
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_WMS']['xml_choice']['start_selected']='true';
 
 
@@ -2597,7 +2604,7 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['installer_tmp']="/tmp/pl.procesy5_SE_LAST_UPDATE_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_SE_LAST_UPDATE"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['title']='Procesy5 last check scirpts - must run always ';
+		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['title']='(U+I)Procesy5 last check scirpts - must run always ';
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['description']='run update scripts and bash_install_check';
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['xml_choice']['start_selected']='true';
 		$packages['pl.procesy5.INSTALL_GETCOMMANDS_SE_LAST_UPDATE']['encrypt']=true;

SE/superedit-STATYSTYKA_TABELE.php

@@ -163,7 +163,7 @@ function STATYSTYKA_TABELE() {
 						;";
 				
 				$sqlList[]="drop  view if exists `BUILDINGS__MARKETING_ERROR` ;";
-				$sqlList[]="create ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER view BUILDINGS__MARKETING_ERROR as
+				$sqlList[]="create ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW BUILDINGS__MARKETING_ERROR as
 					 SELECT t1.ID, t1.M_REWIR, t1.S_ADDRESS_STREET, t1.A_ADM_COMPANY, t1.A_CLASSIFIED, t1.A_RECORD_UPDATE_DATE, t1.A_RECORD_CREATE_DATE, t1.A_RECORD_CREATE_AUTHOR, t1.A_RECORD_UPDATE_AUTHOR
 					 	,t1.T_BUILDING_MIESZKANIA , 0 as ILOSC_POW_MIESZKAN 
 					 	,'ERROR Brak powiazanych mieszkan do budynku' AS ERROR