X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=cmd_neonserv_users.c;h=783457551e25f20b409fa64f1162deec7afc9971;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=a013cdbffdc9be66c9258914f9c2ca4f7b3fe348;hpb=f09df147ed45eece6eced6f9c870746e7702e73b;p=NeonServV5.git

diff --git a/cmd_neonserv_users.c b/cmd_neonserv_users.c
index a013cdb..7834575 100644
--- a/cmd_neonserv_users.c
+++ b/cmd_neonserv_users.c
@@ -1,4 +1,6 @@
 
+#include "cmd_neonserv.h"
+
 /*
 * argv[0] - usermask
 * argv[1] - min access
@@ -15,7 +17,7 @@ struct neonserv_cmd_users_cache {
     int max_access;
 };
 
-static CMD_BIND(neonserv_cmd_users) {
+CMD_BIND(neonserv_cmd_users) {
     int min_access = 1, max_access = 500;
     char *usermask = NULL;
     if(argc > 0)
@@ -35,7 +37,7 @@ static CMD_BIND(neonserv_cmd_users) {
     cache->usermask = (usermask ? strdup(usermask) : NULL);
     cache->min_access = min_access;
     cache->max_access = max_access;
-    get_userlist(chan, neonserv_cmd_users_userlist_lookup, cache);
+    get_userlist_with_invisible(chan, neonserv_cmd_users_userlist_lookup, cache);
 }
 
 static USERLIST_CALLBACK(neonserv_cmd_users_userlist_lookup) {
@@ -53,7 +55,7 @@ static void neonserv_cmd_users_async1(struct ClientSocket *client, struct Client
     char seenstr[MAXLEN];
     struct Table *table;
     struct ChanUser *chanuser;
-    printf_mysql_query("SELECT `chanuser_access`, `user_user`, `chanuser_seen`, `chanuser_flags` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `chanuser_cid` = '%d'", chan->channel_id);
+    printf_mysql_query("SELECT `chanuser_access`, `user_user`, `chanuser_seen`, `chanuser_flags` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `chanuser_cid` = '%d' ORDER BY `chanuser_access` DESC, `user_user` ASC", chan->channel_id);
     res = mysql_use();
     table = table_init(4, mysql_num_rows(res) + 1, 0);
     if(usermask)
@@ -74,12 +76,16 @@ static void neonserv_cmd_users_async1(struct ClientSocket *client, struct Client
             is_here = 0;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
                 if((chanuser->user->flags & USERFLAG_ISAUTHED) && !strcmp(chanuser->user->auth, row[1])) {
-                    is_here = 1;
-                    break;
+                    if((chanuser->flags & CHANUSERFLAG_INVISIBLE))
+                        is_here = 2;
+                    else {
+                        is_here = 1;
+                        break;
+                    }
                 }
             }
             if(is_here) {
-                content[2] = get_language_string(user, "NS_USERS_SEEN_HERE");
+                content[2] = get_language_string(user, (is_here == 2 ? "NS_USERS_SEEN_INVISIBLE" : "NS_USERS_SEEN_HERE"));
             } else if(!strcmp(row[2], "0")) {
                 content[2] = get_language_string(user, "NS_USERS_SEEN_NEVER");
             } else {
@@ -103,8 +109,8 @@ static void neonserv_cmd_users_async1(struct ClientSocket *client, struct Client
     if(!content_count)
         reply(textclient, user, "NS_TABLE_NONE");
     if(usermask || min_access != 1 || max_access != 500)
-        reply(textclient, user, (table->length == 2 ? "NS_USERS_COUNT_MATCH_1" : "NS_USERS_COUNT_MATCH"), table->length - 1, chan->name, min_access, max_access, content_count);
+        reply(textclient, user, (table->length == 2 ? "NS_USERS_COUNT_MATCH_1" : "NS_USERS_COUNT_MATCH"), table->length - 1, chan->name, content_count);
     else
-        reply(textclient, user, (table->length == 2 ? "NS_USERS_COUNT_1" : "NS_USERS_COUNT"), table->length - 1, chan->name, min_access, max_access);
+        reply(textclient, user, (table->length == 2 ? "NS_USERS_COUNT_1" : "NS_USERS_COUNT"), table->length - 1, chan->name);
     table_free(table);
 }