X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=5ac6924ab3f970c06a8a528775ab4ea0ee1e72cb;hb=66c74e96472bd59c9c01815c621c303f4cb19b58;hp=d5d873cae3c7f25ed203eb30fab5411dd94b2c39;hpb=2c0dc163ea5a84f8bf2d4fb5ac98985d77da32c1;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index d5d873c..5ac6924 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -315,19 +315,23 @@ int Chan_userJoin_id(int channelid, client_t *client)
 
 channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client)
 {
+	channelJoinResult_t result;
 	channel_t *ch_itr = NULL;
 	do {
 		Chan_iterate(&ch_itr);
 	} while (ch_itr != NULL && ch_itr->id != channelid);
 	if (ch_itr == NULL) {
 		Log_warn("Channel id %d not found - ignoring.", channelid);
-		return CHJOIN_NOTFOUND;
+		result.CHJOIN_NOTFOUND = true;
 	}
-	else if (ch_itr->noenter)
-		return CHJOIN_NOENTER;
-	else if (ch_itr->password && !Client_token_match(client, ch_itr->password))
-		return CHJOIN_WRONGPW;
-	else return CHJOIN_OK;
+	else
+		result.CHJOIN_NOTFOUND = false;
+
+	result.CHJOIN_NOENTER = ch_itr->noenter;
+	result.CHJOIN_WRONGPW = ch_itr->password && !Client_token_match(client, ch_itr->password) && !client->isAdmin;
+	result.CHJOIN_SILENT = ch_itr->silent;
+
+	return result;
 }
 
 #if 0