fixes for multi thread support

[NeonServV5.git] / src / event_neonserv_notice.c

diff --git a/src/event_neonserv_notice.c b/src/event_neonserv_notice.c
index a566a4ec9018415d48c8039f6c15c87b3cc2baf3..84fb51a25084da0394b3c8fc608b3d253f4cf213 100644 (file)
--- a/src/event_neonserv_notice.c
+++ b/src/event_neonserv_notice.c
@@ -1,3 +1,19 @@
+/* event_neonserv_notice.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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 struct neonserv_event_notice_cache {
     struct ClientSocket *client;
@@ -12,7 +28,7 @@ static void neonserv_event_notice_async1(struct ClientSocket *client, struct Use
 static void neonserv_event_channotice(struct UserNode *user, struct ChanNode *chan, char *message) {
     struct ClientSocket *client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
-    if(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)) return; 
+    if(isNetworkService(user)) return; 
     loadChannelSettings(chan);
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
     if(!(user->flags & USERFLAG_ISAUTHED)) {
@@ -72,7 +88,7 @@ static void neonserv_event_notice_async1(struct ClientSocket *client, struct Use
                     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);