blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

apply https bugfix from Frank De Meulenaere

Browse source
This commit is contained in:
Andrew Dolgov 2008-02-24 13:18:08 +01:00
parent 9a91a51e0d
commit d70c5ae4de
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
functions.php
View file

@ -5219,7 +5219,7 @@
function article_publish_url($link) { 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"); $url_path .= "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY");
@ -5247,7 +5247,7 @@
* @return string The Mozilla Firefox feed adding URL. * @return string The Mozilla Firefox feed adding URL.
*/ */
function add_feed_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"; $url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
return $url_path; return $url_path;
} // function add_feed_url } // function add_feed_url

9
modules/pref-feeds.php
View file

@ -506,13 +506,10 @@
} }
if ($p_from != 'tt-rss') { if ($p_from != 'tt-rss') {
$tt_uri = 'http://' . $_SERVER['SERVER_NAME'] . $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
preg_replace('/backend\.php.*$/',
'tt-rss.php', $_SERVER["REQUEST_URI"]);
$tp_uri = 'http://' . $_SERVER['SERVER_NAME'] .
preg_replace('/backend\.php.*$/', $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
'prefs.php', $_SERVER["REQUEST_URI"]);
print "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> |"; print "<p><a href='$tt_uri'>Return to Tiny Tiny RSS</a> |";