X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/567a5f269b302b62f983dc73e005711f1ae82d10..0f3e9cfc4b5d0f13085c975e10c0e6c4c8e5fbc3:/src/helpfile.c

diff --git a/src/helpfile.c b/src/helpfile.c
index a5d5bdd..c97eb13 100644
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -345,14 +345,14 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
         for (pos=ii=0; ii<((table.flags & TABLE_REPEAT_HEADERS)?nreps:1); ii++) {
             for (jj=0; 1; ) {
                 len = strlen(table.contents[0][jj]);
-                line[pos++] = '\02'; /* bold header */
+                //line[pos++] = '\02'; /* bold header */
                 spaces = max_width[jj] - len;
                 if (table.flags & TABLE_PAD_LEFT)
                     while (spaces--)
                         line[pos++] = ' ';
                 memcpy(line+pos, table.contents[0][jj], len);
                 pos += len;
-                line[pos++] = '\02'; /* end bold header */
+                //line[pos++] = '\02'; /* end bold header */
                 if (++jj == table.width)
                     break;
                 if (!(table.flags & TABLE_PAD_LEFT))
@@ -362,12 +362,15 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
             }
         }
         line[pos] = 0;
-        irc_send(from, to, line);
         sepsize = strlen_vis(line);
         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 */
+        if(hi && hi->userlist_style != HI_STYLE_CLEAN)
+            irc_send(from, to, sepstr); /* ----------------- */
         ii = 1;
     }
     /* Send the table. */
@@ -402,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);
     }
 
@@ -744,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;
@@ -753,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
@@ -800,9 +810,9 @@ send_help_brief(struct userNode *dest, struct userNode *src, struct helpfile *hf
     }
     rec = dict_find(hf->db, "<missing>", NULL);
     if (!rec)
-        return send_message(dest, src, "MSG_TOPIC_UNKNOWN");
+        return 0; /* send_message(dest, src, "MSG_TOPIC_UNKNOWN"); */
     if (rec->type != RECDB_QSTRING)
-	return send_message(dest, src, "HFMSG_HELP_NOT_STRING");
+	return 0; /* send_message(dest, src, "HFMSG_HELP_NOT_STRING"); */
     return _send_help(dest, src, hf->expand, rec->d.qstring);
 }