get default value if channel_getop or channel_getvoice is NULL

[NeonServV5.git] / UserNode.c

diff --git a/UserNode.c b/UserNode.c
index 06069403b638194c8f6495245c40db7bb157dcf6..5b6c9c11259c79019d5e7d7a562f656be786ab33 100644 (file)
--- a/UserNode.c
+++ b/UserNode.c
@@ -1,7 +1,5 @@
 #include "UserNode.h"
 #include "ChanUser.h"
-#include "mysqlConn.h"
-#include "lang.h"
 
 static struct UserNode **userList;
 
@@ -197,7 +195,23 @@ struct UserNode* createTempUser(const char *mask) {
             strcpy(user->ident, &cmask[ii]);
             ii = i+1;
         } else if(cmask[i] == '\0') {
-            if(user == NULL) return NULL;
+            if(user == NULL) {
+                //nick only
+                user = malloc(sizeof(*user));
+                if (!user)
+                {
+                    perror("malloc() failed");
+                    return NULL;
+                }
+                strcpy(user->nick, cmask);
+                user->created = time(0);
+                user->ident[0] = 0;
+                user->host[0] = 0;
+                user->realname[0] = 0;
+                user->flags = 0;
+                user->channel = NULL;
+                return user;
+            }
             strcpy(user->host, &cmask[ii]);
         }
     }
@@ -262,29 +276,3 @@ void clearTempUsers() {
             last_user = cuser;
     }
 }
-
-
-void load_user_settings(struct UserNode *user) {
-    if(!(user->flags & USERFLAG_ISAUTHED) || (user->flags & USERFLAG_LOADED_SETTINGS))
-        return;
-    check_mysql();
-    MYSQL_RES *res;
-    MYSQL_ROW row;
-    printf_mysql_query("SELECT `user_lang`, `user_reply_privmsg`, `user_god` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        user->language = get_language_by_tag(row[0]);
-        if(user->language == NULL) user->language = get_default_language();
-        if(strcmp(row[1], "0"))
-            user->flags |= USERFLAG_REPLY_PRIVMSG;
-        if(strcmp(row[2], "0"))
-            user->flags |= USERFLAG_GOD_MODE;
-    } else
-        user->language = get_default_language();
-    user->flags |= USERFLAG_LOADED_SETTINGS;
-}
-
-int isGodMode(struct UserNode *user) {
-    load_user_settings();
-    return (user->flags & USERFLAG_GOD_MODE);
-}