X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_neonserv_giveowner.c;h=9cf5ae750941c0439e6ac25563a089e2fcef2e23;hb=b53d0c5f88063f075a48a0426f9d5d6b3490b9fc;hp=b16a890d00f371f0fcb9fe446e123906caabd0a4;hpb=95fed4deda0319bee515e44ceec0c77061a2c04e;p=NeonServV5.git

diff --git a/src/cmd_neonserv_giveowner.c b/src/cmd_neonserv_giveowner.c
index b16a890..9cf5ae7 100644
--- a/src/cmd_neonserv_giveowner.c
+++ b/src/cmd_neonserv_giveowner.c
@@ -1,5 +1,5 @@
-/* cmd_neonserv_giveowner.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* 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
@@ -55,6 +55,10 @@ CMD_BIND(neonserv_cmd_giveowner) {
         struct UserNode *cuser = getUserByNick(argv[0]);
         if(!cuser) {
             cuser = createTempUser(argv[0]);
+			if(!cuser) {
+                reply(getTextBot(), user, "NS_USER_UNKNOWN", argv[0]);
+                return;
+            }
             cuser->flags |= USERFLAG_ISTMPUSER;
         }
         if(cuser->flags & USERFLAG_ISAUTHED) {
@@ -103,6 +107,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();
@@ -124,7 +144,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 {