BugTrack/566 CVS キーワード置換調整, SKIN_DIR='./skin/'

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

diff --git a/plugin/rename.inc.php b/plugin/rename.inc.php
index 798ca03..ea26860 100644 (file)
--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: rename.inc.php,v 1.7 2003/06/18 00:11:09 arino Exp $
+// $Id: rename.inc.php,v 1.11 2004/03/20 13:37:43 arino Exp $
 //
 
 /*
@@ -20,45 +20,11 @@
 
 define('RENAME_LOGPAGE',':RenameLog');
 
-function plugin_rename_init()
-{
-       $messages = array(
-               '_rename_messages'=>array(
-                       'err' => '<p>¥¨¥é¡¼:%s</p>',
-                       'err_nomatch' => '¥Þ¥Ã¥Á¤¹¤ë¥Ú¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó¡£',
-                       'err_notvalid' => '¥ê¥Í¡¼¥à¸å¤Î¥Ú¡¼¥¸Ì¾¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£',
-                       'err_adminpass' => '´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£',
-                       'err_notpage' => '%s¤Ï¥Ú¡¼¥¸Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
-                       'err_norename' => '%s¤ò¥ê¥Í¡¼¥à¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£',
-                       'err_already' => '¥Ú¡¼¥¸¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£:%s',
-                       'err_already_below' => '°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤¬¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹¡£',
-                       'msg_title' => '¥Ú¡¼¥¸Ì¾¤ÎÊѹ¹',
-                       'msg_page' => 'Êѹ¹¸µ¥Ú¡¼¥¸¤ò»ØÄê',
-                       'msg_regex' => 'Àµµ¬É½¸½¤ÇÃÖ´¹',
-                       'msg_related' => '´ØÏ¢¥Ú¡¼¥¸',
-                       'msg_do_related' => '´ØÏ¢¥Ú¡¼¥¸¤â¥ê¥Í¡¼¥à¤¹¤ë',
-                       'msg_rename' => '%s¤Î̾Á°¤òÊѹ¹¤·¤Þ¤¹¡£',
-                       'msg_oldname' => '¸½ºß¤Î̾Á°',
-                       'msg_newname' => '¿·¤·¤¤Ì¾Á°',
-                       'msg_adminpass' => '´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É',
-                       'msg_arrow' => '¢ª',
-                       'msg_exist_none' => '¤½¤Î¥Ú¡¼¥¸¤ò½èÍý¤·¤Ê¤¤',
-                       'msg_exist_overwrite' => '¤½¤Î¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë',
-                       'msg_confirm' => '°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥Í¡¼¥à¤·¤Þ¤¹¡£',
-                       'msg_result' => '°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Þ¤·¤¿¡£',
-                       'btn_submit' => '¼Â¹Ô',
-                       'btn_next' => '¼¡¤Ø'
-               )
-       );
-       set_plugin_messages($messages);
-}
 function plugin_rename_action()
 {
-       global $adminpass,$whatsnew,$WikiName,$BracketName;
+       global $adminpass,$whatsnew;
        global $_rename_messages;
        
-       set_time_limit(60);
-       
        $method = rename_getvar('method');
        if ($method == 'regex')
        {
@@ -75,10 +41,12 @@ function plugin_rename_action()
                        return rename_phase1('nomatch');
                }
                $arr1 = preg_replace($src_pattern,$dst,$arr0);
-               $arr2 = preg_grep("/^$BracketName$/",$arr1);
-               if (count($arr2) != count($arr1))
+               foreach ($arr1 as $page)
                {
-                       return rename_phase1('notvalid');
+                       if (!is_pagename($page))
+                       {
+                               return rename_phase1('notvalid');
+                       }
                }
                return rename_regex($arr0,$arr1);
        }
@@ -88,7 +56,7 @@ function plugin_rename_action()
                $refer = rename_getvar('refer');
                if ($refer == '')
                {
-                       return rename_phase1($s_vars);
+                       return rename_phase1();
                }
                if (!is_page($refer))
                {
@@ -102,7 +70,7 @@ function plugin_rename_action()
                {
                        return rename_phase2();
                }
-               if (!preg_match("/^$BracketName$/",$page))
+               if (!is_pagename($page))
                {
                        return rename_phase2('notvalid');
                }
@@ -219,7 +187,7 @@ $msg
   <input type="hidden" name="refer" value="$s_refer" />
   $msg_rename<br />
   {$_rename_messages['msg_newname']}:<input type="text" name="page" size="80" value="$s_page" /><br />
-  $rename_related
+  $msg_related
   <input type="submit" value="{$_rename_messages['btn_next']}" /><br />
  </div>
 </form>