Okay, this was good in theory, but totally and utterly fucked in implementation. Rip out automatic global snotice code. It's not going to be *that* difficult to trigger global snotice with protocol interface now anyway I guess. We need to re-add calls to protocol interfaces in places like failed oper and so on.

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

1 files changed, 2 insertions, 11 deletions

diff --git a/include/snomasks.h b/include/snomasks.h
index d4bd8a22c..6e3f75d7a 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -24,11 +24,10 @@ class Snomask : public Extensible
 	std::string Description;
 	std::string LastMessage;
 	unsigned int Count;
-	bool LocalOnly; // whether or not messages are netwide
 
 	/** Create a new Snomask
 	 */
-	Snomask(InspIRCd* Instance, char snomask, const std::string &description, bool local) : ServerInstance(Instance), MySnomask(snomask), Description(description), LastMessage(""), Count(0), LocalOnly(local)
+	Snomask(InspIRCd* Instance, char snomask, const std::string &description) : ServerInstance(Instance), MySnomask(snomask), Description(description), LastMessage(""), Count(0)
 	{
 	}
 
@@ -78,11 +77,10 @@ class CoreExport SnomaskManager : public Extensible
 	 * their list, and users may add this letter to their list.
 	 * @param description The descriptive text sent along with any
 	 * server notices, at the start of the notice, e.g. "GLOBOPS".
-	 * @param local Whether or not messages should be locally broadcast only (default off)
 	 * @return True if the snomask was enabled, false if it already
 	 * exists.
 	 */
-	bool EnableSnomask(char letter, const std::string &description, bool local = false);
+	bool EnableSnomask(char letter, const std::string &description);
 
 	/** Disable a snomask.
 	 * @param letter The snomask letter to disable.
@@ -91,13 +89,6 @@ class CoreExport SnomaskManager : public Extensible
 	 */
 	bool DisableSnomask(char letter);
 
-	/** Set the local only message state of a given snomask.
-	 * This is used by remote stuff to prevent endless recursion in sending
-	 * XXX this is currently a really shit way to do it, as it effectively
-	 * bypasses snomask compression!
-	 */
-	bool SetLocalOnly(char letter, bool local);
-
 	/** Write to all users with a given snomask.
 	 * @param letter The snomask letter to write to
 	 * @param text The text to send to the users