OSDN Git Service

BugTrack/238. and some cleanup.
authorpanda <panda>
Mon, 3 Mar 2003 07:07:28 +0000 (16:07 +0900)
committerpanda <panda>
Mon, 3 Mar 2003 07:07:28 +0000 (16:07 +0900)
plugin/attach.inc.php
plugin/include.inc.php
plugin/navi.inc.php
plugin/paint.inc.php
plugin/popular.inc.php
plugin/random.inc.php
plugin/ref.inc.php
plugin/rename.inc.php

index a339110..4ed3422 100644 (file)
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-//  $Id: attach.inc.php,v 1.17 2003/02/26 12:28:12 panda Exp $
+//  $Id: attach.inc.php,v 1.18 2003/03/03 07:07:28 panda Exp $
 //
 
 /*
@@ -386,7 +386,7 @@ function attach_open($page,$file,$age=0)
        $obj->status['count'][$age]++;
        $obj->putstatus();
        
-       $type = attach_mime_content_type($obj->file);
+       $type = attach_mime_content_type($obj->filename);
        $name = htmlspecialchars($obj->file);
        
        // for japanese (???)
@@ -437,6 +437,10 @@ function attach_mime_content_type($filename)
        $type = 'application/octet-stream'; //default
        $config = ':config/plugin/attach/mime-type';
        
+       if (!file_exists($filename))
+       {
+               return $type;
+       }
        $size = getimagesize($filename);
        if (is_array($size))
        {
@@ -537,7 +541,10 @@ EOD;
 class AttachFile
 {
        var $page,$file,$age,$basename,$filename,$logname;
-       var $time,$size,$time_str,$size_str;
+       var $time = 0;
+       var $size = 0;
+       var $time_str = '';
+       var $size_str = '';
        var $status = array('count'=>array(0),'age'=>'','pass'=>'','freeze'=>FALSE);
        
        function AttachFile($page,$file,$age=0)
@@ -555,6 +562,10 @@ class AttachFile
        // ¥Õ¥¡¥¤¥ë¾ðÊó¼èÆÀ
        function getstatus()
        {
+               if (!$this->exist)
+               {
+                       return;
+               }
                // ¥í¥°¥Õ¥¡¥¤¥ë¼èÆÀ
                if (file_exists($this->logname))
                {
index 543afc0..46d01e4 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: include.inc.php,v 1.6 2003/03/03 07:07:28 panda Exp $
+//
+
 /*
  include.inc.php
  ¥Ú¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
@@ -9,18 +15,21 @@ function plugin_include_convert()
        global $script,$vars,$get,$post,$hr,$WikiName,$BracketName;
        global $include_list; //½èÍýºÑ¥Ú¡¼¥¸Ì¾¤ÎÇÛÎó
        
-       if (!isset($include_list)) {
+       if (!isset($include_list))
+       {
                $include_list = array($vars['page']=>TRUE);
        }
        
-       if (func_num_args() == 0) {
+       if (func_num_args() == 0)
+       {
                return;
        }
        
        list($page) = func_get_args();
        $page = strip_bracket($page);
        
-       if (!is_page($page) or isset($include_list[$page])) {
+       if (!is_page($page) or isset($include_list[$page]))
+       {
                return '';
        }
        $include_list[$page] = TRUE;
@@ -33,13 +42,15 @@ function plugin_include_convert()
        $s_page = htmlspecialchars($page);
        $r_page = rawurlencode($page);
        $link = "<a href=\"$script?cmd=edit&amp;page=$r_page\">$s_page</a>";
-       if ($page == 'MenuBar') {
+       if ($page == 'MenuBar')
+       {
                $body = <<<EOD
 <span align="center"><h5 class="side_label">$link</h5></span>
 <small>$body</small>
 EOD;
        }
-       else {
+       else
+       {
                $body = "<h1>$link</h1>\n$body\n";
        }
        
index cb0fbca..e133b9a 100644 (file)
@@ -1,6 +1,11 @@
 <?php
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: navi.inc.php,v 1.8 2003/03/03 07:07:28 panda Exp $
+//
+
 /*
-Last-Update:2002-10-30 rev.4
 
 *¥×¥é¥°¥¤¥ó navi
 DobBookÉ÷¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨¤¹¤ë
@@ -46,23 +51,28 @@ function plugin_navi_convert()
        static $_navi_pages;
        
        $home = $vars['page'];
-       if (func_num_args()) {
+       if (func_num_args())
+       {
                list($home) = func_get_args();
        }
        $is_home = ($home == $vars['page']);
        $current = $vars['page'];
        
-       if (!$footer = isset($_navi_pages)) {
+       if (!$footer = isset($_navi_pages))
+       {
                $pages = array($current=>strip_bracket($current));
                $_pages = preg_grep('/^(\[\[)?'.strip_bracket($home).'\//',get_existpages());
-               foreach ($_pages as $_page) {
+               foreach ($_pages as $_page)
+               {
                        $pages[$_page] = strip_bracket($_page);
                }
                natcasesort($pages);
                $pages = array_keys($pages);
                $prev = $home;
-               foreach ($pages as $page) {
-                       if ($page == $current) {
+               foreach ($pages as $page)
+               {
+                       if ($page == $current)
+                       {
                                break;
                        }
                        $prev = $page;
@@ -80,15 +90,18 @@ function plugin_navi_convert()
                );
 
                $pos = strrpos($current, '/');
-               if ($pos > 0) {
+               if ($pos > 0)
+               {
                        $up = substr($current, 0, $pos).(substr($current,0,2)=='[[' ? ']]' : '');
                        $_navi_pages['up'] = navi_make_link($up,'none',$_navi_messages['msg_up']);
                }
-               if (!$is_home) {
+               if (!$is_home)
+               {
                        $_navi_pages['prev'] = navi_make_link($prev,'left');
                        $_navi_pages['prev1'] = navi_make_link($prev,'left',$_navi_messages['msg_prev']);
                }
-               if ($next != '') {
+               if ($next != '')
+               {
                        $_navi_pages['next'] = navi_make_link($next,'right');
                        $_navi_pages['next1'] = navi_make_link($next,'right',$_navi_messages['msg_next']);
                }
@@ -97,7 +110,8 @@ function plugin_navi_convert()
        }
 
        $ret = '';
-       if ($footer) { //¥Õ¥Ã¥¿
+       if ($footer) //¥Õ¥Ã¥¿
+       {
                $ret = <<<EOD
 <hr class="full_hr" />
 <ul class="navi">
@@ -107,17 +121,20 @@ function plugin_navi_convert()
 </ul>
 EOD;
        }
-       else if ($is_home) { //Ìܼ¡
+       else if ($is_home) //Ìܼ¡
+       {
                $ret .= '<ul>';
                foreach ($pages as $page) {
-                       if (strip_bracket($page) == strip_bracket($home)) {
+                       if (strip_bracket($page) == strip_bracket($home))
+                       {
                                continue;
                        }
                        $ret .= '<li>'.make_link("[[$page]]").'</li>';
                }
                $ret .= '</ul>';
        }
-       else {
+       else
+       {
                $ret = <<<EOD
 <ul class="navi">
   <li class="navi_left">{$_navi_pages['prev1']}</li>
index 06d5efd..f8f8313 100644 (file)
@@ -1,7 +1,11 @@
 <?php
-/*
-Last-Update:2002-10-30 rev.20
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: paint.inc.php,v 1.5 2003/03/03 07:07:28 panda Exp $
+//
 
+/*
 *¥×¥é¥°¥¤¥ó paint
 ³¨¤òÉÁ¤¯
 
@@ -43,18 +47,20 @@ define('PAINT_FORMAT_NOMSG',"\x08NAME\x08 \x08DATE\x08");
 
 function plugin_paint_init()
 {
-       $messages = array('_paint_messages'=>array(
-               'field_name'    => '¤ªÌ¾Á°',
-               'field_filename'=> '¥Õ¥¡¥¤¥ë̾',
-               'field_comment' => '¥³¥á¥ó¥È',
-               'btn_submit'    => 'paint',
-               'msg_max'       => '(ºÇÂç %d x %d)',
-               'msg_title'     => 'Paint and Attach to $1',
-               'msg_title_collided' => '$1 ¤Ç¡Ú¹¹¿·¤Î¾×ÆÍ¡Û¤¬µ¯¤­¤Þ¤·¤¿',
-               'msg_collided'  => '¤¢¤Ê¤¿¤¬²èÁü¤òÊÔ½¸¤·¤Æ¤¤¤ë´Ö¤Ë¡¢Â¾¤Î¿Í¤¬Æ±¤¸¥Ú¡¼¥¸¤ò¹¹¿·¤·¤Æ¤·¤Þ¤Ã¤¿¤è¤¦¤Ç¤¹¡£<br />
+       $messages = array(
+               '_paint_messages'=>array(
+                       'field_name'    => '¤ªÌ¾Á°',
+                       'field_filename'=> '¥Õ¥¡¥¤¥ë̾',
+                       'field_comment' => '¥³¥á¥ó¥È',
+                       'btn_submit'    => 'paint',
+                       'msg_max'       => '(ºÇÂç %d x %d)',
+                       'msg_title'     => 'Paint and Attach to $1',
+                       'msg_title_collided' => '$1 ¤Ç¡Ú¹¹¿·¤Î¾×ÆÍ¡Û¤¬µ¯¤­¤Þ¤·¤¿',
+                       'msg_collided'  => '¤¢¤Ê¤¿¤¬²èÁü¤òÊÔ½¸¤·¤Æ¤¤¤ë´Ö¤Ë¡¢Â¾¤Î¿Í¤¬Æ±¤¸¥Ú¡¼¥¸¤ò¹¹¿·¤·¤Æ¤·¤Þ¤Ã¤¿¤è¤¦¤Ç¤¹¡£<br />
 ²èÁü¤È¥³¥á¥ó¥È¤òÄɲä·¤Þ¤·¤¿¤¬¡¢°ã¤¦°ÌÃÖ¤ËÁÞÆþ¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£<br />',
-       ));
-  set_plugin_messages($messages);
+               )
+       );
+       set_plugin_messages($messages);
 }
 function plugin_paint_action()
 {
index c3351c5..dd790ba 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: popular.inc.php,v 1.3 2003/03/03 07:07:28 panda Exp $
+//
+
 /*
  * PukiWiki popular ¥×¥é¥°¥¤¥ó
  * (C) 2002, Kazunori Mizushima <kazunori@uc.netyou.jp>
index d468069..7731e2b 100644 (file)
@@ -1,25 +1,30 @@
 <?php
-/*
-Last-Update:2002-10-29 rev.2
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: random.inc.php,v 1.4 2003/03/03 07:07:28 panda Exp $
+//
 
-*¥×¥é¥°¥¤¥ó random
-ÇÛ²¼¤Î¥Ú¡¼¥¸¤ò¥é¥ó¥À¥à¤Ëɽ¼¨¤¹¤ë
+/*
+ *¥×¥é¥°¥¤¥ó random
+  ÇÛ²¼¤Î¥Ú¡¼¥¸¤ò¥é¥ó¥À¥à¤Ëɽ¼¨¤¹¤ë
 
-*Usage
- #random(¥á¥Ã¥»¡¼¥¸)
+ *Usage
 #random(¥á¥Ã¥»¡¼¥¸)
 
-*¥Ñ¥é¥á¡¼¥¿
--¥á¥Ã¥»¡¼¥¸~
+ *¥Ñ¥é¥á¡¼¥¿
+ -¥á¥Ã¥»¡¼¥¸~
  ¥ê¥ó¥¯¤Ëɽ¼¨¤¹¤ëʸ»úÎó
 
-*/
+ */
 function plugin_random_convert()
 {
        global $script,$vars;
        
        $title = 'press here.';
        
-       if (func_num_args()) {
+       if (func_num_args())
+       {
                $args = func_get_args();
                $title = htmlspecialchars($args[0]);
        }
@@ -34,13 +39,20 @@ function plugin_random_action()
        
        $pages = array();
        foreach (get_existpages() as $_page)
+       {
                if (strpos($_page,$pattern) === 0)
+               {
                        $pages[$_page] = strip_bracket($_page);
+               }
+       }
 //     natcasesort($pages);
        srand((double)microtime()*1000000);
        $page = array_rand($pages);
 
-       if ($page != '') { $vars['refer'] = $page; }
+       if ($page != '')
+       {
+               $vars['refer'] = $page;
+       }
        return array('body'=>'','msg'=>'');
 }
 ?>
index 2e33d72..3703a67 100644 (file)
@@ -1,7 +1,11 @@
 <?php
-/*
- $Id: ref.inc.php,v 1.9 2003/03/02 16:07:43 panda Exp $
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: ref.inc.php,v 1.10 2003/03/03 07:07:28 panda Exp $
+//
 
+/*
 *¥×¥é¥°¥¤¥ó ref
 ¥Ú¡¼¥¸¤ËźÉÕ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òŸ³«¤¹¤ë
 
index 11f0d02..a9f95a5 100644 (file)
@@ -1,7 +1,11 @@
 <?php
-/*
-Last-Update:2002-10-29 rev.5
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: rename.inc.php,v 1.3 2003/03/03 07:07:28 panda Exp $
+//
 
+/*
 *¥×¥é¥°¥¤¥ó rename
 ¥Ú¡¼¥¸¤Î̾Á°¤òÊѤ¨¤ë
 
@@ -16,103 +20,149 @@ Last-Update:2002-10-29 rev.5
 
 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' => '¼¡¤Ø',
-       ));
+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() {
+function plugin_rename_action()
+{
        global $vars,$adminpass,$whatsnew,$WikiName,$BracketName;
        global $_rename_messages;
 
        // XSS
        foreach (array('refer','page','src','dst','method','related') as $var)
+       {
                $s_vars[$var] = array_key_exists($var,$vars) ? htmlspecialchars($vars[$var]) : '';
+       }
 
        set_time_limit(60);
 
        $method = empty($vars['method']) ? '' : $vars['method'];
-       if ($method == 'regex') {
+       if ($method == 'regex')
+       {
                if ($vars['src'] == '')
+               {
                        return rename_phase1($s_vars);
+               }
                $pages = get_existpages();
                $arr0 = preg_grep('/'.str_replace(array('(',')'),'',$vars['src']).'/',$pages);
                if (!is_array($arr0) or count($arr0) == 0)
+               {
                        return rename_phase1($s_vars,'nomatch');
+               }
                $arr1 = preg_replace("/{$vars['src']}/",$vars['dst'],$arr0);
                $arr2 = preg_grep("/^($WikiName|$BracketName)$/",$arr1);
                if (count($arr2) != count($arr1))
+               {
                        return rename_phase1($s_vars,'notvalid');
+               }
                return rename_regex($s_vars,$arr0,$arr1);
        }
-       else { // $vars['method'] = 'page'
-               if ($vars['refer'] == '')
+       else // $vars['method'] = 'page'
+       {
+               if (!array_key_exists('refer',$vars) or $vars['refer'] == '')
+               {
                        return rename_phase1($s_vars);
+               }
                if (!is_page($vars['refer']))
+               {
                        return rename_phase1($s_vars,'notpage',$s_vars['refer']);
+               }
                if ($vars['refer'] == $whatsnew)
+               {
                        return rename_phase1($s_vars,'norename',$s_vars['refer']);
+               }
                if ($vars['page'] == '' or $vars['page'] == $vars['refer'])
+               {
                        return rename_phase2($s_vars);
+               }
                if (!preg_match("/^$WikiName|$BracketName$/",$vars['page']))
+               {
                        return rename_phase2($s_vars,'notvalid');
+               }
                return rename_refer($s_vars);
        }
 }
 // ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òºî¤ë
-function rename_err($err,$page='') {
+function rename_err($err,$page='')
+{
        global $_rename_messages;
-       if ($err == '') { return ''; }
+       
+       if ($err == '')
+       {
+               return '';
+       }
        $body = $_rename_messages["err_$err"];
-       if (is_array($page)) {
+       if (is_array($page))
+       {
                $tmp = '';
-               foreach ($page as $_page) { $tmp .= "<br />$_page"; }
+               foreach ($page as $_page)
+               {
+                       $tmp .= "<br />$_page";
+               }
                $page = $tmp;
        }
-       if ($page != '') { $body = sprintf($body,$page); }
+       if ($page != '')
+       {
+               $body = sprintf($body,$page);
+       }
        $msg = sprintf($_rename_messages['err'],$body);
        return $msg;
 }
 // From->To¥á¥Ã¥»¡¼¥¸¤òºî¤ë
-function rename_arrow($from,$to) {
+function rename_arrow($from,$to)
+{
        global $_rename_messages;
+       
        return "$from{$_rename_messages['msg_arrow']}$to";
 }
 //Âè°ìÃʳ¬:¥Ú¡¼¥¸Ì¾¤Þ¤¿¤ÏÀµµ¬É½¸½¤ÎÆþÎÏ
-function &rename_phase1(&$s_vars,$err='',$page='') {
+function &rename_phase1(&$s_vars,$err='',$page='')
+{
        global $script,$vars,$_rename_messages;
+       
+       if (!array_key_exists('refer',$vars))
+       {
+               return FALSE;
+       }
        $msg = rename_err($err,$page);
 
        $radio_regex = $radio_page = '';
-       if (array_key_exists('method',$vars) and $vars['method'] == 'regex') {
+       if (array_key_exists('method',$vars) and $vars['method'] == 'regex')
+       {
                $radio_regex =' checked'; 
        }
-       else {
+       else
+       {
                $radio_page = ' checked'; 
        }
        $select_refer = rename_getselecttag($vars['refer']);
@@ -138,17 +188,23 @@ EOD;
        return $ret;
 }
 //ÂèÆóÃʳ¬:¿·¤·¤¤Ì¾Á°¤ÎÆþÎÏ
-function &rename_phase2(&$s_vars,$err='') {
+function &rename_phase2(&$s_vars,$err='')
+{
        global $script,$vars,$_rename_messages;
+       
        $msg = rename_err($err);
 
        $related = rename_getrelated($vars['refer']);
        sort($related);
-       if (count($related) > 0) {
+       if (count($related) > 0)
+       {
                $rename_related = $_rename_messages['msg_do_related'].
                        '<input type="checkbox" name="related" value="1" checked="checked" /><br />';
        }
-       if ($s_vars['page'] == '') { $s_vars['page'] = $s_vars['refer']; }
+       if ($s_vars['page'] == '')
+       {
+               $s_vars['page'] = $s_vars['refer'];
+       }
        $msg_rename = sprintf($_rename_messages['msg_rename'],make_link($vars['refer']));
 
        $ret['msg'] = $_rename_messages['msg_title'];
@@ -166,7 +222,8 @@ $msg
 </form>
 EOD;
 
-       if (count($related) > 0) {
+       if (count($related) > 0)
+       {
                $ret['body'].= "<hr /><p>{$_rename_messages['msg_related']}</p><ul>";
                foreach ($related as $name) { $ret['body'].= '<li>'.make_link($name).'</li>'; }
                $ret['body'].= '</ul>';
@@ -174,62 +231,85 @@ EOD;
        return $ret;
 }
 //¥Ú¡¼¥¸Ì¾¤È´ØÏ¢¤¹¤ë¥Ú¡¼¥¸¤òÎóµó¤·¡¢phase3¤Ø
-function &rename_refer(&$s_vars) {
+function &rename_refer(&$s_vars)
+{
        global $vars;
 
        $pages[encode($vars['refer'])] = encode($vars['page']);
-       if ($vars['related']) {
+       if ($vars['related'])
+       {
                $from = strip_bracket($vars['refer']);
                $to =   strip_bracket($vars['page']);
                $related = rename_getrelated($vars['refer']);
-               foreach ($related as $page) {
+               foreach ($related as $page)
+               {
                        $pages[encode($page)] = encode(str_replace($from,$to,$page));
                }
        }
        return rename_phase3($s_vars,$pages);
 }
 //Àµµ¬É½¸½¤Ç¥Ú¡¼¥¸¤òÃÖ´¹
-function &rename_regex(&$s_vars,&$arr_from,&$arr_to) {
+function &rename_regex(&$s_vars,&$arr_from,&$arr_to)
+{
        global $vars;
 
        $exists = array();
-       foreach ($arr_to as $page) {
-               if (is_page($page)) { $exists[] = $page; }
+       foreach ($arr_to as $page)
+       {
+               if (is_page($page))
+               {
+                       $exists[] = $page;
+               }
+       }
+       if (count($exists) > 0) {
+               return rename_phase1($s_vars,'already',$exists);
        }
-       if (count($exists) > 0) { return rename_phase1($s_vars,'already',$exists); }
 
        $pages = array();
-       foreach ($arr_from as $refer) {
+       foreach ($arr_from as $refer)
+       {
                $pages[encode($refer)] = encode(array_shift($arr_to));
        }
        return rename_phase3($s_vars,$pages);
 }
-function &rename_phase3(&$s_vars,&$pages) {
+function &rename_phase3(&$s_vars,&$pages)
+{
        global $script,$vars,$_rename_messages,$adminpass;
 
        $files = rename_get_files($pages);
 
        $exists = array();
-       foreach ($files as $_page=>$arr) {
-               foreach ($arr as $old=>$new) {
-                       if (is_readable($new)) { $exists[$_page][$old] = $new; }
+       foreach ($files as $_page=>$arr)
+       {
+               foreach ($arr as $old=>$new)
+               {
+                       if (is_readable($new)) {
+                               $exists[$_page][$old] = $new;
+                       }
                }
        }
 
-       if ($vars['pass'] != '') {
+       if ($vars['pass'] != '')
+       {
                if (md5($vars['pass']) == $adminpass)
+               {
                        return rename_proceed($s_vars,$pages,$files,$exists);
+               }
                else
+               {
                        $msg = rename_err('adminpass');
+               }
        }
 
-       if ($s_vars['method'] == "regex") {
+       if ($s_vars['method'] == "regex")
+       {
                $msg .= $_rename_messages['msg_regex']."<br />";
                $input .= "<input type=\"hidden\" name=\"method\" value=\"regex\" />";
                $input .= "<input type=\"hidden\" name=\"src\" value=\"{$s_vars['src']}\" />";
                $input .= "<input type=\"hidden\" name=\"dst\" value=\"{$s_vars['dst']}\" />";
        }
-       else {
+       else
+       {
                $msg .= $_rename_messages['msg_page']."<br />";
                $input .= "<input type=\"hidden\" name=\"method\" value=\"page\" />";
                $input .= "<input type=\"hidden\" name=\"refer\" value=\"{$s_vars['refer']}\" />";
@@ -237,11 +317,16 @@ function &rename_phase3(&$s_vars,&$pages) {
                $input .= "<input type=\"hidden\" name=\"related\" value=\"{$s_vars['related']}\" />";
        }
 
-       if (count($exists) > 0) {
+       if (count($exists) > 0)
+       {
                $msg .= $_rename_messages['err_already_below']."<ul>";
-               foreach ($exists as $page=>$arr) {
+               foreach ($exists as $page=>$arr)
+               {
                        $msg .= "<li>".rename_arrow(make_link(decode($page)),decode($pages[$page]))."<ul>\n";
-                       foreach ($arr as $ofile=>$nfile) { $msg .= "<li>".rename_arrow($ofile,$nfile)."</li>\n"; }
+                       foreach ($arr as $ofile=>$nfile)
+                       {
+                               $msg .= "<li>".rename_arrow($ofile,$nfile)."</li>\n";
+                       }
                        $msg .= "</ul></li>\n";
                }
                $msg .= "</ul><hr />";
@@ -266,27 +351,47 @@ EOD;
 
        ksort($pages);
        $ret['body'] .= "<ul>\n";
-       foreach ($pages as $old=>$new) {
+       foreach ($pages as $old=>$new)
+       {
                $ret['body'] .= "<li>".rename_arrow(make_link(decode($old)),decode($new))."</li>\n";
        }
        $ret['body'] .= "</ul>\n";
        return $ret;
 }
 
-function &rename_get_files(&$pages) {
+function &rename_get_files(&$pages)
+{
        $files = array();
        $dirs = array(BACKUP_DIR,DIFF_DIR,DATA_DIR);
-       if (exist_plugin_convert('attach')) { $dirs[] = UPLOAD_DIR; }
-       if (exist_plugin_convert('counter')) { $dirs[] = COUNTER_DIR; }
+       if (exist_plugin_convert('attach'))
+       {
+               $dirs[] = UPLOAD_DIR; 
+       }
+       if (exist_plugin_convert('counter'))
+       {
+               $dirs[] = COUNTER_DIR;
+       }
        // and more ...
 
-       foreach ($dirs as $path) {
-               if (!$dir = opendir($path)) { continue; }
-               while ($file = readdir($dir)) {
-                       if ($file == '.' or $file == '..') { continue; }
-                       foreach ($pages as $from=>$to) {
+       foreach ($dirs as $path)
+       {
+               if (!$dir = opendir($path))
+               {
+                       continue;
+               }
+               while ($file = readdir($dir))
+               {
+                       if ($file == '.' or $file == '..')
+                       {
+                               continue; 
+                       }
+                       foreach ($pages as $from=>$to)
+                       {
                                $pattern = '/^'.str_replace('/','\/',$from).'([._].+)$/';
-                               if (!preg_match($pattern,$file,$matches)) { continue; }
+                               if (!preg_match($pattern,$file,$matches))
+                               {
+                                       continue; 
+                               }
                                $newfile = $to.$matches[1];
                                $files[$from][$path.$file] = $path.$newfile;
                        }
@@ -295,43 +400,62 @@ function &rename_get_files(&$pages) {
        return $files;
 }
 
-function rename_proceed(&$s_vars,&$pages,&$files,&$exists) {
+function rename_proceed(&$s_vars,&$pages,&$files,&$exists)
+{
        global $script,$vars,$_rename_messages,$now;
 
        if (!$vars['exist'])
-               foreach ($exists as $key=>$arr) { unset($files[$key]); }
+       {
+               foreach ($exists as $key=>$arr)
+               {
+                       unset($files[$key]); 
+               }
+       }
 
        set_time_limit(0);
-       foreach ($files as $page=>$arr) {
-               foreach ($arr as $old=>$new) {
-                       if ($exists[$page][$old]) { unlink($new); }
+       foreach ($files as $page=>$arr)
+       {
+               foreach ($arr as $old=>$new)
+               {
+                       if ($exists[$page][$old])
+                       {
+                               unlink($new); 
+                       }
                        rename($old,$new);
                }
        }
 
        $postdata = get_source(RENAME_LOGPAGE);
        $postdata[] = '*'.$now."\n";
-       if ($vars['method'] == 'regex') {
+       if ($vars['method'] == 'regex')
+       {
                $postdata[] = '-'.$_rename_messages['msg_regex']."\n";
                $postdata[] = '--From:'.$s_vars['src']."\n";
                $postdata[] = '--To:'.$s_vars['dst']."\n";
        }
-       else {
+       else
+       {
                $postdata[] = '-'.$_rename_messages['msg_page']."\n";
                $postdata[] = '--From:'.$s_vars['refer']."\n";
                $postdata[] = '--To:'.$s_vars['page']."\n";
        }
-       if (count($exists) > 0) {
+       if (count($exists) > 0)
+       {
                $postdata[] = "\n".$_rename_messages['msg_result']."\n";
-               foreach ($exists as $page=>$arr) {
+               foreach ($exists as $page=>$arr)
+               {
                        $postdata[] = '-'.rename_arrow(decode($page),decode($pages[$page]))."\n";
                        foreach ($arr as $ofile=>$nfile)
+                       {
                                $postdata[] = '--'.rename_arrow($ofile,$nfile)."\n";
+                       }
                }
                $postdata[] = "----\n";
        }
        foreach ($pages as $old=>$new)
+       {
                $postdata[] = '-'.rename_arrow(decode($old),decode($new))."\n";
+       }
 
        // ¹¹¿·¤Î¾×ÆͤϥÁ¥§¥Ã¥¯¤·¤Ê¤¤¡£
 
@@ -344,22 +468,35 @@ function rename_proceed(&$s_vars,&$pages,&$files,&$exists) {
        die();
 }
 
-function &rename_getrelated($page) {
+function &rename_getrelated($page)
+{
        $related = array();
        $pages = get_existpages();
        $pattern = '/(?:^|\/)'.str_replace('/','\/',strip_bracket($page)).'(?:\/|$)/';
-       foreach ($pages as $name) {
-               if ($name == $page) { continue; }
-               if (preg_match($pattern,$name)) { $related[] = $name; }
+       foreach ($pages as $name)
+       {
+               if ($name == $page)
+               {
+                       continue; 
+               }
+               if (preg_match($pattern,$name))
+               {
+                       $related[] = $name;
+               }
        }
        return $related;
 }
-function &rename_getselecttag($page) {
+function &rename_getselecttag($page)
+{
        global $whatsnew;
 
        $pages =array();
-       foreach (get_existpages() as $_page) {
-               if ($_page == $whatsnew) { continue; }
+       foreach (get_existpages() as $_page)
+       {
+               if ($_page == $whatsnew)
+               {
+                       continue; 
+               }
                $selected = ($_page == $page) ? ' selected' : '';
                $pages[$_page] = "<option value=\"$_page\"$selected>$_page</option>";
        }