fixed php syntax error in procesy5 install

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -594,10 +594,10 @@ function INSTALL_GETCOMMANDS_XSL_ENGINES($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADM
   $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && tar -xzf `ls -1 jre-8u*-macosx-x64.tar.gz | sort -rn -t u -k 2 | head -1`';
   $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && defaults write `pwd`/Contents/Info.plist JavaVM -dict-add \'JVMCapabilities\' \'<array><string>JNI</string><string>BundledApp</string><string>CommandLine</string></array>\' ';
   $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && chmod 0664 Contents/Info.plist ';
-  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && plutil -convert xml1 Contents/Info.plist '; 
-  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && mv `pwd` /Library/Java/JavaVirtualMachines/ '; 
-  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && mkdir -p Contents/Home/bundle/Libraries'; 
-  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && cd Contents/Home/bundle/Libraries && ln -s ../../lib/server/libjvm.dylib libserver.dylib'; 
+  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && plutil -convert xml1 Contents/Info.plist ';
+  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && mv `pwd` /Library/Java/JavaVirtualMachines/ ';
+  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && mkdir -p Contents/Home/bundle/Libraries';
+  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/SE/stuff/ && cd `ls -1d jre1.8.*.jre/ | sort -rn -t _  -k 1.8 -k 2 | head -1` && cd Contents/Home/bundle/Libraries && ln -s ../../lib/server/libjvm.dylib libserver.dylib';
   */
  return $cmd;
 }
@@ -744,8 +744,8 @@ $cmd[]['rsh']='serveradmin stop web && serveradmin start web';
   $cmd[]['rsh']='which md5sum || port install md5sha1sum';
   $cmd[]['rsh']='which makepasswd || port install makepasswd';
 
-  
- 
+
+
  return $cmd;
 
 
@@ -1631,7 +1631,7 @@ 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')  { 
+ 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);
@@ -2235,7 +2235,7 @@ function tell_user_gui_error($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
+	return $output;
 }
 
 function MakeCommand($command_id,$command,$installer_tmp,$installer_dir) {
@@ -2575,7 +2575,7 @@ function INSTALL_SES_PROCESY_A() {
 			try {
 				Lib::loadClass('ServeradminParser');
 				$serveradmin = new ServeradminParser();
-                                
+
                 if  (preg_match('/^(.*)\.procesy5\.pl$/',$h->SERVER_ADDRESS,$matches)) {
                     // Jezeli nazwa serwera jest w domenie procesy5.pl, dodajemy rekord DNS dla samej danej nazwy (np. test.procesy5.pl)
                     if ($serveradmin->dnsAddIpAddress("procesy5.pl", $matches[1], $h->SERVER_ADDRESS_IP, true)) {
@@ -2676,7 +2676,7 @@ function INSTALL_SES_PROCESY_A() {
 		$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_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
@@ -2875,36 +2875,36 @@ function INSTALL_SES_PROCESY_A() {
 
 	echo "<hr><h2><A href='{$installer_url}".$h->ID."_Procesy5_".str_replace('.','_',$h->SERVER_ADDRESS).".pkg'> ściągnij glowną instalacje Procesy5 ".$h->ID."_Procesy5_".str_replace('.','_',$h->SERVER_ADDRESS).".pkg</a></h2>\n";
 
-        
+
     } else if(!empty($_REQUEST['ZAINSTALUJ_NA_PARALLELS'])) {
         try {
             $subnets["94.158.130.224"] = array(
                 "mask" => "255.255.255.224",
                 "gw" => "94.158.130.225",
                 "dns" => "94.158.130.225");
-            
+
             $subnets["94.158.132.0"] = array(
                 "mask" => "255.255.255.0",
                 "gw" => "94.158.132.1",
                 "dns" => "94.158.132.1");
-    
+
             foreach ($subnets as $network => $values) $availableSubnetsArr[] = $network . "/" . $values["mask"];
             $availableSubnets = implode(", ",$availableSubnetsArr);
-            
+
             $installer_dir_tar  ="/Library/Server/Web/Data/Sites/Default/PLIKI/SES_PROCESY5_A"; //katalog CWD z ktorego budowana jest instalacja
             $package = $h->ID."_Procesy5_".str_replace('.','_',$h->SERVER_ADDRESS).".pkg";
             $file = $installer_dir_tar.'/'.$package;
-            
+
             echo "<br/>Weryfikacja poprawności danych konfiguracyjnych";
             if (!file_exists($file)) throw new Exception("Nie znaleziono pliku instalatora - ".$file.". Należy najpierw wyzwolić funkcję \"2. POBIERZ_INSTALATOR_SH\" (po wygenerowaniu pliku instalatora nie należy niczego pobierać).");
             DEBUG_S(-3, 'Plik instalatora', 'OK');
-            
+
             if ($h->SERVER_ADDRESS_LDAP_DC != "dc=procesy5,dc=local") throw new Exception('Błędny Adres LDAP DC - należy koniecznie ustawić "dc=procesy5,dc=local", a następnie na nowo wygenerować plik instalatora klikając na "2. POBIERZ_INSTALATOR_SH".');
             DEBUG_S(-3, 'Poprawność Adresu LDAP DC', 'OK');
-            
+
             if (!filter_var($h->SERVER_ADDRESS_IP, FILTER_VALIDATE_IP) === true) throw new Exception('Błąd - '.$h->SERVER_ADDRESS_IP.' nie jest poprawnym adresem IP! Popraw Adres IP serwera.');
             DEBUG_S(-3, 'Poprawność Adresu IP serwera', 'OK');
-            
+
             unset($subnet);
             foreach ($subnets as $network => $values) {
                 if ((ip2long($h->SERVER_ADDRESS_IP) & ip2long($values["mask"])) == ip2long($network)) $subnet = $network;
@@ -2914,31 +2914,31 @@ function INSTALL_SES_PROCESY_A() {
             if ($h->SERVER_ADDRESS_IP == $subnets[$subnet]["gw"]) throw new Exception("Adres IP ".$h->SERVER_ADDRESS_IP." jest zarezerwowany dla routera dla podsieci ".$subnet."/".$subnets[$subnet]["mask"].". Należy wybrać inny adres IP z puli adresów.<br/>Dostępne pule: ".$availableSubnets);
             if ($h->SERVER_ADDRESS_IP == long2ip(ip2long($subnet) | ~ip2long($subnets[$subnet]["mask"]))) throw new Exception("Adres IP ".$h->SERVER_ADDRESS_IP." jest adresem rozgłoszeniowym dla podsieci ".$subnet."/".$subnets[$subnet]["mask"].". Należy wybrać inny adres IP z puli adresów.<br/>Dostępne pule: ".$availableSubnets);
             DEBUG_S(-3, 'Adres IP serwera należy do znanej puli adresów', 'OK');
-            
+
             V::exec("ping ".$h->SERVER_ADDRESS_IP." -c 10 -i 0.2 -t 2", $output, $exit);
             if (!$exit) throw new Exception('Błąd - maszyna o adresie IP '.$h->SERVER_ADDRESS_IP.' już istnieje (odpowiada na "pingi").');
             DEBUG_S(-3, 'Brak maszyny w sieci o adresie IP '.$h->SERVER_ADDRESS_IP, 'OK');
-            
+
             $result = execOnParallels('prlctl status "'.$h->SERVER_ADDRESS.'"');
             if ($result) throw new Exception("Maszyna wirtualna o nazwie ".$h->SERVER_ADDRESS." już istnieje!");
             DEBUG_S(-3, 'Brak wirtualnej maszyny Parallels o nazwie '.$h->SERVER_ADDRESS, 'OK');
-            
+
             $result = execOnParallels('[ -f "Parallels/.current_autoinstall_'.$h->SERVER_VERSION.'" ] && echo 1');
             if (!$result) throw new Exception("Brak definicji szablonu wirtualnej maszyny Parallels dla systemu macOS ".$h->SERVER_VERSION);
             DEBUG_S(-3, 'Definicja szablonu wirtualnej maszyny Parallels dla systemu macOS '.$h->SERVER_VERSION, 'OK');
-            
+
             $result = execOnParallels('prlctl list -t "\$(<Parallels/.current_autoinstall_'.$h->SERVER_VERSION.')" >/dev/null 2>&1 && echo 1');
             if (!$result) throw new Exception("Wystąpił problem z szablonem wirtualnej maszyny Parallels dla systemu macOS ".$h->SERVER_VERSION);
             DEBUG_S(-3, 'Szablon wirtualnej maszyny Parallels dla systemu macOS '.$h->SERVER_VERSION, 'OK');
-            
+
             echo "<br/>Tworzenie maszyny wirtualnej";
             $result = execOnParallels('prlctl clone "\$(<Parallels/.current_autoinstall_'.$h->SERVER_VERSION.')" --name "'.$h->SERVER_ADDRESS.'"');
             DEBUG_S(-3, 'Tworzenie maszyny wirtualnej', $result);
-            
+
             $result = execOnParallels('prlctl status "'.$h->SERVER_ADDRESS.'"');
             if (!$result) throw new Exception("Błąd tworzenia maszyny wirtualnej Parallels o nazwie ".$h->SERVER_ADDRESS);
             DEBUG_S(-3, 'Poprawność utworzenia maszyny wirtualnej Parallels o nazwie '.$h->SERVER_ADDRESS, 'OK');
-            
+
             $plist = '<?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">
@@ -2960,7 +2960,7 @@ function INSTALL_SES_PROCESY_A() {
             $result = execOnParallels('sudo -n su -
 echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.plist');
             DEBUG_S(-3, 'Utworzenie pliku plist do LaunchDaemona', 'OK');
-            
+
             echo "<br/>Uruchomienie maszyny wirtualnej";
             execOnParallels('sudo launchctl load /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.plist');
             $i = 0;
@@ -2979,12 +2979,12 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
                 }
             } while ($state == "not_installed");
             DEBUG_S(-3, 'Uruchomienie maszyny wirtualnej Parallels', 'OK');
-            
+
             echo "<br/>Konfiguracja maszyny wirtualnej";
             $result = execOnParallels('prlctl exec "'.$h->SERVER_ADDRESS.'" "networksetup -setmanual Ethernet '.$h->SERVER_ADDRESS_IP.' '.$subnets[$subnet]["mask"].' '.$subnets[$subnet]["gw"].'"');
             DEBUG_S(-3, 'Ustawienie adresu IP/maskę oraz bramy domyślnej', $result);
             sleep(2);
-            
+
             $result = execOnParallels('prlctl exec "'.$h->SERVER_ADDRESS.'" "networksetup -setdnsservers Ethernet '.$subnets[$subnet]["dns"].'"');
             DEBUG_S(-3, 'Ustawienie serwera DNS', $result);
             sleep(2);
@@ -3007,32 +3007,32 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'scutil --set HostName "'.$h->SERVER_ADDRESS.'"\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'scutil --set ComputerName "'.$h->SERVER_ADDRESS.'"\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'scutil --set LocalHostName "'.str_replace('.','-',$h->SERVER_ADDRESS).'"\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'dscl . passwd /Users/server "'.str_replace('!','\!',$h->ADMIN_USERNAME_PASSWD).'"\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'ldappasswd -x -H ldapi://%2Fvar%2Frun%2Fldapi -s "'.str_replace('!','\!',$h->ADMIN_USERNAME_PASSWD).'" uid=diradmin,cn=users,dc=procesy5,dc=local\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
-            
+
             echo "<br/>Kopiowanie pliku instalatora Procesy5";
             $cmd = '/opt/local/bin/sshpass -v -p "'.str_replace('!','\!',$h->ADMIN_USERNAME_PASSWD).'" scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "'.$file.'" "server@'.$h->SERVER_ADDRESS_IP.':Downloads/'.$package.'"';
             $result = shell_exec($cmd);
@@ -3043,26 +3043,26 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             if (!$result) throw new Exception("Wystąpił bląd instalacji certyfikatu, przerywam...");
-            
+
             echo "<br/>Instalowanie Procesy5";
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'mkdir /var/root/.procesy5_install; touch /var/root/.procesy5_install/started\'';
             $result = execOnParallels($cmd);
             $cmd = 'screen -d -m prlctl exec "'.$h->SERVER_ADDRESS.'" \'installer -package "/Users/server/Downloads/'.$package.'" -target "/" -verboseR > /var/root/.procesy5_install/log && touch /var/root/.procesy5_install/completed\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
-                        
+
             echo "<br/><font size=3 color=orange><b>Uruchomiono w tle instalację Procesy5 na maszynie wirtualnej ".$h->SERVER_ADDRESS.".<br/>Aby sprawdzić status instalacji, kliknij na \"4. STATUS_INSTALACJI_NA_PARALLELS\"</b></font><br/><br/>";
-                        
+
         } catch (Exception $e) {
             echo "<br/><font size=4 color=red><b>".$e->getMessage()."</b></font><br/><br/>";
         }
-        
+
     } else if(!empty($_REQUEST['STATUS_INSTALACJI_NA_PARALLELS'])) {
         try {
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'[ -f "/var/root/.procesy5_install/started" ] && echo 1\' 2>/dev/null';
             $result = execOnParallels($cmd);
             if (!$result) throw new Exception("Błąd - automatyczna instalacja Procesy5 na wirtualnej maszynie ".$h->SERVER_ADDRESS." nie została uruchomiona.");
-            
+
             $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'[ -f "/var/root/.procesy5_install/completed" ] && echo 1\'';
             $result = execOnParallels($cmd);
             if ($result) {
@@ -3094,8 +3094,8 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
             echo "<br/>";
         } catch (Exception $e) {
             echo "<br/><font size=4 color=red><b>".$e->getMessage()."</b></font><br/><br/>";
-        }    
-        
+        }
+
 	} else {