Corrected 1.54

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

diff --git a/plugin/include.inc.php b/plugin/include.inc.php
index cd5ce46..a9ce41b 100644 (file)
--- a/plugin/include.inc.php
+++ b/plugin/include.inc.php
@@ -1,41 +1,66 @@
 <?php
-/*
- include.inc.php
- ¥Ú¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
-*/
+/////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: include.inc.php,v 1.15 2004/08/10 11:38:21 henoheno Exp $
+//
 
+define('INCLUDE_MAX', 4); // °ìÅ٤˥¤¥ó¥¯¥ë¡¼¥É¤Ç¤­¤ë¥Ú¡¼¥¸¤ÎºÇÂç¿ô
+
+// ¥Ú¡¼¥¸¤ò(²Äǽ¤Ê¤é¤ÐºÆµ¢Åª¤Ë)¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
 function plugin_include_convert()
 {
-       global $script,$vars,$get,$post,$hr,$WikiName,$BracketName;
-       global $include_list; //½èÍýºÑ¥Ú¡¼¥¸Ì¾¤ÎÇÛÎó
-       
-       if (!isset($include_list)) { $include_list = array($vars['page']=>TRUE); }
-       
-       if (func_num_args() == 0) { return; }
-       
+       global $script, $vars, $get, $post, $menubar, $_msg_include_restrict;
+       static $included = array();
+       static $count = 1;
+
+       if (func_num_args() == 0) return '#include(): No argument<br />';
+
+       // Get an argument
        list($page) = func_get_args();
-       
-       if (!preg_match("/^($WikiName|\[\[$BracketName\]\])$/",$page))
-               $page = "[[$page]]";
-
-       if (!is_page($page) or isset($include_list[$page])) { return ''; }
-       $include_list[$page] = TRUE;
-       
-       $tmppage = $vars['page'];
+       $page = strip_bracket($page);
+       $s_page = htmlspecialchars($page);
+       $r_page = rawurlencode($page);
+       $link = "<a href=\"$script?$r_page\">$s_page</a>"; // Read link
+
+       // Loop yourself
+       $root = isset($vars['page']) ? $vars['page'] : '';
+       $included[$root] = TRUE;
+
+       // I'm stuffed
+       if (isset($included[$page])) {
+               return "#include(): Included already: $link<br />";
+       } if (! is_page($page)) {
+               return "#include(): No such page: $s_page<br />";
+       } if ($count > INCLUDE_MAX) {
+               return "#include(): Limit exceeded: $link<br />";
+       } else {
+               ++$count;
+       }
+
+       // One page, only one time, at a time
+       $included[$page] = TRUE;
+
+       // Include A page, that probably includes another pages
        $get['page'] = $post['page'] = $vars['page'] = $page;
-       
-       $body = convert_html(get_source($page));
-       
-       $get['page'] = $post['page'] = $vars['page'] = $tmppage;
-
-       $link = "<a href=\"$script?cmd=edit&page=".rawurlencode($page)."\">".strip_bracket($page)."</a>";
-       if ($page == 'MenuBar') {
-               $body = "<span align=\"center\"><h5 class=\"side_label\">$link</h5></span>\n<small>$body</small>\n";
+       if (check_readable($page, false, false)) {
+               $body = convert_html(get_source($page));
+       } else {
+               $body = str_replace('$1', $page, $_msg_include_restrict);
        }
-       else {
-               $body = "<h1>$link</h1>\n$body\n";
+       $get['page'] = $post['page'] = $vars['page'] = $root;
+
+       // Add a title with edit link, before included document
+       $link = "<a href=\"$script?cmd=edit&amp;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;
 }
-?>
\ No newline at end of file
+?>