and a little tweak to remote MOTD too.

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 858a7883d5578ad00d96a9fba76f5d9ddf085c3a..2ac6ad55e114d06ce434f3982753ee5d5bee85d9 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "wildcard.h"
-#include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -75,7 +74,7 @@ class ModuleAlias : public Module
  public:
        
        ModuleAlias(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                ReadAliases();
                pars.resize(127);
@@ -168,7 +167,7 @@ class ModuleAlias : public Module
                                                continue;
                                }
 
-                               if ((Aliases[i].operonly) && (!*user->oper))
+                               if ((Aliases[i].operonly) && (!IS_OPER(user)))
                                        return 0;
 
                                if (Aliases[i].requires != "")
@@ -255,7 +254,7 @@ class ModuleAlias : public Module
                const char* parv[127];
                int x = 0;
 
-               while ((pars[x] = ss.GetToken()) != "")
+               while (ss.GetToken(pars[x]))
                {
                        parv[x] = pars[x].c_str();
                        x++;
@@ -289,7 +288,7 @@ class ModuleAliasFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleAliasFactory;
 }