Changed more to use InsertMode

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

6 files changed, 6 insertions, 94 deletions

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 156695be9..bd6049718 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -85,24 +85,7 @@ class ModuleKnock : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "K";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-		{
-	                output = temp2.substr(0,temp2.length()-1) + std::string(" KNOCK");
-		}
-		else output = output + std::string(" KNOCK");
+		InsertMode(output,"K",4);
         }
 
 	virtual ~ModuleKnock()
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 669cff54a..ad6c74e84 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -44,21 +44,7 @@ class ModuleNoCTCP : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "C";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
+		InsertMode(output,"C",4);
         }
 	
 	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index a72a95db8..1d4d8fedd 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -44,22 +44,7 @@ class ModuleNoInvite : public Module
 
 		virtual void On005Numeric(std::string &output)
 		{
-			std::stringstream line(output);
-			std::string temp1, temp2;
-
-			while (!line.eof())
-			{
-				line >> temp1;
-				if (temp1.substr(0,10) == "CHANMODES=")
-				{
-					// append the chanmode to the end
-					temp1 = temp1.substr(10,temp1.length());
-					temp1 = "CHANMODES=" + temp1 + "V";
-				}
-				temp2 = temp2 + temp1 + " ";
-			}
-			if (temp2.length())
-				output = temp2.substr(0,temp2.length()-1);
+			InsertMode(output,"V",4);
 		}
 
 
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index e5e8dd582..d5b99b388 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -44,21 +44,7 @@ class ModuleNoKicks : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "Q";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
+		InsertMode(output,"Q",4);
         }
 
 	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 809408310..7c13d678a 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -55,21 +55,7 @@ class ModuleNoNickChange : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "N";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
+		InsertMode(output,"N",4);
         }
 	
 	virtual int OnUserPreNick(userrec* user, std::string newnick)
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index b80dd4070..bd5c34ee3 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -65,21 +65,7 @@ class ModuleNoNotice : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "T";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
+		InsertMode(output,"T",4);
         }
 
 	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)