Removed extremely verbose debugging from the SSL modules, as I believe that bug has...

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

diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index c6ce500e6621f0556f7830faf0eda12f2da2a10a..a0d96fc88ac194a43ba309001473b607e12e2f84 100644 (file)
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -35,16 +35,16 @@ public:
        ModuleSQLOper(InspIRCd* Me)
        : Module::Module(Me)
        {
-               ServerInstance->UseInterface("SQLutils");
-               ServerInstance->UseInterface("SQL");
-               ServerInstance->UseInterface("HashRequest");
+               ServerInstance->Modules->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQL");
+               ServerInstance->Modules->UseInterface("HashRequest");
 
                /* Attempt to locate the md5 service provider, bail if we can't find it */
-               HashModule = ServerInstance->FindModule("m_md5.so");
+               HashModule = ServerInstance->Modules->Find("m_md5.so");
                if (!HashModule)
                        throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_sqloper.so.");
 
-               SQLutils = ServerInstance->FindModule("m_sqlutils.so");
+               SQLutils = ServerInstance->Modules->Find("m_sqlutils.so");
                if (!SQLutils)
                        throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqloper.so.");
 
@@ -53,9 +53,9 @@ public:
 
        virtual ~ModuleSQLOper()
        {
-               ServerInstance->DoneWithInterface("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
-               ServerInstance->DoneWithInterface("HashRequest");
+               ServerInstance->Modules->DoneWithInterface("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
+               ServerInstance->Modules->DoneWithInterface("HashRequest");
        }
 
        void Implements(char* List)
@@ -91,7 +91,7 @@ public:
        {
                Module* target;
                
-               target = ServerInstance->FindFeature("SQL");
+               target = ServerInstance->Modules->FindFeature("SQL");
 
                if (target)
                {
@@ -260,7 +260,7 @@ public:
                                        user->ChangeDisplayedHost(operhost.c_str());
 
                                ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str());
-                               user->WriteServ("381 %s :You are now an IRC operator of type %s", user->nick, type.c_str());
+                               user->WriteServ("381 %s :You are now %s %s",user->nick, strchr("aeiouAEIOU", type[0]) ? "an" : "a", irc::Spacify(type.c_str()));
 
                                if (!user->modes[UM_OPERATOR])
                                        user->Oper(type);
@@ -279,27 +279,4 @@ public:
        
 };
 
-class ModuleSQLOperFactory : public ModuleFactory
-{
- public:
-       ModuleSQLOperFactory()
-       {
-       }
-       
-       ~ModuleSQLOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLOper(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLOperFactory;
-}
-
+MODULE_INIT(ModuleSQLOper);