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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -2947,14 +2947,18 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
             V::exec("ping ".$h->SERVER_ADDRESS_IP." -c 5 -t 20", $output, $exit);
             DEBUG_S(-3, 'Weryfikacja czy maszyna wirtualna odpowiada na "pingi"', $output);
             if ($exit) {
-/*                execOnParallels('sudo launchctl unload /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.plist');
+                execOnParallels('sudo launchctl unload /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.plist');
                 execOnParallels('sudo rm -f /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.plist');
                 execOnParallels('prlctl stop "'.$h->SERVER_ADDRESS.'" --kill');
-                execOnParallels('prlctl delete "'.$h->SERVER_ADDRESS.'"');*/
+                execOnParallels('prlctl delete "'.$h->SERVER_ADDRESS.'"');
                 throw new Exception('Błąd - maszyna wirtualna nie odpowiada na pingi, usuwam maszynę i przerywam...');
             }
-            
-            $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'/Applications/Server.app/Contents/ServerRoot/usr/sbin/changeip '.$h->SERVER_ADDRESS_IP.' procesy5 "'.$h->SERVER_ADDRESS_IP.'"\'';
+
+            $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'printf "'.$h->SERVER_ADDRESS_IP.'\t'.$h->SERVER_ADDRESS.'\n" >> /etc/hosts\'';
+            $result = execOnParallels($cmd);
+            DEBUG_S(-3, $cmd, $result);
+
+            $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'/Applications/Server.app/Contents/ServerRoot/usr/sbin/changeip '.$h->SERVER_ADDRESS_IP.' procesy5 "'.$h->SERVER_ADDRESS.'"\'';
             $result = execOnParallels($cmd);
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
@@ -2984,22 +2988,24 @@ echo \''.$plist.'\' > /Library/LaunchDaemons/parallels.'.$h->SERVER_ADDRESS.'.pl
             DEBUG_S(-3, $cmd, $result);
             sleep(2);
             
-            $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'printf "'.$h->SERVER_ADDRESS_IP.'\t'.$h->SERVER_ADDRESS.'\n" >> /etc/hosts\'';
-            $result = execOnParallels($cmd);
-            DEBUG_S(-3, $cmd, $result);
-            
             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);
             DEBUG_S(-3, $cmd, $result);
-            
+
+            echo "<br/>Aktualizacja certyfikatu";
+            $cmd = 'prlctl exec "'.$h->SERVER_ADDRESS.'" \'[ -n "`find /etc/certificates -name *'.$h->SERVER_ADDRESS.'*.cert.pem`" ] && /Applications/Server.app/Contents/ServerRoot/usr/sbin/certupdate replace -c "`find /etc/certificates -name *procesy5.local.*.cert.pem | tail -1`" -C "`find /etc/certificates -name *'.$h->SERVER_ADDRESS.'*.cert.pem | tail -1`" 2>&1\'';
+            $result = execOnParallels($cmd);
+            DEBUG_S(-3, $cmd, $result);
+            if (!$result) throw new Exception("Wystąpił bląd instalacji certyfikatu, przerywam...");
+            die("test koniec");
             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) {

SE/superedit-ZLECENIE.php

@@ -12,7 +12,7 @@ function ZLECENIE_KONFIGURACJA($SES_A) {
 		$SUBNET_MASK="255.255.255.0";
 		$GATEWAY=$IP_a[0].".".$IP_a[1].".".$IP_a[2].".1";
 	}
-	if (preg_match("/^[[:alpha:]_]*/",$SES_A['S_ADDRESS_STREET'],$ULICA)) {
+	if (preg_match("/^[[:alpha:]ĘÓĄŚŁŻŹĆŃęóąśłżźćń_]*/",$SES_A['S_ADDRESS_STREET'],$ULICA)) {
 		$BUDYNEK_MIESZKANIE=substr($SES_A['S_ADDRESS_STREET'],strlen($ULICA[0]));
 		if (preg_match("/^[[:digit:]]*/",$BUDYNEK_MIESZKANIE,$BUDYNEK)) {
 			$query="select * from BUILDINGS where S_ADDRESS_STREET like '".$ULICA[0].$BUDYNEK[0]."%' limit 1";