@@ -162,14+165,14 @@ class ModuleServicesAccount : public Module
if ((c->IsModeSet('M')) && (!account))
{
if ((c->IsModeSet('M')) && (!account))
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+ if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)) || (!strcmp(user->server,"")))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +M channel and is not registered
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +M channel and is not registered
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
return 1;
}
}
return 1;
}
}
@@ -179,14+182,14 @@ class ModuleServicesAccount : public Module
if ((u->modes['R'-65]) && (!account))
{
if ((u->modes['R'-65]) && (!account))
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+ if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +R user and is not registered
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +R user and is not registered
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
return 1;
}
}
return 1;
}
}
@@ -209,13+212,13 @@ class ModuleServicesAccount : public Module
{
if (!account)
{
{
if (!account)
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+ if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)))
{
// user is ulined, won't be stopped from joining
return 0;
}
// joining a +R channel and not identified
{
// user is ulined, won't be stopped from joining
return 0;
}
// joining a +R channel and not identified
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
return 1;
}
}
return 1;
}
}
@@ -335,7+338,7 @@ class ModuleServicesAccountFactory : public ModuleFactory