diff options
| -rw-r--r-- | functions.php | 4 | ||||
| -rw-r--r-- | modules/pref-feeds.php | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/functions.php b/functions.php index 06d7e7a74..ae6e0f8e3 100644 --- a/functions.php +++ b/functions.php @@ -5219,7 +5219,7 @@ function article_publish_url($link) { - $url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); + $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); $url_path .= "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY"); @@ -5247,7 +5247,7 @@ * @return string The Mozilla Firefox feed adding URL. */ function add_feed_url() { - $url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); + $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); $url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s"; return $url_path; } // function add_feed_url 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> |"; |