X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsnomasks.h;h=d0062e16266d642358cb72f9dad8bf00a7d44ddf;hb=095e0a067b6ed1a191c31711771df66acfc41f2c;hp=5bd4742c18200c1f46987085601152940209cbc3;hpb=57542f8488ce9f3250915d6c2aa03c243e34b7b3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/snomasks.h b/include/snomasks.h
index 5bd4742c1..d0062e162 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,63 +14,42 @@
 #ifndef __SNOMASKS_H__
 #define __SNOMASKS_H__
 
-class Snomask : public Extensible
+class Snomask
 {
- private:
-	InspIRCd *ServerInstance;
-
  public:
-	char MySnomask;
 	std::string Description;
 	std::string LastMessage;
-	unsigned int Count;
-	bool LocalOnly; // whether or not messages are netwide
+	int Count;
+	bool LastBlocked;
+	char LastLetter;
 
 	/** 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() : Count(0), LastBlocked(false), LastLetter(0)
 	{
 	}
 
 	/** Sends a message to all opers with this snomask.
 	 */
-	void SendMessage(const std::string &message);
+	void SendMessage(const std::string &message, char letter);
 
-	/** Sends out a pending message
+	/** Sends out the (last message repeated N times) message
 	 */
 	void Flush();
 };
 
-/** A list of snomasks which are valid, and their descriptive texts
- */
-typedef std::map<char, Snomask *> SnoList;
-
 /** Snomask manager handles routing of SNOMASK (usermode +n) messages to opers.
  * 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;
-
-	/** Set up the default (core available) snomask chars
-	 */
-	void SetupDefaults();
  public:
-	/** Create a new SnomaskManager
-	 */
-	SnomaskManager(InspIRCd* Instance);
+	Snomask	masks[26];
 
-	/** Delete SnomaskManager
+	/** Create a new SnomaskManager
 	 */
-	~SnomaskManager();
+	SnomaskManager();
 
 	/** Enable a snomask.
 	 * @param letter The snomask letter to enable. Once enabled,
@@ -78,32 +57,36 @@ 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);
-
-	/** Disable a snomask.
-	 * @param letter The snomask letter to disable.
-	 * @return True if the snomask was disabled, false if it didn't
-	 * exist.
 	 */
-	bool DisableSnomask(char letter);
+	void EnableSnomask(char letter, const std::string &description);
 
-	/** 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
@@ -113,12 +96,6 @@ class CoreExport SnomaskManager : public Extensible
 	 * is not particularly significant, in order to keep notices going out.
 	 */
 	void FlushSnotices();
-
-	/** Check if a snomask is enabled.
-	 * @param letter The snomask letter to check.
-	 * @return True if the snomask has been enabled.
-	 */
-	bool IsEnabled(char letter);
 };
 
 #endif