*** VERSION 5.3.0 ***

[NeonServV5.git] / src / cmd_global_bots.c

diff --git a/src/cmd_global_bots.c b/src/cmd_global_bots.c
index d2916c823d9c576c64519d50a8a9107bb7da44ab..f7849010d997072b0636c206fefd2f378939cc2f 100644 (file)
--- a/src/cmd_global_bots.c
+++ b/src/cmd_global_bots.c
@@ -1,4 +1,4 @@
-/* cmd_global_bots.c - NeonServ v5.2
+/* cmd_global_bots.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -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[5];
-    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,26 +43,29 @@ CMD_BIND(global_cmd_bots) {
     int flagspos;
     char botchans[20];
     while ((row = mysql_fetch_row(res)) != NULL) {
-        sprintf(botnick, (strcmp(row[0], "0") ? "%s" : "\00315%s\003"), row[1]);
-        contents[0] = botnick;
+        content[0] = row[11];
+        sprintf(botnick, (strcmp(row[0], "0") ? "%s" : "!%s"), row[1]);
+        content[1] = botnick;
         sprintf(botserver, (strcmp(row[4], "") ? "%s:%s:*" : "%s:%s"), row[2], row[3]);
-        contents[1] = botserver;
-        contents[2] = 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';
-        contents[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]);
-        contents[4] = botchans;
-        contents[5] = row[8];
+        content[5] = botchans;
+        content[6] = row[8];
+        table_add(table, content);
     }
     char **table_lines = table_end(table);
+    int i;
     for(i = 0; i < table->entrys; i++) {
         reply(getTextBot(), user, table_lines[i]);
     }