kill_link() and Server::QuitUser() -> userrec::QuitUser() (static member) - this cant be a normal member as it causes the userrec to be deleted, and "delete this" is bad, mmm'k

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

9 files changed, 14 insertions, 14 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 58ca77333..a658a60b6 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -144,7 +144,7 @@ class ModuleFilterPCRE : public Module
 
 				if (do_action == "kill")
 				{
-					Srv->QuitUser(user,reason);
+					userrec::QuitUser(user,reason);
 				}
 				return 1;
 			}
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index a1b58151d..e6878777d 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -94,7 +94,7 @@ public:
 		
 		if (!CheckCredentials(user))
 		{
-			Srv->QuitUser(user,killreason);
+			userrec::QuitUser(user,killreason);
 		}
 	}
 
@@ -202,7 +202,7 @@ public:
 	{
 		if(user->GetExt("sqlauth_failed"))
 		{
-			Srv->QuitUser(user,killreason);
+			userrec::QuitUser(user,killreason);
 			return false;
 		}
 		
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index fdbc33839..b46da5527 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -141,7 +141,7 @@ public:
 					WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
 
 				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-					Srv->QuitUser(user, "Global message (/amsg or /ame) detected");
+					userrec::QuitUser(user, "Global message (/amsg or /ame) detected");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
 					WriteServ(user->fd, "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
 									
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index a97fe8d3f..d89030ff9 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -94,7 +94,7 @@ class ModuleWaitPong : public Module
 				else
 				{
 					if(killonbadreply)
-						Srv->QuitUser(user, "Incorrect ping reply for registration");
+						userrec::QuitUser(user, "Incorrect ping reply for registration");
 					return 1;
 				}
 			}
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 8df8ecefc..e5d3fd2ad 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -94,7 +94,7 @@ public:
 				Srv->SendOpers("*** Connection throttle deactivated");
 				return;
 			}
-			Srv->QuitUser(user, quitmsg);
+			userrec::QuitUser(user, quitmsg);
 			return;
 		}
 
@@ -104,7 +104,7 @@ public:
 			{
 				throttled = 1;
 				Srv->SendOpers("*** Connection throttle activated");
-				Srv->QuitUser(user, quitmsg);
+				userrec::QuitUser(user, quitmsg);
 				return;
 			}
 		}
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 1fd3bde92..8dd862ee7 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -116,7 +116,7 @@ class ModuleFilter : public Module
 
 				if (f->action == "kill")
 				{
-					Srv->QuitUser(user,f->reason);
+					userrec::QuitUser(user,f->reason);
 				}
 				return 1;
 			}
diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index 31da8f033..2a9aad5f0 100644
--- a/src/modules/m_park.cpp
+++ b/src/modules/m_park.cpp
@@ -325,7 +325,7 @@ class ModulePark : public Module
 					// and then corrupt the pointer!
 					pinfo.erase(j);
 					if (thisnick)
-						Srv->QuitUser(thisnick,"PARK timeout");
+						userrec::QuitUser(thisnick,"PARK timeout");
 					go_again = true;
 					break;
 				}
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 0069e3486..5ede08b67 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -63,7 +63,7 @@ class cmd_saquit : public command_t
 			line = line + std::string(parameters[pcnt-1]);
 		
 			Srv->SendOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-			Srv->QuitUser(dest, line);
+			userrec::QuitUser(dest, line);
 		}
 	}
 };
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 93e501e6f..491c3c471 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -330,7 +330,7 @@ class TreeServer : public classbase
 			userrec* a = (userrec*)*n;
 			log(DEBUG,"Kill %s fd=%d",a->nick,a->fd);
 			if (!IS_LOCAL(a))
-				kill_link(a,reason_s);
+				userrec::QuitUser(a,reason_s);
 		}
 		return time_to_die.size();
 	}
@@ -2078,7 +2078,7 @@ class TreeSocket : public InspSocket
 			params[1] = ":" + params[1];
 			DoOneToAllButSender(prefix,"KILL",params,sourceserv);
 			::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
-			Srv->QuitUser(who,reason);
+			userrec::QuitUser(who,reason);
 		}
 		return true;
 	}
@@ -2965,11 +2965,11 @@ class TreeSocket : public InspSocket
 								p.push_back(prefix);
 								p.push_back("Nickname collision");
 								DoOneToMany(Srv->GetServerName(),"KILL",p);
-								Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
+								userrec::QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
 								userrec* y = Srv->FindNick(prefix);
 								if (y)
 								{
-									Srv->QuitUser(y,"Nickname collision");
+									userrec::QuitUser(y,"Nickname collision");
 								}
 								return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
 							}