<?php
// PukiWiki - Yet another WikiWikiWeb clone
-//
-// $Id: paint.inc.php,v 1.18 2005/01/29 02:49:41 henoheno Exp $
+// paint.inc.php
+// Copyright 2002-2017 PukiWiki Development Team
+// License: GPL v2 or (at your option) any later version
//
// Paint plugin
/*
* Usage
* #paint(width,height)
- * ¥Ñ¥é¥á¡¼¥¿
- * ¥¥ã¥ó¥Ð¥¹¤ÎÉý¤È¹â¤µ
+ * ã\83\91ã\83©ã\83¡ã\83¼ã\82¿
+ * キャンバスの幅と高さ
*/
-// ÁÞÆþ¤¹¤ë°ÌÃÖ 1:Íó¤ÎÁ° 0:Íó¤Î¸å
+// 挿入する位置 1:欄の前 0:欄の後
define('PAINT_INSERT_INS',0);
-// ¥Ç¥Õ¥©¥ë¥È¤ÎÉÁ²èÎΰè¤ÎÉý¤È¹â¤µ
+// デフォルトの描画領域の幅と高さ
define('PAINT_DEFAULT_WIDTH',80);
define('PAINT_DEFAULT_HEIGHT',60);
-// ÉÁ²èÎΰè¤ÎÉý¤È¹â¤µ¤ÎÀ©¸ÂÃÍ
+// 描画領域の幅と高さの制限値
define('PAINT_MAX_WIDTH',320);
define('PAINT_MAX_HEIGHT',240);
-// ¥¢¥×¥ì¥Ã¥ÈÎΰè¤ÎÉý¤È¹â¤µ 50x50̤Ëþ¤ÇÊÌ¥¦¥¤¥ó¥É¥¦¤¬³«¤¯
+// アプレット領域の幅と高さ 50x50未満で別ウインドウが開く
define('PAINT_APPLET_WIDTH',800);
define('PAINT_APPLET_HEIGHT',300);
-//¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È
+//コメントの挿入フォーマット
define('PAINT_NAME_FORMAT','[[$name]]');
define('PAINT_MSG_FORMAT','$msg');
define('PAINT_NOW_FORMAT','&new{$now};');
-//¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¾ì¹ç
+//メッセージがある場合
define('PAINT_FORMAT',"\x08MSG\x08 -- \x08NAME\x08 \x08NOW\x08");
-//¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¾ì¹ç
+//メッセージがない場合
define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
function plugin_paint_action()
{
- global $script, $vars, $pkwk_dtd, $_paint_messages;
+ global $vars, $_paint_messages;
+ $script = get_base_uri();
if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
- //Ìá¤êÃͤò½é´ü²½
+ //戻り値を初期化
$retval['msg'] = $_paint_messages['msg_title'];
$retval['body'] = '';
and array_key_exists('refer',$vars))
{
$file = $_FILES['attach_file'];
- //BBSPaiter.jar¤Ï¡¢shift-jis¤ÇÆâÍƤòÁ÷¤Ã¤Æ¤¯¤ë¡£ÌÌÅݤʤΤǥڡ¼¥¸Ì¾¤Ï¥¨¥ó¥³¡¼¥É¤·¤Æ¤«¤éÁ÷¿®¤µ¤»¤ë¤è¤¦¤Ë¤·¤¿¡£
+ //BBSPaiter.jarは、shift-jisで内容を送ってくる。面倒なのでページ名はエンコードしてから送信させるようにした。
$vars['page'] = $vars['refer'] = decode($vars['refer']);
$filename = $vars['filename'];
$filename = mb_convert_encoding($filename,SOURCE_ENCODING,'auto');
- //¥Õ¥¡¥¤¥ë̾ÃÖ´¹
+ //ファイル名置換
$attachname = preg_replace('/^[^\.]+/',$filename,$file['name']);
- //¤¹¤Ç¤Ë¸ºß¤·¤¿¾ì¹ç¡¢ ¥Õ¥¡¥¤¥ë̾¤Ë'_0','_1',...¤òÉÕ¤±¤Æ²óÈò(¸È©)
+ //すでに存在した場合、 ファイル名に'_0','_1',...を付けて回避(姑息)
$count = '_0';
while (file_exists(UPLOAD_DIR.encode($vars['refer']).'_'.encode($attachname)))
{
else
{
$message = '';
- $r_refer = $s_refer = '';
+ $page_uri = get_base_uri();
if (array_key_exists('refer',$vars))
{
- $r_refer = rawurlencode($vars['refer']);
- $s_refer = htmlspecialchars($vars['refer']);
+ $page_uri = get_page_uri($vars['refer']);
+ $s_refer = htmlsc($vars['refer']);
}
- $link = "<p><a href=\"$script?$r_refer\">$s_refer</a></p>";;
+ $link = "<p><a href=\"$page_uri\">$s_refer</a></p>";;
$w = PAINT_APPLET_WIDTH;
$h = PAINT_APPLET_HEIGHT;
- //¥¦¥¤¥ó¥É¥¦¥â¡¼¥É :)
+ //ウインドウモード :)
if ($w < 50 and $h < 50)
{
$w = $h = 0;
$link = '';
}
- //XSSÀȼåÀÌäÂê - ³°Éô¤«¤éÍ褿ÊÑ¿ô¤ò¥¨¥¹¥±¡¼¥×
+ //XSS脆弱性問題 - 外部から来た変数をエスケープ
$width = empty($vars['width']) ? PAINT_DEFAULT_WIDTH : $vars['width'];
$height = empty($vars['height']) ? PAINT_DEFAULT_HEIGHT : $vars['height'];
$f_w = (is_numeric($width) and $width > 0) ? $width : PAINT_DEFAULT_WIDTH;
$f_h = (is_numeric($height) and $height > 0) ? $height : PAINT_DEFAULT_HEIGHT;
- $f_refer = array_key_exists('refer',$vars) ? encode($vars['refer']) : ''; // BBSPainter.jar¤¬shift-jis¤ËÊÑ´¹¤¹¤ë¤Î¤ò²óÈò
- $f_digest = array_key_exists('digest',$vars) ? htmlspecialchars($vars['digest']) : '';
+ $f_refer = array_key_exists('refer',$vars) ? encode($vars['refer']) : ''; // BBSPainter.jarがshift-jisに変換するのを回避
+ $f_digest = array_key_exists('digest',$vars) ? htmlsc($vars['digest']) : '';
$f_no = (array_key_exists('paint_no',$vars) and is_numeric($vars['paint_no'])) ?
$vars['paint_no'] + 0 : 0;
<param name="param4" value="max_file_size=1000000" />
<param name="param5" value="paint_no=$f_no" />
<param name="enctype" value="multipart/form-data" />
- <param name="return.URL" value="$script?$r_refer" />
+ <param name="return.URL" value="$page_uri" />
</applet>
</div>
EOD;
- // XHTML 1.0 Transitional
- if (! isset($pkwk_dtd) || $pkwk_dtd == PKWK_DTD_XHTML_1_1)
- $pkwk_dtd = PKWK_DTD_XHTML_1_0_TRANSITIONAL;
}
return $retval;
}
function plugin_paint_convert()
{
- global $script,$vars,$digest;
+ global $vars,$digest;
global $_paint_messages;
static $numbers = array();
+ $script = get_base_uri();
if (PKWK_READONLY) return ''; // Show nothing
if (!array_key_exists($vars['page'],$numbers))
}
$paint_no = $numbers[$vars['page']]++;
- //Ìá¤êÃÍ
+ //戻り値
$ret = '';
- //ʸ»úÎó¤ò¼èÆÀ
+ //文字列を取得
$width = $height = 0;
$args = func_get_args();
if (count($args) >= 2)
$height = PAINT_DEFAULT_HEIGHT;
}
- //XSSÀȼåÀÌäÂê - ³°Éô¤«¤éÍ褿ÊÑ¿ô¤ò¥¨¥¹¥±¡¼¥×
- $f_page = htmlspecialchars($vars['page']);
+ //XSS脆弱性問題 - 外部から来た変数をエスケープ
+ $f_page = htmlsc($vars['page']);
$max = sprintf($_paint_messages['msg_max'],PAINT_MAX_WIDTH,PAINT_MAX_HEIGHT);
}
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'];
$msg = str_replace("\x08NAME\x08",$name, $msg);
$msg = str_replace("\x08NOW\x08",$now, $msg);
- //¥Ö¥í¥Ã¥¯¤Ë¿©¤ï¤ì¤Ê¤¤¤è¤¦¤Ë¡¢#clear¤ÎľÁ°¤Ë\n¤ò2¸Ä½ñ¤¤¤Æ¤ª¤¯
+ //ブロックに食われないように、#clearの直前に\nを2個書いておく
$msg = "#ref($filename,wrap,around)\n" . trim($msg) . "\n\n" .
"#clear\n";
$postdata_old = get_source($vars['refer']);
$postdata = '';
- $paint_no = 0; //'#paint'¤Î½Ð¸½²ó¿ô
+ $paint_no = 0; //'#paint'の出現回数
foreach ($postdata_old as $line)
{
if (!PAINT_INSERT_INS)
}
}
- // ¹¹¿·¤Î¾×Æͤò¸¡½Ð
- if (md5(join('',$postdata_old)) != $vars['digest'])
+ // 更新の衝突を検出
+ if (md5(join('',$postdata_old)) !== $vars['digest'])
{
$ret['msg'] = $_paint_messages['msg_title_collided'];
$ret['body'] = $_paint_messages['msg_collided'];
return $ret;
}
-?>
OSDN Git Service
