X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=648723b09d91fc186345149d9066ddf0da0d2211;hb=990c308a959a376335e91014bcaeb0081693947b;hp=d0d2215506cc3421a21bd79fcdef27a8a623bbd8;hpb=29fd51d6f76a639fbd909e7bf7489eb92e9f90db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index d0d221550..648723b09 100644
--- 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