Windows compile fixes for RLine

[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 60d852cf56df5eb866bb3a34f0ae149ddc571f20..fe381f64cc60d34f78695a0cb59083232eae0733 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -54,7 +54,7 @@ class ModuleServicesAccount : public Module
                m2 = new AChannel_M(ServerInstance);
                m3 = new AUser_R(ServerInstance);
                if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3))
-                       throw ModuleException("Could not add new modes!");
+                       throw ModuleException("You cannot load m_services.so and m_services_account.so at the same time (or some other module has claimed our modes)!");
 
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
                        I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric };
@@ -64,8 +64,8 @@ class ModuleServicesAccount : public Module
 
        virtual void On005Numeric(std::string &t)
        {
-               ServerInstance->AddExtBanChar("R");
-               ServerInstance->AddExtBanChar("M");
+               ServerInstance->AddExtBanChar('R');
+               ServerInstance->AddExtBanChar('M');
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -164,7 +164,7 @@ class ModuleServicesAccount : public Module
                                if (chan->IsExtBanned(*account, 'R'))
                                {
                                        // may not join
-                                       user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(chan->name)+" :You may not join. this channel");
+                                       user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
                                        return 1;
                                }
                        }
@@ -286,7 +286,7 @@ class ModuleServicesAccount : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };