Improved strhashcomp with no allocations

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index a8142030d8b8d8463946bb92ab978d4ba597470c..77f882d0e16d96315a6ef2c24e93c72be57e5729 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -50,15 +50,18 @@ class cmd_swhois : public command_t
                        if(text)
                        {
                                // We already had it set...
-                                                               
-                               WriteOpers("%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+                               
+                               if (!Srv->IsUlined(user->server))
+                                       // Ulines set SWHOISes silently
+                                       WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                                
                                dest->Shrink("swhois");
                                delete text;
                        }
-                       else
+                       else if(!Srv->IsUlined(user->server))
                        {
-                               WriteOpers("%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+                               // Ulines set SWHOISes silently
+                               WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
                        }
                        
                        text = new std::string(line);
@@ -187,16 +190,19 @@ class ModuleSWhois : public Module
                        {
                                std::string swhois = Conf->ReadValue("type", "swhois", i);
                                
-                               if(std::string* old = (std::string*)user->GetExt("swhois"))
+                               if(swhois.length())
                                {
-                                       user->Shrink("swhois");
-                                       delete old;
-                               }
+                                       if(std::string* old = (std::string*)user->GetExt("swhois"))
+                                       {
+                                               user->Shrink("swhois");
+                                               delete old;
+                                       }
                        
-                               std::string* text = new std::string(swhois);
-                               user->Extend("swhois", (char*)text);
-                               
-                               break;
+                                       std::string* text = new std::string(swhois);
+                                       user->Extend("swhois", (char*)text);
+                                       
+                                       break;
+                               }
                        }
                }               
        }