Index: trunk/admin/install.php =================================================================== diff -u -r383 -r402 --- trunk/admin/install.php (.../install.php) (revision 383) +++ trunk/admin/install.php (.../install.php) (revision 402) @@ -128,7 +128,7 @@ $mods[3] = "In-Portal"; // simulate rootURL variable: begin - $rootURL = 'http://'.dirname($_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']); + $rootURL = 'http://'.dirname($_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']); $tmp = explode('/', $rootURL); if( $tmp[ count($tmp) - 1 ] == $admin) unset( $tmp[ count($tmp) - 1 ] ); $rootURL = implode('/', $tmp).'/'; @@ -342,7 +342,7 @@ if (ConvertVersion($g_InPortal) >= ConvertVersion("1.0.5")) { $act = 'check'; } - $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['UserName'])."&password=".md5($_POST['UserPass'])."&action=$act&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { $login_err_mesg = "Unable to connect to the Intechnic server!"; $LoggedIn = false; @@ -689,7 +689,7 @@ if ($lic_login != '' && $lic_password != '') { // Here we determine weather login is ok & check available licenses - $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?login=".md5($_POST['login'])."&password=".md5($_POST['password'])."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".base64_encode($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { $get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; $state = "get_license"; @@ -1464,8 +1464,8 @@ $sitepath = $pathguess; $esc_path = str_replace("\\","/",$pathtoroot); $esc_path = str_replace("/","\\",$esc_path); - //set_ini_value("Site","DomainName",$_SERVER["SERVER_NAME"]); - //$g_DomainName= $_SERVER["SERVER_NAME"]; + //set_ini_value("Site","DomainName",$_SERVER["HTTP_HOST"]); + //$g_DomainName= $_SERVER["HTTP_HOST"]; save_values(); $ado =& inst_GetADODBConnection(); @@ -1500,7 +1500,7 @@ } $modules_str = substr($modules_str, 0, strlen($modules_str) - 1); - $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".md5($_SERVER['SERVER_NAME']), "r"); + $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['HTTP_HOST'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&license_code=".base64_encode($g_LicenseCode)."&version=".GetMaxPortalVersion($pathtoroot.$admin)."&domain=".md5($_SERVER['HTTP_HOST']), "r"); if (!$rfile) { //$get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; //$state = "postconfig_1";