BugTrack/595: Cleanup. Added error messages. while(count($array)) => while(! empty...

diff --git a/plugin/menu.inc.php b/plugin/menu.inc.php
index 4208bf5..0a92602 100644 (file)
--- a/plugin/menu.inc.php
+++ b/plugin/menu.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: menu.inc.php,v 1.7 2004/11/19 14:54:43 henoheno Exp $
+// $Id: menu.inc.php,v 1.8 2004/11/27 12:23:02 henoheno Exp $
 //
 
 // ¥µ¥Ö¥á¥Ë¥å¡¼¤ò»ÈÍѤ¹¤ë
@@ -16,35 +16,45 @@ function plugin_menu_convert()
        global $vars, $menubar;
        static $menu = NULL;
 
-       if (func_num_args()) {
+       $num = func_num_args();
+       if ($num > 0) {
+               // Try to change default 'MenuBar' page name (only)
+               if ($num > 1)       return '#menu(): Zero or One argument needed';
+               if ($menu !== NULL) return '#menu(): Already set: ' . htmlspecialchars($menu);
                $args = func_get_args();
-               if (is_page($args[0])) $menu = $args[0];
-               return '';
-       }
-
-       $page = ($menu === NULL) ? $menubar : $menu;
+               if (! is_page($args[0])) {
+                       return '#menu(): No such page: ' . htmlspecialchars($args[0]);
+               } else {
+                       $menu = $args[0]; // Set
+                       return '';
+               }
 
-       if (MENU_ENABLE_SUBMENU) {
-               $path = explode('/', strip_bracket($vars['page']));
-               while(count($path)) {
-                       $_page = join('/', $path) . '/' . MENU_SUBMENUBAR;
-                       if (is_page($_page)) {
-                               $page = $_page;
-                               break;
+       } else {
+               // Output menubar page data
+               $page = ($menu === NULL) ? $menubar : $menu;
+
+               if (MENU_ENABLE_SUBMENU) {
+                       $path = explode('/', strip_bracket($vars['page']));
+                       while(! empty($path)) {
+                               $_page = join('/', $path) . '/' . MENU_SUBMENUBAR;
+                               if (is_page($_page)) {
+                                       $page = $_page;
+                                       break;
+                               }
+                               array_pop($path);
                        }
-                       array_pop($path);
                }
-       }
 
-       if (! is_page($page)) {
-               return '';
-       } else if ($vars['page'] == $page) {
-               return '<!-- #menu(): You already view ' . htmlspecialchars($page) . ' -->';
-       } else {
-               // Cut fixed anchors
-               $menutext = preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/m', '$1$2', get_source($page));
+               if (! is_page($page)) {
+                       return '';
+               } else if ($vars['page'] == $page) {
+                       return '<!-- #menu(): You already view ' . htmlspecialchars($page) . ' -->';
+               } else {
+                       // Cut fixed anchors
+                       $menutext = preg_replace('/^(\*{1,3}.*)\[#[A-Za-z][\w-]+\](.*)$/m', '$1$2', get_source($page));
 
-               return preg_replace('/<ul[^>]*>/', '<ul>', convert_html($menutext));  
+                       return preg_replace('/<ul[^>]*>/', '<ul>', convert_html($menutext));  
+               }
        }
 }
 ?>