X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FDBHelper.c;h=6e2f84385c99a44abcd9b7f5c32b754ea66832ee;hp=787b336845451821833f9303eba792ae1b87ac18;hb=f6bdc9d0fc8db22c265918f3325e11177fd001b9;hpb=9f5af1bc8ff4e8fc9c28433c76a890a990dd0ae5

diff --git a/src/DBHelper.c b/src/DBHelper.c
index 787b336..6e2f843 100644
--- a/src/DBHelper.c
+++ b/src/DBHelper.c
@@ -1,4 +1,4 @@
-/* DBHelper.c - NeonServ v5.4
+/* DBHelper.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include "ClientSocket.h"
 #include "bots.h"
 #include "ConfigParser.h"
+#include "log.h"
 
 void _loadUserSettings(struct UserNode *user) {
     SYNCHRONIZE(cache_sync);
@@ -226,8 +227,8 @@ int renameAccount(char *oldauth, char *newauth) {
                 printf_mysql_query("SELECT `chanuser_id`, `chanuser_access`, `chanuser_flags` FROM `chanusers` WHERE `chanuser_uid` = '%d'", userid);
                 res2 = mysql_use();
                 if((row2 = mysql_fetch_row(res2)) != NULL) {
-                    if(atoi(row[0]) > atoi(row2[0])) {
-                        printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '%s' WHERE `chanuser_id` = '%s'", row[0], row2[0]);
+                    if(atoi(row[1]) > atoi(row2[1])) {
+                        printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '%s' WHERE `chanuser_id` = '%s'", row[1], row2[0]);
                     }
                     printf_mysql_query("DELETE FROM `chanusers` WHERE `chanuser_id` = '%s'", row[0]);
                 } else
@@ -241,11 +242,10 @@ int renameAccount(char *oldauth, char *newauth) {
             printf_mysql_query("UPDATE `owner_history` SET `owner_history_from_uid` = '%d' WHERE `owner_history_from_uid` = '%d'", userid, newuid);
             printf_mysql_query("UPDATE `owner_history` SET `owner_history_from_uid` = '%d' WHERE `owner_history_from_uid` = '%d'", userid, newuid);
             printf_mysql_query("UPDATE `noinvite` SET `uid` = '%d' WHERE `uid` = '%d'", userid, newuid);
-            printf_mysql_query("DELETE FROM `users` WHERE `chanuser_id` = '%d'", newuid);
-        } else {
-            //simply rename the account
-            printf_mysql_query("UPDATE `users` SET `user_user` = '%s' WHERE `user_id` = '%d'", escape_string(newauth), userid);
+            printf_mysql_query("DELETE FROM `users` WHERE `user_id` = '%d'", newuid);
         }
+        //simply rename the account
+        printf_mysql_query("UPDATE `users` SET `user_user` = '%s' WHERE `user_id` = '%d'", escape_string(newauth), userid);
         char *alertchan = get_string_field("General.CheckAuths.alertchan");
         if(alertchan) {
             struct ChanNode *alertchan_chan = getChanByName(alertchan);
@@ -262,28 +262,35 @@ int renameAccount(char *oldauth, char *newauth) {
 static AUTHLOOKUP_CALLBACK(event_user_registered_auth_lookup);
 
 struct event_user_registered_cache {
-    struct UserNode *new_user;
+    struct UserNode *user;
     char *oldauth;
 };
 
-static int event_user_registered(struct UserNode *old_user, struct UserNode *new_user) {
+static void event_user_registered(struct UserNode *user, char *new_mask) {
     //check if there is a fakehost on both sides...
-    if(!isFakeHost(old_user->host) || !isFakeHost(new_user->host)) return 0;
+    //extract host from new_mask
+    char *new_host = strchr(new_mask, '@');
+    if(new_host)
+        new_host++;
+    else
+        return;
+    if(!isFakeHost(user->host) || !isFakeHost(new_host)) 
+        return;
     //extract user names
     char oldauth[AUTHLEN], newauth[AUTHLEN];
     char *p;
-    if((p = strstr(old_user->host, "."))) {
+    if((p = strstr(user->host, "."))) {
         *p = '\0';
-        strcpy(oldauth, old_user->host);
+        strcpy(oldauth, user->host);
         *p = '.';
     }
-    if((p = strstr(new_user->host, "."))) {
+    if((p = strstr(new_host, "."))) {
         *p = '\0';
-        strcpy(newauth, new_user->host);
+        strcpy(newauth, new_host);
         *p = '.';
     }
     if(!stricmp(oldauth, newauth))
-        return 0;
+        return;
     //check if we know this user; then check the new auth
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -292,22 +299,22 @@ static int event_user_registered(struct UserNode *old_user, struct UserNode *new
     if ((row = mysql_fetch_row(res)) != NULL) {
         struct event_user_registered_cache *cache = malloc(sizeof(*cache));
         if (!cache) {
-            perror("malloc() failed");
-            return 1;
+            printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
+            return;
         }
-        cache->new_user = new_user;
+        cache->user = user;
         cache->oldauth = strdup(oldauth);
         lookup_authname(newauth, 0, event_user_registered_auth_lookup, cache);
     }
-    return 1;
+    return;
 }
 
 static AUTHLOOKUP_CALLBACK(event_user_registered_auth_lookup) {
     struct event_user_registered_cache *cache = data;
     if(exists) {
         renameAccount(cache->oldauth, auth);
-        strcpy(cache->new_user->auth, auth);
-        cache->new_user->flags |= USERFLAG_ISAUTHED;
+        strcpy(cache->user->auth, auth);
+        cache->user->flags |= USERFLAG_ISAUTHED;
     }
     free(cache->oldauth);
     free(cache);