X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=cmd_neonserv_adduser.c;h=c63c176aeb6f090eb1a7edcfcada09b03dfc932b;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=e5d2bd2e1e4e66dbbe6e11b6d5dd3e866ee56f1e;hpb=db818bf4952ccd5eda06f7ccbbe2283db1414065;p=NeonServV5.git

diff --git a/cmd_neonserv_adduser.c b/cmd_neonserv_adduser.c
index e5d2bd2..c63c176 100644
--- a/cmd_neonserv_adduser.c
+++ b/cmd_neonserv_adduser.c
@@ -1,31 +1,40 @@
 
+#include "cmd_neonserv.h"
+
 /*
 * argv[0] - nick / *auth
 * argv[1] - chan access
 */
 static AUTHLOOKUP_CALLBACK(neonserv_cmd_adduser_auth_lookup);
 static USERAUTH_CALLBACK(neonserv_cmd_adduser_nick_lookup);
-static void neonserv_cmd_adduser_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, int access);
+static void neonserv_cmd_adduser_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *nick, char *auth, int access);
 
 struct neonserv_cmd_adduser_cache {
     struct ClientSocket *client, *textclient;
     struct UserNode *user;
     struct ChanNode *chan;
+    struct Event *event;
     int access;
     char *nick;
 };
 
-static CMD_BIND(neonserv_cmd_adduser) {
+CMD_BIND(neonserv_cmd_adduser) {
     int caccess;
     MYSQL_RES *res;
     MYSQL_ROW row;
-    check_mysql();
-    //check acccess
     caccess = atoi(argv[1]);
     if(caccess <= 0 || caccess > 500) {
         reply(getTextBot(), user, "NS_INVALID_ACCESS", caccess);
         return;
     }
+    if(caccess >= getChannelAccess(user, chan, 0)) {
+        if(isGodMode(user)) {
+            event->flags |= CMDFLAG_OPLOG;
+        } else {
+            reply(getTextBot(), user, "NS_ACCESS_OUTRANKED");
+            return;
+        }
+    }
     //check own access
     if(argv[0][0] == '*') {
         //we've got an auth
@@ -33,7 +42,7 @@ static CMD_BIND(neonserv_cmd_adduser) {
         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_adduser_async1(client, getTextBot(), user, chan, argv[0], row[0], caccess);
+            neonserv_cmd_adduser_async1(client, getTextBot(), user, chan, event, argv[0], row[0], caccess);
         } else {
             //we need to create a new user...
             //but first lookup the auth to check if it really exists
@@ -46,6 +55,7 @@ static CMD_BIND(neonserv_cmd_adduser) {
             cache->textclient = getTextBot();
             cache->user = user;
             cache->chan = chan;
+            cache->event = event;
             cache->access = caccess;
             cache->nick = strdup(argv[0]);
             lookup_authname(argv[0], neonserv_cmd_adduser_auth_lookup, cache);
@@ -57,7 +67,7 @@ static CMD_BIND(neonserv_cmd_adduser) {
             cuser->flags |= USERFLAG_ISTMPUSER;
         }
         if(cuser->flags & USERFLAG_ISAUTHED) {
-            neonserv_cmd_adduser_async1(client, getTextBot(), user, chan, argv[0], cuser->auth, caccess);
+            neonserv_cmd_adduser_async1(client, getTextBot(), user, chan, event, argv[0], cuser->auth, caccess);
         } else {
             struct neonserv_cmd_adduser_cache *cache = malloc(sizeof(*cache));
             if (!cache) {
@@ -68,6 +78,7 @@ static CMD_BIND(neonserv_cmd_adduser) {
             cache->textclient = getTextBot();
             cache->user = user;
             cache->chan = chan;
+            cache->event = event;
             cache->access = caccess;
             cache->nick = strdup(argv[0]);
             get_userauth(cuser, neonserv_cmd_adduser_nick_lookup, cache);
@@ -81,7 +92,7 @@ static AUTHLOOKUP_CALLBACK(neonserv_cmd_adduser_auth_lookup) {
         //AUTH_DOES_NOT_EXIST
         reply(cache->textclient, cache->user, "NS_AUTH_UNKNOWN", cache->nick);
     } else
-        neonserv_cmd_adduser_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->nick, auth, cache->access);
+        neonserv_cmd_adduser_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, cache->nick, auth, cache->access);
     free(cache->nick);
     free(cache);
 }
@@ -97,12 +108,12 @@ static USERAUTH_CALLBACK(neonserv_cmd_adduser_nick_lookup) {
         reply(cache->textclient, cache->user, "NS_USER_NEED_AUTH", cache->nick);
     }
     else
-        neonserv_cmd_adduser_async1(cache->client, cache->textclient, cache->user, cache->chan, user->nick, user->auth, cache->access);
+        neonserv_cmd_adduser_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, user->nick, user->auth, cache->access);
     free(cache->nick);
     free(cache);
 }
 
-static void neonserv_cmd_adduser_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, int caccess) {
+static void neonserv_cmd_adduser_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *nick, char *auth, int caccess) {
     //we've got a valid auth now...
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -122,6 +133,7 @@ static void neonserv_cmd_adduser_async1(struct ClientSocket *client, struct Clie
         printf_mysql_query("INSERT INTO `users` (`user_user`) VALUES ('%s')", escape_string(auth));
         userid = (int) mysql_insert_id(mysql_conn);
     }
-    printf_mysql_query("INSERT INTO `chanusers` (`chanuser_cid`, `chanuser_uid`, `chanuser_access`) VALUES ('%d', '%d', '%d')", chan->channel_id, userid, access);
-    reply(textclient, user, "NS_ADDUSER_DONE", nick, chan->name, atoi(row[0]));
+    printf_mysql_query("INSERT INTO `chanusers` (`chanuser_cid`, `chanuser_uid`, `chanuser_access`) VALUES ('%d', '%d', '%d')", chan->channel_id, userid, caccess);
+    reply(textclient, user, "NS_ADDUSER_DONE", nick, chan->name, caccess);
+    logEvent(event);
 }