X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsnomasks.h;h=591a8708cc1f7cf766ee6a99b5d748291f84ce7e;hb=fa452641bf37077fcda964d59e404a76e1fb13e5;hp=a8e5c525c79fb885347eecbce2d4f58ff14e2724;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/snomasks.h b/include/snomasks.h
index a8e5c525c..591a8708c 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -14,11 +14,8 @@
 #ifndef __SNOMASKS_H__
 #define __SNOMASKS_H__
 
-class Snomask : public Extensible
+class Snomask
 {
- private:
-	InspIRCd *ServerInstance;
-
  public:
 	char MySnomask;
 	std::string Description;
@@ -28,7 +25,7 @@ class Snomask : public Extensible
 
 	/** Create a new Snomask
 	 */
-	Snomask(InspIRCd* Instance, char snomask, const std::string &description) : ServerInstance(Instance), MySnomask(snomask), Description(description), LastMessage(""), Count(0)
+	Snomask(char snomask, const std::string &description) : MySnomask(snomask), Description(description), LastMessage(""), Count(0)
 	{
 	}
 
@@ -49,13 +46,9 @@ 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
-	 */
-	InspIRCd* ServerInstance;
-
 	/** Currently active snomask list
 	 */
 	SnoList SnoMasks;
@@ -66,7 +59,7 @@ class CoreExport SnomaskManager : public Extensible
  public:
 	/** Create a new SnomaskManager
 	 */
-	SnomaskManager(InspIRCd* Instance);
+	SnomaskManager();
 
 	/** Delete SnomaskManager
 	 */
@@ -90,19 +83,33 @@ class CoreExport SnomaskManager : public Extensible
 	 */
 	bool DisableSnomask(char letter);
 
-	/** 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