Fix broken +G for AnMaster (thanks for pointing out the bug)

Also: MAJOR speed increase for *any network that loads m_censor*!
It seems that this was looping all the censor items (not attempting a replace though) for all channels and users, even those that WERE NOT +G!
Fixed.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6109 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 14 insertions, 19 deletions

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 9d2a26191..49c04a946 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -118,11 +118,11 @@ class ModuleCensor : public Module
 
 	virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
 	{
-		if ((pattern != "") && (text != ""))
+		if ((!pattern.empty()) && (!text.empty()))
 		{
-			while (text.find(pattern) != irc::string::npos)
+			std::string::size_type pos;
+			while ((pos = text.find(pattern)) != irc::string::npos)
 			{
-				int pos = text.find(pattern);
 				text.erase(pos,pattern.length());
 				text.insert(pos,replace);
 			}
@@ -133,29 +133,24 @@ class ModuleCensor : public Module
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		bool active = false;
+
+		if (target_type == TYPE_USER)
+			active = ((userrec*)dest)->IsModeSet('G');
+		else if (target_type == TYPE_CHANNEL)
+			active = ((chanrec*)dest)->IsModeSet('G');
+
+		if (!active)
+			return 0;
+
 		irc::string text2 = text.c_str();
 		for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
 		{ 
 			if (text2.find(index->first) != irc::string::npos)
 			{
-				if (target_type == TYPE_USER)
-				{
-					userrec* t = (userrec*)dest;
-					active = t->IsModeSet('G');
-				}
-				else if (target_type == TYPE_CHANNEL)
-				{
-					chanrec* t = (chanrec*)dest;
-					active = t->IsModeSet('G');
-				}
-				
-				if (active)
-				{
-					this->ReplaceLine(text2,index->first,index->second);
-					text = text2.c_str();
-				}
+				this->ReplaceLine(text2,index->first,index->second);
 			}
 		}
+		text = text2.c_str();
 		return 0;
 	}