X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=25f071bab3ded04560ae8f7e73f7afc42991d38b;hb=1c89cb1002c915a18abd1dda2204b5c3ea1b5515;hp=c7f0da690ed8b9eb80cae4378f3b0afc51c91163;hpb=9ee588b23fd915255d2cea0c537e6938297dbe5b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index c7f0da690..25f071bab 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005, 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2007, 2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides aliases of commands. */
@@ -65,11 +74,9 @@ class ModuleAlias : public Module
 
 	virtual void ReadAliases()
 	{
-		ConfigReader MyConf;
-
-		AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
-
-		std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
+		ConfigTag* fantasy = ServerInstance->Config->ConfValue("fantasy");
+		AllowBots = fantasy->getBool("allowbots", false);
+		std::string fpre = fantasy->getString("prefix", "!");
 		fprefix = fpre.empty() ? '!' : fpre[0];
 
 		Aliases.clear();
@@ -78,12 +85,13 @@ class ModuleAlias : public Module
 		{
 			ConfigTag* tag = i->second;
 			Alias a;
-			a.AliasedCommand = tag->getString("text").c_str();
+			std::string aliastext = tag->getString("text");
+			a.AliasedCommand = aliastext.c_str();
 			tag->readString("replace", a.ReplaceFormat, true);
 			a.RequiredNick = tag->getString("requires");
 			a.ULineOnly = tag->getBool("uline");
-			a.ChannelCommand = tag->getBool("channelcommand", "no");
-			a.UserCommand = tag->getBool("usercommand", "yes");
+			a.ChannelCommand = tag->getBool("channelcommand", false);
+			a.UserCommand = tag->getBool("usercommand", true);
 			a.OperOnly = tag->getBool("operonly");
 			a.format = tag->getString("format");
 			a.CaseSensitive = tag->getBool("matchcase");
@@ -93,12 +101,11 @@ class ModuleAlias : public Module
 
  public:
 
-	ModuleAlias()
+	void init()
 	{
 		ReadAliases();
-		ServerInstance->Modules->Attach(I_OnPreCommand, this);
-		ServerInstance->Modules->Attach(I_OnRehash, this);
-		ServerInstance->Modules->Attach(I_OnUserMessage, this);
+		Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleAlias()
@@ -244,7 +251,7 @@ class ModuleAlias : public Module
 	}
 
 
-	int DoAlias(User *user, Channel *c, Alias *a, const std::string compare, const std::string safe)
+	int DoAlias(User *user, Channel *c, Alias *a, const std::string& compare, const std::string& safe)
 	{
 		User *u = NULL;
 
@@ -271,7 +278,7 @@ class ModuleAlias : public Module
 			u = ServerInstance->FindNick(a->RequiredNick);
 			if (!u)
 			{
-				user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
+				user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is currently unavailable. Please try again later.");
 				return 1;
 			}
 		}
@@ -280,7 +287,7 @@ class ModuleAlias : public Module
 			if (!ServerInstance->ULine(u->server))
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
-				user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
+				user->WriteNumeric(401, ""+user->nick+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
 				return 1;
 			}
 		}