Просмотр исходного кода

added subdomain under procesy5.pl - instalator

Piotr Labudda 9 лет назад
Родитель
Сommit
c28835085f
1 измененных файлов с 9 добавлено и 5 удалено
  1. 9 5
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 9 - 5
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -47,15 +47,15 @@ echo "<h2>(W przypadku instalacji zdalnej) Pamiętaj o konieczności udostępnie
 
 class INSTALL_SES_PROCESY_A {
 	//make option for sgencoder (several domains)  --domain '.$h->SERVER_ADDRESS_SHORT.' -r *.php
-	function get_same_domains_for_install($SERVER_ADDRESS_SHORT) {
-		$domainList = self::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT);
+	function get_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS = null) {
+		$domainList = self::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS);
 		$argDomain = array();
 		foreach ($domainList as $domain) {
 			$argDomain[] = ' --domain ' . $domain;
 		}
 		return implode(' ', $argDomain);
 	}
-	function fetch_same_domains_for_install($SERVER_ADDRESS_SHORT) {
+	function fetch_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS = null) {
 		$domainList = array();
 	 	if(strlen($SERVER_ADDRESS_SHORT)==0) die('Error with server address short');
 		$res=DB::query("select SERVER_ADDRESS_IP from SES_PROCESY5_A where SERVER_ADDRESS_SHORT='".$SERVER_ADDRESS_SHORT."'");
@@ -65,6 +65,10 @@ class INSTALL_SES_PROCESY_A {
 			 	$domainList[] = $h2->SERVER_ADDRESS_SHORT;
 			}
 		}
+		if ($SERVER_ADDRESS) {
+			$subDomainP5 = '' . $SERVER_ADDRESS . '.procesy5.pl';
+			if (!in_array($subDomainP5, $domainList)) $domainList[] = $subDomainP5;
+		}
 		$domainList[] = '127.0.0.1';
 		$domainList[] = 'localhost';
 		return $domainList;
@@ -2033,7 +2037,7 @@ zasob_id=\"2\"
 ';
 
 // aliasowanie do localhosta konfigow do testow systemu
-$domainList = INSTALL_SES_PROCESY_A::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT);// [ $SERVER_ADDRESS, localhost, 127.0.0.1, ... ]
+$domainList = INSTALL_SES_PROCESY_A::fetch_same_domains_for_install($SERVER_ADDRESS_SHORT, $SERVER_ADDRESS);// [ $SERVER_ADDRESS, localhost, 127.0.0.1, ... ]
 foreach ($domainList as $domain) {
 	if ($SERVER_ADDRESS == $domain) continue;// skip main domain
 	if ('localhost' == $domain) continue;// skip localhost (127.0.0.1)
@@ -2297,7 +2301,7 @@ function MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$installer_tmp,
 
 				$phpVersionsForSgencoder = '--phpversion 5.5 --phpversion 5.6';// encode for PHP 5.x (currently supported PHP 5.0-5.6)
 
-	 			$exec='cd '.$installer_dir.' && /Applications/SourceGuardian.app/Contents/MacOS/sgencoder '.$phpVersionsForSgencoder.' -b- '.INSTALL_SES_PROCESY_A::get_same_domains_for_install($h->SERVER_ADDRESS_SHORT).' -r *.php ' . $skipFilesSgencoder;
+	 			$exec='cd '.$installer_dir.' && /Applications/SourceGuardian.app/Contents/MacOS/sgencoder '.$phpVersionsForSgencoder.' -b- '.INSTALL_SES_PROCESY_A::get_same_domains_for_install($h->SERVER_ADDRESS_SHORT, $h->SERVER_ADDRESS).' -r *.php ' . $skipFilesSgencoder;
 
 	 			exec($exec,$out,$exit);$out="";$exit="";
 	 			DEBUG_S(-3,'Zakodowanie kodu php/kompilacja z licencja i kluczem',array($exec,$out,$exit),__FILE__,__FUNCTION__,__LINE__);