Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 b5024e4df1dfa2680ee38bc3811a4e0325fd7127..1f9daf452f16baa3a3c99c167185c56bb801249d 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -147,6 +147,10 @@ class ModuleServicesAccount : public Module
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                std::string *account;
+
+               if (!IS_LOCAL(user))
+                       return 0;
+
                user->GetExt("accountname", account);
                
                if (target_type == TYPE_CHANNEL)
@@ -155,7 +159,7 @@ class ModuleServicesAccount : public Module
                        
                        if ((c->IsModeSet('M')) && (!account))
                        {
-                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+                               if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
                                {
                                        // user is ulined, can speak regardless
                                        return 0;
@@ -239,7 +243,7 @@ class ModuleServicesAccount : public Module
        }
 
        // when a user quits, tidy up their metadata
-       virtual void OnUserQuit(userrec* user, const std::string &message)
+       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
        {
                std::string* account;
                user->GetExt("accountname", account);
@@ -279,8 +283,9 @@ class ModuleServicesAccount : public Module
                if ((target_type == TYPE_USER) && (extname == "accountname"))
                {       
                        userrec* dest = (userrec*)target;
+                       
                        /* logging them out? */
-                       if (extdata == "")
+                       if (extdata.empty())
                        {
                                std::string* account;
                                dest->GetExt("accountname", account);