BugTrack/2213 Use get_base_uri() instead of get_script_uri()

diff --git a/lib/auth.php b/lib/auth.php
index 890aec3..d33b02f 100644 (file)
--- a/lib/auth.php
+++ b/lib/auth.php
@@ -307,8 +307,8 @@ function basic_auth($page, $auth_enabled, $exit_on_fail, $auth_pages, $title_can
                                header('WWW-Authenticate: Basic realm="' . $_msg_auth . '"');
                                header('HTTP/1.0 401 Unauthorized');
                        } elseif (AUTH_TYPE_FORM === $auth_type) {
-                               $url_after_login = get_script_uri() . '?' . $g_query_string;
-                               $loginurl = get_script_uri() . '?plugin=loginform'
+                               $url_after_login = get_base_uri() . '?' . $g_query_string;
+                               $loginurl = get_base_uri() . '?plugin=loginform'
                                        . '&page=' . rawurlencode($page)
                                        . '&url_after_login=' . rawurlencode($url_after_login);
                                header('HTTP/1.0 302 Found');

diff --git a/lib/init.php b/lib/init.php
index e067b90..87863ae 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -143,7 +143,7 @@ if (isset($script)) {
 
 // INI_FILE: Auth settings
 if (isset($auth_type) && $auth_type === AUTH_TYPE_SAML) {
-       $auth_external_login_url_base = get_script_uri() . '?//cmd.saml//sso';
+       $auth_external_login_url_base = get_base_uri() . '?//cmd.saml//sso';
 }
 
 

diff --git a/lib/make_link.php b/lib/make_link.php
index 598ce07..b103497 100644 (file)
--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -322,7 +322,7 @@ EOD;
                if (PKWK_ALLOW_RELATIVE_FOOTNOTE_ANCHOR) {
                        $script = '';
                } else {
-                       $script = get_script_uri() . '?' . pagename_urlencode($page);
+                       $script = get_page_uri($page);
                }
 
                $id   = ++$note_id;

diff --git a/lib/plugin.php b/lib/plugin.php
index a6b9f8a..2980438 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -30,9 +30,9 @@ function exist_plugin($name)
                        die('Alert: plugin "' . htmlsc($name) .
                        '" was called over ' . PKWK_PLUGIN_CALL_TIME_LIMIT .
                        ' times. SPAM or someting?<br />' . "\n" .
-                       '<a href="' . get_script_uri() . '?cmd=edit&amp;page='.
+                       '<a href="' . get_base_uri() . '?cmd=edit&amp;page='.
                        rawurlencode($vars['page']) . '">Try to edit this page</a><br />' . "\n" .
-                       '<a href="' . get_script_uri() . '">Return to frontpage</a>');
+                       '<a href="' . get_base_uri() . '">Return to frontpage</a>');
                return $exist[$name];
        }
 

diff --git a/plugin/aname.inc.php b/plugin/aname.inc.php
index 3d62f37..56638af 100644 (file)
--- a/plugin/aname.inc.php
+++ b/plugin/aname.inc.php
@@ -102,7 +102,7 @@ function plugin_aname_tag($args = array(), $convert = TRUE)
        $id = htmlsc($id); // Insurance
        $class   = $f_super ? 'anchor_super' : 'anchor';
        $attr_id = $f_noid  ? '' : ' id="' . $id . '"';
-       $url     = $f_full  ? get_script_uri() . '?' . pagename_urlencode($vars['page']) : '';
+       $url     = $f_full  ? get_page_uri($vars['page']) : '';
        if ($body != '') {
                $href  = ' href="' . $url . '#' . $id . '"';
                $title = ' title="' . $id . '"';

diff --git a/plugin/backup.inc.php b/plugin/backup.inc.php
index f3c1557..34ba19d 100644 (file)
--- a/plugin/backup.inc.php
+++ b/plugin/backup.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
 // backup.inc.php
-// Copyright (C)
-//   2002-2016 PukiWiki Development Team
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -40,7 +40,7 @@ function plugin_backup_action()
        $s_age  = (isset($vars['age']) && is_numeric($vars['age'])) ? $vars['age'] : 0;
        if ($s_age <= 0) return array( 'msg'=>$_title_pagebackuplist, 'body'=>plugin_backup_get_list($page));
 
-       $script = get_script_uri();
+       $script = get_base_uri();
 
        $body  = '<ul>' . "\n";
        $body .= ' <li><a href="' . $script . '?cmd=backup">' . $_msg_backuplist . '</a></li>' ."\n";
@@ -144,7 +144,7 @@ function plugin_backup_delete($page)
                }
        }
 
