From 9a041dbac782566ff5a7ddb1f472e587cd6663f2 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Tue, 16 Sep 2014 09:34:13 +0000
Subject: Enabled SSL

---
 h-source/Application/Include/myFunctions.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'h-source/Application/Include/myFunctions.php')

diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php
index dc2eb9c..5cb1036 100644
--- a/h-source/Application/Include/myFunctions.php
+++ b/h-source/Application/Include/myFunctions.php
@@ -215,7 +215,7 @@ function getLinkToUser($user)
 	}
 	else
 	{
-		return "<a href='http://".DOMAIN_NAME."/meet/user/".Lang::$current."/$user'>$user</a>";
+		return "<a href='".Url::getRoot()."meet/user/".Lang::$current."/$user'>$user</a>";
 	}
 }
 
@@ -233,7 +233,7 @@ 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='".Url::getRoot().$controller."/view/".Lang::$current."/".$clean['id_hard']."/".$name."'>".$clean['id_hard']."</a></b>";
 	}
 	else
 	{
@@ -404,24 +404,24 @@ function goToModeratedItem( $row = array() )
 			$url = 'wiki/page/'.Lang::$current.'/'.encodeUrl(getWikiNameFromId($row['id']));
 			break;
 	}
-	return 'http://'.DOMAIN_NAME.'/'.$url;
+	return Url::getRoot($url);
 }
 
 function getUrlsFromIdHard($id_hard)
 {
 	$clean['id_hard'] = (int)$id_hard;
 	
-	$urlView = "http://".DOMAIN_NAME;
-	$urlTalk = "http://".DOMAIN_NAME;
+	$urlView = $urlTalk = Url::getRoot();
+
 	$deviceName = null;
 	
 	$hard = new HardwareModel();
 	$res = $hard->select('type,model')->where(array('id_hard'=>$clean['id_hard']))->send();
 	if (count($res) > 0)
 	{
-		$urlView = "http://".DOMAIN_NAME."/".Hardware::$typeToController[$res[0]['hardware']['type']]."/view/".Lang::$current."/".$clean['id_hard']."/".encodeUrl($res[0]['hardware']['model']);
+		$urlView = Url::getRoot().Hardware::$typeToController[$res[0]['hardware']['type']]."/view/".Lang::$current."/".$clean['id_hard']."/".encodeUrl($res[0]['hardware']['model']);
 		
-		$urlTalk = "http://".DOMAIN_NAME."/".Hardware::$typeToController[$res[0]['hardware']['type']]."/talk/".Lang::$current."/".$clean['id_hard'];
+		$urlTalk = Url::getRoot().Hardware::$typeToController[$res[0]['hardware']['type']]."/talk/".Lang::$current."/".$clean['id_hard'];
 
 		$deviceName = $res[0]['hardware']['model'];
 	}
-- 
cgit v1.2.3