This should fix the nickserv module complaining about not enough parameters when...

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

diff --git a/src/helpfile.c b/src/helpfile.c
index e104685dfe0154898a4eaaad6feda7497a7003e6..c97eb135f8afd023936b6b07037a8d91dd21c17a 100644 (file)
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -366,9 +366,11 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
         sepstr = malloc(sepsize + 1);
         memset(sepstr, '-', sepsize);
         sepstr[sepsize] = 0;
-        irc_send(from, to, sepstr); /* ----------------- */
+        if(hi && hi->userlist_style != HI_STYLE_CLEAN)
+            irc_send(from, to, sepstr); /* ----------------- */
         irc_send(from, to, line);   /* alpha  beta   roe */
-        irc_send(from, to, sepstr); /* ----------------- */
+        if(hi && hi->userlist_style != HI_STYLE_CLEAN)
+            irc_send(from, to, sepstr); /* ----------------- */
         ii = 1;
     }
     /* Send the table. */
@@ -403,7 +405,9 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
            sepstr[sepsize/2] = 'n';
            sepstr[sepsize/2+1]= 'd';
         }
-        irc_send(from, to, sepstr);
+
+        if(hi && hi->userlist_style != HI_STYLE_CLEAN)
+            irc_send(from, to, sepstr);
         free(sepstr);
     }
 
@@ -745,7 +749,7 @@ send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, cons
         topic = "<index>";
     if (!hf) {
         _send_help(dest, src, NULL, "HFMSG_MISSING_HELPFILE");
-        return 0;
+        return false;
     }
     for (curr = (dest->handle_info ? dest->handle_info->language : lang_C);
          curr;
@@ -754,15 +758,20 @@ send_help(struct userNode *dest, struct userNode *src, struct helpfile *hf, cons
         if (!lang_hf)
             continue;
         rec = dict_find(lang_hf->db, topic, NULL);
-        if (rec && rec->type == RECDB_QSTRING)
-            return _send_help(dest, src, hf->expand, rec->d.qstring);
+        if (rec && rec->type == RECDB_QSTRING) {
+            _send_help(dest, src, hf->expand, rec->d.qstring);
+            return true;
+        }
     }
     rec = dict_find(hf->db, "<missing>", NULL);
     if (!rec)
-        return send_message(dest, src, "MSG_TOPIC_UNKNOWN");
-    if (rec->type != RECDB_QSTRING)
-       return send_message(dest, src, "HFMSG_HELP_NOT_STRING");
-    return _send_help(dest, src, hf->expand, rec->d.qstring);
+        return false;
+    if (rec->type != RECDB_QSTRING) { 
+        send_message(dest, src, "HFMSG_HELP_NOT_STRING");
+       return false; 
+    }
+    _send_help(dest, src, hf->expand, rec->d.qstring);
+    return true;
 }
 
 int