-       $script = get_script_uri();
+       $script = get_base_uri();
        $s_page = htmlsc($page);
        $body .= <<<EOD
 <p>$_msg_backup_adminpass</p>
@@ -180,7 +180,7 @@ function plugin_backup_get_list($page)
        global $_msg_backuplist, $_msg_diff, $_msg_nowdiff, $_msg_source, $_msg_nobackup;
        global $_title_backup_delete;
 
-       $script = get_script_uri();
+       $script = get_base_uri();
        $r_page = rawurlencode($page);
        $s_page = htmlsc($page);
        $retval = array();

diff --git a/plugin/basicauthlogout.inc.php b/plugin/basicauthlogout.inc.php
index 8de0105..74f39d7 100644 (file)
--- a/plugin/basicauthlogout.inc.php
+++ b/plugin/basicauthlogout.inc.php
@@ -1,7 +1,7 @@
 <?php
-
 // PukiWiki - Yet another WikiWikiWeb clone
-// Copyright (C) 2016 PukiWiki Development Team
+// basicauthlogout.inc.php
+// Copyright 2016-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // "Basic auth logout" plugin
@@ -9,7 +9,7 @@
 function plugin_basicauthlogout_inline()
 {
        $logout_param = '?plugin=basicauthlogout';
-       return '<a href="' . htmlsc(get_script_uri() . $logout_param) . '">Log out</a>';
+       return '<a href="' . htmlsc(get_base_uri() . $logout_param) . '">Log out</a>';
 }
 
 function plugin_basicauthlogout_convert()

diff --git a/plugin/bugtrack.inc.php b/plugin/bugtrack.inc.php
index 17a682f..a2d1a0a 100644 (file)
--- a/plugin/bugtrack.inc.php
+++ b/plugin/bugtrack.inc.php
@@ -99,7 +99,7 @@ function plugin_bugtrack_print_form($base, $category)
                $encoded_category .= '</select>';
        }
 
-       $script     = get_script_uri();
+       $script     = get_base_uri();
        $s_base     = htmlsc($base);
        $s_name     = htmlsc($_plugin_bugtrack['name']);
        $s_category = htmlsc($_plugin_bugtrack['category']);

diff --git a/plugin/comment.inc.php b/plugin/comment.inc.php
index 6ef906f..df3f108 100644 (file)
--- a/plugin/comment.inc.php
+++ b/plugin/comment.inc.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // comment.inc.php
 // Copyright
-//   2002-2016 PukiWiki Development Team
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -114,7 +114,7 @@ function plugin_comment_convert()
        $above  = in_array('above',  $options) ? '1' :
                (in_array('below', $options) ? '0' : PLUGIN_COMMENT_DIRECTION_DEFAULT);
 
-       $script = get_script_uri();
+       $script = get_base_uri();
        $s_page = htmlsc($vars['page']);
        $string = <<<EOD
 <br />

diff --git a/plugin/edit.inc.php b/plugin/edit.inc.php
index 89b41f9..6245ff2 100644 (file)
--- a/plugin/edit.inc.php
+++ b/plugin/edit.inc.php
@@ -169,7 +169,7 @@ function plugin_edit_inline()
        }
 
        // URL
