Mention ulines too

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

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 4a9541324cd367875f1fce63321a0e73bb5c8610..278b74541acf2810365638fe22028446398e3d43 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -105,11 +105,12 @@ class CloakUser : public ModeHandler
                                        /* Force creation of missing cloak */
                                        Sender->OnUserConnect(dest);
                                }
-
-                               dest->GetExt("cloaked_host", cloak);
-                               dest->ChangeDisplayedHost(cloak->c_str());
-                               dest->SetMode('x',true);
-                               return MODEACTION_ALLOW;
+                               if (dest->GetExt("cloaked_host", cloak))
+                               {
+                                       dest->ChangeDisplayedHost(cloak->c_str());
+                                       dest->SetMode('x',true);
+                                       return MODEACTION_ALLOW;
+                               }
                        }
                }
                else
@@ -291,8 +292,10 @@ class ModuleCloaking : public Module
 
                ServerInstance->Modules->UseInterface("HashRequest");
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData };
+               Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
                ServerInstance->Modules->Attach(eventlist, this, 6);
+
+               CloakExistingUsers();
        }
 
        void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
@@ -305,6 +308,17 @@ class ModuleCloaking : public Module
                }
        }
 
+       void CloakExistingUsers()
+       {
+               std::string* cloak;
+               for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+               {
+                       if (!(*u)->GetExt("cloaked_host", cloak))
+                       {
+                               OnUserConnect(*u);
+                       }
+               }
+       }
 
        virtual int OnCheckBan(User* user, Channel* chan)
        {
@@ -337,7 +351,10 @@ class ModuleCloaking : public Module
        {
                std::string* tofree;
                if (user->GetExt("cloaked_host", tofree))
+               {
                        delete tofree;
+                       user->Shrink("cloaked_host");
+               }
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -367,6 +384,10 @@ class ModuleCloaking : public Module
 
        virtual void OnUserConnect(User* dest)
        {
+               std::string* tofree;
+               if (dest->GetExt("cloaked_host", tofree))
+                       return;
+
                if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
                {
                        unsigned int iv[] = { cu->key1, cu->key2, cu->key3, cu->key4 };