Remove SpanningTreeProtocolInterface::SendOperNotice - it was translated to a SendSNO...

[user/henk/code/inspircd.git] / include / channels.h

diff --git a/include/channels.h b/include/channels.h
index aa23d881664418b523077ca382bc01921c8d0dcf..940b9b555b86263d1a9500bdc8f6d6930135315d 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -41,7 +41,7 @@ class HostItem : public classbase
        time_t set_time;
        /** Who added the item
         */
-       char set_by[NICKMAX];
+       char set_by[64];
        /** The actual item data
         */
        char data[MAXBUF];
@@ -344,7 +344,7 @@ class CoreExport Channel : public Extensible
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long ServerKickUser(User* user, const char* reason, bool triggerevents);
+       long ServerKickUser(User* user, const char* reason, bool triggerevents, const char* servername = NULL);
 
        /** Part a user from this channel with the given reason.
         * If the reason field is NULL, no reason will be sent.
@@ -371,7 +371,7 @@ class CoreExport Channel : public Extensible
         * @param text A printf-style format string which builds the output line without prefix
         * @param ... Zero or more POD types
         */
-       void WriteChannel(User* user, const char* text, ...);
+       void WriteChannel(User* user, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
        /** Write to a channel, from a user, using std::string for text
         * @param user User whos details to prefix the line with
@@ -384,7 +384,7 @@ class CoreExport Channel : public Extensible
         * @param text A printf-style format string which builds the output line without prefix
         * @param ... Zero or more POD type
         */
-       void WriteChannelWithServ(const char* ServName, const char* text, ...);
+       void WriteChannelWithServ(const char* ServName, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
        /** Write to a channel, from a server, using std::string for text
         * @param ServName Server name to prefix the line with
@@ -401,7 +401,7 @@ class CoreExport Channel : public Extensible
         * @param text A printf-style format string which builds the output line without prefix
         * @param ... Zero or more POD type
         */
-       void WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...);
+       void WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...) CUSTOM_PRINTF(5, 6);
 
        /** Write to all users on a channel except a list of users, using va_args for text
         * @param user User whos details to prefix the line with, and to omit from receipt of the message
@@ -412,7 +412,7 @@ class CoreExport Channel : public Extensible
         * @param text A printf-style format string which builds the output line without prefix
         * @param ... Zero or more POD type
         */
-       void WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...);
+       void WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...) CUSTOM_PRINTF(6, 7);
 
        /** Write to all users on a channel except a specific user, using std::string for text.
         * Internally, this calls WriteAllExcept().
@@ -528,6 +528,13 @@ class CoreExport Channel : public Extensible
         */
        bool IsBanned(User* user);
 
+       /** Check whether an extban of a given type matches
+        * a given user for this channel.
+        * @param u The user to match bans against
+        * @param type The type of extban to check
+        */
+       bool IsExtBanned(User *u, char type);
+
        /** Clears the cached max bans value
         */
        void ResetMaxBans();