X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fcmd_global_bots.c;h=cec43b7a51fc69bf2c95d798382a3e1dc6079bde;hp=93a1d1943851b375772e35c518475b0db18a3c4e;hb=391260f64a1dfb35bf0a55e7044fe1b8d83f2561;hpb=74495e70c2a89dc7dd938c5278cb256bd3820c9e diff --git a/src/cmd_global_bots.c b/src/cmd_global_bots.c index 93a1d19..cec43b7 100644 --- a/src/cmd_global_bots.c +++ b/src/cmd_global_bots.c @@ -27,14 +27,15 @@ CMD_BIND(global_cmd_bots) { MYSQL_ROW row, row2; printf_mysql_query("SELECT `active`, `nick`, `server`, `port`, `pass`, `botclass`, `textbot`, `queue`, `defaulttrigger`, `max_channels`, `register_priority`, `id` FROM `bots`"); res = mysql_use(); - table = table_init(6, mysql_num_rows(res) + 1, 0); - char *content[6]; - content[0] = get_language_string(user, "NS_BOTS_NICK"); - content[1] = get_language_string(user, "NS_BOTS_SERVER"); - content[2] = get_language_string(user, "NS_BOTS_CLASS"); - content[3] = get_language_string(user, "NS_BOTS_FLAGS"); - content[4] = get_language_string(user, "NS_BOTS_CHANNELS"); - content[5] = get_language_string(user, "NS_BOTS_TRIGGER"); + table = table_init(7, mysql_num_rows(res) + 1, 0); + char *content[7]; + content[0] = get_language_string(user, "NS_BOTS_ID"); + content[1] = get_language_string(user, "NS_BOTS_NICK"); + content[2] = get_language_string(user, "NS_BOTS_SERVER"); + content[3] = get_language_string(user, "NS_BOTS_CLASS"); + content[4] = get_language_string(user, "NS_BOTS_FLAGS"); + content[5] = get_language_string(user, "NS_BOTS_CHANNELS"); + content[6] = get_language_string(user, "NS_BOTS_TRIGGER"); table_add(table, content); char botnick[NICKLEN + 3]; char botserver[MAXLEN]; @@ -42,24 +43,25 @@ CMD_BIND(global_cmd_bots) { int flagspos; char botchans[20]; while ((row = mysql_fetch_row(res)) != NULL) { + content[0] = row[11]; sprintf(botnick, (strcmp(row[0], "0") ? "%s" : "!%s"), row[1]); - content[0] = botnick; + content[1] = botnick; sprintf(botserver, (strcmp(row[4], "") ? "%s:%s:*" : "%s:%s"), row[2], row[3]); - content[1] = botserver; - content[2] = (char *) resolve_botid(atoi(row[5])); + content[2] = botserver; + content[3] = (char *) resolve_botid(atoi(row[5])); flagspos = 0; if(!strcmp(row[6], "1")) botflags[flagspos++] = 't'; if(!strcmp(row[7], "1")) botflags[flagspos++] = 'q'; botflags[flagspos] = '\0'; - content[3] = botflags; + content[4] = botflags; printf_mysql_query("SELECT COUNT(*) FROM `bot_channels` WHERE `botid` = '%s'", row[11]); res2 = mysql_use(); row2 = mysql_fetch_row(res2); sprintf(botchans, "%s/%s", row2[0], row[9]); - content[4] = botchans; - content[5] = row[8]; + content[5] = botchans; + content[6] = row[8]; table_add(table, content); } char **table_lines = table_end(table);