X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=869bc6a1f9c1f7a0cbe8d11ce7623f7644284574;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=db3d75baebed43bdfb07fffe0f579b8e42ee07f2;hpb=6725061d066929143d38f8d32cf032d9968c39f4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index db3d75bae..869bc6a1f 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -24,7 +24,7 @@ using namespace std;
 
 /* $ModDesc: Provides aliases of commands. */
 
-class Alias
+class Alias : public classbase
 {
 	public:
  		irc::string text;
@@ -79,7 +79,7 @@ class ModuleAlias : public Module
 	
 		virtual ~ModuleAlias()
 		{
-			delete MyConf;
+			DELETE(MyConf);
 		}
 	
 		virtual Version GetVersion()
@@ -87,7 +87,7 @@ 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();
@@ -112,7 +112,7 @@ class ModuleAlias : public Module
 							return 1;
 						}
 					}
-					if (Aliases[i].uline)
+					if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
 					{
 						if (!Srv->IsUlined(u->server))
 						{
@@ -137,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;
@@ -148,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();