X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63c95a478af1b51ad021abef19f630de189f0229..8ce9df050cb90b5124cdea7c53ab801599795a33:/src/helpfile.c
diff --git a/src/helpfile.c b/src/helpfile.c
index 31aa342..544e905 100644
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -276,7 +276,7 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
char line[MAX_LINE_SIZE+1];
struct handle_info *hi;
char *sepstr = NULL;
- int sepsize = 0;
+ unsigned int sepsize = 0;
if (IsChannelName(to) || *to == '$') {
message_dest = NULL;
@@ -308,10 +308,18 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
if (irc_send)
{} /* use that function */
- else if (hi)
+ else if(IsChannelName(to)) {
+ irc_send = irc_privmsg;
+ }
+ else if (message_dest->no_notice) {
+ irc_send = irc_privmsg;
+ }
+ else if (hi) {
irc_send = HANDLE_FLAGGED(hi, USE_PRIVMSG) ? irc_privmsg : irc_notice;
- else
- irc_send = IsChannelName(to) ? irc_privmsg : irc_notice;
+ }
+ else {
+ irc_send = irc_notice;
+ }
/* Limit size to how much we can show at once */
if (size > sizeof(line))
@@ -360,25 +368,34 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu
line[pos++] = ' ';
line[pos++] = ' ';
}
+ line[pos++] = ' ';
}
line[pos] = 0;
- sepsize = strlen_vis(line);
- sepstr = malloc(sepsize + 1);
- memset(sepstr, '-', sepsize);
- sepstr[sepsize] = 0;
- if(hi && hi->userlist_style != HI_STYLE_CLEAN)
+
+ /* Dont show ---- bars in 'clean' style. */
+ if(!(hi && hi->userlist_style == HI_STYLE_CLEAN)) {
+ //sepsize = strlen_vis(line);
+ sepsize = tot_width * nreps;
+ sepstr = malloc(sepsize + 1);
+ memset(sepstr, '-', sepsize);
+ sepstr[sepsize] = 0;
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, line); /* alpha beta roe */
+ if(!(hi && hi->userlist_style == HI_STYLE_CLEAN))
irc_send(from, to, sepstr); /* ----------------- */
ii = 1;
}
/* Send the table. */
for (jj=0, pos=0, reps=0; ii
5)
+ /* Send end bar */
+ if (!(table.flags & TABLE_NO_HEADERS) &&
+ !(table.flags & TABLE_NO_FOOTER) &&
+ !(hi && hi->userlist_style == HI_STYLE_CLEAN)) {
+ char endstr[MAX_LINE_SIZE+1];
+ sprintf(endstr, "End (%d rows)", table.length-1);
+
+ /* Copy above into the sepstr, centered */
+ if(sepsize > strlen(endstr)+2)
{
- sepstr[sepsize/2-1] = 'E';
- sepstr[sepsize/2] = 'n';
- sepstr[sepsize/2+1]= 'd';
+ char* eptr = endstr;
+ char* sptr = sepstr+(sepsize/2) - (strlen(endstr)+2)/2;
+ while(*eptr)
+ *sptr++ = *eptr++;
}
-
- if(hi && hi->userlist_style != HI_STYLE_CLEAN)
- irc_send(from, to, sepstr);
- free(sepstr);
+ irc_send(from, to, sepstr);
}
+ if(!(hi && hi->userlist_style == HI_STYLE_CLEAN))
+ free(sepstr);
+
if (!(table.flags & TABLE_NO_FREE)) {
/* Deallocate table memory (but not the string memory). */
for (ii=0; iino_notice)
+ irc_send = irc_privmsg;
+ else
+ irc_send = irc_notice;
break;
case 2:
irc_send = irc_wallchops;
@@ -482,7 +512,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
expand_pos = pos = 0;
chars_sent = 0;
while (input.list[ipos]) {
- char ch, *value, *free_value;
+ char ch, *value = NULL, *free_value;
while ((ch = input.list[ipos]) && (ch != '$') && (ch != '\n') && (pos < size)) {
line[pos++] = ch;
@@ -536,6 +566,9 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
case 'b':
value = use_color ? "\002" : "";
break;
+ case 'k':
+ value = use_color ? "\003" : "";
+ break;
case 'o':
value = use_color ? "\017" : "";
break;
@@ -567,9 +600,23 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle
case 's':
value = self->name;
break;
+#ifdef HAVE_HELPSERV
+ case 'i':
+ value = strdup(get_helpserv_id(dest, src));
+ break;
+#endif
case 'H':
value = handle ? handle->handle : "Account";
break;
+ case '!': /* Command Char for chanserv */
+ if(!trigger)
+ trigger = calloc(sizeof(*trigger), 2);
+ if(chanserv && (service = service_find(chanserv->nick)))
+ trigger[0] = service->trigger;
+ else
+ trigger[0] = '!';
+ value = trigger;
+ break;
#define SEND_LINE(TRUNCED) do { \
line[pos] = 0; \
if (pos > 0) { \