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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -810,6 +810,13 @@ $cmd[]['rsh']='sed -i.bak "s/\\\'extra_login_security\\\'\].*=.*true/\\\'extra_l
 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 ';
+
+return $cmd;
+		  }
+
 function INSTALL_GETCOMMANDS_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) {
 //@2016-05- bindera: dodajemy instalke wordpressa
 
@@ -817,8 +824,8 @@ $cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && rm wordpress.tar.gz
 $cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && wget https://wordpress.org/latest.tar.gz -O wordpress.tar.gz";
 $cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default && tar -zxpvf wordpress.tar.gz";
 
-$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';
+// 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.'\'';
 
@@ -960,9 +967,9 @@ $cmd[]['rsh']='mv /tmp/wp-cli.phar /opt/local/wordpress/bin/wp';
 
 
 
-$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin install ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin is-installed ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress || /opt/local/wordpress/bin/wp plugin install ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
 //17:
-$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin activate ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin activate ldap-login-password-and-role-manager --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress || echo PASSED';
 $cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_base_dn "cn=users,'.$SERVER_ADDRESS_LDAP_DC.'" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
 $cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_domain_controllers "'.$SERVER_ADDRESS_SHORT.'" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
 $cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and_role_manager_loginattr "uid" --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
@@ -973,8 +980,8 @@ $cmd[]['rsh']='/opt/local/wordpress/bin/wp option update ldap_login_password_and
 //@2016-05 TODO póki nie ma danych z clone repo - tutaj wrzucamy wersje aktualna modulu do wordpressa
 $cmd[]['rsh']='unzip -o /Library/Server/Web/Data/Sites/Default/SE/stuff/p5_BeeCtrl.zip -d /Library/Server/Web/Data/Sites/Default/wordpress/wp-content/plugins';
 
-
-$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin activate p5_BeeCtrl --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
+//is-installed
+$cmd[]['rsh']='/opt/local/wordpress/bin/wp plugin is-installed p5_BeeCtrl --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress || /opt/local/wordpress/bin/wp plugin activate p5_BeeCtrl --allow-root --path=/Library/Server/Web/Data/Sites/Default/wordpress';
 
 
 
@@ -2404,8 +2411,19 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['description']='Component located at /garbage URL, to manage database';
 		$packages['pl.procesy5.MYADMIN']['xml_choice']['start_selected']='true';
 
+//! pakiet: INSTALL_GETCOMMANDS_UNINSTALL_WORDPRESS
+		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['exit_file']=str_replace('.', '_', $h->ID.".UNINSTALL_WORDPRESS".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
+		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['installer_dir_name']=$h->ID.".UNINSTALL_WORDPRESS".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
+		$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']['description']='Warning - it drops database for Wordpress- do not use for upgrade!';
+		$packages['pl.procesy5.UNINSTALL_WORDPRESS']['xml_choice']['start_selected']='false';
+
+
 //! pakiet: INSTALL_GETCOMMANDS_WORDPRESS
-		$packages['pl.procesy5.WORDPRESS']['exit_file']=str_replace('.', '_', $h->ID.".POSTGIS_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
+		$packages['pl.procesy5.WORDPRESS']['exit_file']=str_replace('.', '_', $h->ID.".WORDPRESS_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
 		$packages['pl.procesy5.WORDPRESS']['installer_dir_name']=$h->ID.".WORDPRESS_".$h->SERVER_ADDRESS; //nazwa katalogu w jakim jest przygotowywany pkg
 		$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

SE/superedit-STATYSTYKA_TABELE.php

@@ -14,7 +14,7 @@
  * 
  */
 function STATYSTYKA_TABELE() {
-
+	global $$A_STATUS_L2_SQL;
 	$db = DB::getDB();
 	if (!$db) {
 		echo '<div class="alert alert-danger">' . "Database Error" . '</div>';
@@ -38,7 +38,11 @@ function STATYSTYKA_TABELE() {
 
 
 			//TODO zastapic to czyms Piotrowym @2016-06-11
-			$A_STATUS_L2_SQL="if(SV.HANGUP_STATUS=SV.A_STATUS,coalesce(SV.A_STATUS),
+			if(!isset($A_STATUS_L2_SQL)) {
+				
+				echo "<br> WARNING variable A_STATUS_L2_SQL is not set globally to emulate correct active client status.";
+				
+				$A_STATUS_L2_SQL="if(SV.HANGUP_STATUS=SV.A_STATUS,coalesce(SV.A_STATUS),
     if( ( unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_FROM) and  ( SV.HANGUP_TILL='0000-00-00' or SV.HANGUP_TILL is NULL )
     and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , coalesce(SV.HANGUP_STATUS), 
     if( ( unix_timestamp(NOW()) < unix_timestamp(SV.HANGUP_FROM) and  ( SV.HANGUP_TILL='0000-00-00' or SV.HANGUP_TILL is NULL )
@@ -69,6 +73,7 @@ function STATYSTYKA_TABELE() {
     )
    )
  "; 
+ }
 
 
 
@@ -334,6 +339,7 @@ function STATYSTYKA_TABELE() {
 						or USERS2_MARKETING.TV_OPER='BN'
 					), 1, 0) ) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
+				, BUILDINGS.the_geom, BUILDINGS.A_STATUS
 			";
 			foreach ($COLSFORSTATS as $FFS) {
 				$sql .= " , round((sum(if( USERS2_MARKETING.`{$FFS}_OPER`='BN',1,0) ) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as `NAS_{$FFS}` ";
@@ -429,6 +435,8 @@ function STATYSTYKA_TABELE() {
 						or USERS2_MARKETING.TV_OPER='BN'), 1, 0)
 					) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
+				, MK_Rewiry.the_geom , MK_Rewiry.A_STATUS
+				, count(BUILDINGS.ID) as BUDYNKOW
 			";
 			foreach ($COLSFORSTATS as $FFS) {
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
@@ -468,6 +476,7 @@ function STATYSTYKA_TABELE() {
 			$sql .= "
 				from USERS2_MARKETING as USERS2_MARKETING
 					left join BUILDINGS on BUILDINGS.S_ADDRESS_STREET=USERS2_MARKETING.T_TELBOX_BUILDING_IN
+					left join MK_Rewiry on MK_Rewiry.NAZWA_REWI=BUILDINGS.M_REWIR
 				where USERS2_MARKETING.A_STATUS!='DELETED' and BUILDINGS.A_STATUS!='DELETED'
 				group by USERS2_MARKETING.M_REWIR
 				order by USERS2_MARKETING.M_REWIR DESC ,USERS2_MARKETING.T_TELBOX_BUILDING_IN 
@@ -523,7 +532,7 @@ function STATYSTYKA_TABELE() {
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_PROBLEM enum('', 'WARNING', 'PROBLEM', 'SERIOUS', 'UNVERIFIED')  ; ";
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_PROBLEM_DESC varchar(255) not null  ; ";
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_PROBLEM_DATE varchar(30) not null  ; ";
-			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_STATUS enum('WAITING', 'NORMAL', 'MONITOR', 'WARNING', 'OFF_SOFT', 'OFF_HARD', 'DELETED')  ; ";
+			//$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_STATUS enum('WAITING', 'NORMAL', 'MONITOR', 'WARNING', 'OFF_SOFT', 'OFF_HARD', 'DELETED')  ; ";
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_STATUS_INFO varchar(255) not null  ; ";
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add A_CLASSIFIED varchar(100) not null  ; ";
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add T_WORKPOINTS varchar(100) not null  ; ";