From 9a041dbac782566ff5a7ddb1f472e587cd6663f2 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Tue, 16 Sep 2014 09:34:13 +0000 Subject: Enabled SSL --- h-source/Application/Models/TalkModel.php | 3 ++- h-source/Application/Models/UsersModel.php | 2 +- h-source/Application/Models/WikiModel.php | 2 +- h-source/Application/Models/WikitalkModel.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'h-source/Application/Models') diff --git a/h-source/Application/Models/TalkModel.php b/h-source/Application/Models/TalkModel.php index 0edcdda..1d15ab7 100644 --- a/h-source/Application/Models/TalkModel.php +++ b/h-source/Application/Models/TalkModel.php @@ -96,7 +96,8 @@ class TalkModel extends BaseModel { //send the notice Account::sendTalkNotice($myName,$ffusers,$clean['id_hard']); - header('Refresh: 0;url=http://'.DOMAIN_NAME.$_SERVER['REQUEST_URI']); + $domainName = rtrim(Url::getRoot(),"/"); + header('Refresh: 0;url='.$domainName.$_SERVER['REQUEST_URI']); exit; } } diff --git a/h-source/Application/Models/UsersModel.php b/h-source/Application/Models/UsersModel.php index ea19a7b..e666e36 100755 --- a/h-source/Application/Models/UsersModel.php +++ b/h-source/Application/Models/UsersModel.php @@ -102,7 +102,7 @@ class UsersModel extends Model_Map } else { - return "$user"; + return "$user"; } } diff --git a/h-source/Application/Models/WikiModel.php b/h-source/Application/Models/WikiModel.php index 6dc9fd1..bb60b66 100644 --- a/h-source/Application/Models/WikiModel.php +++ b/h-source/Application/Models/WikiModel.php @@ -309,7 +309,7 @@ class WikiModel extends Model_Map { { $clean['id'] = (int)$id; $title = $this->getTheModelName($clean['id'], true); - return "http://".DOMAIN_NAME."/wiki/page/".Lang::$current."/".$title; + return Url::getRoot()."wiki/page/".Lang::$current."/".$title; } public function getDiffArray($oldArray, $newArray) diff --git a/h-source/Application/Models/WikitalkModel.php b/h-source/Application/Models/WikitalkModel.php index 8739984..7dee896 100644 --- a/h-source/Application/Models/WikitalkModel.php +++ b/h-source/Application/Models/WikitalkModel.php @@ -94,7 +94,7 @@ class WikitalkModel extends BaseModel //send the notice Account::sendWikiTalkNotice($myName,$ffusers,$clean['id_wiki']); - header('Refresh: 0;url=http://'.DOMAIN_NAME."/wiki/talk/".Lang::$current."/".$clean['id_wiki']); + header('Refresh: 0;url='.Url::getRoot()."wiki/talk/".Lang::$current."/".$clean['id_wiki']); exit; } } -- cgit v1.2.3