X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=cd53c9f9733cc45ea17cdc6be70375af3de1e0eb;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=991d6f26401168a121db63b09bb3f8a386111496;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 991d6f264..cd53c9f97 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -59,14 +59,12 @@ class Alias
 
 class ModuleAlias : public Module
 {
- private:
-
 	char fprefix;
 
 	/* We cant use a map, there may be multiple aliases with the same name.
 	 * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
 	 *		-- w00t
-   */
+     */
 	std::multimap<irc::string, Alias> Aliases;
 
 	/* whether or not +B users are allowed to use fantasy commands */
@@ -100,17 +98,11 @@ class ModuleAlias : public Module
 	}
 
  public:
-
 	void init()
 	{
 		ReadAliases();
-		ServerInstance->Modules->Attach(I_OnPreCommand, this);
-		ServerInstance->Modules->Attach(I_OnRehash, this);
-		ServerInstance->Modules->Attach(I_OnUserMessage, this);
-	}
-
-	virtual ~ModuleAlias()
-	{
+		Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual Version GetVersion()
@@ -271,7 +263,7 @@ class ModuleAlias : public Module
 			}
 		}
 
-		if ((a->OperOnly) && (!IS_OPER(user)))
+		if ((a->OperOnly) && (!user->IsOper()))
 			return 0;
 
 		if (!a->RequiredNick.empty())