--- lbbs/src/menu.c	2005/03/20 17:37:14	1.10
+++ lbbs/src/menu.c	2005/03/21 13:27:00	1.12
@@ -88,7 +88,7 @@ load_menu (MENU_SET * p_menu_set, const
 		{
 		  if (buffer[0] == '#')
 		    {
-		      break;
+		      continue;
 		    }
 		  if (buffer[0] == '%')
 		    {
@@ -99,8 +99,9 @@ load_menu (MENU_SET * p_menu_set, const
 		    }
 		  if (ireg ("^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+),"
 			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-			    "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-			    buffer, 7, pmatch) == 0)
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*\"([^\"]+)\"",
+			    buffer, 8, pmatch) == 0)
 		    {
 		      p_menu_set->p_menu[i]->items[j] =
 			malloc (sizeof (MENU_ITEM));
@@ -126,25 +127,31 @@ load_menu (MENU_SET * p_menu_set, const
 			       pmatch[4].rm_eo - pmatch[4].rm_so);
 		      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
 		      p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
-		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
+		      strncpy (temp,
 			       buffer + pmatch[5].rm_so,
 			       pmatch[5].rm_eo - pmatch[5].rm_so);
-		      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo -
-							    pmatch[5].rm_so] =
-			'\0';
-		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+		      temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->level = atoi (temp);
+		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
 			       buffer + pmatch[6].rm_so,
 			       pmatch[6].rm_eo - pmatch[6].rm_so);
-		      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo -
+		      p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
 							    pmatch[6].rm_so] =
 			'\0';
+		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+			       buffer + pmatch[7].rm_so,
+			       pmatch[7].rm_eo - pmatch[7].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
+							    pmatch[7].rm_so] =
+			'\0';
 		      j++;
 		      continue;
 		    }
 		  if (ireg ("^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
 			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-			    "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-			    buffer, 7, pmatch) == 0)
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*\"([^\"]+)\"",
+			    buffer, 8, pmatch) == 0)
 		    {
 		      p_menu_set->p_menu[i]->items[j] =
 			malloc (sizeof (MENU_ITEM));
@@ -152,9 +159,9 @@ load_menu (MENU_SET * p_menu_set, const
 		      strncpy (p_menu_set->p_menu[i]->items[j]->action,
 			       buffer + pmatch[1].rm_so,
 			       pmatch[1].rm_eo - pmatch[1].rm_so);
-		      p_menu_set->p_menu[i]->items[j]->action[pmatch[0].
+		      p_menu_set->p_menu[i]->items[j]->action[pmatch[1].
 							      rm_eo -
-							      pmatch[0].
+							      pmatch[1].
 							      rm_so] = '\0';
 		      strncpy (temp, buffer + pmatch[2].rm_so,
 			       pmatch[2].rm_eo - pmatch[2].rm_so);
@@ -170,18 +177,23 @@ load_menu (MENU_SET * p_menu_set, const
 			       pmatch[4].rm_eo - pmatch[4].rm_so);
 		      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
 		      p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
-		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
+		      strncpy (temp,
 			       buffer + pmatch[5].rm_so,
 			       pmatch[5].rm_eo - pmatch[5].rm_so);
-		      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo -
-							    pmatch[5].rm_so] =
-			'\0';
-		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+		      temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->level = atoi (temp);
+		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
 			       buffer + pmatch[6].rm_so,
 			       pmatch[6].rm_eo - pmatch[6].rm_so);
-		      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo -
+		      p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
 							    pmatch[6].rm_so] =
 			'\0';
+		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+			       buffer + pmatch[7].rm_so,
+			       pmatch[7].rm_eo - pmatch[7].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
+							    pmatch[7].rm_so] =
+			'\0';
 		      j++;
 		      continue;
 		    }
@@ -288,7 +300,8 @@ display_menu (MENU * p_menu)
 
   for (i = 0; i < p_menu->item_count; i++)
     {
-      if (checkpriv (&BBS_priv, 0, p_menu->items[i]->priv) == 0)
+      if (checkpriv (&BBS_priv, 0, p_menu->items[i]->priv) == 0
+        || checklevel (&BBS_priv, p_menu->items[i]->level) == 0)
 	{
 	  p_menu->items[i]->display = 0;
 	}
@@ -320,6 +333,16 @@ display_menu (MENU * p_menu)
   return 0;
 }
 
+int
+display_current_menu (MENU_SET * p_menu_set)
+{
+  MENU *p_menu;
+
+  p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
+
+  return display_menu (p_menu);
+}
+
 const char *
 menu_control (MENU_SET * p_menu_set, int key)
 {
@@ -356,8 +379,7 @@ menu_control (MENU_SET * p_menu_set, int
       if (p_menu_set->menu_select_depth > 0)
 	{
 	  p_menu_set->menu_select_depth--;
-	  p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
-	  if (display_menu (p_menu) != 0)
+	  if (display_current_menu (p_menu_set) != 0)
 	    return menu_control (p_menu_set, KEY_LEFT);
 	  break;
 	}
@@ -365,7 +387,9 @@ menu_control (MENU_SET * p_menu_set, int
 	{
 	  display_menu_cursor (p_menu, 0);
 	  p_menu->item_cur_pos = p_menu->item_count - 1;
-	  while (!p_menu->items[p_menu->item_cur_pos]->display)
+	  while (!p_menu->items[p_menu->item_cur_pos]->display
+	    || p_menu->items[p_menu->item_cur_pos]->priv != 0
+	    || p_menu->items[p_menu->item_cur_pos]->level != 0)
 	    p_menu->item_cur_pos--;
 	  display_menu_cursor (p_menu, 1);
 	  break;