* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
public:
SSLMode(InspIRCd* Instance) : ModeHandler(Instance, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
if (adding)
{
CUList* userlist = channel->GetUsers();
for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
{
- if(!i->first->GetExt("ssl", dummy))
+ if(!i->first->GetExt("ssl", dummy) && !ServerInstance->ULine(i->first->server))
{
- source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+ source->WriteNumeric(ERR_ALLMUSTSSL, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
return MODEACTION_DENY;
}
}
class ModuleSSLModes : public Module
{
-
+
SSLMode* sslm;
-
+
public:
ModuleSSLModes(InspIRCd* Me)
: Module(Me)
{
-
+
sslm = new SSLMode(ServerInstance);
- if (!ServerInstance->AddMode(sslm))
+ if (!ServerInstance->Modes->AddMode(sslm))
throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnUserPreJoin };
ServerInstance->Modules->Attach(eventlist, this, 1);
}
- void Implements(char* List)
- {
- List[I_OnUserPreJoin] = 1;
- }
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if(chan && chan->IsModeSet('z'))
{
else
{
// Deny
- user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick, cname);
+ user->WriteServ( "489 %s %s :Cannot join channel; SSL users only (+z)", user->nick.c_str(), cname);
return 1;
}
}
-
+
return 0;
}
virtual ~ModuleSSLModes()
{
ServerInstance->Modes->DelMode(sslm);
- DELETE(sslm);
+ delete sslm;
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};