A ton more clear() and empty() stuff thats been lingering on the long term todo for...

[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 651735e442347c69eb53ffa9013bb28ebc6f5fd9..27d9b335e14b9a91beb5003c93e616e2ea031b4f 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -2,25 +2,20 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
@@ -121,15 +116,14 @@ class ModuleServicesAccount : public Module
        AChannel_M* m2;
        AUser_R* m3;
  public:
-       ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me)
+       ModuleServicesAccount(InspIRCd* Me) : Module(Me)
        {
                
                m1 = new AChannel_R(ServerInstance);
                m2 = new AChannel_M(ServerInstance);
                m3 = new AUser_R(ServerInstance);
-               ServerInstance->AddMode(m1, 'R');
-               ServerInstance->AddMode(m2, 'M');
-               ServerInstance->AddMode(m3, 'R');
+               if (!ServerInstance->AddMode(m1, 'R') || !ServerInstance->AddMode(m2, 'M') || !ServerInstance->AddMode(m3, 'R'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -140,7 +134,7 @@ class ModuleServicesAccount : public Module
 
                if (account)
                {
-                       source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
+                       ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
                }
        }
 
@@ -150,9 +144,13 @@ class ModuleServicesAccount : public Module
                List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       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)
@@ -161,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;
@@ -192,9 +190,9 @@ class ModuleServicesAccount : public Module
                return 0;
        }
         
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreMessage(user, dest, target_type, text, status);
+               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
         
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
@@ -227,7 +225,7 @@ class ModuleServicesAccount : public Module
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                // check if the linking module wants to know about OUR metadata
                if (extname == "accountname")
@@ -237,6 +235,9 @@ class ModuleServicesAccount : public Module
                        user->GetExt("accountname", account);
                        if (account)
                        {
+                               // remove any accidental leading/trailing spaces
+                               trim(*account);
+
                                // call this function in the linking module, let it format the data how it
                                // sees fit, and send it on its way. We dont need or want to know how.
                                proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account);
@@ -245,7 +246,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);
@@ -285,8 +286,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);
@@ -303,6 +305,8 @@ class ModuleServicesAccount : public Module
                                if (!dest->GetExt("accountname", text))
                                {
                                        text = new std::string(extdata);
+                                       // remove any accidental leading/trailing spaces
+                                       trim(*text);
                                        dest->Extend("accountname", text);
                                }
                        }
@@ -345,7 +349,7 @@ class ModuleServicesAccountFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleServicesAccountFactory;
 }