BugTrack2/361 Simplify URL. Keep slash / and colon : in page name URL

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

diff --git a/plugin/include.inc.php b/plugin/include.inc.php
index 14475be..b8b08f2 100644 (file)
--- a/plugin/include.inc.php
+++ b/plugin/include.inc.php
@@ -1,53 +1,121 @@
 <?php
-/////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: include.inc.php,v 1.23 2011/01/25 15:01:01 henoheno Exp $
 //
-// $Id: include.inc.php,v 1.11 2004/08/06 14:14:36 henoheno Exp $
-//
+// Include-once plugin
+
+//--------
+//     | PageA
+//     |
+//     | // #include(PageB)
+//     ---------
+//             | PageB
+//             |
+//             | // #include(PageC)
+//             ---------
+//                     | PageC
+//                     |
+//             --------- // PageC end
+//             |
+//             | // #include(PageD)
+//             ---------
+//                     | PageD
+//                     |
+//             --------- // PageD end
+//             |
+//     --------- // PageB end
+//     |
+//     | #include(): Included already: PageC
+//     |
+//     | // #include(PageE)
+//     ---------
+//             | PageE
+//             |
+//     --------- // PageE end
+//     |
+//     | #include(): Limit exceeded: PageF
+//     | // When PLUGIN_INCLUDE_MAX == 4
+//     |
+//     |
+//-------- // PageA end
+
+// ----
+
+// Default value of 'title|notitle' option
+define('PLUGIN_INCLUDE_WITH_TITLE', TRUE);     // Default: TRUE(title)
+
+// Max pages allowed to be included at a time
+define('PLUGIN_INCLUDE_MAX', 4);
+
+// ----
+define('PLUGIN_INCLUDE_USAGE', '#include(): Usage: (a-page-name-you-want-to-include[,title|,notitle])');
 
-// ¥Ú¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë
 function plugin_include_convert()
 {
        global $script, $vars, $get, $post, $menubar, $_msg_include_restrict;
        static $included = array();
+       static $count = 1;
 
-       // Get an argument
-       if (func_num_args() == 0) return;
-       list($page) = func_get_args();
-       $page = strip_bracket($page);
+       if (func_num_args() == 0) return PLUGIN_INCLUDE_USAGE . '<br />' . "\n";;
+
+       // $menubar will already be shown via menu plugin
+       if (! isset($included[$menubar])) $included[$menubar] = TRUE;
 
        // Loop yourself
-       $self = isset($vars['page']) ? $vars['page'] : '';
-       $included[$self] = TRUE;
+       $root = isset($vars['page']) ? $vars['page'] : '';
+       $included[$root] = TRUE;
+
+       // Get arguments
+       $args = func_get_args();
+       // strip_bracket() is not necessary but compatible
+       $page = isset($args[0]) ? get_fullname(strip_bracket(array_shift($args)), $root) : '';
+       $with_title = PLUGIN_INCLUDE_WITH_TITLE;
+       if (isset($args[0])) {
+               switch(strtolower(array_shift($args))) {
+               case 'title'  : $with_title = TRUE;  break;
+               case 'notitle': $with_title = FALSE; break;
+               }
+       }
+
+       $s_page = htmlsc($page);
+       $r_page = pagename_urlencode($page);
+       $link = '<a href="' . $script . '?' . $r_page . '">' . $s_page . '</a>'; // Read link
 
        // I'm stuffed
-       if (isset($included[$page]) || ! is_page($page)) return '';
+       if (isset($included[$page])) {
+               return '#include(): Included already: ' . $link . '<br />' . "\n";
+       } if (! is_page($page)) {
+               return '#include(): No such page: ' . $s_page . '<br />' . "\n";
+       } if ($count > PLUGIN_INCLUDE_MAX) {
+               return '#include(): Limit exceeded: ' . $link . '<br />' . "\n";
+       } else {
+               ++$count;
+       }
 
        // One page, only one time, at a time
        $included[$page] = TRUE;
 
-       // Include a $page, that probably includes more pages
+       // Include A page, that probably includes another 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);
        }
-       $get['page'] = $post['page'] = $vars['page'] = $self;
+       $get['page'] = $post['page'] = $vars['page'] = $root;
 
-       // Add a title with edit link, before included document
-       $s_page = htmlspecialchars($page);
-       $r_page = rawurlencode($page);
-       $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";
+       // Put a title-with-edit-link, before including document
+       if ($with_title) {
+               $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;
 }
-?>
+