fixed ban timeout check

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index ccfc67af8fb9f1ffbd9821e898c6250a8f32e59e..04ec1446510e8b287817e45c74702557bd257d2b 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -197,7 +197,7 @@ static IRC_CMD(raw_kick) {
     }
     if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
         //remove the user
-        delUser(user, 1);
+        delUser(target, 1);
     }
     return 1;
 }
@@ -390,3 +390,18 @@ void reply(struct ClientSocket *client, struct UserNode *user, const char *text,
     write_socket(client, sendBuf, pos+1);
 }
 
+char* merge_argv(char **argv, int start, int end) {
+    return merge_argv_char(argv, start, end, ' ');
+}
+
+char* merge_argv_char(char **argv, int start, int end, char seperator) {
+    int i;
+    char *p = NULL;
+    for(i = start; i < end; i++) {
+        p = argv[i];
+        while(*p) p++;
+        *p = seperator;
+    }
+    if(p) *p = '\0';
+    return argv[start];
+}