Commit: 8e51d1f11315c953388d8c27e58ead9c167b5c42 - pukiwiki-fork (git)

Commit MetaInfo

• Revision: 8e51d1f11315c953388d8c27e58ead9c167b5c42 (tree)
• Time: 2017-09-03 11:51:11
• Author: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2260 Use get_script_uri() instead of $script

Change Summary

• modified: lib/auth.php
• modified: lib/func.php
• modified: lib/html.php
• modified: lib/make_link.php
• modified: plugin/amazon.inc.php
• modified: plugin/article.inc.php
• modified: plugin/attach.inc.php
• modified: plugin/calendar.inc.php
• modified: plugin/calendar2.inc.php
• modified: plugin/comment.inc.php
• modified: plugin/diff.inc.php
• modified: plugin/dump.inc.php
• modified: plugin/freeze.inc.php
• modified: plugin/include.inc.php
• modified: plugin/includesubmenu.inc.php
• modified: plugin/insert.inc.php
• modified: plugin/links.inc.php
• modified: plugin/ls2.inc.php
• modified: plugin/map.inc.php
• modified: plugin/memo.inc.php
• modified: plugin/newpage.inc.php
• modified: plugin/paint.inc.php
• modified: plugin/random.inc.php
• modified: plugin/ref.inc.php
• modified: plugin/rename.inc.php
• modified: plugin/search.inc.php
• modified: plugin/template.inc.php
• modified: plugin/tracker.inc.php
• modified: plugin/unfreeze.inc.php
• modified: plugin/update_entities.inc.php
• modified: plugin/vote.inc.php

Incremental Difference

