Bläddra i källkod

Route Install Fix fetchDomainsByLicenceId

Piotr Labudda 10 år sedan
förälder
incheckning
bb69f86fef
1 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5 2
      SE/se-lib/Route/Install.php

+ 5 - 2
SE/se-lib/Route/Install.php

@@ -96,7 +96,7 @@ jQuery(document).ready(function () {
 			SE_Layout::dol();
 			exit;
 		}
-		echo'<pre>';print_r($domains);echo'</pre>';
+		echo'<pre>Domains with Licence: ';print_r($domains);echo'</pre>';
 		$installPath = '/Library/Server/Web/Data/Sites/Default/PLIKI/SES_PROCESY5_A';
 		$installPath .= "/{$args['licence_id']}_upgrade_SE_source_encrypted";
 		$cmds = array();
@@ -152,7 +152,7 @@ jQuery(document).ready(function () {
 	public function fetchDomainsByLicenceId($licenceId) {
 		$domains = array();
 		$db = DB::getDB();
-		$sql = "select g.`SERVER_ADDRESS_SHORT`
+		$sql = "select g.`SERVER_ADDRESS_SHORT`, g.`SERVER_ADDRESS`
 			from `SES_PROCESY5_A` g
 			where g.`SERVER_ADDRESS_IP`=(select l.`SERVER_ADDRESS_IP`
 				from `SES_PROCESY5_A` l
@@ -164,6 +164,9 @@ jQuery(document).ready(function () {
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
 			$domains[] = $r->SERVER_ADDRESS_SHORT;
+			if ($r->SERVER_ADDRESS != $r->SERVER_ADDRESS_SHORT) {
+				$domains[] = $r->SERVER_ADDRESS;
+			}
 		}
 		return $domains;
 	}