unsigned long chanrec::DelUser(userrec* user)
{
- CUList::iterator a = internal_userlist.find(user);
+ CUListIter a = internal_userlist.find(user);
+
if (a != internal_userlist.end())
{
internal_userlist.erase(a);
DelOppedUser(user);
DelHalfoppedUser(user);
DelVoicedUser(user);
- return internal_userlist.size();
}
+
return internal_userlist.size();
}
void chanrec::DelOppedUser(userrec* user)
{
- CUList::iterator a = internal_op_userlist.find(user);
+ CUListIter a = internal_op_userlist.find(user);
if (a != internal_op_userlist.end())
{
internal_op_userlist.erase(a);
void chanrec::DelHalfoppedUser(userrec* user)
{
- CUList::iterator a = internal_halfop_userlist.find(user);
+ CUListIter a = internal_halfop_userlist.find(user);
+
if (a != internal_halfop_userlist.end())
{
internal_halfop_userlist.erase(a);
- return;
}
}
void chanrec::DelVoicedUser(userrec* user)
{
- CUList::iterator a = internal_voice_userlist.find(user);
+ CUListIter a = internal_voice_userlist.find(user);
+
if (a != internal_voice_userlist.end())
{
internal_voice_userlist.erase(a);
- return;
}
}
log(DEBUG,"Passed channel checks");
- for (std::vector<ucrec*>::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
+ for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
{
if ((*index)->channel == NULL)
{
if (n != chanlist.end())
{
Ptr->DelUser(user);
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(n);
for (unsigned int index =0; index < user->chans.size(); index++)
{
}
}
}
+ else
+ {
+ for (unsigned int index =0; index < user->chans.size(); index++)
+ {
+ if (user->chans[index]->channel == Ptr)
+ {
+ user->chans[index]->channel = NULL;
+ user->chans[index]->uc_modes = 0;
+ }
+ }
+ }
return NULL;
}
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(iter);
}
}
if (iter != chanlist.end())
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
+ DELETE(Ptr);
chanlist.erase(iter);
}
}
WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
return;
}
+ if ((is_uline(user->server)) && (!is_uline(src->server)))
+ {
+ WriteServ(src->fd,"482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, Ptr->name);
+ return;
+ }
int MOD_RESULT = 0;
if (!is_uline(src->server))
FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
- for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+ for (UserChanList::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
/* zap it from the channel list of the user */
if ((*i)->channel && ((*i)->channel == Ptr))
{
log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
- delete Ptr;
+ DELETE(Ptr);
chanlist.erase(iter);
}
}