Use relative URLs instead of hardcoding domain

4 files changed, 11 insertions, 11 deletions

diff --git a/h-source/admin/Application/Include/myFunctions.php b/h-source/admin/Application/Include/myFunctions.php
index ab32bbf..355c181 100644
--- a/h-source/admin/Application/Include/myFunctions.php
+++ b/h-source/admin/Application/Include/myFunctions.php
@@ -166,7 +166,7 @@ function getLinkToUser($user)
 	}
 	else
 	{
-		return "<a href='http://".DOMAIN_NAME."/users/meet/".Lang::$current."/$user'>$user</a>";
+		return "<a href='/users/meet/".Lang::$current."/$user'>$user</a>";
 	}
 }
 
@@ -271,7 +271,7 @@ function linkToNotebook($match)
 	$hardware = new HardwareModel();
 	$clean['id_hard'] = (int)$match[2];
 	$name = encodeUrl($hardware->getTheModelName($clean['id_hard']));
-	$href = "HTTP://".DOMAIN_NAME."/notebooks/view/".Lang::$current."/".$clean['id_hard']."/$name";
+	$href = "/notebooks/view/".Lang::$current."/".$clean['id_hard']."/$name";
 	return (strcmp($name,'') !== 0) ? "<a title = 'link to notebook $name:  $href' href='$href'>".$name."</a>" : $match[0];
 }
 
@@ -281,7 +281,7 @@ function linkToWifi($match)
 	$hardware = new HardwareModel();
 	$clean['id_hard'] = (int)$match[2];
 	$name = encodeUrl($hardware->getTheModelName($clean['id_hard']));
-	$href = "HTTP://".DOMAIN_NAME."/wifi/view/".Lang::$current."/".$clean['id_hard']."/$name";
+	$href = "/wifi/view/".Lang::$current."/".$clean['id_hard']."/$name";
 	return (strcmp($name,'') !== 0) ? "<a title = 'link to wifi card $name:  $href' href='$href'>".$name."</a>" : $match[0];
 }
 
@@ -291,7 +291,7 @@ function linkToVideocard($match)
 	$hardware = new HardwareModel();
 	$clean['id_hard'] = (int)$match[2];
 	$name = encodeUrl($hardware->getTheModelName($clean['id_hard']));
-	$href = "HTTP://".DOMAIN_NAME."/videocards/view/".Lang::$current."/".$clean['id_hard']."/$name";
+	$href = "/videocards/view/".Lang::$current."/".$clean['id_hard']."/$name";
 	return (strcmp($name,'') !== 0) ? "<a title = 'link to video card $name:  $href' href='$href'>".$name."</a>" : $match[0];
 }
 
@@ -309,10 +309,10 @@ function getMotivation($row,$controller)
 		$clean['id_hard'] = (int)$row['deletion']['id_duplicate'];
 		$hardware = new HardwareModel();
 		$name = encodeUrl($hardware->getTheModelName($clean['id_hard']));
-		return "<b>duplication</b> of the model having id <b><a href='http://".DOMAIN_NAME."/".$controller."/view/".Lang::$current."/".$clean['id_hard']."/".$name."'>".$clean['id_hard']."</a></b>";
+		return "<b>duplication</b> of the model having id <b><a href='/".$controller."/view/".Lang::$current."/".$clean['id_hard']."/".$name."'>".$clean['id_hard']."</a></b>";
 	}
 	else
 	{
 		return "<b>".$row['deletion']['object']."</b>";
 	}
-}
\ No newline at end of file
+}
diff --git a/h-source/admin/Library/Helper/Popup.php b/h-source/admin/Library/Helper/Popup.php
index 9ceac72..17ba908 100755
--- a/h-source/admin/Library/Helper/Popup.php
+++ b/h-source/admin/Library/Helper/Popup.php
@@ -78,10 +78,10 @@ class Helper_Popup extends Helper_Html {
 				$this->viewArgs[$field] = $tempArg;
 			}
 			if (count($this->popupArray)>0) {
-				$returnString .= "<script type=\"text/javascript\" src=\"http://".DOMAIN_NAME."/Public/Js/DisplayTag.js\"></script>\n";
+				$returnString .= "<script type=\"text/javascript\" src=\"/admin/Public/Js/DisplayTag.js\"></script>\n";
 			}
 		}
 		return $returnString;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/h-source/admin/Library/Theme.php b/h-source/admin/Library/Theme.php
index 692697e..afa3660 100755
--- a/h-source/admin/Library/Theme.php
+++ b/h-source/admin/Library/Theme.php
@@ -22,8 +22,8 @@ class Theme {
 	
 	function __construct($controller) {
 		$this->controller = $controller;
-		$this->baseUrl = MOD_REWRITE_MODULE === true ? 'http://' . DOMAIN_NAME : 'http://' . DOMAIN_NAME . '/index.php';
-		$this->baseUrlSrc = 'http://' . DOMAIN_NAME;
+		$this->baseUrl = MOD_REWRITE_MODULE === true ? '/admin' : '/admin/index.php';
+		$this->baseUrlSrc = '/admin';
 	}
 
 
diff --git a/h-source/admin/Library/Url.php b/h-source/admin/Library/Url.php
index 4e2ca5e..54d6e3e 100755
--- a/h-source/admin/Library/Url.php
+++ b/h-source/admin/Library/Url.php
@@ -9,7 +9,7 @@ class Url {
 
 	//get the url starting from the root folder
 	public static function getRoot($pathFromRootFolder = null) {
-		$url = MOD_REWRITE_MODULE === true ? 'http://' . DOMAIN_NAME . '/' . $pathFromRootFolder : 'http://' . DOMAIN_NAME . '/index.php/' . $pathFromRootFolder;
+		$url = MOD_REWRITE_MODULE === true ? '/admin/' . $pathFromRootFolder : '/admin/index.php/' . $pathFromRootFolder;
 		return $url;
 	}