Commit: 004ef760328260a2ec8ced68cc05905cfd1d7b1d - pukiwiki-plugin (git)

Commit MetaInfo

• Revisión: 004ef760328260a2ec8ced68cc05905cfd1d7b1d (tree)
• Tiempo: 2022-01-24 02:08:24
• Autor: hai-fun <haifun129@gmai...>
• Commiter: hai-fun

Log Message

PHP8

Cambiar Resumen

• modified: vote2.inc.php

Diferencia incremental

--- a/vote2.inc.php
+++ b/vote2.inc.php
@@ -5,8 +5,10 @@
 // $Id: vote2.inc.php,v 0.12 2003/10/05 17:55:04 sha Exp $
 // based on vote.inc.php v1.14
 //
-// v0.2はインラインのリンクにtitleを付けた。
+// v0.2???ゃ?潟???ゃ?潟?????潟????itle??篁???????
 
+ // v0.13 PHP8絲上? 2021-12-17 by?????泣??
+ 
 function plugin_vote2_init()
 {
 	$messages = array(
@@ -16,11 +18,11 @@ function plugin_vote2_init()
 			'arg_nolabel'     => 'nolabel',
 			'arg_notitle'     => 'notitle',
 			'title_error' => 'Error in vote2',
-			'no_page_error' => '$1 のページは存在しません',
-			'update_failed' => '投票失敗：$1において投票先が無いか項目が合致しませんでした。',
-			'body_error' => 'あるべき引数が渡されていないか、引数にエラーがあります。',
-			'msg_collided'  => '<h3>あなたが投票している間に、他の人が同じページの内容を更新してしまったようです。<br />従って、投票する位置を間違える可能性があります。<br /><br />
-あなたの更新を無効にしました。前のページをリロードしてやり直してください。</h3>'
+			'no_page_error' => '$1 ?????若?吾????????障????',
+			'update_failed' => '??腑?け??鐚?$1??????????腑??????＜?????????????眼???障?????с??????',
+			'body_error' => '?????鴻??綣??違??羝＜????????????????綣??違???????若???????障????',
+			'msg_collided'  => '<h3>??????????腑???????????????篁???査?????????若?吾????絎鴻???贋?違???????障?ｃ???????с????<br />緇??ｃ??????腑?????篏?臀??????????????醇?с???????障????<br /><br />
+?????????贋?違???≦?鴻?????障?????????????若?吾???????若???????????眼?????????????</h3>'
 
 		),
 	);
@@ -71,17 +73,18 @@ function plugin_vote2_action()
 }
 function plugin_vote2_inline()
 {
-	global $script,$vars,$digest, $_vote2_messages, $_vote_plugin_votes;
+	global $vars, $digest, $_vote2_messages, $_vote_plugin_votes;
 	global $_vote_plugin_choice, $_vote_plugin_votes;
 	static $numbers = array();
 	static $notitle = FALSE;
+	$script = get_script_uri();
 	$str_notimestamp = $_vote2_messages['arg_notimestamp'];
 	$str_nonumber    = $_vote2_messages['arg_nonumber'];
 	$str_nolabel     = $_vote2_messages['arg_nolabel'];
 	$str_notitle     = $_vote2_messages['arg_notitle'];
 
 	$args = func_get_args();
-	array_pop($args); // {}内の要素の削除
+	array_pop($args); // {}?????膣??????
 	$page = $vars['page'];
 	if (!array_key_exists($page,$numbers))	$numbers[$page] = 0;
 	$vote_inno = $numbers[$page]++;
@@ -180,15 +183,16 @@ function plugin_vote2_address($match, $vote_no, $page, $ndigest)
 			 break;
 		default:  $vote_no  = 'error'; break;
 	}
-	$f_vote_no = htmlspecialchars($npage . '=' . $vote_no);
+	$f_vote_no = htmlsc($npage . '=' . $vote_no);
 	return array($npage, $vote_no, $f_vote_no, $ndigest);
 }
 function plugin_vote2_convert()
 {
-	global $script,$vars,$digest, $_vote2_messages;
+	global $vars, $digest, $_vote2_messages;
 	global $_vote_plugin_choice, $_vote_plugin_votes, $digests;
 	static $numbers = array();
 	static $notitle = FALSE;
+	$script = get_script_uri();
 	$str_notimestamp = $_vote2_messages['arg_notimestamp'];
 	$str_nonumber    = $_vote2_messages['arg_nonumber'];
 	$str_nolabel     = $_vote2_messages['arg_nolabel'];
@@ -284,8 +288,8 @@ EOD;
 		}
 	}
 
-	$s_page    = htmlspecialchars($page);
-	$s_digest  = htmlspecialchars($ndigest);
+	$s_page    = htmlsc($page);
+	$s_digest  = htmlsc($ndigest);
 	$title = $notitle ? '' : "title=\"$f_vote_no\"";
 	$body = <<<EOD
 <form action="$script" method="post">
@@ -313,9 +317,10 @@ EOD;
 }
 function plugin_vote2_action_inline($vote_no)
 {
-	global $get,$vars,$script,$cols,$rows, $_vote2_messages;
+	global $get, $vars, $cols, $rows, $_vote2_messages;
 	global $_title_collided,$_msg_collided,$_title_updated;
 	global $_vote_plugin_choice, $_vote_plugin_votes;
+	$script = get_script_uri();
 	$str_notimestamp = $_vote2_messages['arg_notimestamp'];
 	$str_nonumber    = $_vote2_messages['arg_nonumber'];
 	$str_nolabel     = $_vote2_messages['arg_nolabel'];
@@ -414,9 +419,10 @@ function plugin_vote2_action_inline($vote_no)
 }
 function plugin_vote2_action_block($vote_no)
 {
-	global $post,$vars,$script,$cols,$rows, $_vote2_messages;
+	global $post, $vars, $cols, $rows, $_vote2_messages;
 	global $_title_collided,$_msg_collided,$_title_updated;
 	global $_vote_plugin_choice, $_vote_plugin_votes;
+	$script = get_script_uri();
 	$str_notimestamp = $_vote2_messages['arg_notimestamp'];
 	$str_nonumber    = $_vote2_messages['arg_nonumber'];
 	$str_nolabel     = $_vote2_messages['arg_nolabel'];