Forward port r10133.

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index db9d90de49a95afea543e11256c24d9cf473a252..76712df61a0d40458edd25af315e5302fcda96ef 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -42,14 +42,14 @@ class AChannel_M : public SimpleChannelModeHandler
 
 class ModuleServicesAccount : public Module
 {
-        
+
        AChannel_R* m1;
        AChannel_M* m2;
        AUser_R* m3;
  public:
        ModuleServicesAccount(InspIRCd* Me) : Module(Me)
        {
-               
+
                m1 = new AChannel_R(ServerInstance);
                m2 = new AChannel_M(ServerInstance);
                m3 = new AUser_R(ServerInstance);
@@ -57,9 +57,15 @@ class ModuleServicesAccount : public Module
                        throw ModuleException("Could not add new modes!");
 
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
-                       I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData };
+                       I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric };
 
-               ServerInstance->Modules->Attach(eventlist, this, 8);
+               ServerInstance->Modules->Attach(eventlist, this, 9);
+       }
+
+       virtual void On005Numeric(std::string &t)
+       {
+               ServerInstance->AddExtBanChar('R');
+               ServerInstance->AddExtBanChar('M');
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -83,36 +89,41 @@ class ModuleServicesAccount : public Module
                        return 0;
 
                user->GetExt("accountname", account);
-               
+
+               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
+               {
+                       // user is ulined, can speak regardless
+                       return 0;
+               }
+
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
-                       
+
                        if ((c->IsModeSet('M')) && (!account))
                        {
-                               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-                               {
-                                       // user is ulined, can speak regardless
-                                       return 0;
-                               }
-
                                // user messaging a +M channel and is not registered
                                user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
                                return 1;
                        }
+
+                       if (account)
+                       {
+                               if (c->IsExtBanned(*account, 'M'))
+                               {
+                                       // may not speak
+                                       user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You may not speak in this channel");
+                                       return 1;
+                               }
+                       }
                }
+
                if (target_type == TYPE_USER)
                {
                        User* u = (User*)dest;
-                       
+
                        if ((u->modes['R'-65]) && (!account))
                        {
-                               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-                               {
-                                       // user is ulined, can speak regardless
-                                       return 0;
-                               }
-
                                // user messaging a +R user and is not registered
                                user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
                                return 1;
@@ -120,17 +131,17 @@ class ModuleServicesAccount : public Module
                }
                return 0;
        }
-        
+
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
-        
+
        virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                std::string *account;
                user->GetExt("accountname", account);
-               
+
                if (chan)
                {
                        if (chan->IsModeSet('R'))
@@ -147,10 +158,20 @@ class ModuleServicesAccount : public Module
                                        return 1;
                                }
                        }
+
+                       if (account)
+                       {
+                               if (chan->IsExtBanned(*account, 'R'))
+                               {
+                                       // may not join
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+                                       return 1;
+                               }
+                       }
                }
                return 0;
        }
-       
+
        // Whenever the linking module wants to send out data, but doesnt know what the data
        // represents (e.g. it is metadata, added to a User or Channel by a module) then
        // this method is called. We should use the ProtoSendMetaData function after we've
@@ -215,9 +236,9 @@ class ModuleServicesAccount : public Module
        {
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "accountname"))
-               {       
+               {
                        User* dest = (User*)target;
-                       
+
                        /* logging them out? */
                        if (extdata.empty())
                        {
@@ -262,7 +283,7 @@ class ModuleServicesAccount : public Module
                delete m2;
                delete m3;
        }
-       
+
        virtual Version GetVersion()
        {
                return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);