From a40e0df080a82db2b1150492a8952cdfe3559185 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 26 Sep 2012 16:06:47 +0200 Subject: [PATCH] fixed renameAccount function (merging mode) --- src/DBHelper.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/DBHelper.c b/src/DBHelper.c index d5d8d0b..69bdf44 100644 --- a/src/DBHelper.c +++ b/src/DBHelper.c @@ -226,8 +226,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 +241,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); -- 2.20.1