Whoops, patch

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

diff --git a/include/channels.h b/include/channels.h
index 14e06d40fc5b71183b8ad2426a712a8356eb4d12..648723b09d91fc186345149d9066ddf0da0d2211 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -66,30 +66,10 @@ class BanItem : public HostItem
 {
 };
 
-/** A subclass of HostItem designed to hold channel exempts (+e)
- */
-class ExemptItem : public HostItem
-{
-};
-
-/** A subclass of HostItem designed to hold channel invites (+I)
- */
-class InviteItem : public HostItem
-{
-};
-
 /** Holds a complete ban list
  */
 typedef std::vector<BanItem>   BanList;
 
-/** Holds a complete exempt list
- */
-typedef std::vector<ExemptItem>        ExemptList;
-
-/** Holds a complete invite list
- */
-typedef std::vector<InviteItem>        InviteList;
-
 /** A list of users on a channel
  */
 typedef std::map<userrec*,userrec*> CUList;
@@ -170,7 +150,7 @@ class chanrec : public Extensible
 
        /** Connect a chanrec to a userrec
         */
-       static chanrec* ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created);
+       static chanrec* ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, const std::string &privs);
 
        prefixlist prefixes;
 
@@ -428,18 +408,22 @@ class chanrec : public Extensible
 
        /** Write to all users on a channel except a specific user, using va_args for text
         * @param user User whos details to prefix the line with, and to omit from receipt of the message
+        * @param serversource If this parameter is true, use the local server name as the source of the text, otherwise,
+        * use the nick!user@host of the user.
         * @param status The status of the users to write to, e.g. '@' or '%'. Use a value of 0 to write to everyone
         * @param text A printf-style format string which builds the output line without prefi
         * @param ... Zero or more POD type
         */
-       void WriteAllExceptSender(userrec* user, char status, char* text, ...);
+       void WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...);
 
        /** Write to all users on a channel except a specific user, using std::string for text
         * @param user User whos details to prefix the line with, and to omit from receipt of the message
+        * @param serversource If this parameter is true, use the local server name as the source of the text, otherwise,
+        * use the nick!user@host of the user.          
         * @param status The status of the users to write to, e.g. '@' or '%'. Use a value of 0 to write to everyone
         * @param text A std::string containing the output line without prefix
         */
-       void WriteAllExceptSender(userrec* user, char status, const std::string& text);
+       void WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text);
 
        /** Returns the maximum number of bans allowed to be set on this channel
         * @return The maximum number of bans allowed
@@ -527,6 +511,12 @@ class chanrec : public Extensible
         */
        void SetPrefix(userrec* user, char prefix, unsigned int prefix_rank, bool adding);
 
+       /** Check if a user is banned on this channel
+        * @param user A user to check against the banlist
+        * @returns True if the user given is banned
+        */
+       bool IsBanned(userrec* user);
+
        /** Destructor for chanrec
         */
        virtual ~chanrec() { /* stub */ }