Get rid of Server::GetUsers(chanrec) - a throwback to before chanrec could do this...

[user/henk/code/inspircd.git] / src / modules / m_sslmodes.cpp

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 3d5074c7049a2df9dc930168256ea5013a94a2b7..0d4b0e515bc37c629870d91d54cd32d93cc1267a 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -5,33 +5,83 @@
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
 
+static char* dummy;
+
+class SSLMode : public ModeHandler
+{
+       Server* Srv;
+ public:
+       SSLMode(Server* s) : ModeHandler('z', 0, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               if (adding)
+               {
+                       if (!channel->IsModeSet('z'))
+                       {
+                               if (IS_LOCAL(source))
+                               {
+                                       CUList* userlist = channel->GetUsers();
+                                       for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
+                                       {
+                                               if(!i->second->GetExt("ssl", dummy))
+                                               {
+                                                       source->WriteServ("490 %s %s :all members of the channel must be connected via SSL", source->nick, channel->name);
+                                                       return MODEACTION_DENY;
+                                               }
+                                       }
+                               }
+                               channel->SetMode('z',true);
+                               return MODEACTION_ALLOW;
+                       }
+                       else
+                       {
+                               return MODEACTION_DENY;
+                       }
+               }
+               else
+               {
+                       if (channel->IsModeSet('z'))
+                       {
+                               channel->SetMode('z',false);
+                               return MODEACTION_ALLOW;
+                       }
+
+                       return MODEACTION_DENY;
+               }
+       }
+};
+
 class ModuleSSLModes : public Module
 {
        Server *Srv;
+       SSLMode* sslm;
        
  public:
        ModuleSSLModes(Server* Me)
                : Module::Module(Me)
        {
                Srv = Me;
-               Srv->AddExtendedMode('z', MT_CHANNEL, false, 0, 0);
+
+               sslm = new SSLMode(Me);
+               Srv->AddMode(sslm, 'z');
        }
 
        void Implements(char* List)
        {
-               List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
        }
 
        virtual void On005Numeric(std::string &output)
        {
-               output.insert(output.find(" ", output.find("CHANMODES=", 0)), "z");
+               InsertMode(output, "z", 4);
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if(chan && chan->IsCustomModeSet('z'))
+               if(chan && chan->IsModeSet('z'))
                {
-                       if(user->GetExt("ssl"))
+                       if(user->GetExt("ssl", dummy))
                        {
                                // Let them in
                                return 0;
@@ -39,42 +89,17 @@ class ModuleSSLModes : public Module
                        else
                        {
                                // Deny
-                               WriteServ(user->fd, "489 %s %s :Cannot join channel (+z)", user->nick, cname);
+                               user->WriteServ( "489 %s %s :Cannot join channel (+z)", user->nick, cname);
                                return 1;
                        }
                }
                
                return 0;
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'z') && (type == MT_CHANNEL))
-               {
-                       chanrec* chan = (chanrec*)target;
-                       
-                       chanuserlist userlist = Srv->GetUsers(chan);
-                       
-                       for(unsigned int i = 0; i < userlist.size(); i++)
-                       {
-                               if(!userlist[i]->GetExt("ssl"))
-                               {
-                                       WriteServ(user->fd, "974 %s z :all members must be connected via SSL", user->nick);
-                                       return 0;
-                               }
-                       }
-                       
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
 
        virtual ~ModuleSSLModes()
        {
+               DELETE(sslm);
        }
        
        virtual Version GetVersion()