m_namedmodes Only show chan key to members and opers with channels/auspex

[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 a325275779cd78faae85958de34b271e67ddd948..154968e9ec274b38ca22bd9820d47aaa8d61f6d0 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -37,7 +37,7 @@ class Channel_r : public ModeHandler
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                // only a u-lined server may add or remove the +r mode.
-               if (!IS_LOCAL(source) || ServerInstance->ULine(source->server))
+               if (!IS_LOCAL(source))
                {
                        // Only change the mode if it's not redundant
                        if ((adding != channel->IsModeSet('r')))
@@ -64,7 +64,7 @@ class User_r : public ModeHandler
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               if (!IS_LOCAL(source) || ServerInstance->ULine(source->server))
+               if (!IS_LOCAL(source))
                {
                        if ((adding != dest->IsModeSet('r')))
                        {
@@ -112,24 +112,40 @@ class ModuleServicesAccount : public Module
        Channel_r m4;
        User_r m5;
        AccountExtItem accountname;
+       bool checking_ban;
+
+       static bool ReadCGIIRCExt(const char* extname, User* user, const std::string*& out)
+       {
+               ExtensionItem* wiext = ServerInstance->Extensions.GetItem(extname);
+               if (!wiext)
+                       return false;
+
+               if (wiext->creator->ModuleSourceFile != "m_cgiirc.so")
+                       return false;
+
+               StringExtItem* stringext = static_cast<StringExtItem*>(wiext);
+               std::string* addr = stringext->get(user);
+               if (!addr)
+                       return false;
+
+               out = addr;
+               return true;
+       }
+
  public:
        ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
-               accountname("accountname", this)
+               accountname("accountname", this), checking_ban(false)
        {
        }
 
        void init()
        {
-               ServerInstance->Modules->AddService(m1);
-               ServerInstance->Modules->AddService(m2);
-               ServerInstance->Modules->AddService(m3);
-               ServerInstance->Modules->AddService(m4);
-               ServerInstance->Modules->AddService(m5);
-               ServerInstance->Modules->AddService(accountname);
+               ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
+               ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
                        I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
 
-               ServerInstance->Modules->Attach(eventlist, this, 9);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void On005Numeric(std::string &t)
@@ -175,12 +191,6 @@ class ModuleServicesAccount : public Module
                std::string *account = accountname.get(user);
                bool is_registered = account && !account->empty();
 
-               if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-               {
-                       // user is ulined, can speak regardless
-                       return MOD_RES_PASSTHRU;
-               }
-
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
@@ -209,8 +219,7 @@ class ModuleServicesAccount : public Module
 
        ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
        {
-               static bool checking = false;
-               if (checking)
+               if (checking_ban)
                        return MOD_RES_PASSTHRU;
 
                if ((mask.length() > 2) && (mask[1] == ':'))
@@ -230,9 +239,9 @@ class ModuleServicesAccount : public Module
 
                                /* If we made it this far we know the user isn't registered
                                        so just deny if it matches */
-                               checking = true;
+                               checking_ban = true;
                                bool result = chan->CheckBan(user, mask.substr(2));
-                               checking = false;
+                               checking_ban = false;
 
                                if (result)
                                        return MOD_RES_DENY;
@@ -259,12 +268,6 @@ class ModuleServicesAccount : public Module
 
                if (chan)
                {
-                       if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
-                       {
-                               // user is ulined, won't be stopped from joining
-                               return MOD_RES_PASSTHRU;
-                       }
-
                        if (chan->IsModeSet('R'))
                        {
                                if (!is_registered)
@@ -297,8 +300,19 @@ class ModuleServicesAccount : public Module
                                trim(*account);
 
                                if (IS_LOCAL(dest))
-                                       dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s",
-                                               dest->nick.c_str(), dest->GetFullHost().c_str(), account->c_str(), account->c_str());
+                               {
+                                       const std::string* host = &dest->dhost;
+                                       if (dest->registered != REG_ALL)
+                                       {
+                                               if (!ReadCGIIRCExt("cgiirc_webirc_hostname", dest, host))
+                                               {
+                                                       ReadCGIIRCExt("cgiirc_webirc_ip", dest, host);
+                                               }
+                                       }
+
+                                       dest->WriteNumeric(900, "%s %s!%s@%s %s :You are now logged in as %s",
+                                               dest->nick.c_str(), dest->nick.c_str(), dest->ident.c_str(), host->c_str(), account->c_str(), account->c_str());
+                               }
 
                                AccountEvent(this, dest, *account).Send();
                        }