-       $script = get_script_uri();
+       $script = get_base_uri();
        if ($isfreeze) {
                $url   = $script . '?cmd=unfreeze&page=' . rawurlencode($s_page);
        } else {

diff --git a/plugin/loginform.inc.php b/plugin/loginform.inc.php
index ea7d932..609b981 100644 (file)
--- a/plugin/loginform.inc.php
+++ b/plugin/loginform.inc.php
@@ -1,7 +1,6 @@
 <?php
-
 // PukiWiki - Yet another WikiWikiWeb clone
-// Copyright (C) 2015 PukiWiki Development Team
+// Copyright 2015-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // "Login form" plugin
@@ -9,7 +8,7 @@
 function plugin_loginform_inline()
 {
        $logout_param = '?plugin=basicauthlogout';
-       return '<a href="' . htmlsc(get_script_uri() . $logout_param) . '">Log out</a>';
+       return '<a href="' . htmlsc(get_base_uri() . $logout_param) . '">Log out</a>';
 }
 
 function plugin_loginform_convert()
@@ -27,7 +26,7 @@ function plugin_loginform_action()
        if (!$url_after_login) {
                $page_after_login = $page;
        }
-       $action_url = get_script_uri() . '?plugin=loginform'
+       $action_url = get_base_uri() . '?plugin=loginform'
                . '&page=' . rawurlencode($page)
                . ($url_after_login ? '&url_after_login=' . rawurlencode($url_after_login) : '')
                . ($page_after_login ? '&page_after_login=' . rawurlencode($page_after_login) : '');
@@ -59,7 +58,7 @@ function plugin_loginform_action()
                return array(
                        'msg' => 'Log out',
                        'body' => 'Logged out completely<br>'
-                               . '<a href="'. get_script_uri() . '?' . pagename_urlencode($page) . '">'
+                               . '<a href="'. get_page_uri($page) . '">'
                                . $page . '</a>'
                );
        } else {

diff --git a/plugin/lookup.inc.php b/plugin/lookup.inc.php
index 5030ba7..15c2f79 100644 (file)
--- a/plugin/lookup.inc.php
+++ b/plugin/lookup.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: lookup.inc.php,v 1.23 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// lookup.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -26,7 +26,7 @@ function plugin_lookup_convert()
        $s_page    = htmlsc($vars['page']);
        ++$id;
 
-       $script = get_script_uri();
+       $script = get_base_uri();
        $ret = <<<EOD
 <form action="$script" method="post">
  <div>
@@ -62,4 +62,3 @@ function plugin_lookup_action()
        header('Location: ' . $url); // Publish as GET method
        exit;
 }
-?>

diff --git a/plugin/md5.inc.php b/plugin/md5.inc.php
index fb271ec..bf5e30a 100644 (file)
--- a/plugin/md5.inc.php
+++ b/plugin/md5.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: md5.inc.php,v 1.25 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2001-2006 PukiWiki Developers Team
+// md5.inc.php
+// Copyright 2001-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 //  MD5 plugin: Allow to convert password/passphrase
@@ -70,7 +70,7 @@ function plugin_md5_show_form($nophrase = FALSE, $value = '')
                $md5_checked  = 'checked="checked" ';
        }
 
-       $self = get_script_uri();
+       $self = get_base_uri();
 
        $form = <<<EOD
 <p><strong>NOTICE: Don't use this feature via untrustful or unsure network</strong></p>
@@ -131,4 +131,3 @@ EOD;
 
        return $form;
 }
-?>

diff --git a/plugin/pcomment.inc.php b/plugin/pcomment.inc.php
index 4130774..f07871a 100644 (file)
--- a/plugin/pcomment.inc.php
+++ b/plugin/pcomment.inc.php
@@ -133,7 +133,7 @@ function plugin_pcomment_convert()
                $s_nodate = htmlsc($params['nodate']);
                $s_count  = htmlsc($count);
 
-               $form_start = '<form action="' . get_script_uri() . '" method="post">' . "\n";
+               $form_start = '<form action="' . get_base_uri() . '" method="post">' . "\n";
                $form = <<<EOD
   <div>
   <input type="hidden" name="digest" value="$digest" />

diff --git a/plugin/recent.inc.php b/plugin/recent.inc.php
index 5936879..e7166a5 100644 (file)
--- a/plugin/recent.inc.php
+++ b/plugin/recent.inc.php
@@ -1,9 +1,10 @@
 <?php
