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

move add_feed_url() to pref_feeds

Browse source
This commit is contained in:
Andrew Dolgov 2017-05-11 09:07:49 +03:00
parent 6c34ef612c
commit c114a2596f
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
classes/pref/feeds.php
View file

@ -1489,7 +1489,7 @@ class Pref_Feeds extends Handler_Protected {
print "<button onclick='window.navigator.registerContentHandler(" . print "<button onclick='window.navigator.registerContentHandler(" .
"\"application/vnd.mozilla.maybe.feed\", " . "\"application/vnd.mozilla.maybe.feed\", " .
"\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" . "\"" . $this->subscribe_to_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
__('Click here to register this site as a feed reader.') . __('Click here to register this site as a feed reader.') .
"</button>"; "</button>";
@ -1972,4 +1972,11 @@ class Pref_Feeds extends Handler_Protected {
print (int) $this->dbh->fetch_result($result, 0, "num_inactive"); print (int) $this->dbh->fetch_result($result, 0, "num_inactive");
} }
static function subscribe_to_feed_url() {
$url_path = get_self_url_prefix() .
"/public.php?op=subscribe&feed_url=%s";
return $url_path;
}
} }

13
include/functions.php
View file

@ -1791,19 +1791,6 @@
} }
} }
/**
* Compute the Mozilla Firefox feed adding URL from server HOST and REQUEST_URI.
*
* @return string The Mozilla Firefox feed adding URL.
*/
function add_feed_url() {
//$url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
$url_path = get_self_url_prefix() .
"/public.php?op=subscribe&feed_url=%s";
return $url_path;
} // function add_feed_url
function encrypt_password($pass, $salt = '', $mode2 = false) { function encrypt_password($pass, $salt = '', $mode2 = false) {
if ($salt && $mode2) { if ($salt && $mode2) {
return "MODE2:" . hash('sha256', $salt . $pass); return "MODE2:" . hash('sha256', $salt . $pass);

2
plugins/bookmarklets/init.php
View file

@ -21,7 +21,7 @@ class Bookmarklets extends Plugin {
print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>"; print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
$bm_subscribe_url = str_replace('%s', '', add_feed_url()); $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?')); $confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));