fixes for multi thread support

[NeonServV5.git] / src / cmd_neonserv_addtimeban.c

diff --git a/src/cmd_neonserv_addtimeban.c b/src/cmd_neonserv_addtimeban.c
index 8a8d567776d4980fedaf20f37fee3f09ea1c91e3..837812e8e856e6264316c95ddd928bc83d815395 100644 (file)
--- a/src/cmd_neonserv_addtimeban.c
+++ b/src/cmd_neonserv_addtimeban.c
@@ -1,3 +1,19 @@
+/* cmd_neonserv_addtimeban.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/>. 
+ */
 
 #include "cmd_neonserv.h"
 
@@ -20,8 +36,8 @@ struct neonserv_cmd_addtimeban_cache {
 
 CMD_BIND(neonserv_cmd_addtimeban) {
     int duration = strToTime(user, argv[1]);
-    if(duration < 30) {
-        reply(getTextBot(), user, "NS_TIMEBAN_DURATION_TOO_SHORT", 30);
+    if(duration < 5) {
+        reply(getTextBot(), user, "NS_TIMEBAN_DURATION_TOO_SHORT", 5);
         return;
     }
     struct neonserv_cmd_addtimeban_cache *cache = malloc(sizeof(*cache));
@@ -103,13 +119,13 @@ static void neonserv_cmd_addtimeban_async1(struct ClientSocket *client, struct C
         return;
     //add the ban
     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(mask), (unsigned long) (time(0) + duration), userid, escape_string(reason));
-    int banid = (int) mysql_insert_id(mysql_conn);
+    int banid = (int) mysql_insert_id(get_mysql_conn());
     putsock(client, "MODE %s +b %s", chan->name, mask);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         cuser = chanuser->user;
         sprintf(usermask, "%s!%s@%s", cuser->nick, cuser->ident, cuser->host);
         if(!match(mask, usermask)) {
-            putsock(client, "KICK %s %s :%s", chan->name, cuser->nick, reason);
+            putsock(client, "KICK %s %s :(%s) %s", chan->name, cuser->nick, user->nick, reason);
         }
     }
     char nameBuf[MAXLEN];