-// $Id: recent.inc.php,v 1.27 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2007 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone
+// recent.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2002      Y.MASUI http://masui.net/pukiwiki/ masui@masui.net
-// License: GPL version 2
+// License: GPL v2 or (at your option) any later version
 //
 // Recent plugin -- Show RecentChanges list
 //   * Usually used at 'MenuBar' page
@@ -54,8 +55,6 @@ function plugin_recent_convert()
        // Get latest N changes
        $lines = file_head(PLUGIN_RECENT_CACHE, $recent_lines);
        if ($lines == FALSE) return '#recent(): File can not open' . '<br />' . "\n";
-
-       $script = get_script_uri();
        $date = $items = '';
        foreach ($lines as $line) {
                list($time, $page) = explode("\t", rtrim($line));
@@ -77,9 +76,8 @@ function plugin_recent_convert()
                        // No need to link to the page you just read, or notify where you just read
                        $items .= ' <li>' . $s_page . '</li>' . "\n";
                } else {
-                       $r_page = pagename_urlencode($page);
                        $passage = $show_passage ? ' ' . get_passage($time) : '';
-                       $items .= ' <li><a href="' . $script . '?' . $r_page . '"' . 
+                       $items .= ' <li><a href="' . get_page_uri($page) . '"' .
                                ' title="' . $s_page . $passage . '">' . $s_page . '</a></li>' . "\n";
                }
        }
@@ -88,4 +86,3 @@ function plugin_recent_convert()
 
        return sprintf($_recent_plugin_frame, count($lines), $items);
 }
-

diff --git a/plugin/topicpath.inc.php b/plugin/topicpath.inc.php
index 96691e5..d7cb2a0 100644 (file)
--- a/plugin/topicpath.inc.php
+++ b/plugin/topicpath.inc.php
@@ -34,7 +34,6 @@ function plugin_topicpath_inline()
 {
        global $vars, $defaultpage;
 
-       $script = get_script_uri();
        $page = isset($vars['page']) ? $vars['page'] : '';
        if ($page == '' || $page == $defaultpage) return '';
 
@@ -50,7 +49,6 @@ function plugin_topicpath_inline()
        $topic_path = array();
        while (! empty($parts)) {
                $_landing = join('/', $parts);
-               $landing  = pagename_urlencode($_landing);
                $element  = htmlsc(array_pop($parts));
                if (! $b_link)  {
                        // This page ($_landing == $page)
@@ -61,7 +59,7 @@ function plugin_topicpath_inline()
                        $topic_path[] = $element;
                } else {
                        // Page exists or not exists
-                       $topic_path[] = '<a href="' . $script . '?' . $landing . '">' .
+                       $topic_path[] = '<a href="' . get_page_uri($_landing) . '">' .
                                $element . '</a>';
                }
        }

diff --git a/plugin/yetlist.inc.php b/plugin/yetlist.inc.php
index 559aed4..a12c142 100644 (file)
--- a/plugin/yetlist.inc.php
+++ b/plugin/yetlist.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: yetlist.inc.php,v 1.29 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2001-2006 PukiWiki Developers Team
+// yetlist.inc.php
+// Copyright 2001-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Yet list plugin - Show a list of dangling links (not yet created)
@@ -23,7 +23,7 @@ function plugin_yetlist_action()
        $empty = TRUE;
 
        // Load .ref files and Output
-       $script      = get_script_uri();
+       $script      = get_base_uri();
        $refer_regex = '/' . $non_list . '|^' . preg_quote($whatsdeleted, '/') . '$/S';
        asort($pages, SORT_STRING);
        foreach ($pages as $file=>$page) {
@@ -43,7 +43,7 @@ function plugin_yetlist_action()
                        $link_refs = array();
                        foreach ($refer as $_refer) {
                                $r_refer = pagename_urlencode($_refer);
-                               $link_refs[] = '<a href="' . $script . '?' . $r_refer . '">' .
+                               $link_refs[] = '<a href="' . get_page_uri($_refer) . '">' .
                                        htmlsc($_refer) . '</a>';
                        }
                        $link_ref = join(' ', $link_refs);
@@ -73,4 +73,3 @@ function plugin_yetlist_action()
 
        return $retval;
 }
-