BugTrack2/139: Correct. Deleted a first space at preview.

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

diff --git a/plugin/rename.inc.php b/plugin/rename.inc.php
index daf6303..2e30446 100644 (file)
--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: rename.inc.php,v 1.21 2004/12/30 12:55:58 henoheno Exp $
+// $Id: rename.inc.php,v 1.27 2005/02/27 07:57:26 henoheno Exp $
 //
 // Rename plugin: Rename page-name and related data
 //
@@ -12,6 +12,8 @@ function plugin_rename_action()
 {
        global $whatsnew;
 
+       if (PKWK_READONLY) die_message('PKWK_READONLY prohibits this');
+
        $method = plugin_rename_getvar('method');
        if ($method == 'regex') {
                $src = plugin_rename_getvar('src');
@@ -70,7 +72,7 @@ function plugin_rename_err($err, $page = '')
 
        if ($err == '') return '';
 
-       $body = $_rename_messages[err_ . $err];
+       $body = $_rename_messages['err_' . $err];
        if (is_array($page)) {
                $tmp = '';
                foreach ($page as $_page) $tmp .= '<br />' . $_page;
@@ -93,9 +95,9 @@ function plugin_rename_phase1($err = '', $page = '')
 
        $radio_regex = $radio_page = '';
        if ($method == 'regex') {
-               $radio_regex =' checked';
+               $radio_regex = ' checked="checked"';
        } else {
-               $radio_page = ' checked';
+               $radio_page  = ' checked="checked"';
        }
        $select_refer = plugin_rename_getselecttag($refer);
 
@@ -103,20 +105,20 @@ function plugin_rename_phase1($err = '', $page = '')
        $s_dst = htmlspecialchars(plugin_rename_getvar('dst'));
 
        $ret = array();
-       $ret['msg'] = $_rename_messages['msg_title'];
+       $ret['msg']  = $_rename_messages['msg_title'];
        $ret['body'] = <<<EOD
 $msg
 <form action="$script" method="post">
  <div>
   <input type="hidden" name="plugin" value="rename" />
-  <input type="radio"  name="method" value="page"$radio_page />
-  {$_rename_messages['msg_page']}:$select_refer<br />
-  <input type="radio" name="method" value="regex"$radio_regex />
-  {$_rename_messages['msg_regex']}:<br />
-  From:<br />
-  <input type="text" name="src" size="80" value="$s_src" /><br />
-  To:<br />
-  <input type="text" name="dst" size="80" value="$s_dst" /><br />
+  <input type="radio"  name="method" id="_p_rename_page" value="page"$radio_page />
+  <label for="_p_rename_page">{$_rename_messages['msg_page']}:</label>$select_refer<br />
+  <input type="radio"  name="method" id="_p_rename_regex" value="regex"$radio_regex />
+  <label for="_p_rename_regex">{$_rename_messages['msg_regex']}:</label><br />
+  <label for="_p_rename_from">From:</label><br />
+  <input type="text" name="src" id="_p_rename_from" size="80" value="$s_src" /><br />
+  <label for="_p_rename_to">To:</label><br />
+  <input type="text" name="dst" id="_p_rename_to"   size="80" value="$s_dst" /><br />
   <input type="submit" value="{$_rename_messages['btn_next']}" /><br />
  </div>
 </form>
@@ -137,8 +139,8 @@ function plugin_rename_phase2($err = '')
        $msg_related = '';
        $related = plugin_rename_getrelated($refer);
        if (! empty($related))
-               $msg_related = $_rename_messages['msg_do_related'] .
-                       '<input type="checkbox" name="related" value="1" checked="checked" /><br />';
+               $msg_related = '<label for="_p_rename_related">' . $_rename_messages['msg_do_related'] . '</label>' .
+               '<input type="checkbox" name="related" id="_p_rename_related" value="1" checked="checked" /><br />';
 
        $msg_rename = sprintf($_rename_messages['msg_rename'], make_pagelink($refer));
        $s_page  = htmlspecialchars($page);
@@ -153,7 +155,8 @@ $msg
   <input type="hidden" name="plugin" value="rename" />
   <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 />
+  <label for="_p_rename_newname">{$_rename_messages['msg_newname']}:</label>
+  <input type="text" name="page" id="_p_rename_newname" size="80" value="$s_page" /><br />
   $msg_related
   <input type="submit" value="{$_rename_messages['btn_next']}" /><br />
  </div>
@@ -273,8 +276,8 @@ function plugin_rename_phase3($pages)
  <div>
   <input type="hidden" name="plugin" value="rename" />
   $input
-  {$_rename_messages['msg_adminpass']}
-  <input type="password" name="pass" value="" />
+  <label for="_p_rename_adminpass">{$_rename_messages['msg_adminpass']}</label>
+  <input type="password" name="pass" id="_p_rename_adminpass" value="" />
   <input type="submit" value="{$_rename_messages['btn_submit']}" />
  </div>
 </form>
@@ -331,7 +334,8 @@ function plugin_rename_proceed($pages, $files, $exists)
        set_time_limit(0);
        foreach ($files as $page=>$arr) {
                foreach ($arr as $old=>$new) {
-                       if ($exists[$page][$old]) unlink($new);
+                       if (isset($exists[$page][$old]) && $exists[$page][$old])
+                               unlink($new);
                        rename($old, $new);
 
                        // link¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤¹¤ë BugTrack/327 arino