X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsnomasks.h;h=c35fc92b7235d5ef5534ea6621c9efcfd9d7b758;hb=01c23b31f7d0ea87052cd22814af826ecb11f0f3;hp=d4bd8a22c9e1ef8d95ab0b369f6eda12b37e56af;hpb=28a1967177d055fbbd30b18864209721b8075ce1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/snomasks.h b/include/snomasks.h
index d4bd8a22c..c35fc92b7 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -23,12 +23,12 @@ class Snomask : public Extensible
 	char MySnomask;
 	std::string Description;
 	std::string LastMessage;
+	bool LastBlocked;
 	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)
 	{
 	}
 
@@ -36,7 +36,7 @@ class Snomask : public Extensible
 	 */
 	void SendMessage(const std::string &message);
 
-	/** Sends out a pending message
+	/** Sends out the (last message repeated N times) message
 	 */
 	void Flush();
 };
@@ -49,7 +49,7 @@ typedef std::map<char, Snomask *> SnoList;
  * Modules and the core can enable and disable snomask characters. If they do,
  * then sending snomasks using these characters becomes possible.
  */
-class CoreExport SnomaskManager : public Extensible
+class CoreExport SnomaskManager
 {
  private:
 	/** Creator/owner
@@ -78,11 +78,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,26 +90,33 @@ 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.
+	/** Write to all users with a given snomask (local server only)
 	 * @param letter The snomask letter to write to
 	 * @param text The text to send to the users
 	 */
 	void WriteToSnoMask(char letter, const std::string &text);
 
-	/** Write to all users with a given snomask.
+	/** Write to all users with a given snomask (local server only)
 	 * @param letter The snomask letter to write to
 	 * @param text A format string containing text to send
 	 * @param ... Format arguments
 	 */
 	void WriteToSnoMask(char letter, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
+	/** Write to all users with a given snomask (sent globally)
+	 * @param letter The snomask letter to write to
+	 * @param text The text to send to the users
+	 */
+	void WriteGlobalSno(char letter, const std::string &text);
+
+	/** Write to all users with a given snomask (sent globally)
+	 * @param letter The snomask letter to write to
+	 * @param text A format string containing text to send
+	 * @param ... Format arguments
+	 */
+	void WriteGlobalSno(char letter, const char* text, ...) CUSTOM_PRINTF(3, 4);
+
+
 	/** Called once per 5 seconds from the mainloop, this flushes any cached
 	 * snotices. The way the caching works is as follows:
 	 * Calls to WriteToSnoMask write to a cache, if the call is the same as it was