From b2d42e960b3b3a59aac0d102856f842d021fe59a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 6 Jul 2017 23:01:44 +0300 Subject: replace some usages of SELF_URL_PATH with get_self_url_prefix() --- plugins/af_zz_imgproxy/init.php | 4 ++-- plugins/bookmarklets/init.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php index 870e12a08..c3b3f7fd5 100644 --- 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 14db3994a..43bc42870 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -35,7 +35,7 @@ class Bookmarklets extends Plugin { print "

"; - $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 "" . __('Share with Tiny Tiny RSS'). ""; -- cgit v1.2.3