PKWK_READONLY prohibits editing

[pukiwiki/pukiwiki.git] / plugin / paint.inc.php

diff --git a/plugin/paint.inc.php b/plugin/paint.inc.php
index 0cc0783..6514371 100644 (file)
--- a/plugin/paint.inc.php
+++ b/plugin/paint.inc.php
@@ -1,38 +1,32 @@
 <?php
-/////////////////////////////////////////////////
-// PukiWiki - Yet another WikiWikiWeb clone.
+// PukiWiki - Yet another WikiWikiWeb clone
 //
-// $Id: paint.inc.php,v 1.14 2004/07/31 03:09:20 henoheno Exp $
+// $Id: paint.inc.php,v 1.18 2005/01/29 02:49:41 henoheno Exp $
 //
+// Paint plugin
 
 /*
-*¥×¥é¥°¥¤¥ó paint
-³¨¤òÉÁ¤¯
-
-*Usage
- #paint(width,height)
-
-*¥Ñ¥é¥á¡¼¥¿
--width,height~
- ¥­¥ã¥ó¥Ð¥¹¤ÎÉý¤È¹â¤µ
-
-*/
+ * Usage
+ *  #paint(width,height)
+ * ¥Ñ¥é¥á¡¼¥¿
+ *  ¥­¥ã¥ó¥Ð¥¹¤ÎÉý¤È¹â¤µ
+ */
 
 // ÁÞÆþ¤¹¤ë°ÌÃÖ 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̤Ëþ¤ÇÊÌ¥¦¥¤¥ó¥É¥¦¤¬³«¤¯
 define('PAINT_APPLET_WIDTH',800);
 define('PAINT_APPLET_HEIGHT',300);
-//
+
 //¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È
 define('PAINT_NAME_FORMAT','[[$name]]');
 define('PAINT_MSG_FORMAT','$msg');
@@ -44,10 +38,10 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08NOW\x08");
 
 function plugin_paint_action()
 {
-       global $script,$vars;
-       global $_paint_messages;
-       global $html_transitional;
+       global $script, $vars, $pkwk_dtd, $_paint_messages;
 
+       if (PKWK_READONLY) die_message('PKWK_READONLY prohibits editing');
+       
        //Ìá¤êÃͤò½é´ü²½
        $retval['msg'] = $_paint_messages['msg_title'];
        $retval['body'] = '';
@@ -150,16 +144,20 @@ function plugin_paint_action()
  </div>
 EOD;
                // XHTML 1.0 Transitional
-               $html_transitional = TRUE;
+               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 $_paint_messages;
        static $numbers = array();
 
+       if (PKWK_READONLY) return ''; // Show nothing
+
        if (!array_key_exists($vars['page'],$numbers))
        {
                $numbers[$vars['page']] = 0;
@@ -229,8 +227,10 @@ function paint_insert_ref($filename)
                str_replace("\x08MSG\x08", $msg, PAINT_FORMAT);
        $msg = str_replace("\x08NAME\x08",$name, $msg);
        $msg = str_replace("\x08NOW\x08",$now, $msg);
-       //¥Ö¥í¥Ã¥¯¤Ë¿©¤ï¤ì¤Ê¤¤¤è¤¦¤Ë¡¢#img¤ÎľÁ°¤Ë\n¤ò2¸Ä½ñ¤¤¤Æ¤ª¤¯¡£
-       $msg = "#ref($filename,wrap,around)\n".trim($msg)."\n\n#img(,clear)\n";
+
+       //¥Ö¥í¥Ã¥¯¤Ë¿©¤ï¤ì¤Ê¤¤¤è¤¦¤Ë¡¢#clear¤ÎľÁ°¤Ë\n¤ò2¸Ä½ñ¤¤¤Æ¤ª¤¯
+       $msg = "#ref($filename,wrap,around)\n" . trim($msg) . "\n\n" .
+               "#clear\n";
 
        $postdata_old = get_source($vars['refer']);
        $postdata = '';
@@ -241,7 +241,7 @@ function paint_insert_ref($filename)
                {
                        $postdata .= $line;
                }
-               if (preg_match('/^#paint/',$line))
+               if (preg_match('/^#paint/i',$line))
                {
                        if ($paint_no == $vars['paint_no'])
                        {