m_spanningtree Add ServerCommand::ExtractTS() to convert string to raw TS

[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 8ab9c9a3ba37a79e7933e7e5e4b235672013ad85..edb6f6ef5b0b828d22828e72cb77d4eca6ec7508 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -102,24 +102,6 @@ class AChannel_M : public SimpleChannelModeHandler
        AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
 };
 
-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;
-}
-
 class AccountExtItemImpl : public AccountExtItem
 {
  public:
@@ -140,17 +122,8 @@ class AccountExtItemImpl : public AccountExtItem
                        // Logged in
                        if (IS_LOCAL(user))
                        {
-                               const std::string* host = &user->dhost;
-                               if (user->registered != REG_ALL)
-                               {
-                                       if (!ReadCGIIRCExt("cgiirc_webirc_hostname", user, host))
-                                       {
-                                               ReadCGIIRCExt("cgiirc_webirc_ip", user, host);
-                                       }
-                               }
-
-                               user->WriteNumeric(900, "%s!%s@%s %s :You are now logged in as %s",
-                                       user->nick.c_str(), user->ident.c_str(), host->c_str(), value.c_str(), value.c_str());
+                               user->WriteNumeric(900, "%s %s :You are now logged in as %s",
+                                       user->GetFullHost().c_str(), value.c_str(), value.c_str());
                        }
 
                        AccountEvent(creator, user, value).Send();
@@ -317,4 +290,3 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
-