aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

channel_set_singlemode() : don't do anything if you're not channel op/halfop

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1555 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-06-12 00:08:14 +00:00 committed by cras
parent 3a0534da46
commit 7c9438c172
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/irc/core/bans.c
View File

@ -107,8 +107,7 @@ void ban_set(IRC_CHANNEL_REC *channel, const char *bans, int ban_type)
ban_type = default_ban_type; ban_type = default_ban_type;
masks = ban_get_masks(channel, bans, ban_type); masks = ban_get_masks(channel, bans, ban_type);
channel_set_singlemode(channel->server, channel->name, channel_set_singlemode(channel, masks, "+b");
masks, "+b");
g_free(masks); g_free(masks);
} }
@ -145,8 +144,7 @@ void ban_remove(IRC_CHANNEL_REC *channel, const char *bans)
g_strfreev(banlist); g_strfreev(banlist);
if (str->len > 0) if (str->len > 0)
channel_set_singlemode(channel->server, channel->name, channel_set_singlemode(channel, str->str, "-b");
str->str, "-b");
g_string_free(str, TRUE); g_string_free(str, TRUE);
} }

34
src/irc/core/modes.c
View File

@ -420,17 +420,26 @@ static void event_unaway(IRC_SERVER_REC *server, const char *data)
signal_emit("away mode changed", 1, server); signal_emit("away mode changed", 1, server);
} }
void channel_set_singlemode(IRC_SERVER_REC *server, const char *channel, void channel_set_singlemode(IRC_CHANNEL_REC *channel, const char *nicks,
const char *nicks, const char *mode) const char *mode)
{ {
GString *str; GString *str;
int num, modepos; int num, modepos;
char **nick, **nicklist; char **nick, **nicklist;
g_return_if_fail(IS_IRC_SERVER(server)); g_return_if_fail(IS_IRC_CHANNEL(channel));
g_return_if_fail(channel != NULL && nicks != NULL && mode != NULL); g_return_if_fail(nicks != NULL && mode != NULL);
if (*nicks == '\0') return; if (*nicks == '\0') return;
if (!channel->chanop) {
/* not op - can we do anything? */
if (!channel->ownnick->halfop)
return; /* not even halfop, abort */
if (mode[0] != '\0' && mode[1] == 'o')
return; /* halfops can't op/deop */
}
num = modepos = 0; num = modepos = 0;
str = g_string_new(NULL); str = g_string_new(NULL);
@ -441,7 +450,8 @@ void channel_set_singlemode(IRC_SERVER_REC *server, const char *channel,
if (num == 0) if (num == 0)
{ {
g_string_sprintf(str, "MODE %s %s", channel, mode); g_string_sprintf(str, "MODE %s %s",
channel->name, mode);
modepos = str->len; modepos = str->len;
} else { } else {
/* insert the mode string */ /* insert the mode string */
@ -450,13 +460,13 @@ void channel_set_singlemode(IRC_SERVER_REC *server, const char *channel,
g_string_sprintfa(str, " %s", *nick); g_string_sprintfa(str, " %s", *nick);
if (++num == server->max_modes_in_cmd) { if (++num == channel->server->max_modes_in_cmd) {
/* max. modes / command reached, send to server */ /* max. modes / command reached, send to server */
irc_send_cmd(server, str->str); irc_send_cmd(channel->server, str->str);
num = 0; num = 0;
} }
} }
if (num > 0) irc_send_cmd(server, str->str); if (num > 0) irc_send_cmd(channel->server, str->str);
g_strfreev(nicklist); g_strfreev(nicklist);
g_string_free(str, TRUE); g_string_free(str, TRUE);
@ -585,7 +595,7 @@ static void cmd_op(const char *data, IRC_SERVER_REC *server,
nicks = get_nicks(channel, data, 0, -1); nicks = get_nicks(channel, data, 0, -1);
if (nicks != NULL && *nicks != '\0') if (nicks != NULL && *nicks != '\0')
channel_set_singlemode(server, channel->name, nicks, "+o"); channel_set_singlemode(channel, nicks, "+o");
g_free_not_null(nicks); g_free_not_null(nicks);
} }
@ -600,7 +610,7 @@ static void cmd_deop(const char *data, IRC_SERVER_REC *server,
nicks = get_nicks(channel, data, 1, -1); nicks = get_nicks(channel, data, 1, -1);
if (nicks != NULL && *nicks != '\0') if (nicks != NULL && *nicks != '\0')
channel_set_singlemode(server, channel->name, nicks, "-o"); channel_set_singlemode(channel, nicks, "-o");
g_free_not_null(nicks); g_free_not_null(nicks);
} }
@ -615,7 +625,7 @@ static void cmd_voice(const char *data, IRC_SERVER_REC *server,
nicks = get_nicks(channel, data, 0, 0); nicks = get_nicks(channel, data, 0, 0);
if (nicks != NULL && *nicks != '\0') if (nicks != NULL && *nicks != '\0')
channel_set_singlemode(server, channel->name, nicks, "+v"); channel_set_singlemode(channel, nicks, "+v");
g_free_not_null(nicks); g_free_not_null(nicks);
} }
@ -630,7 +640,7 @@ static void cmd_devoice(const char *data, IRC_SERVER_REC *server,
nicks = get_nicks(channel, data, 0, 1); nicks = get_nicks(channel, data, 0, 1);
if (nicks != NULL && *nicks != '\0') if (nicks != NULL && *nicks != '\0')
channel_set_singlemode(server, channel->name, nicks, "-v"); channel_set_singlemode(channel, nicks, "-v");
g_free_not_null(nicks); g_free_not_null(nicks);
} }

4
src/irc/core/modes.h
View File

@ -33,8 +33,8 @@ int channel_mode_is_set(IRC_CHANNEL_REC *channel, char mode);
void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby, void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby,
const char *modestr); const char *modestr);
void channel_set_singlemode(IRC_SERVER_REC *server, const char *channel, void channel_set_singlemode(IRC_CHANNEL_REC *channel, const char *nicks,
const char *nicks, const char *mode); const char *mode);
void channel_set_mode(IRC_SERVER_REC *server, const char *channel, void channel_set_mode(IRC_SERVER_REC *server, const char *channel,
const char *mode); const char *mode);