valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace some usages of SELF_URL_PATH with get_self_url_prefix()

This commit is contained in:
Andrew Dolgov 2017-07-06 23:01:44 +03:00
parent 948471a44b
commit b2d42e960b
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/handler/public.php
View File

@ -541,7 +541,7 @@ class Handler_Public extends Handler {
if ($_REQUEST['return']) { if ($_REQUEST['return']) {
header("Location: " . $_REQUEST['return']); header("Location: " . $_REQUEST['return']);
} else { } else {
header("Location: " . SELF_URL_PATH); header("Location: " . get_self_url_prefix());
} }
} }
} }

9
include/functions.php
View File

@ -1529,7 +1529,7 @@
$xpath = new DOMXPath($doc); $xpath = new DOMXPath($doc);
$ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https'; $ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https';
$rewrite_base_url = $site_url ? $site_url : SELF_URL_PATH; $rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
$entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src])'); $entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src])');
@ -1782,6 +1782,7 @@
return $tag; return $tag;
} }
// this returns SELF_URL_PATH sans ending slash
function get_self_url_prefix() { function get_self_url_prefix() {
if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) { if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1); return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
@ -1830,7 +1831,7 @@
FROM ttrss_filters2_rules AS r, FROM ttrss_filters2_rules AS r,
ttrss_filter_types AS t ttrss_filter_types AS t
WHERE WHERE
(match_on IS NOT NULL OR (match_on IS NOT NULL OR
(($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats_str)) AND (($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats_str)) AND
(feed_id IS NULL OR feed_id = '$feed_id'))) AND (feed_id IS NULL OR feed_id = '$feed_id'))) AND
filter_type = t.id AND filter_id = '$filter_id'"); filter_type = t.id AND filter_id = '$filter_id'");
@ -2370,7 +2371,7 @@
function init_js_translations() { function init_js_translations() {
print 'var T_messages = new Object(); print 'var T_messages = new Object();
function __(msg) { function __(msg) {
if (T_messages[msg]) { if (T_messages[msg]) {
return T_messages[msg]; return T_messages[msg];
@ -2378,7 +2379,7 @@
return msg; return msg;
} }
} }
function ngettext(msg1, msg2, n) { function ngettext(msg1, msg2, n) {
return __((parseInt(n) > 1) ? msg2 : msg1); return __((parseInt(n) > 1) ? msg2 : msg1);
}'; }';

4
plugins/af_zz_imgproxy/init.php
View File

@ -40,7 +40,7 @@ class Af_Zz_ImgProxy extends Plugin {
public function imgproxy() { public function imgproxy() {
$url = rewrite_relative_url(SELF_URL_PATH, $_REQUEST["url"]); $url = rewrite_relative_url(get_self_url_prefix(), $_REQUEST["url"]);
// called without user context, let's just redirect to original URL // called without user context, let's just redirect to original URL
if (!$_SESSION["uid"]) { if (!$_SESSION["uid"]) {
@ -117,7 +117,7 @@ class Af_Zz_ImgProxy extends Plugin {
if ($all_remote) { if ($all_remote) {
$host = parse_url($url, PHP_URL_HOST); $host = parse_url($url, PHP_URL_HOST);
$self_host = parse_url(SELF_URL_PATH, PHP_URL_HOST); $self_host = parse_url(get_self_url_prefix(), PHP_URL_HOST);
$is_remote = $host != $self_host; $is_remote = $host != $self_host;
} else { } else {

2
plugins/bookmarklets/init.php
View File

@ -35,7 +35,7 @@ class Bookmarklets extends Plugin {
print "<p>"; print "<p>";
$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".SELF_URL_PATH."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()"); $bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Share with Tiny Tiny RSS'). "</a>"; print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Share with Tiny Tiny RSS'). "</a>";