X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=6bedff9c381b44618d097876e32c3ac4ed36bbdf;hb=003f6906aeb911cce26ee25b48a818d0d1c4aea5;hp=6bd0dd06f7b71e051b44080c804b76a255534e6c;hpb=9b9c9415add69209fbdc77bdc3d7ccd0570ef3f6;p=NeonServV5.git

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 6bd0dd0..6bedff9 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -36,6 +36,7 @@
 #include "cmd_neonserv.h"
 
 #define BOTID 1
+#define BOTALIAS "NeonServ"
 
 static const struct default_language_entry msgtab[] = {
     {"NS_USER_UNKNOWN", "User with nick $b%s$b does not exist."}, /* {ARGS: "TestUser"} */
@@ -89,8 +90,10 @@ static const struct default_language_entry msgtab[] = {
     {"NS_SUSPEND_NOT", "$b%s$b is not suspended." }, /* {ARGS: "TestUser"} */
     {"NS_SUSPEND_DONE", "$b%s$b's access to $b%s$b has been suspended." }, /* {ARGS: "TestUser", "#TestChan"} */
     {"NS_SUSPEND_RESTORED", "$b%s$b's access to $b%s$b has been restored." }, /* {ARGS: "TestUser", "#TestChan"} */
+    {"NS_DELME_OWNER", "You cannot delete your owner access in $b%s$b."}, /* {ARGS: "#TestChan"} */
     {"NS_DELME_KEY", "To really remove yourself, you must use 'deleteme %s'."}, /* {ARGS: "abc123"} */
     {"NS_DELME_DONE", "Your $b%d$b access has been deleted from $b%s$b."}, /* {ARGS: 123, "#TestChan"} */
+    {"NS_MYACCESS_SELF_ONLY", "You may only see the list of infolines for yourself (by using $bmyaccess$b with no arguments)."},
     {"NS_MYACCESS_HEADER", "Showing all channel entries for account $b%s$b:"}, /* {ARGS: "TestAuth"} */
     {"NS_MYACCESS_HEADER_MATCH", "Showing all channel entries for account $b%s$b matching %s:"}, /* {ARGS: "TestAuth", "#Test*"} */
     {"NS_MYACCESS_HEADER_NAME", "Name"},
@@ -313,10 +316,11 @@ static const struct default_language_entry msgtab[] = {
     {"NS_RENAME_DONE", "Renamed $b%s$b to $b%s$b."}, /* {ARGS: "TestUser", "TestUser2"} */
     {"NS_RENAME_FAIL", "Failed renaming $b%s$b."}, /* {ARGS: "TestUser"} */
     {"NS_FUN_DISABLED", "Fun commands are disabled in %s."}, /* {ARGS: "#TestChan"} */
-    {"NS_UNBIND_REQUIRED", "%1$s is a required function and there is no other command bound to %1$s. Bind anothjer command to %1$s first."}, /* {ARGS: bind} */
+    {"NS_UNBIND_REQUIRED", "%1$s is a required function and there is no other command bound to %1$s. Bind another command to %1$s first."}, /* {ARGS: "bind"} */
     {"NS_COMMANDS_NAME", "Name"},
     {"NS_COMMANDS_ACCESS", "Access"},
     {"NS_COMMANDS_GACCESS", "GodAccess"},
+    {"NS_COMMANDS_TRIGGERED", "Triggered"},
     {"NS_COMMANDS_FUNCTION", "Function"},
     {"NS_DNR_SET", "$b%s$b is do-not-register (by $b%s$b): %s" }, /* {ARGS: "#TestChan", "TestUser", "because of it is like it is"} */
     {"NS_DNR_SET_EXPIRES", "$b%s$b is do-not-register (by $b%s$b; expires %s): %s" }, /* {ARGS: "#TestChan", "TestUser", "1 day", "because of it is like it is"} */
@@ -330,6 +334,12 @@ static const struct default_language_entry msgtab[] = {
     {"NS_DNR_EXPIRES", "Expires"},
     {"NS_DNR_REASON", "Reason"},
     {"NS_STAFF_LOGGEDIN", "Logged in as"},
+    {"NS_BOTS_NICK", "Nick"},
+    {"NS_BOTS_SERVER", "Server:Port(:Pass)"},
+    {"NS_BOTS_CLASS", "Bot Class"},
+    {"NS_BOTS_FLAGS", "Flags"},
+    {"NS_BOTS_CHANNELS", "Channels"},
+    {"NS_BOTS_TRIGGER", "Trigger"},
     {NULL, NULL}
 };
 
@@ -395,22 +405,18 @@ static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
 }
 
 static void start_bots() {
-    struct UserNode *user;
     struct ClientSocket *client;
     MYSQL_RES *res, *res2;
     MYSQL_ROW row;
     
-    printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+    printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
     res = mysql_use();
     
     while ((row = mysql_fetch_row(res)) != NULL) {
-        user = addUser(row[0]);
-        strcpy(user->ident, row[1]);
-        strcpy(user->realname, row[2]);
-        user->flags |= USERFLAG_ISBOT;
-        client = create_socket(row[3], atoi(row[4]), row[5], user);
+        client = create_socket(row[3], atoi(row[4]), row[5], row[0], row[1], row[2]);
         client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
         client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
+        client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0);
         client->botid = BOTID;
         client->clientid = atoi(row[7]);
         connect_socket(client);
@@ -436,6 +442,7 @@ static void start_bots() {
 
 void init_NeonServ() {
     
+    set_bot_alias(BOTID, BOTALIAS);
     start_bots();
     
     //register events
@@ -465,3 +472,4 @@ void free_NeonServ() {
 }
 
 #undef BOTID
+#undef BOTALIAS