X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=b1b0de25f7ebaac3292f818e01d209ad4f9bbefa;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=c9e9c243fbb0cbd7c246d367399174bd53bb9abb;hpb=29b4e8dce678748ecc9e6004288464c179ca20ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c9e9c243f..b1b0de25f 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -26,7 +26,7 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-Server *Srv;
+static Server *Srv;
 	 
 class TimedBan
 {
@@ -62,8 +62,8 @@ class cmd_tban : public command_t
 				}
 				for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
 				{
-	                                irc::string listitem = i->mask.c_str();
-	                                irc::string target = parameters[2];
+					irc::string listitem = i->mask.c_str();
+					irc::string target = parameters[2];
 					irc::string listchan = i->channel.c_str();
 					irc::string targetchan = parameters[0];
 					if ((listitem == target) && (listchan == targetchan))
@@ -83,7 +83,7 @@ class cmd_tban : public command_t
 				char duration[MAXBUF];
 				snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1]));
 				std::string mask = parameters[2];
-				char *setban[3];
+				char *setban[32];
 				setban[0] = parameters[0];
 				setban[1] = "+b";
 				setban[2] = parameters[2];
@@ -127,18 +127,18 @@ class ModuleTimedBans : public Module
 		List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
 	}
 
-	virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask)
+	virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
 	{
-                for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
-                {
-                        irc::string listitem = banmask.c_str();
-                        irc::string target = i->mask.c_str();
-                        if (listitem == target)
-                        {
-                                TimedBanList.erase(i);
-                                break;
-                        }
-                }
+		for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+		{
+			irc::string listitem = banmask.c_str();
+			irc::string target = i->mask.c_str();
+			if (listitem == target)
+			{
+				TimedBanList.erase(i);
+				break;
+			}
+		}
 		return 0;
 	}
 
@@ -170,7 +170,7 @@ class ModuleTimedBans : public Module
 						temp->fd = FD_MAGIC_NUMBER;
 						temp->server = "";
 						Srv->SendMode(setban,3,temp);
-						delete temp;
+						DELETE(temp);
 					}
 					// we used to delete the item here, but we dont need to as the servermode above does it for us,
 					break;