From ce5f8c93cd4b68bbe5353c8a80b3554251ce3fa5 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Tue, 7 Apr 2015 09:59:53 +0000
Subject: [PATCH] Bug fix: properly compute the URLs/URIs for the soap server
 (and its extensions)

SVN:2.1.0[3537]
---
 webservices/itop.wsdl.php  | 2 +-
 webservices/soapserver.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webservices/itop.wsdl.php b/webservices/itop.wsdl.php
index e37af4d32..eace04042 100644
--- a/webservices/itop.wsdl.php
+++ b/webservices/itop.wsdl.php
@@ -66,7 +66,7 @@ else
 	$sRawFile = WebServicesBase::GetWSDLContents();
 }
 
-$sServerURI = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/soapserver.php';
+$sServerURI = utils::GetAbsoluteUrlAppRoot().'webservices/soapserver.php';
 if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
 {
 	$sServerURI .= "?service_category=".$_REQUEST['service_category'];
diff --git a/webservices/soapserver.php b/webservices/soapserver.php
index a76a43df1..2b294ec49 100644
--- a/webservices/soapserver.php
+++ b/webservices/soapserver.php
@@ -32,10 +32,10 @@ require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
 // this file is generated dynamically with location = here
-$sWsdlUri = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../webservices/itop.wsdl.php';
+$sWsdlUri = utils::GetAbsoluteUrlAppRoot().'webservices/itop.wsdl.php';
 if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
 {
-	$sWsdlUri .= "soapserver.php?service_category=".$_REQUEST['service_category'];
+	$sWsdlUri .= "?service_category=".$_REQUEST['service_category'];
 }
 
 
@@ -99,7 +99,7 @@ else
 		if (is_subclass_of($sPHPClass, 'WebServicesBase'))
 		{
 			$sServiceCategory = $sPHPClass;
-			$sSoapServerUri = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../webservices/soapserver.php';
+			$sSoapServerUri = utils::GetAbsoluteUrlAppRoot().'webservices/soapserver.php';
 			$sSoapServerUri .= "?service_category=$sServiceCategory";
 			echo "<li><a href=\"$sSoapServerUri\">$sServiceCategory</a></li>\n";
 		}