#include "portab.h"
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.35 2006/03/16 20:14:16 fw Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.40 2007/07/31 18:56:14 alex Exp $";
#include "imp.h"
#include <assert.h>
assert( Req != NULL );
/* Bad number of arguments? */
- if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if (Req->argc < 1 || Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
/* Who is the sender? */
if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
chan = NULL; flags = NULL;
/* wird der Channel neu angelegt? */
- if( Channel_Search( channame )) is_new_chan = false;
- else is_new_chan = true;
+ if( Channel_Search( channame )) {
+ is_new_chan = false;
+ } else {
+ if (Conf_PredefChannelsOnly) { /* this server does not allow creation of channels */
+ IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+ /* Try next name, if any */
+ channame = strchr(channame, ',');
+ continue;
+ }
+ is_new_chan = true;
+ }
/* Hat ein Server Channel-User-Modes uebergeben? */
if( Client_Type( Client ) == CLIENT_SERVER )
chan = Channel_Search( channame );
assert( chan != NULL );
- is_banned = Lists_CheckBanned( target, chan );
- is_invited = Lists_CheckInvited( target, chan );
+ is_banned = Lists_Check(Channel_GetListBans(chan), target );
+ is_invited = Lists_Check(Channel_GetListInvites(chan), target );
/* Testen, ob Client gebanned ist */
if(( is_banned == true) && ( is_invited == false ))
IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
}
* commands) in this list become deleted when a user
* joins a channel this way. */
chan = Channel_Search( channame );
- if( chan != NULL ) (void)Lists_CheckInvited( target, chan );
+ if( chan != NULL ) (void)Lists_Check(Channel_GetListInvites(chan), target);
}
/* Channel joinen (und ggf. anlegen) */
if( ! Channel_Join( target, channame ))
{
/* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
if( ! chan ) chan = Channel_Search( channame );
{
if( *ptr == 'l' )
{
- snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan ));
+ snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
strlcat( modes_add, l, sizeof( modes_add ));
}
if( *ptr == 'k' )