Annotations

[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 3e09aef2f8bca736ac7c685c237a904c4340041f..fd3dedff2dec5169a79cdde94a2551a771a6cc33 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -19,21 +19,23 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "commands.h"
 #include "inspircd.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
-
-
+/** An alias definition
+ */
 class Alias : public classbase
 {
  public:
+       /** The text of the alias command */
        irc::string text;
+       /** Text to replace with */
        std::string replace_with;
+       /** Nickname required to perform alias */
        std::string requires;
+       /** Alias requires ulined server */
        bool uline;
 };
 
@@ -71,7 +73,7 @@ class ModuleAlias : public Module
                : Module::Module(Me)
        {
                
-               MyConf = new ConfigReader;
+               MyConf = new ConfigReader(ServerInstance);
                ReadAliases();
        }
 
@@ -116,7 +118,7 @@ class ModuleAlias : public Module
                                }
                                if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
                                {
-                                       if (!is_uline(u->server))
+                                       if (!ServerInstance->ULine(u->server))
                                        {
                                                ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
                                                user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
@@ -149,7 +151,7 @@ class ModuleAlias : public Module
        virtual void OnRehash(const std::string &parameter)
        {
                DELETE(MyConf);
-               MyConf = new ConfigReader;
+               MyConf = new ConfigReader(ServerInstance);
        
                ReadAliases();
        }