Some awkward list endings were fixed

[irc/evilnet/x3.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index ca5e2684147641e9c9bd46598449d44ccf6a8124..e4bf40f21ce421c34540956dd3ae476f7770db43 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -152,7 +152,7 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_UNREG_SUCCESS", "$b%s$b has been unregistered." },
     { "CSMSG_UNREG_NODELETE", "$b%s$b is protected from unregistration." },
     { "CSMSG_CHAN_SUSPENDED", "$b$C$b access to $b%s$b has been temporarily suspended (%s)." },
-    { "CSMSG_CONFIRM_UNREG", "To confirm this unregistration, you must use 'unregister %s'." },
+    { "CSMSG_CONFIRM_UNREG", "To confirm this unregistration, you must use 'unregister %s %s'." },
 
 /* Channel moving */
     { "CSMSG_MOVE_SUCCESS", "Channel registration has been moved to $b%s$b." },
@@ -2089,7 +2089,7 @@ static CHANSERV_FUNC(cmd_unregister)
         confirm_string = make_confirmation_string(uData);
        if((argc < 2) || strcmp(argv[1], confirm_string))
        {
-           reply("CSMSG_CONFIRM_UNREG", confirm_string);
+           reply("CSMSG_CONFIRM_UNREG", channel->name, confirm_string);
            return 0;
        }
     }
@@ -3747,12 +3747,13 @@ def_list(struct listData *list)
         send_message(list->user, list->bot, "CSMSG_ACCESS_SEARCH_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest), list->search);
     else
         send_message(list->user, list->bot, "CSMSG_ACCESS_ALL_HEADER", list->channel->name, user_level_name_from_level(list->lowest), user_level_name_from_level(list->highest));
-    table_send(list->bot, list->user->nick, 0, NULL, list->table);
     if(list->table.length == 1)
     {
         msg = user_find_message(list->user, "MSG_NONE");
         send_message_type(4, list->user, list->bot, "  %s", msg);
     }
+    else
+        table_send(list->bot, list->user->nick, 0, NULL, list->table);
 }
 
 static int
@@ -3785,7 +3786,7 @@ cmd_list_users(struct userNode *user, struct chanNode *channel, unsigned int arg
     lData.search = (argc > 1) ? argv[1] : NULL;
     send_list = def_list;
     /* What does the following line do exactly?? */
-    (void)zoot_list; /* since it doesn't show user levels */
+    /*(void)zoot_list; ** since it doesn't show user levels */
 
     /* this does nothing!! -rubin
     if(user->handle_info)