--- a/lib/auth.php
+++ b/lib/auth.php
@@ -157,7 +157,7 @@ function pkwk_ldap_escape_dn($value) {
 // Check edit-permission
 function check_editable($page, $auth_enabled = TRUE, $exit_on_fail = TRUE)
 {
-	global $script, $_title_cannotedit, $_msg_unfreeze;
+	global $_title_cannotedit, $_msg_unfreeze;
 
 	if (edit_auth($page, $auth_enabled, $exit_on_fail) && is_editable($page)) {
 		// Editable
@@ -171,7 +171,7 @@ function check_editable($page, $auth_enabled = TRUE, $exit_on_fail = TRUE)
 			$body = $title = str_replace('$1',
 				htmlsc(strip_bracket($page)), $_title_cannotedit);
 			if (is_freeze($page))
-				$body .= '(<a href="' . $script . '?cmd=unfreeze&amp;page=' .
+				$body .= '(<a href="' . get_script_uri() . '?cmd=unfreeze&amp;page=' .
 					rawurlencode($page) . '">' . $_msg_unfreeze . '</a>)';
 			$page = str_replace('$1', make_search($page), $_title_cannotedit);
 			catbody($title, $page, $body);

--- a/lib/func.php
+++ b/lib/func.php
@@ -301,7 +301,7 @@ function get_search_words($words = array(), $do_escape = FALSE)
 // 'Search' main function
 function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 {
-	global $script, $whatsnew, $non_list, $search_non_list;
+	global $whatsnew, $non_list, $search_non_list;
 	global $_msg_andresult, $_msg_orresult, $_msg_notfoundresult;
 	global $search_auth, $show_passage;
 
@@ -366,7 +366,7 @@ function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 		$r_page  = rawurlencode($page);
 		$s_page  = htmlsc($page);
 		$passage = $show_passage ? ' ' . get_passage(get_filetime($page)) : '';
-		$retval .= ' <li><a href="' . $script . '?cmd=read&amp;page=' .
+		$retval .= ' <li><a href="' . get_script_uri() . '?cmd=read&amp;page=' .
 			$r_page . '&amp;word=' . $r_word . '">' . $s_page .
 			'</a>' . $passage . '</li>' . "\n";
 	}
@@ -433,10 +433,12 @@ function strip_bracket($str)
 // Create list of pages
 function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 {
-	global $script, $list_index;
+	global $list_index;
 	global $_msg_symbol, $_msg_other;
 	global $pagereading_enable;
 
+	$script = get_script_uri();
+
 	// ソートキーを決定する。 ' ' < '[a-zA-Z]' < 'zz'という前提。
 	$symbol = ' ';
 	$other = 'zz';

--- a/lib/html.php
+++ b/lib/html.php
@@ -11,7 +11,7 @@
 // Show page-content
 function catbody($title, $page, $body)
 {
-	global $script, $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
+	global $vars, $arg, $defaultpage, $whatsnew, $help_page, $hr;
 	global $attach_link, $related_link, $cantedit, $function_freeze;
 	global $search_word_color, $_msg_word, $foot_explain, $note_hr, $head_tags;
 	global $javascript, $nofollow;
@@ -24,6 +24,7 @@ function catbody($title, $page, $body)
 	global $modifier;     // Site administrator's  web page
 	global $modifierlink; // Site administrator's name
 
+	$script = get_script_uri();
 	$enable_login = false;
 	$enable_logout = false;
 	if (AUTH_TYPE_FORM === $auth_type || AUTH_TYPE_EXTERNAL === $auth_type ||
@@ -232,13 +233,14 @@ EOS;
 // Show 'edit' form
 function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 {
-	global $script, $vars, $rows, $cols, $hr, $function_freeze;
+	global $vars, $rows, $cols, $hr, $function_freeze;
 	global $_btn_preview, $_btn_repreview, $_btn_update, $_btn_cancel, $_msg_help;
 	global $whatsnew, $_btn_template, $_btn_load, $load_template_func;
 	global $notimeupdate;
 	global $_title_list, $_label_template_pages;
 	global $rule_page;
 
+	$script = get_script_uri();
 	// Newly generate $digest or not
 	if ($digest === FALSE) $digest = md5(join('', get_source($page)));
 
@@ -379,8 +381,9 @@ EOD;
 // Related pages
 function make_related($page, $tag = '')
 {
-	global $script, $vars, $rule_related_str, $related_str;
+	global $vars, $rule_related_str, $related_str;
 
+	$script = get_script_uri();
 	prepare_links_related($page);
 	$links = links_get_related($page);
 
@@ -466,12 +469,9 @@ function strip_autolink($str)
 // Make a backlink. searching-link of the page name, by the page name, for the page name
 function make_search($page)
 {
-	global $script;
-
 	$s_page = htmlsc($page);
 	$r_page = rawurlencode($page);
-
-	return '<a href="' . $script . '?plugin=related&amp;page=' . $r_page .
+	return '<a href="' . get_script_uri() . '?plugin=related&amp;page=' . $r_page .
 		'">' . $s_page . '</a> ';
 }
 

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -541,8 +541,6 @@ EOD;
 
 	function set($arr, $page)
 	{
-		global $script;
-
 		list(, $alias, , $name, $this->param) = $this->splice($arr);
 
 		$matches = array();
@@ -551,7 +549,7 @@ EOD;
 
 		$url = get_interwiki_url($name, $this->param);
 		$this->url = ($url === FALSE) ?
-			$script . '?' . pagename_urlencode('[[' . $name . ':' . $this->param . ']]') :
+			get_script_uri() . '?' . pagename_urlencode('[[' . $name . ':' . $this->param . ']]') :
 			htmlsc($url);
 
 		return parent::setParam(
@@ -754,8 +752,9 @@ class Link_autolink_a extends Link_autolink
 // Make hyperlink for the page
 function make_pagelink($page, $alias = '', $anchor = '', $refer = '', $isautolink = FALSE)
 {
-	global $script, $vars, $link_compact, $related, $_symbol_noexists;
+	global $vars, $link_compact, $related, $_symbol_noexists;
 
+	$script = get_script_uri();
 	$s_page = htmlsc(strip_bracket($page));
 	$s_alias = ($alias == '') ? $s_page : $alias;
 

--- a/plugin/amazon.inc.php
+++ b/plugin/amazon.inc.php
@@ -112,8 +112,9 @@ EOD;
 
 function plugin_amazon_convert()
 {
-	global $script, $vars, $asin, $asin_all;
+	global $vars, $asin, $asin_all;
 
+	$script = get_script_uri();
 	if (func_num_args() > 3) {
 		if (PKWK_READONLY) return ''; // Show nothing
 
@@ -187,7 +188,7 @@ EOD;
 
 function plugin_amazon_action()
 {
-	global $vars, $script, $edit_auth, $edit_auth_users;
+	global $vars, $edit_auth, $edit_auth_users;
 	global $amazon_body, $asin, $asin_all;
 
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');

--- a/plugin/article.inc.php
+++ b/plugin/article.inc.php
@@ -1,7 +1,8 @@
 <?php
-// $Id: article.inc.php,v 1.28 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone
+// article.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2002      Originally written by OKAWARA,Satoshi <[e-mail]>
 //             http://www.dml.co.jp/~kawara/pukiwiki/pukiwiki.php
 //
@@ -45,11 +46,12 @@ $_plugin_article_mailto = array (
 
 function plugin_article_action()
 {
-	global $script, $post, $vars, $cols, $rows, $now;
+	global $post, $vars, $cols, $rows, $now;
 	global $_title_collided, $_msg_collided, $_title_updated;
 	global $_plugin_article_mailto, $_no_subject, $_no_name;
 	global $_msg_article_mail_sender, $_msg_article_mail_page;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 
 	if ($post['msg'] == '')
@@ -121,7 +123,7 @@ EOD;
 			$mailbody .= "\n\n" . '---' . "\n";
 			$mailbody .= $_msg_article_mail_sender . $post['name'] . ' (' . $now . ')' . "\n";
 			$mailbody .= $_msg_article_mail_page . $post['refer'] . "\n";
-			$mailbody .= '   URL: ' . $script . '?' . pagename_urlencode($post['refer']) . "\n";
+			$mailbody .= '   URL: ' . get_script_uri(PKWK_URI_ABSOLUTE) . '?' . pagename_urlencode($post['refer']) . "\n";
 			$mailbody = mb_convert_encoding($mailbody, 'JIS');
 
 			$mailaddheader = 'From: ' . PLUGIN_ARTICLE_MAIL_FROM;
@@ -142,10 +144,11 @@ EOD;
 
 function plugin_article_convert()
 {
-	global $script, $vars, $digest;
+	global $vars, $digest;
 	global $_btn_article, $_btn_name, $_btn_subject;
 	static $numbers = array();
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) return ''; // Show nothing
 
 	if (! isset($numbers[$vars['page']])) $numbers[$vars['page']] = 0;
@@ -177,4 +180,3 @@ EOD;
 
 	return $string;
 }
-

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -380,8 +380,9 @@ function attach_mime_content_type($filename, $displayname)
 // アップロードフォームの出力
 function attach_form($page)
 {
-	global $script, $vars, $_attach_messages;
+	global $vars, $_attach_messages;
 
+	$script = get_script_uri();
 	$r_page = rawurlencode($page);
 	$s_page = htmlsc($page);
 	$navi = <<<EOD
@@ -496,8 +497,9 @@ class AttachFile
 
 	function toString($showicon, $showinfo)
 	{
-		global $script, $_attach_messages;
+		global $_attach_messages;
 
+		$script = get_script_uri();
 		$this->getstatus();
 		$param  = '&amp;file=' . rawurlencode($this->file) . '&amp;refer=' . rawurlencode($this->page) .
 			($this->age ? '&amp;age=' . $this->age : '');
@@ -519,8 +521,9 @@ class AttachFile
 	// 情報表示
 	function info($err)
 	{
-		global $script, $_attach_messages;
+		global $_attach_messages;
 
+		$script = get_script_uri();
 		$r_page = rawurlencode($this->page);
 		$s_page = htmlsc($this->page);
 		$s_file = htmlsc($this->file);

--- a/plugin/calendar.inc.php
+++ b/plugin/calendar.inc.php
@@ -1,7 +1,8 @@
 <?php
-// $Id: calendar.inc.php,v 1.22 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2003,2005 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone
+// calendar.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
 //
@@ -9,8 +10,9 @@
 
 function plugin_calendar_convert()
 {
-	global $script, $weeklabels, $vars, $command;
+	global $weeklabels, $vars, $command;
 
+	$script   = get_script_uri();
 	$args     = func_get_args();
 	$date_str = get_date('Ym');
 	$page     = '';
@@ -68,7 +70,7 @@ function plugin_calendar_convert()
 
 	$m_name = $year . '.' . $m_num . ' (' . $cmd . ')';
 
-	$prefix_url = rawurlencode(is_pagename($pre) ? $pre : '[[' . $pre . ']]');
+	$prefix_url = pagename_urlencode($pre);
 	$pre = strip_bracket($pre);
 
 	$ret = <<<EOD
@@ -149,4 +151,3 @@ EOD;
 
 	return $ret;
 }
-?>

--- a/plugin/calendar2.inc.php
+++ b/plugin/calendar2.inc.php
@@ -1,5 +1,9 @@
 <?php
-// $Id: calendar2.inc.php,v 1.24 2011/01/25 15:01:01 henoheno Exp $
+// PukiWiki - Yet another WikiWikiWeb clone
+// calendar2.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Calendar2 plugin
 //
@@ -9,9 +13,10 @@
 
 function plugin_calendar2_convert()
 {
-	global $script, $vars, $post, $get, $weeklabels, $WikiName, $BracketName;
+	global $vars, $post, $get, $weeklabels, $WikiName, $BracketName;
 	global $_calendar2_plugin_edit, $_calendar2_plugin_empty;
 
+	$script = get_script_uri();
 	$date_str = get_date('Ym');
 	$base     = strip_bracket($vars['page']);
 
@@ -197,4 +202,3 @@ function plugin_calendar2_action()
 
 	return $ret;
 }
-

--- a/plugin/comment.inc.php
+++ b/plugin/comment.inc.php
@@ -20,7 +20,7 @@ define('PLUGIN_COMMENT_FORMAT_STRING', "\x08MSG\x08 -- \x08NAME\x08 \x08NOW\x08"
 
 function plugin_comment_action()
 {
-	global $script, $vars, $now, $_title_updated, $_no_name;
+	global $vars, $now, $_title_updated, $_no_name;
 	global $_msg_comment_collided, $_title_comment_collided;
 	global $_comment_plugin_fail_msg;
 

--- a/plugin/diff.inc.php
+++ b/plugin/diff.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: diff.inc.php,v 1.20 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2005 PukiWiki Developers Team
+// diff.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2002      Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -25,10 +25,11 @@ function plugin_diff_action()
 
 function plugin_diff_view($page)
 {
-	global $script, $hr;
+	global $hr;
 	global $_msg_notfound, $_msg_goto, $_msg_deleted, $_msg_addline, $_msg_delline, $_title_diff;
 	global $_title_diff_delete;
 
+	$script = get_script_uri();
 	$r_page = pagename_urlencode($page);
 	$s_page = htmlsc($page);
 
@@ -72,10 +73,11 @@ EOD;
 
 function plugin_diff_delete($page)
 {
-	global $script, $vars;
+	global $vars;
 	global $_title_diff_delete, $_msg_diff_deleted;
 	global $_msg_diff_adminpass, $_btn_delete, $_msg_invalidpass;
 
+	$script = get_script_uri();
 	$filename = DIFF_DIR . encode($page) . '.txt';
 	$body = '';
 	if (! is_pagename($page))     $body = 'Invalid page name';
@@ -110,4 +112,3 @@ EOD;
 
 	return array('msg'=>$_title_diff_delete, 'body'=>$body);
 }
-

--- a/plugin/dump.inc.php
+++ b/plugin/dump.inc.php
@@ -216,8 +216,9 @@ function download_tarfile($tempnam, $arc_kind)
 // 入力フォームを表示
 function plugin_dump_disp_form()
 {
-	global $script, $defaultpage;
+	global $defaultpage;
 
+	$script   = get_script_uri();
 	$act_down = PLUGIN_DUMP_DUMP;
 	$act_up   = PLUGIN_DUMP_RESTORE;
 	$maxsize  = PLUGIN_DUMP_MAX_FILESIZE;

--- a/plugin/freeze.inc.php
+++ b/plugin/freeze.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: freeze.inc.php,v 1.12 2011/01/25 15:01:01 henoheno Exp $
-// Copyright: 2003-2004, 2007 PukiWiki Developers Team
+// freeze.inc.php
+// Copyright 2003-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Freeze(Lock) plugin
@@ -11,10 +11,11 @@ function plugin_freeze_convert() { return ''; }
 
 function plugin_freeze_action()
 {
-	global $script, $vars, $function_freeze;
+	global $vars, $function_freeze;
 	global $_title_isfreezed, $_title_freezed, $_title_freeze;
 	global $_msg_invalidpass, $_msg_freezing, $_btn_freeze;
 
+	$script = get_script_uri();
 	$page = isset($vars['page']) ? $vars['page'] : '';
 	if (! $function_freeze || ! is_page($page))
 		return array('msg' => '', 'body' => '');
@@ -59,4 +60,3 @@ EOD;
 
 	return array('msg'=>$msg, 'body'=>$body);
 }
-?>

--- a/plugin/include.inc.php
+++ b/plugin/include.inc.php
@@ -1,6 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: include.inc.php,v 1.23 2011/01/25 15:01:01 henoheno Exp $
+// include.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Include-once plugin
 
@@ -52,10 +54,11 @@ define('PLUGIN_INCLUDE_USAGE', '#include(): Usage: (a-page-name-you-want-to-incl
 
 function plugin_include_convert()
 {
-	global $script, $vars, $get, $post, $menubar, $_msg_include_restrict;
+	global $vars, $get, $post, $menubar, $_msg_include_restrict;
 	static $included = array();
 	static $count = 1;
 
+	$script = get_script_uri();
 	if (func_num_args() == 0) return PLUGIN_INCLUDE_USAGE . '<br />' . "\n";;
 
 	// $menubar will already be shown via menu plugin

--- a/plugin/includesubmenu.inc.php
+++ b/plugin/includesubmenu.inc.php
@@ -1,14 +1,16 @@
 <?php
-// $Id: includesubmenu.inc.php,v 1.7 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2002-2004, 2007 PukiWiki Developers Team
+// PukiWiki - Yet another WikiWikiWeb clone.
+// includesubmenu.inc
+// Copyright 2002-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Including submenu 
 
 function plugin_includesubmenu_convert()
 {
-  global $script,$vars;
+  global $vars;
 
+  $script = get_script_uri();
   $ShowPageName = FALSE;
 
   if (func_num_args()) {
@@ -58,4 +60,3 @@ function plugin_includesubmenu_convert()
   }
   return $body;
 }
-?>

--- a/plugin/insert.inc.php
+++ b/plugin/insert.inc.php
@@ -1,5 +1,8 @@
 <?php
-// $Id: insert.inc.php,v 1.16 2011/01/25 15:01:01 henoheno Exp $
+// PukiWiki - Yet another WikiWikiWeb clone.
+// insert.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Text inserting box plugin
 
@@ -9,9 +12,10 @@ define('INSERT_INS',   1); // Order of insertion (1:before the textarea, 0:after
 
 function plugin_insert_action()
 {
-	global $script, $vars, $cols, $rows;
+	global $vars, $cols, $rows;
 	global $_title_collided, $_msg_collided, $_title_updated;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 	if (! isset($vars['msg']) || $vars['msg'] == '') return;
 
@@ -68,10 +72,11 @@ EOD;
 
 function plugin_insert_convert()
 {
-	global $script, $vars, $digest;
+	global $vars, $digest;
 	global $_btn_insert;
 	static $numbers = array();
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) return ''; // Show nothing
 
 	if (! isset($numbers[$vars['page']])) $numbers[$vars['page']] = 0;
@@ -97,4 +102,3 @@ EOD;
 
 	return $string;
 }
-?>

--- a/plugin/links.inc.php
+++ b/plugin/links.inc.php
@@ -1,8 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // links.inc.php
-// Copyright
-//   2003-2005, 2007 PukiWiki Development Team
+// Copyright 2003-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Update link cache plugin
@@ -35,9 +34,10 @@ function plugin_links_init()
 
 function plugin_links_action()
 {
-	global $script, $post, $vars, $foot_explain;
+	global $post, $vars, $foot_explain;
 	global $_links_messages;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits this');
 
 	$msg = $body = '';

--- a/plugin/ls2.inc.php
+++ b/plugin/ls2.inc.php
@@ -51,7 +51,7 @@ function plugin_ls2_action()
 
 function plugin_ls2_convert()
 {
-	global $script, $vars, $_ls2_msg_title;
+	global $vars, $_ls2_msg_title;
 
 	$params = array(
 		'link'    => FALSE,
@@ -85,7 +85,7 @@ function plugin_ls2_convert()
 	if (isset($params['title']))   $tmp[] = 'title=1';
 	if (isset($params['include'])) $tmp[] = 'include=1';
 
-	return '<p><a href="' . $script . '?' . join('&amp;', $tmp) . '">' .
+	return '<p><a href="' . get_script_uri() . '?' . join('&amp;', $tmp) . '">' .
 		$title . '</a></p>' . "\n";
 }
 
@@ -119,7 +119,6 @@ function plugin_ls2_show_lists($prefix, & $params)
 
 function plugin_ls2_get_headings($page, & $params, $level, $include = FALSE)
 {
-	global $script;
 	static $_ls2_anchor = 0;
 
 	// ページが未表示のとき
@@ -128,7 +127,7 @@ function plugin_ls2_get_headings($page, & $params, $level, $include = FALSE)
 
 	$s_page = htmlsc($page);
 	$title  = $s_page . ' ' . get_pg_passage($page, FALSE);
-	$href   = $script . '?' . pagename_urlencode($page);
+	$href   = get_script_uri() . '?' . pagename_urlencode($page);
 
 	plugin_ls2_list_push($params, $level);
 	$ret = $include ? '<li>include ' : '<li>';

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
 // map.inc.php
-// Copyright 2002-2016 PukiWiki Development Team
+// Copyright 2002-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Site map plugin
@@ -110,7 +110,7 @@ class MapNode
 	}
 	function __construct($page, $reverse = FALSE)
 	{
-		global $script, $non_list;
+		global $non_list;
 
 		static $id = 0;
 
@@ -124,7 +124,7 @@ class MapNode
 
 		$this->rels = $reverse ? $this->ref() : $this->rel();
 		$mark       = $reverse ? '' : '<sup>+</sup>';
-		$this->mark = '<a id="rel_' . $this->id . '" href="' . $script .
+		$this->mark = '<a id="rel_' . $this->id . '" href="' . get_script_uri() .
 			'?plugin=map&amp;refer=' . rawurlencode($this->page) . '">' .
 			$mark . '</a>';
 	}

--- a/plugin/memo.inc.php
+++ b/plugin/memo.inc.php
@@ -1,5 +1,8 @@
 <?php
-// $Id: memo.inc.php,v 1.17 2011/01/25 15:01:01 henoheno Exp $
+// PukiWiki - Yet another WikiWikiWeb clone.
+// memo.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Memo box plugin
 
@@ -8,9 +11,10 @@ define('MEMO_ROWS',  5); // Rows of textarea
 
 function plugin_memo_action()
 {
-	global $script, $vars, $cols, $rows;
+	global $vars, $cols, $rows;
 	global $_title_collided, $_msg_collided, $_title_updated;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 	if (! isset($vars['msg']) || $vars['msg'] == '') return;
 
@@ -68,7 +72,7 @@ EOD;
 
 function plugin_memo_convert()
 {
-	global $script, $vars, $digest;
+	global $vars, $digest;
 	global $_btn_memo_update;
 	static $numbers = array();
 
@@ -85,7 +89,7 @@ function plugin_memo_convert()
 		$_script = '';
 		$_submit = '';	
 	} else {
-		$_script = & $script;
+		$_script = get_script_uri();
 		$_submit = '<input type="submit" name="memo"    value="' . $_btn_memo_update . '" />';
 	}
 
@@ -108,4 +112,3 @@ EOD;
 
 	return $string;
 }
-?>

--- a/plugin/newpage.inc.php
+++ b/plugin/newpage.inc.php
@@ -8,9 +8,10 @@
 
 function plugin_newpage_convert()
 {
-	global $script, $vars, $_btn_edit, $_msg_newpage, $BracketName;
+	global $vars, $_btn_edit, $_msg_newpage, $BracketName;
 	static $id = 0;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) return ''; // Show nothing
 
 	$newpage = '';

--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -1,8 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // paint.inc.php
-// Copyright
-//   2002-2016 PukiWiki Development Team
+// Copyright 2002-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Paint plugin
@@ -40,8 +39,9 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
 
 function plugin_paint_action()
 {
-	global $script, $vars, $_paint_messages;
+	global $vars, $_paint_messages;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 	
 	//戻り値を初期化
@@ -151,10 +151,11 @@ EOD;
 
 function plugin_paint_convert()
 {
-	global $script,$vars,$digest;
+	global $vars,$digest;
 	global $_paint_messages;
 	static $numbers = array();
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) return ''; // Show nothing
 
 	if (!array_key_exists($vars['page'],$numbers))
@@ -207,7 +208,7 @@ EOD;
 }
 function paint_insert_ref($filename)
 {
-	global $script,$vars,$now,$do_backup;
+	global $vars,$now,$do_backup;
 	global $_paint_messages,$_no_name;
 
 	$ret['msg'] = $_paint_messages['msg_title'];

--- a/plugin/random.inc.php
+++ b/plugin/random.inc.php
@@ -1,9 +1,10 @@
 <?php
-/////////////////////////////////////////////////
-// PukiWiki - Yet another WikiWikiWeb clone.
-//
-// $Id: random.inc.php,v 1.9 2011/01/25 15:01:01 henoheno Exp $
+// PukiWiki - Yet another WikiWikiWeb clone
+// random.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
+// Show random page plugin
 
 /*
  *プラグイン random
@@ -20,8 +21,9 @@
 
 function plugin_random_convert()
 {
-	global $script, $vars;
+	global $vars;
 
+	$script = $get_script_uri();
 	$title = '[Random Link]'; // default
 	if (func_num_args()) {
 		$args  = func_get_args();
@@ -51,4 +53,3 @@ function plugin_random_action()
 
 	return array('body'=>'','msg'=>'');
 }
-

--- a/plugin/ref.inc.php
+++ b/plugin/ref.inc.php
@@ -107,9 +107,10 @@ EOD;
 
 function plugin_ref_body($args)
 {
-	global $script, $vars;
+	global $vars;
 	global $WikiName, $BracketName; // compat
 
+	$script = get_script_uri();
 	// 戻り値
 	$params = array(
 		'left'   => FALSE, // 左寄せ

--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -92,8 +92,9 @@ function plugin_rename_err($err, $page = '')
 //第一段階:ページ名または正規表現の入力
 function plugin_rename_phase1($err = '', $page = '')
 {
-	global $script, $_rename_messages;
+	global $_rename_messages;
 
+	$script = get_script_uri();
 	$msg    = plugin_rename_err($err, $page);
 	$refer  = plugin_rename_getvar('refer');
 	$method = plugin_rename_getvar('method');
@@ -134,8 +135,9 @@ EOD;
 //第二段階:新しい名前の入力
 function plugin_rename_phase2($err = '')
 {
-	global $script, $_rename_messages;
+	global $_rename_messages;
 
+	$script = get_script_uri();
 	$msg   = plugin_rename_err($err);
 	$page  = plugin_rename_getvar('page');
 	$refer = plugin_rename_getvar('refer');
@@ -213,8 +215,9 @@ function plugin_rename_regex($arr_from, $arr_to)
 
 function plugin_rename_phase3($pages)
 {
-	global $script, $_rename_messages;
+	global $_rename_messages;
 
+	$script = get_script_uri();
 	$msg = $input = '';
 	$files = plugin_rename_get_files($pages);
 

--- a/plugin/search.inc.php
+++ b/plugin/search.inc.php
@@ -1,6 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: search.inc.php,v 1.14 2011/01/25 15:01:01 henoheno Exp $
+// search.inc.php
+// Copyright 2003-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
 //
 // Search plugin
 
@@ -62,9 +64,10 @@ function plugin_search_action()
 
 function plugin_search_search_form($s_word = '', $type = '', $bases = array())
 {
-	global $script, $_btn_and, $_btn_or, $_btn_search;
+	global $_btn_and, $_btn_or, $_btn_search;
 	global $_search_pages, $_search_all;
 
+	$script = get_script_uri();
 	$and_check = $or_check = '';
 	if ($type == 'OR') {
 		$or_check  = ' checked="checked"';
@@ -113,4 +116,3 @@ $base_option
 </form>
 EOD;
 }
-?>

--- a/plugin/template.inc.php
+++ b/plugin/template.inc.php
@@ -12,12 +12,13 @@ define('MAX_LEN', 60);
 
 function plugin_template_action()
 {
-	global $script, $vars;
+	global $vars;
 	global $_title_edit;
 	global $_msg_template_start, $_msg_template_end, $_msg_template_page, $_msg_template_refer;
 	global $_btn_template_create, $_title_template;
 	global $_err_template_already, $_err_template_invalid, $_msg_template_force;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 	if (! isset($vars['refer']) || ! is_page($vars['refer']))
 		return FALSE;

--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -17,8 +17,9 @@ define('TRACKER_LIST_SHOW_ERROR_PAGE',TRUE);
 
 function plugin_tracker_convert()
 {
-	global $script,$vars;
+	global $vars;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) return ''; // Show nothing
 
 	$base = $refer = $vars['page'];
@@ -656,7 +657,7 @@ function plugin_tracker_list_convert()
 }
 function plugin_tracker_list_action()
 {
-	global $script,$vars,$_tracker_messages;
+	global $vars,$_tracker_messages;
 
 	$page = $refer = $vars['refer'];
 	$s_page = make_pagelink($page);
@@ -881,8 +882,7 @@ class Tracker_list
 	}
 	function replace_title($arr)
 	{
-		global $script;
-
+		$script = get_script_uri();
 		$field = $sort = $arr[1];
 		if ($sort == '_name' or $sort == '_page')
 		{

--- a/plugin/unfreeze.inc.php
+++ b/plugin/unfreeze.inc.php
@@ -1,7 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
 // $Id: unfreeze.inc.php,v 1.14 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2003-2004, 2007 PukiWiki Developers Team
+// Copyright 2003-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Unfreeze(Unlock) plugin
@@ -11,10 +11,11 @@ define('PLUGIN_UNFREEZE_EDIT', TRUE);
 
 function plugin_unfreeze_action()
 {
-	global $script, $vars, $function_freeze;
+	global $vars, $function_freeze;
 	global $_title_isunfreezed, $_title_unfreezed, $_title_unfreeze;
 	global $_msg_invalidpass, $_msg_unfreezing, $_btn_unfreeze;
 
+	$script = get_script_uri();
 	$page = isset($vars['page']) ? $vars['page'] : '';
 	if (! $function_freeze || ! is_page($page))
 		return array('msg' => '', 'body' => '');
@@ -70,4 +71,3 @@ EOD;
 
 	return array('msg'=>$msg, 'body'=>$body);
 }
-?>

--- a/plugin/update_entities.inc.php
+++ b/plugin/update_entities.inc.php
@@ -1,8 +1,7 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
 // update_entities.inc.php
-// Copyright
-//   2003-2007 PukiWiki Development Team
+// Copyright 2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Update entities plugin - Update XHTML entities from DTD
@@ -39,9 +38,10 @@ PHPの持つテーブルおよびW3CのDTDをスキャンして、キャッシ
 
 function plugin_update_entities_action()
 {
-	global $script, $vars;
+	global $vars;
 	global $_entities_messages;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits this');
 
 	$msg = $body = '';

--- a/plugin/vote.inc.php
+++ b/plugin/vote.inc.php
@@ -1,17 +1,18 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: vote.inc.php,v 1.27 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C) 2002-2005, 2007 PukiWiki Developers Team
+// vote.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
 // License: GPL v2 or (at your option) any later version
 //
 // Vote box plugin
 
 function plugin_vote_action()
 {
-	global $vars, $script, $cols,$rows;
+	global $vars, $cols,$rows;
 	global $_title_collided, $_msg_collided, $_title_updated;
 	global $_vote_plugin_votes;
 
+	$script = get_script_uri();
 	if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
 
 	$postdata_old  = get_source($vars['refer']);
@@ -76,7 +77,7 @@ EOD;
 
 function plugin_vote_convert()
 {
-	global $script, $vars,  $digest;
+	global $vars, $digest;
 	global $_vote_plugin_choice, $_vote_plugin_votes;
 	static $number = array();
 
@@ -92,7 +93,7 @@ function plugin_vote_convert()
 		$_script = '';
 		$_submit = 'hidden';
 	} else {
-		$_script = $script;
+		$_script = get_script_uri();
 		$_submit = 'submit';
 	}
 
@@ -149,4 +150,3 @@ EOD;
 
 	return $body;
 }
-?>