X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=6ee50ea0727120976c3ef8db9b2679da17653f25;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=59492c828083b27c9aaf191e81ddbef47ed29f47;hpb=984ae685724f26dad0865ad43773364c8b5128ff;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 59492c828..6ee50ea07 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -2,7 +2,7 @@
  *   | Inspire Internet Relay Chat Daemon |
  *   +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *   E-mail:
  *	<brain@chatspike.net>
  *	<Craig@chatspike.net>
@@ -24,7 +24,7 @@ using namespace std;
 
 /* $ModDesc: Provides aliases of commands. */
 
-class Alias
+class Alias : public classbase
 {
 	public:
  		irc::string text;
@@ -40,8 +40,6 @@ class ModuleAlias : public Module
 		ConfigReader *MyConf;
 		std::vector<Alias> Aliases;
 
-		/* XXX - small issue, why is this marked public when it's not (really) intended for external use
-		 * Fixed 30/11/05 by Brain as suggestion by w00t */
  		virtual void ReadAliases()
 		{
 			Aliases.clear();
@@ -73,10 +71,15 @@ class ModuleAlias : public Module
 			MyConf = new ConfigReader;
 			ReadAliases();
 		}
+
+		void Implements(char* List)
+		{
+			List[I_OnPreCommand] = List[I_OnRehash] = 1;
+		}
 	
 		virtual ~ModuleAlias()
 		{
-			delete MyConf;
+			DELETE(MyConf);
 		}
 	
 		virtual Version GetVersion()
@@ -84,13 +87,16 @@ class ModuleAlias : public Module
 			return Version(1,0,0,1,VF_VENDOR);
 		}
 
-		virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated)
+		virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
 		{
 			userrec *u = NULL;
 			irc::string c = command.c_str();
 
-			/* If the command is valid, we dont want to know */
-			if (validated)
+			/* If the command is valid, we dont want to know,
+			 * and if theyre not registered yet, we dont want
+			 * to know either
+			 */
+			if ((validated) || (user->registered != REG_ALL))
 				return 0;
 			
 			for (unsigned int i = 0; i < Aliases.size(); i++)
@@ -100,19 +106,18 @@ class ModuleAlias : public Module
 					if (Aliases[i].requires != "")
 					{
 						u = Srv->FindNick(Aliases[i].requires);
+						if (!u)
+						{
+							user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+							return 1;
+						}
 					}
-				
-					if ((Aliases[i].requires != "") && (!u))
-					{
-						Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
-						return 1;
-					}
-					if (Aliases[i].uline)
+					if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
 					{
 						if (!Srv->IsUlined(u->server))
 						{
 							Srv->SendOpers("*** 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!"); 
-							Srv->SendServ(user->fd,"401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
+							user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
 							return 1;
 						}
 					}
@@ -132,9 +137,9 @@ class ModuleAlias : public Module
 					stuff >> cmd;
 					stuff >> target;
 
-					char* para[2];
-					para[0] = (char*)target.c_str();
-					para[1] = (char*)n.c_str();
+					const char* para[2];
+					para[0] = target.c_str();
+					para[1] = n.c_str();
 
 					Srv->CallCommandHandler(cmd,para,2,user);
 					return 1;
@@ -143,9 +148,9 @@ class ModuleAlias : public Module
 			return 0;
 	 	}
   
-		virtual void OnRehash(std::string parameter)
+		virtual void OnRehash(const std::string &parameter)
 		{
-			delete MyConf;
+			DELETE(MyConf);
 			MyConf = new ConfigReader;
 		
 			ReadAliases();