WHEEEEE!!!!!

All of: Write(), WriteTo(), WriteFrom(), WriteServ() are now methods of userrec.
Write_NoFormat(), WriteTo_NoFormat(), WriteFrom_NoFormat(), WriteServ_NoFormat() are now std::string-taking overloaded methods of the functions above
All modules updated to use new syntax, my fingers hurt :(


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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index a658a60b6..26d231b14 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -135,7 +135,7 @@ class ModuleFilterPCRE : public Module
 					Srv->SendOpers(std::string("Filter: ")+std::string(user->nick)+
     							std::string(" had their notice filtered, target was ")+
     							target+": "+reason);
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+
+					user->WriteServ("NOTICE "+std::string(user->nick)+
     							" :Your notice has been filtered and opers notified: "+reason);
     				}
 				Srv->Log(DEFAULT,std::string("Filter: ")+std::string(user->nick)+
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index bb6718313..3e91959b8 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -179,7 +179,7 @@ public:
 						 * "insufficient awesomeness" (invalid credentials) error
 						 */
 						
-						WriteServ(user->fd, "491 %s :Invalid oper credentials", user->nick);
+						user->WriteServ( "491 %s :Invalid oper credentials", user->nick);
 						WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!", user->nick, user->ident, user->host);
 						log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
 					}
@@ -192,7 +192,7 @@ public:
 					 */
 					log(DEBUG, "Query failed: %s", res->error.Str());
 
-					WriteServ(user->fd, "491 %s :Invalid oper credentials", user->nick);
+					user->WriteServ( "491 %s :Invalid oper credentials", user->nick);
 					WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s! (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str());
 					log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
 				}
@@ -236,7 +236,7 @@ public:
 				strlcpy(user->oper, type.c_str(), NICKMAX-1);
 				
 				WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s", user->nick, user->ident, user->host, type.c_str());
-				WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s", user->nick, type.c_str());
+				user->WriteServ("381 %s :You are now an IRC operator of type %s", user->nick, type.c_str());
 				
 				if (!user->modes[UM_OPERATOR])
 					user->Oper();
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index ce9099d53..216c69c25 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -463,7 +463,7 @@ class ModuleSSLGnuTLS : public Module
 		// Bugfix, only send this numeric for *our* SSL users
 		if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) &&  isin(dest->GetPort(), listenports)))
 		{
-			WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
+			source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick);
 		}
 	}
 	
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index c9b9d42aa..29b97ba9a 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -535,7 +535,7 @@ class ModuleSSLOpenSSL : public Module
 		// Bugfix, only send this numeric for *our* SSL users
 		if(dest->GetExt("ssl", dummy) || (IS_LOCAL(dest) &&  isin(dest->GetPort(), listenports)))
 		{
-			WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
+			source->WriteServ("320 %s %s :is using a secure connection", source->nick, dest->nick);
 		}
 	}