Some awkward list endings were fixed

diff --git a/ChangeLog.X3 b/ChangeLog.X3
index c6f9c7b7564105ce5d86733865976dff5c93f45f..fb1027edae38e049104ab6561d73151f9ac0d6d9 100644 (file)
--- a/ChangeLog.X3
+++ b/ChangeLog.X3
@@ -1,6 +1,12 @@
 /***********************************************************************
  X3 ChangeLog
 
+2005-07-06  Alex Schumann  <rubin@afternet.org>
+
+       * src/chanserv.c: Fixed a couple awkward looking outputs with userlist
+
+       * src/opserv.c: Fixed an awkward output of trace count etc.
+
 2005-06-22  Alex Schumann  <rubin@afternet.org>
        * src/chanserv.help: Improved DURATION help
 

diff --git a/src/chanserv.c b/src/chanserv.c
index 8d3fd48777402f026b9a399262020ace48329073..e4bf40f21ce421c34540956dd3ae476f7770db43 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -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)

diff --git a/src/opserv.c b/src/opserv.c
index 9951f3b2ab05f0b8932f57e67c74170c6b05c596..1fb15bd5bc68a93a89f951141de0cb454ad231d6 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -203,7 +203,8 @@ static const struct message_entry msgtab[] = {
     { "OSMSG_USER_SEARCH_RESULTS", "The following users were found:" },
     { "OSMSG_USER_SEARCH_HEADER", "Nick                  User@Host   (Account)" },
     { "OSMSG_USER_SEARCH_BAR",    "-------------------------------------------" },
-    { "OSMSG_USER_SEARCH_COUNT",  "------------ Found %4u matches -----------" },
+    { "OSMSG_USER_SEARCH_COUNT",  "There were %4u matches" },
+    { "OSMSG_USER_SEARCH_COUNT_BAR",  "------------ Found %4u matches -----------" },
     { "OSMSG_CHANNEL_SEARCH_RESULTS", "The following channels were found:" },
     { "OSMSG_GLINE_SEARCH_RESULTS", "The following glines were found:" },
     { "OSMSG_LOG_SEARCH_RESULTS", "The following log entries were found:" },
@@ -3568,7 +3569,7 @@ static MODCMD_FUNC(cmd_trace)
 
     if (action == trace_print_func)
     {
-       reply("OSMSG_USER_SEARCH_RESULTS");
+        reply("OSMSG_USER_SEARCH_RESULTS");
         reply("OSMSG_USER_SEARCH_BAR");
         reply("OSMSG_USER_SEARCH_HEADER");
         reply("OSMSG_USER_SEARCH_BAR");
@@ -3590,9 +3591,14 @@ static MODCMD_FUNC(cmd_trace)
         dict_foreach(das.dict, opserv_show_hostinfo, &das);
 
     if (matches)
-       reply("OSMSG_USER_SEARCH_COUNT", matches);
+    {
+        if(action == trace_print_func)
+           reply("OSMSG_USER_SEARCH_COUNT_BAR", matches);
+        else
+            reply("OSMSG_USER_SEARCH_COUNT", matches);
+    }
     else
-       reply("MSG_NO_MATCHES");
+           reply("MSG_NO_MATCHES");
 
     if (das.discrim->channel)
         UnlockChannel(das.discrim->channel);