BugTrack/2525 get_page_uri() in existing plugins

* keitai skin
* plugins
  * rss
  * calendar_viewer
  * backup

diff --git a/plugin/backup.inc.php b/plugin/backup.inc.php
index 34ba19d..67201b3 100644 (file)
--- a/plugin/backup.inc.php
+++ b/plugin/backup.inc.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone.
 // backup.inc.php
 // Copyright
-//   2002-2017 PukiWiki Development Team
+//   2002-2021 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -70,7 +70,7 @@ function plugin_backup_action()
 
        if ($is_page) {
                $body .= ' <li>' . str_replace('$1',
-                       '<a href="' . $script . '?' . $r_page . '">' . $s_page . '</a>',
+                       '<a href="' . get_page_uri($page) . '">' . $s_page . '</a>',
                        $_msg_goto) . "\n";
        } else {
                $body .= ' <li>' . str_replace('$1', $s_page, $_msg_deleted) . "\n";

diff --git a/plugin/calendar_viewer.inc.php b/plugin/calendar_viewer.inc.php
index 54de62b..5ec25f3 100644 (file)
--- a/plugin/calendar_viewer.inc.php
+++ b/plugin/calendar_viewer.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // calendar_viewer.inc.php
-// Copyright  2002-2020 PukiWiki Development Team
+// Copyright  2002-2021 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Calendar viewer plugin - List pages that calendar/calnedar2 plugin created
@@ -55,7 +55,7 @@ define('PLUGIN_CALENDAR_VIEWER_USAGE',
 
 function plugin_calendar_viewer_convert()
 {
-       global $vars, $get, $post, $script, $weeklabels;
+       global $vars, $get, $post, $weeklabels;
        global $_msg_calendar_viewer_right, $_msg_calendar_viewer_left;
        global $_msg_calendar_viewer_restrict, $_err_calendar_viewer_param2;
 
@@ -164,9 +164,6 @@ function plugin_calendar_viewer_convert()
                } else {
                        $body = str_replace('$1', $page, $_msg_calendar_viewer_restrict);
                }
-
-               $r_page = pagename_urlencode($page);
-
                if (PLUGIN_CALENDAR_VIEWER_DATE_FORMAT !== FALSE) {
                        $time = strtotime(basename($page)); // $date_sep must be assumed '-' or ''!
                        if ($time === FALSE || $time === -1) {
@@ -184,15 +181,13 @@ function plugin_calendar_viewer_convert()
                }
 
                if (PKWK_READONLY) {
-                       $link   = $script . '?' . $r_page;
+                       $link = get_page_uri($page);
                } else {
-                       $link   = $script . '?cmd=edit&amp;page=' . $r_page;
+                       $link = get_base_uri() . '?cmd=edit&amp;page=' . pagename_urlencode($page);
                }
-               $link   = '<a href="' . $link . '">' . $s_page . '</a>';
-
-               $head   = '<h1>' . $link . '</h1>' . "\n";
+               $link_html = '<a href="' . $link . '">' . $s_page . '</a>';
+               $head = '<h1>' . $link_html . '</h1>' . "\n";
                $return_body .= $head . $body;
-
                ++$tmp;
        }
 
@@ -253,7 +248,7 @@ function plugin_calendar_viewer_convert()
        if ($left_YM != '' || $right_YM != '') {
                $s_date_sep = htmlsc($date_sep);
                $left_link = $right_link = '';
-               $link = $script . '?plugin=calendar_viewer&amp;mode=' . $mode .
+               $link = get_base_uri() . '?plugin=calendar_viewer&amp;mode=' . $mode .
                        '&amp;file=' . rawurlencode($simple_pagename) .
                        '&amp;date_sep=' . $s_date_sep . '&amp;';
                if ($left_YM != '')
@@ -277,7 +272,7 @@ function plugin_calendar_viewer_convert()
 
 function plugin_calendar_viewer_action()
 {
-       global $vars, $get, $post, $script;
+       global $vars, $get, $post;
 
        $date_sep = '-';
 

diff --git a/plugin/navi.inc.php b/plugin/navi.inc.php
index 9eb9a24..47ee689 100644 (file)
--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -1,6 +1,10 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: navi.inc.php,v 1.24 2011/01/25 15:01:01 henoheno Exp $
+// navi.inc.php
+// Copyright
+//   2002-2021 PukiWiki Development Team
+//   2002      Originally written by PANDA
+// License: GPL v2 or (at your option) any later version
 //
 // Navi plugin: Show DocBook-like navigation bar and contents
 
@@ -46,7 +50,7 @@ define('PLUGIN_NAVI_LINK_TAGS', FALSE);       // FALSE, TRUE
 
 function plugin_navi_convert()
 {
-       global $vars, $script, $head_tags;
+       global $vars, $head_tags;
        global $_navi_prev, $_navi_next, $_navi_up, $_navi_home;
        static $navi = array();
 
@@ -135,11 +139,10 @@ function plugin_navi_convert()
                            'prev'=>$prev, 'up'=>$up) as $rel=>$_page) {
                                if ($_page != '') {
                                        $s_page = htmlsc($_page);
-                                       $r_page = pagename_urlencode($_page);
+                                       $r_page_link = htmlsc(get_page_uri($_page));
                                        $head_tags[] = ' <link rel="' .
-                                               $rel . '" href="' . $script .
-                                               '?' . $r_page . '" title="' .
-                                               $s_page . '" />';
+                                               $rel . '" href="' . $r_page_link .
+                                               '" title="' . $s_page . '" />';
                                }
                        }
                }
@@ -189,4 +192,3 @@ EOD;
        }
        return $ret;
 }
