replace some usages of SELF_URL_PATH with get_self_url_prefix()

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 403e20ca588bc3d4220500c7b53383dfd9b4b8a0..7282adfd210172fa8b2598a64829a49a2d20fd37 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -541,7 +541,7 @@ class Handler_Public extends Handler {
                        if ($_REQUEST['return']) {
                                header("Location: " . $_REQUEST['return']);
                        } else {
-                               header("Location: " . SELF_URL_PATH);
+                               header("Location: " . get_self_url_prefix());
                        }
                }
        }

diff --git a/include/functions.php b/include/functions.php
index 492d2b635f631156f89067a2801e9d87e12839e1..f290560778467dae1c91f7f3d778fb150d1e8714 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1529,7 +1529,7 @@
                $xpath = new DOMXPath($doc);
 
                $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])');
 
@@ -1782,6 +1782,7 @@
                return $tag;
        }
 
+       // this returns SELF_URL_PATH sans ending slash
        function get_self_url_prefix() {
                if (strrpos(SELF_URL_PATH, "/") === 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,
                                        ttrss_filter_types AS t
                                        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
                                                  (feed_id IS NULL OR feed_id = '$feed_id'))) AND
                                                filter_type = t.id AND filter_id = '$filter_id'");
@@ -2370,7 +2371,7 @@
        function init_js_translations() {
 
                print 'var T_messages = new Object();
-       
+
                        function __(msg) {
                                if (T_messages[msg]) {
                                        return T_messages[msg];
@@ -2378,7 +2379,7 @@
                                        return msg;
                                }
                        }
-       
+
                        function ngettext(msg1, msg2, n) {
                                return __((parseInt(n) > 1) ? msg2 : msg1);
                        }';

diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 870e12a0816e9e3f3495c8c42ded95046bfd73ec..c3b3f7fd55247f37e80af4a8e0dc6d7471d68ea9 100644 (file)
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -40,7 +40,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
        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
                if (!$_SESSION["uid"]) {
@@ -117,7 +117,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
                if ($all_remote) {
                        $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;
                } else {

diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 14db3994a591b45aaef17f5e03b1efea7d780662..43bc42870a10dd57334de5257bc05083c3a5a075 100644 (file)
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -35,7 +35,7 @@ class Bookmarklets extends Plugin {
 
                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>";