Just a cleanup

diff --git a/plugin/include.inc.php b/plugin/include.inc.php
index a2a3f42..4338f96 100644 (file)
--- a/plugin/include.inc.php
+++ b/plugin/include.inc.php
@@ -2,61 +2,50 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: include.inc.php,v 1.9 2004/07/31 03:09:20 henoheno Exp $
+// $Id: include.inc.php,v 1.10 2004/08/06 14:13:02 henoheno Exp $
 //
 
-/*
- include.inc.php
- ¥Ú¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
-*/
-
+// ¥Ú¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
 function plugin_include_convert()
 {
-       global $script,$vars,$get,$post,$hr,$WikiName,$BracketName;
-       global $_msg_include_restrict;
-       static $include_list = array(); //½èÍýºÑ¥Ú¡¼¥¸Ì¾¤ÎÇÛÎó
-
-       if (func_num_args() == 0)
-       {
-               return;
-       }
-
-       $include_list[$vars['page']] = TRUE;
+       global $script, $vars, $get, $post, $_msg_include_restrict;
+       static $included = array();
 
+       // Get an argument
+       if (func_num_args() == 0) return;
        list($page) = func_get_args();
        $page = strip_bracket($page);
 
-       if (!is_page($page) or isset($include_list[$page]))
-       {
-               return '';
-       }
-       $include_list[$page] = TRUE;
+       // Loop yourself
+       $self = isset($vars['page']) ? $vars['page'] : '';
+       $included[$self] = TRUE;
 
-       $_page = $vars['page'];
-       $get['page'] = $post['page'] = $vars['page'] = $page;
+       // I'm stuffed
+       if (isset($included[$page]) || ! is_page($page)) return '';
 
-       // include¤Î¤È¤­¤Ï¡¢Ç§¾Ú²èÌ̤ò¤¤¤Á¤¤¤Á½Ð¤µ¤º¡¢¸å»ÏËö¤â¤³¤Á¤é¤Ç¤Ä¤±¤ë
+       // One page, only one time, at a time
+       $included[$page] = TRUE;
+
+       // Include a $page, that probably includes more pages
+       $get['page'] = $post['page'] = $vars['page'] = $page;
        if (check_readable($page, false, false)) {
                $body = convert_html(get_source($page));
        } else {
-               $body = str_replace('$1',$page,$_msg_include_restrict);
+               $body = str_replace('$1', $page, $_msg_include_restrict);
        }
+       $get['page'] = $post['page'] = $vars['page'] = $self;
 
-       $get['page'] = $post['page'] = $vars['page'] = $_page;
-
+       // Add a title with edit link, before included document
        $s_page = htmlspecialchars($page);
        $r_page = rawurlencode($page);
-       $link = "<a href=\"$script?cmd=edit&amp;page=$r_page\">$s_page</a>";
-       if ($page == 'MenuBar')
-       {
-               $body = <<<EOD
-<span align="center"><h5 class="side_label">$link</h5></span>
-<small>$body</small>
-EOD;
-       }
-       else
-       {
-               $body = "<h1>$link</h1>\n$body\n";
+       $link = "<a href=\"$script?cmd=edit&page=$r_page\">$s_page</a>";
+
+       if ($page == 'MenuBar') {
+               $body = "<span align=\"center\"><h5 class=\"side_label\">$link</h5></span>" .
+                       "<small>$body</small>";
+       } else {
+               $body = "<h1>$link</h1>\n" .
+                       "$body\n";
        }
 
        return $body;