X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fevent_neonserv_ctcp.c;h=11d03e25ae99285247b454daf3c8b14b45b93d8f;hb=f90d21daf31f8d69e24406678be696afa8cae962;hp=9b7f700088c6c5e126428702749b5e894d488177;hpb=c96115940f1fea1c79284b7892aefc9b33ac7525;p=NeonServV5.git

diff --git a/src/event_neonserv_ctcp.c b/src/event_neonserv_ctcp.c
index 9b7f700..11d03e2 100644
--- a/src/event_neonserv_ctcp.c
+++ b/src/event_neonserv_ctcp.c
@@ -1,5 +1,5 @@
-/* event_neonserv_ctcp.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* event_neonserv_ctcp.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ struct neonserv_event_ctcp_cache {
 
 static USERAUTH_CALLBACK(neonserv_event_ctcp_nick_lookup);
 static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, char *command, char *text);
-static int neonserv_ctcp(char *buffer, char *command, char *text);
 
 static void neonserv_event_chanctcp(struct UserNode *user, struct ChanNode *chan, char *command, char *text) {
     if(!stricmp(command, "ACTION")) return; //always allow CTCP ACTION (/me)
@@ -94,7 +93,7 @@ static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserN
                     duration = 3600;
                 banmask = generate_banmask(user, banmaskBuf);
                 printf_mysql_query("INSERT INTO `bans` (`ban_channel`, `ban_mask`, `ban_triggered`, `ban_timeout`, `ban_owner`, `ban_reason`) VALUES ('%d', '%s', UNIX_TIMESTAMP(), '%lu', '%d', '%s')", chan->channel_id, escape_string(banmask), (unsigned long) (time(0) + duration), 0, escape_string(reason));
-                int banid = (int) mysql_insert_id(mysql_conn);
+                int banid = (int) mysql_insert_id(get_mysql_conn());
                 char nameBuf[MAXLEN];
                 char banidBuf[20];
                 sprintf(nameBuf, "ban_%d", banid);
@@ -111,40 +110,3 @@ static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserN
     }
 }
 
-static void neonserv_event_privctcp(struct UserNode *user, struct UserNode *target, char *command, char *text) {
-    char ctcpBuf[MAXLEN];
-    if(neonserv_ctcp(ctcpBuf, command, text)) {
-        struct ClientSocket *bot;
-        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
-            if(bot->user == target) break;
-        }
-        if(bot)
-            putsock(bot, "NOTICE %s :\001%s\001", user->nick, ctcpBuf);
-    }
-}
-
-static int neonserv_ctcp(char *buffer, char *command, char *text) {
-    if(!stricmp(command, "VERSION")) {
-        sprintf(buffer, "VERSION NeonServ v" NEONSERV_VERSION " by pk910 (%s)", (strcmp(revision, "") ? revision : "-"));
-        return 1;
-    }
-    if(!stricmp(command, "FINGER")) {
-        sprintf(buffer, "FINGER NeonServ v" NEONSERV_VERSION " (%s) build %s lines C code using " COMPILER " (see +netinfo)", (strcmp(revision, "") ? revision : "-"), codelines);
-        return 1;
-    }
-    if(!stricmp(command, "PING")) {
-        sprintf(buffer, "PING %s", (text ? text : "0"));
-        return 1;
-    }
-    if(!stricmp(command, "TIME")) {
-        time_t rawtime;
-        struct tm *timeinfo;
-        char timeBuf[80];
-        time(&rawtime);
-        timeinfo = localtime(&rawtime);
-        strftime(timeBuf, 80, "%c", timeinfo);
-        sprintf(buffer, "TIME %s", timeBuf);
-        return 1;
-    }
-    return 0;
-}