X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=ec09cbbca237d2bdbf022cd2761e856e9654544c;hb=6b27fae945e5310a76cb7fa2a5ff0059cd436ac9;hp=7b6999316f41f45f5cd95cbc20fb60b59ee9ea12;hpb=1524caf2f799cff54c2de330c9670a0b761ba3d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index 7b6999316..ec09cbbca 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -83,7 +83,7 @@ class CoreExport Channel : public Extensible
 {
 	/** Connect a Channel to a User
 	 */
-	static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created);
+	static Channel* ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created);
 
 	/** Set default modes for the channel on creation
 	 */
@@ -94,14 +94,10 @@ class CoreExport Channel : public Extensible
 	int maxbans;
 
  public:
-	/** Pointer to creator object
-	 */
-	InspIRCd* ServerInstance;
-
 	/** Creates a channel record and initialises it with default values
 	 * @throw Nothing at present.
 	 */
-	Channel(InspIRCd* Instance, const std::string &name, time_t ts);
+	Channel(const std::string &name, time_t ts);
 
 	/** The channel's name.
 	 */
@@ -265,7 +261,7 @@ class CoreExport Channel : public Extensible
 	 * been created if the channel did not exist before the user was joined to it.
 	 * If the user could not be joined to a channel, the return value may be NULL.
 	 */
-	static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0);
+	static Channel* JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0);
 
 	/** Write to a channel, from a user, using va_args for text
 	 * @param user User whos details to prefix the line with
@@ -416,16 +412,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
+	/** Check a single ban for match
 	 */
-	ModResult GetExtBanStatus(User *u, char type);
+	bool CheckBan(User* user, const std::string& banmask);
 
-	/** Overloaded version to check whether a particular string is extbanned
+	/** Get the status of an "action" type extban
 	 */
-	ModResult GetExtBanStatus(const std::string &str, char type);
+	ModResult GetExtBanStatus(User *u, char type);
 
 	/** Clears the cached max bans value
 	 */