dodanie interakcji do ustawiania parametrow nazwy bazy danych w przypadku hasla “default”

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1199,7 +1199,7 @@ return $cmd;
 
 
 
-
+//TODO trzeba inaczej to zainstalowac - bez dropowania- update zrobic
 function INSTALL_GETCOMMANDS_WEBMAIL($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) {
 
 
@@ -1631,6 +1631,12 @@ return $cmd;
 
 function INSTALL_GETCOMMANDS_SE_LAST_UPDATE($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-08-10 jest blad tutaj wyzwolenia w kosmetologii z bomby ktorys error wywala
+ if($ADMIN_USERNAME_PASSWD=='default')  { 
+	 //przypadek biall.com.pl jest inna baza danych i ukryte hasla do zczytania z konfigow - TODO uzyc funkcje czytajaca .cnf-default_db...ini.php
+	 $ADMIN_USERNAME_PASSWD=get_user_gui_response('Set/confirm ADMIN_USERNAME_PASSWD',$ADMIN_USERNAME_PASSWD);
+	 $REMOTE_FOLDER_ROOT=get_user_gui_response('Set/confirm database name (REMOTE_FOLDER_ROOT) ',$REMOTE_FOLDER_ROOT);
+
+ }
 $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS;
 //@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
 $cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
@@ -2227,6 +2233,10 @@ function tell_user_gui_error($msg) {
 	return 'osascript -e "tell app \"System Events\" to display alert \"'.$msg.'\""';
 }
 
+function get_user_gui_response($question,$default) {
+	exec("/usr/bin/osascript -e 'set myReply to text returned of (display dialog \"".$question."\" default answer \"".$default."\")'", $output, $exit);
+	return $output
+}
 
 function MakeCommand($command_id,$command,$installer_tmp,$installer_dir) {
 	$file_sh="install.bash/".$command_id.".bash";
@@ -2810,7 +2820,7 @@ function INSTALL_SES_PROCESY_A() {
 
 
 
-					DEBUG_S(-3,'Dane komponentow instalacji',$packages,__FILE__,__FUNCTION__,__LINE__);
+		DEBUG_S(-3,'Dane komponentow instalacji',$packages,__FILE__,__FUNCTION__,__LINE__);
 
 
 		foreach($packages as $pkg_id=>$pkg_info) {