From d70c5ae4de285c672a9c62deb3f3219e820021c5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 24 Feb 2008 13:18:08 +0100
Subject: apply https bugfix from Frank De Meulenaere

---
 modules/pref-feeds.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index ff9243912..854ca0dc2 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -506,13 +506,10 @@
 				}
 
 				if ($p_from != 'tt-rss') {
-					$tt_uri = 'http://' . $_SERVER['SERVER_NAME'] . 
-						preg_replace('/backend\.php.*$/', 
-							'tt-rss.php', $_SERVER["REQUEST_URI"]);
+					$tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
 
-					$tp_uri = 'http://' . $_SERVER['SERVER_NAME'] . 
-						preg_replace('/backend\.php.*$/', 
-							'prefs.php', $_SERVER["REQUEST_URI"]);
+
+					$tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
 
 					print "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> |";
 
-- 
cgit v1.2.3