added cmd_clvl and moved all the database request functions to DBHelper.c

[NeonServV5.git] / cmd_neonserv_deluser.c

diff --git a/cmd_neonserv_deluser.c b/cmd_neonserv_deluser.c
index b98e7f32dc2b8bca25c10d2eb72eb76aedcae1d5..acd271790c407f2f5a7707eda83fc08e0e34e869 100644 (file)
--- a/cmd_neonserv_deluser.c
+++ b/cmd_neonserv_deluser.c
@@ -2,7 +2,6 @@
 /*
 * argv[0] - nick / *auth
 */
-static AUTHLOOKUP_CALLBACK(neonserv_cmd_deluser_auth_lookup);
 static USERAUTH_CALLBACK(neonserv_cmd_deluser_nick_lookup);
 static void neonserv_cmd_deluser_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth);
 
@@ -18,28 +17,11 @@ static CMD_BIND(neonserv_cmd_deluser) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     check_mysql();
+    checkChannelAccess(user, chan, "channel_candel", 1, 0);
     if(argv[0][0] == '*') {
         //we've got an auth
         argv[0]++;
-        printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[0]));
-        res = mysql_use();
-        if ((row = mysql_fetch_row(res)) != NULL) {
-            neonserv_cmd_deluser_async1(client, getTextBot(), user, chan, argv[0], row[0]);
-        } else {
-            //we need to create a new user...
-            //but first lookup the auth to check if it really exists
-            struct neonserv_cmd_deluser_cache *cache = malloc(sizeof(*cache));
-            if (!cache) {
-                perror("malloc() failed");
-                return;
-            }
-            cache->client = client;
-            cache->textclient = getTextBot();
-            cache->user = user;
-            cache->chan = chan;
-            cache->nick = strdup(argv[0]);
-            lookup_authname(argv[0], neonserv_cmd_deluser_auth_lookup, cache);
-        }
+        neonserv_cmd_deluser_async1(client, getTextBot(), user, chan, argv[0], argv[0]);
     } else {
         struct UserNode *cuser = getUserByNick(argv[0]);
         if(!cuser) {
@@ -64,17 +46,6 @@ static CMD_BIND(neonserv_cmd_deluser) {
     }
 }
 
-static AUTHLOOKUP_CALLBACK(neonserv_cmd_deluser_auth_lookup) {
-    struct neonserv_cmd_deluser_cache *cache = data;
-    if(!exists) {
-        //AUTH_DOES_NOT_EXIST
-        reply(cache->textclient, cache->user, "NS_AUTH_UNKNOWN", cache->nick);
-    } else
-        neonserv_cmd_deluser_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->nick, auth);
-    free(cache->nick);
-    free(cache);
-}
-
 static USERAUTH_CALLBACK(neonserv_cmd_deluser_nick_lookup) {
     struct neonserv_cmd_deluser_cache *cache = data;
     if(!user) {
@@ -104,6 +75,10 @@ static void neonserv_cmd_deluser_async1(struct ClientSocket *client, struct Clie
         printf_mysql_query("SELECT `chanuser_access`, `chanuser_id` FROM `chanusers` WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = '%d'", chan->channel_id, userid);
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
+            if(atoi(row[0]) >= getChannelAccess(user, chan, 1)) {
+                reply(textclient, cache->user, "NS_USER_OUTRANKED", nick);
+                return;
+            }
             //delete
             printf_mysql_query("DELETE FROM `chanusers` WHERE `chanuser_id` = '%s'", row[1]);
             reply(textclient, user, "NS_DELUSER_DONE", nick, atoi(row[0]), chan->name);