fixed last commit

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index c52659ed21f3c795511d429d3e221a19449193a9..04ec1446510e8b287817e45c74702557bd257d2b 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -7,6 +7,7 @@
 #include "ClientSocket.h"
 #include "WHOHandler.h"
 #include "lang.h"
+#include "DBHelper.h"
 
 struct irc_cmd *irc_commands = NULL;
 
@@ -45,6 +46,7 @@ static void parse_line(struct ClientSocket *client, char *line) {
         if (*line == ':') {
            //the rest is a single parameter
            argv[argc++] = line + 1;
+           break;
         }
         argv[argc++] = line;
         if (argc >= MAXNUMPARAMS)
@@ -195,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;
 }
@@ -368,11 +370,10 @@ void free_parser() {
 }
 
 void reply(struct ClientSocket *client, struct UserNode *user, const char *text, ...) {
-    char *reply_format = get_language_string(user, text);
+    const char *reply_format = get_language_string(user, text);
     if(reply_format == NULL)
         reply_format = text;
-    if((user->flags & USERFLAG_ISAUTHED) && !(user->flags & USERFLAG_LOADED_SETTINGS))
-        load_user_settings(user);
+    loadUserSettings(user);
     char formatBuf[MAXLEN];
     sprintf(formatBuf, "%s %s :%s", ((user->flags & USERFLAG_REPLY_PRIVMSG) ? "PRIVMSG" : "NOTICE"), user->nick, reply_format);
     va_list arg_list;
@@ -380,7 +381,7 @@ void reply(struct ClientSocket *client, struct UserNode *user, const char *text,
     int pos;
     if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
     sendBuf[0] = '\0';
-    va_start(arg_list, formatBuf);
+    va_start(arg_list, text);
     pos = vsnprintf(sendBuf, MAXLEN - 2, formatBuf, arg_list);
     va_end(arg_list);
     if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
@@ -389,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];
+}