X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodules%2FNeonHelp.mod%2Fbot_NeonHelp.c;h=5d4aecb641b89381d5ee32f1c166447aa67feb73;hp=9e3ba72dc3077236b7ab7ef901deee20935cdc99;hb=9826cc87d81d9adb6ca8819b46e7e83dcbb63020;hpb=30858881bbcaad3c1cdd895e2e3f7b554d5f67c5

diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c
index 9e3ba72..5d4aecb 100644
--- a/src/modules/NeonHelp.mod/bot_NeonHelp.c
+++ b/src/modules/NeonHelp.mod/bot_NeonHelp.c
@@ -1,4 +1,4 @@
-/* bot_NeonHelp.c - NeonServ v5.4
+/* bot_NeonHelp.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -122,7 +122,7 @@ static void start_bots(int type) {
     MYSQL_ROW row;
     
     if(type == MODSTATE_STARTSTOP) {
-        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind`, `secret` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
         res = mysql_use();
         
         while ((row = mysql_fetch_row(res)) != NULL) {
@@ -130,6 +130,7 @@ static void start_bots(int type) {
             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->flags |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0);
             client->flags |= SOCKET_FLAG_SILENT;
             client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
@@ -202,6 +203,16 @@ static TIMEQ_CALLBACK(neonhelp_remind_open_requests);
 static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, char *message) {
     MYSQL_RES *res;
     MYSQL_ROW row, row2;
+    char setting[128];
+    sprintf(setting, "modules.%s.need_auth", get_module_name(module_id));
+    if(get_int_field(setting) && !(user->flags & USERFLAG_ISAUTHED)) {
+        sprintf(setting, "modules.%s.need_auth_message", get_module_name(module_id));
+        char *reply_message;
+        if(!(reply_message = get_string_field(setting)))
+            reply_message = get_language_string(user, "MODCMD_AUTH_REQUIRED");
+        reply(client, user, "%s", reply_message);
+        return;
+    }
     printf_mysql_query("SELECT `helpserv_support`, `helpserv_public`, `helpserv_intern`, `helpserv_intern_announce` FROM `helpserv_settings` WHERE `helpserv_botid` = '%d'", client->clientid);
     res = mysql_use();
     if (!(row = mysql_fetch_row(res))) return;
@@ -475,7 +486,7 @@ static void neonhelp_event_kick(struct UserNode *user, struct ChanUser *target,
     }
 }
 
-static void neonhelp_event_part(struct ChanUser *target, char *reason) {
+static void neonhelp_event_part(struct ChanUser *target, int quit, char *reason) {
     struct ClientSocket *client;
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -518,33 +529,6 @@ static void neonhelp_event_part(struct ChanUser *target, char *reason) {
     }
 }
 
-static void neonhelp_event_quit(struct UserNode *target, char *reason) {
-    struct ClientSocket *client;
-    int userHasRequest;
-    for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
-        if(client->botid == BOTID) {
-            userHasRequest = 0;
-            struct NeonHelpNode *helpnode, *prev_helpnode = NULL;
-            if(client->flags & SOCKET_HAVE_HELPNODE) {
-                for(helpnode = client->botclass_helpnode; helpnode; helpnode = helpnode->next) {
-                    if(helpnode->user == target) {
-                        userHasRequest = 1;
-                        break;
-                    } else
-                        prev_helpnode = helpnode;
-                }
-            }
-            if(!userHasRequest) continue;
-            //free the user's support request
-            if(prev_helpnode)
-                prev_helpnode->next = helpnode->next;
-            else
-                client->botclass_helpnode = helpnode->next;
-            neonhelp_destroy_support_request(client, helpnode, 0);
-        }
-    }
-}
-
 static void neonhelp_event_invite(struct ClientSocket *client, struct UserNode *user, char *channel) {
 	if(client->botid != BOTID)
 		return;
@@ -587,7 +571,6 @@ void init_NeonHelp(int type) {
     bind_chanmsg(neonhelp_event_chanmsg, module_id);
     bind_part(neonhelp_event_part, module_id);
     bind_kick(neonhelp_event_kick, module_id);
-    bind_quit(neonhelp_event_quit, module_id);
 	bind_invite(neonhelp_event_invite, module_id);
     
     set_trigger_callback(BOTID, module_id, neonhelp_trigger_callback);
@@ -595,10 +578,6 @@ void init_NeonHelp(int type) {
     register_default_language_table(msgtab);
 }
 
-void loop_NeonHelp() {
-    
-}
-
 void free_NeonHelp(int type) {
     unbind_allcmd(BOTID);
     if(type == MODSTATE_STARTSTOP) {