/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
new_chan = Channel_Create(conf_chan->name);
if (!new_chan) {
- Log(LOG_ERR, "Can't create pre-defined channel \"%s\"",
+ Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
conf_chan->name);
continue;
}
- Log(LOG_INFO, "Created pre-defined channel \"%s\"",
+ Log(LOG_INFO, "Created pre-defined channel \"%s\".",
conf_chan->name);
Channel_ModeAdd(new_chan, 'P');
/* Check that the channel name is valid */
if (! Channel_IsValidName(Name)) {
- IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+ IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG,
Client_ID(Client), Name);
return false;
}
/* Check that specified channel exists */
chan = Channel_Search(Name);
if (!chan) {
- IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+ IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG,
Client_ID(Client), Name);
return false;
}
/* Check that the client is in the channel */
if (!Get_Cl2Chan(chan, Client)) {
- IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG,
+ IRC_WriteErrClient(Client, ERR_NOTONCHANNEL_MSG,
Client_ID(Client), Name);
return false;
}
const char *Reason )
{
CHANNEL *chan;
- char *ptr, *target_modes;
bool can_kick = false;
assert(Peer != NULL);
/* Check that channel exists */
chan = Channel_Search( Name );
- if( ! chan )
- {
- IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name );
+ if (!chan) {
+ IRC_WriteErrClient(Origin, ERR_NOSUCHCHANNEL_MSG,
+ Client_ID(Origin), Name);
return;
}
Client_Type(Origin) != CLIENT_SERVICE) {
/* Check that user is on the specified channel */
if (!Channel_IsMemberOf(chan, Origin)) {
- IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG,
- Client_ID(Origin), Name);
+ IRC_WriteErrClient(Origin, ERR_NOTONCHANNEL_MSG,
+ Client_ID(Origin), Name);
return;
}
}
+ /* Check that the client to be kicked is on the specified channel */
+ if (!Channel_IsMemberOf(chan, Target)) {
+ IRC_WriteErrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
+ Client_ID(Origin), Client_ID(Target), Name );
+ return;
+ }
+
if(Client_Type(Peer) == CLIENT_USER) {
/* Channel mode 'Q' and user mode 'q' on target: nobody but
* IRC Operators and servers can kick the target user */
- if ((strchr(Channel_Modes(chan), 'Q')
- || Client_HasMode(Target, 'q'))
+ if ((Channel_HasMode(chan, 'Q')
+ || Client_HasMode(Target, 'q')
+ || Client_Type(Target) == CLIENT_SERVICE)
&& !Client_HasMode(Origin, 'o')) {
- IRC_WriteStrClient(Origin, ERR_KICKDENY_MSG,
+ IRC_WriteErrClient(Origin, ERR_KICKDENY_MSG,
Client_ID(Origin), Name,
Client_ID(Target));
return;
}
/* Check if client has the rights to kick target */
- ptr = Channel_UserModes(chan, Peer);
- target_modes = Channel_UserModes(chan, Target);
- while(*ptr) {
- /* Owner can kick everyone */
- if ( *ptr == 'q') {
- can_kick = true;
- break;
- }
- /* Admin can't kick owner */
- if ( *ptr == 'a' ) {
- if (!strchr(target_modes, 'q')) {
- can_kick = true;
- break;
- }
- }
- /* Op can't kick owner | admin */
- if ( *ptr == 'o' ) {
- if (!strchr(target_modes, 'q') &&
- !strchr(target_modes, 'a')) {
- can_kick = true;
- break;
- }
- }
- /* Half Op can't kick owner | admin | op */
- if ( *ptr == 'h' ) {
- if (!strchr(target_modes, 'q') &&
- !strchr(target_modes, 'a') &&
- !strchr(target_modes, 'o')) {
- can_kick = true;
- break;
- }
- }
- ptr++;
- }
+
+ /* Owner can kick everyone */
+ if (Channel_UserHasMode(chan, Peer, 'q'))
+ can_kick = true;
+
+ /* Admin can't kick owner */
+ else if (Channel_UserHasMode(chan, Peer, 'a') &&
+ !Channel_UserHasMode(chan, Target, 'q'))
+ can_kick = true;
+
+ /* Op can't kick owner | admin */
+ else if (Channel_UserHasMode(chan, Peer, 'o') &&
+ !Channel_UserHasMode(chan, Target, 'q') &&
+ !Channel_UserHasMode(chan, Target, 'a'))
+ can_kick = true;
+
+ /* Half Op can't kick owner | admin | op */
+ else if (Channel_UserHasMode(chan, Peer, 'h') &&
+ !Channel_UserHasMode(chan, Target, 'q') &&
+ !Channel_UserHasMode(chan, Target, 'a') &&
+ !Channel_UserHasMode(chan, Target, 'o'))
+ can_kick = true;
if(!can_kick) {
- IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
- Client_ID(Origin), Name);
+ IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
+ Client_ID(Origin), Name);
return;
}
}
- /* Check that the client to be kicked is on the specified channel */
- if (!Channel_IsMemberOf(chan, Target)) {
- IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
- Client_ID(Origin), Client_ID(Target), Name );
- return;
- }
-
/* Kick Client from channel */
Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
} /* Channel_Kick */
c = My_Channels;
while(c) {
if (Client) {
- if (!strchr(Channel_Modes(c), 's')
+ if (!Channel_HasMode(c, 's')
|| Channel_IsMemberOf(c, Client))
count++;
} else
} /* Channel_Modes */
+GLOBAL bool
+Channel_HasMode( CHANNEL *Chan, char Mode )
+{
+ assert( Chan != NULL );
+ return strchr( Chan->modes, Mode ) != NULL;
+} /* Channel_HasMode */
+
+
GLOBAL char *
Channel_Key( CHANNEL *Chan )
{
assert( Chan != NULL );
x[0] = Mode; x[1] = '\0';
- if( ! strchr( Chan->modes, x[0] ))
+ if( ! Channel_HasMode( Chan, x[0] ))
{
/* Channel does not have this mode yet, set it */
strlcat( Chan->modes, x, sizeof( Chan->modes ));
} /* Channel_UserModes */
+GLOBAL bool
+Channel_UserHasMode( CHANNEL *Chan, CLIENT *Client, char Mode )
+{
+ return strchr(Channel_UserModes(Chan, Client), Mode) != NULL;
+} /* Channel_UserHasMode */
+
+
GLOBAL bool
Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
{
if (Channel_IsMemberOf(Chan, From)) {
is_member = true;
- if (strchr(Channel_UserModes(Chan, From), 'v'))
+ if (Channel_UserHasMode(Chan, From, 'v'))
has_voice = true;
- if (strchr(Channel_UserModes(Chan, From), 'h'))
+ if (Channel_UserHasMode(Chan, From, 'h'))
is_halfop = true;
- if (strchr(Channel_UserModes(Chan, From), 'o'))
+ if (Channel_UserHasMode(Chan, From, 'o'))
is_op = true;
- if (strchr(Channel_UserModes(Chan, From), 'a'))
+ if (Channel_UserHasMode(Chan, From, 'a'))
is_chanadmin = true;
- if (strchr(Channel_UserModes(Chan, From), 'q'))
+ if (Channel_UserHasMode(Chan, From, 'q'))
is_owner = true;
}
* If channel mode n set: non-members cannot send to channel.
* If channel mode m set: need voice.
*/
- if (strchr(Channel_Modes(Chan), 'n') && !is_member)
+ if (Channel_HasMode(Chan, 'n') && !is_member)
return false;
- if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')
+ if (Channel_HasMode(Chan, 'M') && !Client_HasMode(From, 'R')
&& !Client_HasMode(From, 'o'))
return false;
if (has_voice || is_halfop || is_op || is_chanadmin || is_owner)
return true;
- if (strchr(Channel_Modes(Chan), 'm'))
+ if (Channel_HasMode(Chan, 'm'))
return false;
if (Lists_Check(&Chan->list_excepts, From))
if (!Can_Send_To_Channel(Chan, From)) {
if (! SendErrors)
return CONNECTED; /* no error, see RFC 2812 */
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+ if (Channel_HasMode(Chan, 'M'))
+ return IRC_WriteErrClient(From, ERR_NEEDREGGEDNICK_MSG,
+ Client_ID(From), Channel_Name(Chan));
+ else
+ return IRC_WriteErrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
Client_ID(From), Channel_Name(Chan));
}
if (Client_Conn(From) > NONE)
Conn_UpdateIdle(Client_Conn(From));
- return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
- "%s %s :%s", Command, Channel_Name(Chan), Text);
+ IRC_WriteStrChannelPrefix(Client, Chan, From, true, "%s %s :%s",
+ Command, Channel_Name(Chan), Text);
+ return CONNECTED;
}
}
/* When channel is empty and is not pre-defined, delete */
- if( ! strchr( Channel_Modes( Chan ), 'P' ))
+ if( ! Channel_HasMode( Chan, 'P' ))
{
if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
}
assert(Client != NULL);
assert(Key != NULL);
- if (!strchr(Chan->modes, 'k'))
+ if (!Channel_HasMode(Chan, 'k'))
return true;
if (*Key == '\0')
return false;
projects / ngircd-alex.git / blobdiff