*** VERSION 5.3.0 ***

[NeonServV5.git] / src / DBHelper.c

diff --git a/src/DBHelper.c b/src/DBHelper.c
index a55b8c677de27c7ec0f7204df4c9c624b2703172..8e48fc0f57560081b6d2601f7dc2b584b1472aa8 100644 (file)
--- a/src/DBHelper.c
+++ b/src/DBHelper.c
@@ -1,4 +1,4 @@
-/* DBHelper.c - NeonServ v5.2
+/* DBHelper.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 void _loadUserSettings(struct UserNode *user) {
     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));
+    printf_mysql_query("SELECT `user_lang`, `user_reply_privmsg`, `user_god`, `user_id` 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]);
@@ -37,6 +37,8 @@ void _loadUserSettings(struct UserNode *user) {
             user->flags |= USERFLAG_REPLY_PRIVMSG;
         if(strcmp(row[2], "0"))
             user->flags |= USERFLAG_GOD_MODE;
+        user->user_id = atoi(row[3]);
+        user->flags |= USERFLAG_HAS_USERID;
     } else
         user->language = get_default_language();
     user->flags |= USERFLAG_LOADED_SETTINGS;
@@ -54,19 +56,27 @@ int getChannelAccess(struct UserNode *user, struct ChanNode *chan) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     int caccess = 0;
-    printf_mysql_query("SELECT `user_id`, `user_access`, `user_god` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags` FROM `chanusers` WHERE `chanuser_uid` = '%s' AND `chanuser_cid` = '%d'", row[0], chan->channel_id);
+    int userid;
+    if(user->flags & USERFLAG_HAS_USERID)
+        userid = user->user_id;
+    else {
+        printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
-            int cflags = atoi(row[1]);
-            if(!(cflags & DB_CHANUSER_SUSPENDED) && atoi(row[0]) > caccess)
-                caccess = atoi(row[0]);
-        }
-        return caccess;
+            userid = atoi(row[0]);
+            user->user_id = userid;
+            user->flags |= USERFLAG_HAS_USERID;
+        } else
+            return 0;
     }
-    return 0;
+    printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags` FROM `chanusers` WHERE `chanuser_uid` = '%d' AND `chanuser_cid` = '%d'", userid, chan->channel_id);
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        int cflags = atoi(row[1]);
+        if(!(cflags & DB_CHANUSER_SUSPENDED) && atoi(row[0]) > caccess)
+            caccess = atoi(row[0]);
+    }
+    return caccess;
 }
 
 char *getChanDefault(char *channel_setting) {
@@ -91,10 +101,21 @@ int checkChannelAccess(struct UserNode *user, struct ChanNode *chan, char *chann
     if(require_access == 0) return 1;
     if(!(user->flags & USERFLAG_ISAUTHED)) return 0;
     int caccess = 0;
-    printf_mysql_query("SELECT `user_id`, `user_access`, `user_god` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags` FROM `chanusers` WHERE `chanuser_uid` = '%s' AND `chanuser_cid` = '%d'", row[0], chan->channel_id);
+    int userid;
+    if(user->flags & USERFLAG_HAS_USERID)
+        userid = user->user_id;
+    else {
+        printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL) {
+            userid = atoi(row[0]);
+            user->user_id = userid;
+            user->flags |= USERFLAG_HAS_USERID;
+        } else
+            userid = -1;
+    }
+    if(userid > -1) {
+        printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags` FROM `chanusers` WHERE `chanuser_uid` = '%d' AND `chanuser_cid` = '%d'", userid, chan->channel_id);
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
             int cflags = atoi(row[1]);
@@ -246,6 +267,8 @@ static int event_user_registered(struct UserNode *old_user, struct UserNode *new
         strcpy(newauth, new_user->host);
         *p = '.';
     }
+    if(!stricmp(oldauth, newauth))
+        return 0;
     //check if we know this user; then check the new auth
     MYSQL_RES *res;
     MYSQL_ROW row;