Revision | 0ca033f598322674444698f8abb6bb2d6346c168 (tree) |
---|---|
Time | 2021-12-05 14:10:31 |
Author | umorigu <umorigu@gmai...> |
Commiter | umorigu |
BugTrack/2525 get_page_uri() in existing plugins
* keitai skin
* plugins
@@ -2,7 +2,7 @@ | ||
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | 3 | // backup.inc.php |
4 | 4 | // Copyright |
5 | -// 2002-2017 PukiWiki Development Team | |
5 | +// 2002-2021 PukiWiki Development Team | |
6 | 6 | // 2001-2002 Originally written by yu-ji |
7 | 7 | // License: GPL v2 or (at your option) any later version |
8 | 8 | // |
@@ -70,7 +70,7 @@ function plugin_backup_action() | ||
70 | 70 | |
71 | 71 | if ($is_page) { |
72 | 72 | $body .= ' <li>' . str_replace('$1', |
73 | - '<a href="' . $script . '?' . $r_page . '">' . $s_page . '</a>', | |
73 | + '<a href="' . get_page_uri($page) . '">' . $s_page . '</a>', | |
74 | 74 | $_msg_goto) . "\n"; |
75 | 75 | } else { |
76 | 76 | $body .= ' <li>' . str_replace('$1', $s_page, $_msg_deleted) . "\n"; |
@@ -1,7 +1,7 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone |
3 | 3 | // calendar_viewer.inc.php |
4 | -// Copyright 2002-2020 PukiWiki Development Team | |
4 | +// Copyright 2002-2021 PukiWiki Development Team | |
5 | 5 | // License: GPL v2 or (at your option) any later version |
6 | 6 | // |
7 | 7 | // Calendar viewer plugin - List pages that calendar/calnedar2 plugin created |
@@ -55,7 +55,7 @@ define('PLUGIN_CALENDAR_VIEWER_USAGE', | ||
55 | 55 | |
56 | 56 | function plugin_calendar_viewer_convert() |
57 | 57 | { |
58 | - global $vars, $get, $post, $script, $weeklabels; | |
58 | + global $vars, $get, $post, $weeklabels; | |
59 | 59 | global $_msg_calendar_viewer_right, $_msg_calendar_viewer_left; |
60 | 60 | global $_msg_calendar_viewer_restrict, $_err_calendar_viewer_param2; |
61 | 61 |
@@ -164,9 +164,6 @@ function plugin_calendar_viewer_convert() | ||
164 | 164 | } else { |
165 | 165 | $body = str_replace('$1', $page, $_msg_calendar_viewer_restrict); |
166 | 166 | } |
167 | - | |
168 | - $r_page = pagename_urlencode($page); | |
169 | - | |
170 | 167 | if (PLUGIN_CALENDAR_VIEWER_DATE_FORMAT !== FALSE) { |
171 | 168 | $time = strtotime(basename($page)); // $date_sep must be assumed '-' or ''! |
172 | 169 | if ($time === FALSE || $time === -1) { |
@@ -184,15 +181,13 @@ function plugin_calendar_viewer_convert() | ||
184 | 181 | } |
185 | 182 | |
186 | 183 | if (PKWK_READONLY) { |
187 | - $link = $script . '?' . $r_page; | |
184 | + $link = get_page_uri($page); | |
188 | 185 | } else { |
189 | - $link = $script . '?cmd=edit&page=' . $r_page; | |
186 | + $link = get_base_uri() . '?cmd=edit&page=' . pagename_urlencode($page); | |
190 | 187 | } |
191 | - $link = '<a href="' . $link . '">' . $s_page . '</a>'; | |
192 | - | |
193 | - $head = '<h1>' . $link . '</h1>' . "\n"; | |
188 | + $link_html = '<a href="' . $link . '">' . $s_page . '</a>'; | |
189 | + $head = '<h1>' . $link_html . '</h1>' . "\n"; | |
194 | 190 | $return_body .= $head . $body; |
195 | - | |
196 | 191 | ++$tmp; |
197 | 192 | } |
198 | 193 |
@@ -253,7 +248,7 @@ function plugin_calendar_viewer_convert() | ||
253 | 248 | if ($left_YM != '' || $right_YM != '') { |
254 | 249 | $s_date_sep = htmlsc($date_sep); |
255 | 250 | $left_link = $right_link = ''; |
256 | - $link = $script . '?plugin=calendar_viewer&mode=' . $mode . | |
251 | + $link = get_base_uri() . '?plugin=calendar_viewer&mode=' . $mode . | |
257 | 252 | '&file=' . rawurlencode($simple_pagename) . |
258 | 253 | '&date_sep=' . $s_date_sep . '&'; |
259 | 254 | if ($left_YM != '') |
@@ -277,7 +272,7 @@ function plugin_calendar_viewer_convert() | ||
277 | 272 | |
278 | 273 | function plugin_calendar_viewer_action() |
279 | 274 | { |
280 | - global $vars, $get, $post, $script; | |
275 | + global $vars, $get, $post; | |
281 | 276 | |
282 | 277 | $date_sep = '-'; |
283 | 278 |
@@ -1,6 +1,10 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | -// $Id: navi.inc.php,v 1.24 2011/01/25 15:01:01 henoheno Exp $ | |
3 | +// navi.inc.php | |
4 | +// Copyright | |
5 | +// 2002-2021 PukiWiki Development Team | |
6 | +// 2002 Originally written by PANDA | |
7 | +// License: GPL v2 or (at your option) any later version | |
4 | 8 | // |
5 | 9 | // Navi plugin: Show DocBook-like navigation bar and contents |
6 | 10 |
@@ -46,7 +50,7 @@ define('PLUGIN_NAVI_LINK_TAGS', FALSE); // FALSE, TRUE | ||
46 | 50 | |
47 | 51 | function plugin_navi_convert() |
48 | 52 | { |
49 | - global $vars, $script, $head_tags; | |
53 | + global $vars, $head_tags; | |
50 | 54 | global $_navi_prev, $_navi_next, $_navi_up, $_navi_home; |
51 | 55 | static $navi = array(); |
52 | 56 |
@@ -135,11 +139,10 @@ function plugin_navi_convert() | ||
135 | 139 | 'prev'=>$prev, 'up'=>$up) as $rel=>$_page) { |
136 | 140 | if ($_page != '') { |
137 | 141 | $s_page = htmlsc($_page); |
138 | - $r_page = pagename_urlencode($_page); | |
142 | + $r_page_link = htmlsc(get_page_uri($_page)); | |
139 | 143 | $head_tags[] = ' <link rel="' . |
140 | - $rel . '" href="' . $script . | |
141 | - '?' . $r_page . '" title="' . | |
142 | - $s_page . '" />'; | |
144 | + $rel . '" href="' . $r_page_link . | |
145 | + '" title="' . $s_page . '" />'; | |
143 | 146 | } |
144 | 147 | } |
145 | 148 | } |
@@ -189,4 +192,3 @@ EOD; | ||
189 | 192 | } |
190 | 193 | return $ret; |
191 | 194 | } |
192 | - |
@@ -1,7 +1,7 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone |
3 | 3 | // rss.inc.php |
4 | -// Copyright 2003-2017 PukiWiki Development Team | |
4 | +// Copyright 2003-2021 PukiWiki Development Team | |
5 | 5 | // License: GPL v2 or (at your option) any later version |
6 | 6 | // |
7 | 7 | // RSS plugin: Publishing RSS of RecentChanges |
@@ -33,14 +33,13 @@ function plugin_rss_action() | ||
33 | 33 | |
34 | 34 | $lang = LANG; |
35 | 35 | $page_title_utf8 = mb_convert_encoding($page_title, 'UTF-8', SOURCE_ENCODING); |
36 | - $self = get_base_uri(PKWK_URI_ABSOLUTE); | |
37 | 36 | |
38 | 37 | // Creating <item> |
39 | 38 | $items = $rdf_li = ''; |
40 | 39 | |
41 | 40 | foreach (file_head($recent, $rss_max) as $line) { |
42 | 41 | list($time, $page) = explode("\t", rtrim($line)); |
43 | - $r_page = pagename_urlencode($page); | |
42 | + $r_page_link = htmlsc(get_page_uri($page, PKWK_URI_ABSOLUTE)); | |
44 | 43 | $title = mb_convert_encoding($page, 'UTF-8', SOURCE_ENCODING); |
45 | 44 | |
46 | 45 | switch ($version) { |
@@ -53,7 +52,7 @@ function plugin_rss_action() | ||
53 | 52 | $items .= <<<EOD |
54 | 53 | <item> |
55 | 54 | <title>$title</title> |
56 | - <link>$self?$r_page</link> | |
55 | + <link>$r_page_link</link> | |
57 | 56 | $date |
58 | 57 | </item> |
59 | 58 |
@@ -62,16 +61,16 @@ EOD; | ||
62 | 61 | |
63 | 62 | case '1.0': |
64 | 63 | // Add <item> into <items> |
65 | - $rdf_li .= ' <rdf:li rdf:resource="' . $self . | |
66 | - '?' . $r_page . '" />' . "\n"; | |
64 | + $rdf_li .= ' <rdf:li rdf:resource="' . $r_page_link . | |
65 | + '" />' . "\n"; | |
67 | 66 | |
68 | 67 | $date = substr_replace(get_date('Y-m-d\TH:i:sO', $time), ':', -2, 0); |
69 | 68 | $items .= <<<EOD |
70 | -<item rdf:about="$self?$r_page"> | |
69 | +<item rdf:about="$r_page_link"> | |
71 | 70 | <title>$title</title> |
72 | - <link>$self?$r_page</link> | |
71 | + <link>$r_page_link</link> | |
73 | 72 | <dc:date>$date</dc:date> |
74 | - <dc:identifier>$self?$r_page</dc:identifier> | |
73 | + <dc:identifier>$r_page_link</dc:identifier> | |
75 | 74 | </item> |
76 | 75 | |
77 | 76 | EOD; |
@@ -84,7 +83,7 @@ EOD; | ||
84 | 83 | header('Content-type: application/xml'); |
85 | 84 | print '<?xml version="1.0" encoding="UTF-8"?>' . "\n\n"; |
86 | 85 | |
87 | - $r_whatsnew = pagename_urlencode($whatsnew); | |
86 | + $r_whatsnew_link = htmlsc(get_page_uri($whatsnew, PKWK_URI_ABSOLUTE)); | |
88 | 87 | switch ($version) { |
89 | 88 | case '0.91': |
90 | 89 | print '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"' . |
@@ -96,7 +95,7 @@ EOD; | ||
96 | 95 | <rss version="$version"> |
97 | 96 | <channel> |
98 | 97 | <title>$page_title_utf8</title> |
99 | - <link>$self?$r_whatsnew</link> | |
98 | + <link>$r_whatsnew_link</link> | |
100 | 99 | <description>PukiWiki RecentChanges</description> |
101 | 100 | <language>$lang</language> |
102 | 101 |
@@ -113,9 +112,9 @@ EOD; | ||
113 | 112 | xmlns="http://purl.org/rss/1.0/" |
114 | 113 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
115 | 114 | xml:lang="$lang"> |
116 | - <channel rdf:about="$self?$r_whatsnew"> | |
115 | + <channel rdf:about="$r_whatsnew_link"> | |
117 | 116 | <title>$page_title_utf8</title> |
118 | - <link>$self?$r_whatsnew</link> | |
117 | + <link>$r_whatsnew_link</link> | |
119 | 118 | <description>PukiWiki RecentChanges</description> |
120 | 119 | <items> |
121 | 120 | <rdf:Seq> |
@@ -1,7 +1,7 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | -// $Id: keitai.skin.php,v 1.16 2006/01/09 10:37:05 henoheno Exp $ | |
4 | -// Copyright (C) 2003-2006 PukiWiki Developers Team | |
3 | +// keitai.skin.php | |
4 | +// Copyright 2003-2021 PukiWiki Development Team | |
5 | 5 | // License: GPL v2 or (at your option) any later version |
6 | 6 | // |
7 | 7 | // Skin for Embedded devices |
@@ -59,7 +59,7 @@ if ($rw) { | ||
59 | 59 | } |
60 | 60 | } |
61 | 61 | } |
62 | -$navi[] = '<a href="' . $script . '?' . pagename_urlencode($menubar) . '" ' . $accesskey . '="4">4.Menu</a>'; | |
62 | +$navi[] = '<a href="' . get_page_uri($menubar) . '" ' . $accesskey . '="4">4.Menu</a>'; | |
63 | 63 | $navi[] = '<a href="' . $link['recent'] . '" ' . $accesskey . '="5">5.Recent</a>'; |
64 | 64 | |
65 | 65 | // Previous / Next block |