-

diff --git a/plugin/rss.inc.php b/plugin/rss.inc.php
index 1f76202..b92751b 100644 (file)
--- a/plugin/rss.inc.php
+++ b/plugin/rss.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // rss.inc.php
-// Copyright 2003-2017 PukiWiki Development Team
+// Copyright 2003-2021 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // RSS plugin: Publishing RSS of RecentChanges
@@ -33,14 +33,13 @@ function plugin_rss_action()
 
        $lang = LANG;
        $page_title_utf8 = mb_convert_encoding($page_title, 'UTF-8', SOURCE_ENCODING);
-       $self = get_base_uri(PKWK_URI_ABSOLUTE);
 
        // Creating <item>
        $items = $rdf_li = '';
 
        foreach (file_head($recent, $rss_max) as $line) {
                list($time, $page) = explode("\t", rtrim($line));
-               $r_page = pagename_urlencode($page);
+               $r_page_link = htmlsc(get_page_uri($page, PKWK_URI_ABSOLUTE));
                $title  = mb_convert_encoding($page, 'UTF-8', SOURCE_ENCODING);
 
                switch ($version) {
@@ -53,7 +52,7 @@ function plugin_rss_action()
                        $items .= <<<EOD
 <item>
  <title>$title</title>
- <link>$self?$r_page</link>
+ <link>$r_page_link</link>
 $date
 </item>
 
@@ -62,16 +61,16 @@ EOD;
 
                case '1.0':
                        // Add <item> into <items>
-                       $rdf_li .= '    <rdf:li rdf:resource="' . $self .
-                               '?' . $r_page . '" />' . "\n";
+                       $rdf_li .= '    <rdf:li rdf:resource="' . $r_page_link .
+                               '" />' . "\n";
 
                        $date = substr_replace(get_date('Y-m-d\TH:i:sO', $time), ':', -2, 0);
                        $items .= <<<EOD
-<item rdf:about="$self?$r_page">
+<item rdf:about="$r_page_link">
  <title>$title</title>
- <link>$self?$r_page</link>
+ <link>$r_page_link</link>
  <dc:date>$date</dc:date>
- <dc:identifier>$self?$r_page</dc:identifier>
+ <dc:identifier>$r_page_link</dc:identifier>
 </item>
 
 EOD;
@@ -84,7 +83,7 @@ EOD;
        header('Content-type: application/xml');
        print '<?xml version="1.0" encoding="UTF-8"?>' . "\n\n";
 
-       $r_whatsnew = pagename_urlencode($whatsnew);
+       $r_whatsnew_link = htmlsc(get_page_uri($whatsnew, PKWK_URI_ABSOLUTE));
        switch ($version) {
        case '0.91':
                print '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"' .
@@ -96,7 +95,7 @@ EOD;
 <rss version="$version">
  <channel>
   <title>$page_title_utf8</title>
-  <link>$self?$r_whatsnew</link>
+  <link>$r_whatsnew_link</link>
   <description>PukiWiki RecentChanges</description>
   <language>$lang</language>
 
@@ -113,9 +112,9 @@ EOD;
   xmlns="http://purl.org/rss/1.0/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xml:lang="$lang">
- <channel rdf:about="$self?$r_whatsnew">
+ <channel rdf:about="$r_whatsnew_link">
   <title>$page_title_utf8</title>
-  <link>$self?$r_whatsnew</link>
+  <link>$r_whatsnew_link</link>
   <description>PukiWiki RecentChanges</description>
   <items>
    <rdf:Seq>

diff --git a/skin/keitai.skin.php b/skin/keitai.skin.php
index fe6de67..1886852 100644 (file)
--- a/skin/keitai.skin.php
+++ b/skin/keitai.skin.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: keitai.skin.php,v 1.16 2006/01/09 10:37:05 henoheno Exp $
-// Copyright (C) 2003-2006 PukiWiki Developers Team
+// keitai.skin.php
+// Copyright 2003-2021 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Skin for Embedded devices
@@ -59,7 +59,7 @@ if ($rw) {
                }
        }
 }
-$navi[] = '<a href="' . $script . '?' . pagename_urlencode($menubar) . '" ' . $accesskey . '="4">4.Menu</a>';
+$navi[] = '<a href="' . get_page_uri($menubar) . '" ' . $accesskey . '="4">4.Menu</a>';
 $navi[] = '<a href="' . $link['recent'] . '" ' . $accesskey . '="5">5.Recent</a>';
 
 // Previous / Next block