fixed config for additional domains - instalator

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -48,17 +48,25 @@ 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);
+		$argDomain = array();
+		foreach ($domainList as $domain) {
+			$argDomain[] = ' --domain ' . $domain;
+		}
+		return implode(' ', $argDomain);
+	}
+	function fetch_same_domains_for_install($SERVER_ADDRESS_SHORT) {
 	 	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."'");
 		while($h=DB::fetch($res)) {
 			$res2=DB::query("select SERVER_ADDRESS_SHORT from SES_PROCESY5_A where SERVER_ADDRESS_IP='".$h->SERVER_ADDRESS_IP."'");
 			while($h2=DB::fetch($res2)) {
-			 	$domain[]=' --domain '.$h2->SERVER_ADDRESS_SHORT;
+			 	$domain[] = $h2->SERVER_ADDRESS_SHORT;
 			}
-			$domain[]=' --domain 127.0.0.1';
-			$domain[]=' --domain localhost';
 		}
-		return implode(' ', $domain);
+		$domain[] = '127.0.0.1';
+		$domain[] = 'localhost';
+		return $domain;
 	}
 }
 
@@ -1615,7 +1623,6 @@ zasob_id=\"2\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php
 ';
 
-$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
  //! .cnf--folders
  $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT;
  $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/PISMA';
@@ -1905,7 +1912,6 @@ DEST_FOLDER_VARNAME2=\"NAZWA_REWI\"
 
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
-$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 //! .config_domena_.php
 //LDAP
 $cmd[]['rsh']='echo ";<?php
@@ -1920,7 +1926,6 @@ pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
 base_dn=\"'.$SERVER_ADDRESS_LDAP_DC.'\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php
 ';
-$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 
 $cmd[]['rsh']='echo "<?php
 
@@ -1948,7 +1953,6 @@ database=\"SES_USERS2\"
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php
 '; //todo zmienic to wczesniej
-$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 
  $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' drop '.$REMOTE_FOLDER_ROOT.' || echo PASSED ';
 
@@ -2027,7 +2031,18 @@ zasob_id=\"2\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php
 ';
 
-$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
+// aliasowanie do localhosta konfigow do testow systemu
+$domainList = INSTALL_SES_PROCESY_A::get_same_domains_for_install($SERVER_ADDRESS_SHORT);// [ $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)
+	$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$domain.'.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$domain.'.ini.php';
+	$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$domain.'.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$domain.'.ini.php';
+	$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$domain.'.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$domain.'.ini.php';
+	$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$domain.'.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$domain.'.ini.php';
+	$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$domain.'.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$domain.'.ini.php';
+}
+
 //! dodanie pierwszego usera ADMIN_USERNAME_L1 oraz diradmin
 
 //!#1228 2016-04-11 bindera: dodaje to tez tutaj - bo chyba tutaj powinno byc wszystko sprawne i dzialajace