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))
/* Send the table. */
for (jj=0, pos=0, reps=0; ii<table.length; ) {
while (1) {
+ int PAD_COL_LEFT = false;
+ if(table.flags & TABLE_PAD_LEFT || str_is_number(table.contents[ii][jj]))
+ PAD_COL_LEFT = true;
len = strlen(table.contents[ii][jj]);
spaces = max_width[jj] - len;
- if (table.flags & TABLE_PAD_LEFT)
+ //if (table.flags & TABLE_PAD_LEFT)
+ if(PAD_COL_LEFT)
while (spaces--) line[pos++] = ' ';
memcpy(line+pos, table.contents[ii][jj], len);
pos += len;
break;
}
}
- if (!(table.flags & TABLE_PAD_LEFT))
+ //if (!(table.flags & TABLE_PAD_LEFT))
+ if(!PAD_COL_LEFT)
while (spaces--)
line[pos++] = ' ';
line[pos++] = ' ';
unsigned int size, ipos, pos, length, chars_sent, use_color;
unsigned int expand_pos, expand_ipos, newline_ipos;
char line[MAX_LINE_SIZE];
+ struct service *service;
+ static char* trigger = NULL;
if (IsChannelName(dest) || *dest == '$') {
message_dest = NULL;
size = DEFAULT_LINE_SIZE;
switch (msg_type & 3) {
case 0:
- irc_send = irc_notice;
+ if(message_dest && message_dest->no_notice)
+ irc_send = irc_privmsg;
+ else
+ irc_send = irc_notice;
break;
case 2:
irc_send = irc_wallchops;
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;
case 'b':
value = use_color ? "\002" : "";
break;
+ case 'k':
+ value = use_color ? "\003" : "";
+ break;
case 'o':
value = use_color ? "\017" : "";
break;
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) { \