X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_neonserv_giveowner.c;h=bc789c7d44b8815fd83f6777b9800fbf913d999d;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=8f173ac326511f74440d9826d8b5270b5bb860f0;hpb=0f1dc61921eef1db8e404a5a82372e2d1cd55daa;p=NeonServV5.git

diff --git a/src/cmd_neonserv_giveowner.c b/src/cmd_neonserv_giveowner.c
index 8f173ac..bc789c7 100644
--- a/src/cmd_neonserv_giveowner.c
+++ b/src/cmd_neonserv_giveowner.c
@@ -1,3 +1,19 @@
+/* cmd_neonserv_giveowner.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 #include "cmd_neonserv.h"
 
@@ -87,6 +103,22 @@ static void neonserv_cmd_giveowner_async1(struct ClientSocket *client, struct Cl
     }
     MYSQL_RES *res;
     MYSQL_ROW row;
+    printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(auth));
+    res = mysql_use();
+    if((row = mysql_fetch_row(res)) != NULL) {
+        int expire_time = atoi(row[1]);
+        if(expire_time) {
+            if(expire_time - time(0) <= 0) {
+                printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
+            } else {
+                reply(getTextBot(), user, "NS_DNR_SET_ANONYM", auth);
+                return;
+            }
+        } else {
+            reply(getTextBot(), user, "NS_DNR_SET_ANONYM", auth);
+            return;
+        }
+    }
     int userid;
     printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth));
     res = mysql_use();
@@ -108,7 +140,7 @@ static void neonserv_cmd_giveowner_async1(struct ClientSocket *client, struct Cl
                 //give ownership
                 printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '500' WHERE `chanuser_id` = '%s'", row[1]);
                 printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '499' WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = (SELECT `user_id` FROM `users` WHERE `user_user` = '%s')", chan->channel_id, escape_string(user->auth));
-                printf_mysql_query("INSERT INTO `owner_history` (`owner_history_cid`, `owner_history_uid`, `owner_history_time`) VALUE ('%d', '%d', UNIX_TIMESTAMP())", chan->channel_id, userid);
+                printf_mysql_query("INSERT INTO `owner_history` (`owner_history_cid`, `owner_history_from_uid`, `owner_history_to_uid`, `owner_history_time`) VALUE ('%d', (SELECT `user_id` FROM `users` WHERE `user_user` = '%s'), '%d', UNIX_TIMESTAMP())", chan->channel_id, escape_string(user->auth), userid);
                 reply(textclient, user, "NS_GIVEOWNER_DONE", chan->name, auth);
                 logEvent(event);
             } else {