changed cmd_users output

[NeonServV5.git] / cmd_neonserv_adduser.c

diff --git a/cmd_neonserv_adduser.c b/cmd_neonserv_adduser.c
index 54d20792fa7310df89f68a6c4273460db2b92f27..f68f0418668d179721d2feb6c04a8da57fbb32b6 100644 (file)
--- a/cmd_neonserv_adduser.c
+++ b/cmd_neonserv_adduser.c
@@ -20,12 +20,16 @@ static CMD_BIND(neonserv_cmd_adduser) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     check_mysql();
-    //check acccess
+    checkChannelAccess(user, chan, "channel_canadd", 1, 0);
     caccess = atoi(argv[1]);
     if(caccess <= 0 || caccess > 500) {
         reply(getTextBot(), user, "NS_INVALID_ACCESS", caccess);
         return;
     }
+    if(caccess >= getChannelAccess(user, chan, 1)) {
+        reply(getTextBot(), user, "NS_ACCESS_OUTRANKED");
+        return;
+    }
     //check own access
     if(argv[0][0] == '*') {
         //we've got an auth
@@ -104,14 +108,24 @@ 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 caccess) {
     //we've got a valid auth now...
+    MYSQL_RES *res;
+    MYSQL_ROW row;
     int userid;
     printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth));
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) != NULL) {
-        userid = atoi(res[0]);
+        userid = atoi(row[0]);
+        //check if the user is already added
+        printf_mysql_query("SELECT `chanuser_access` FROM `chanusers` WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = '%d'", chan->channel_id, userid);
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL) {
+            reply(textclient, user, "NS_ADDUSER_ALREADY_ADDED", nick, chan->name, atoi(row[0]));
+            return;
+        }
     } else {
         printf_mysql_query("INSERT INTO `users` (`user_user`) VALUES ('%s')", escape_string(auth));
         userid = (int) mysql_insert_id(mysql_conn);
     }
-    putsock(client, "PRIVMSG %s :%s: [%d] %s   %d", chan->name, nick, userid, auth, caccess);
+    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);
 }