Incorporated Craig's friendlier SQL class (documentation to come later)

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

diff --git a/include/channels.h b/include/channels.h
index 7962bc34ba552b5172ec5ea97fcfd2bafa473fec..dd6d3b585b64752421af91dbcd82a65e3eb98e08 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,14 +14,15 @@
  * ---------------------------------------------------
  */
 
+#ifndef __CHANNELS_H__
+#define __CHANNELS_H__
+
 #include "inspircd_config.h"
 #include "base.h"
 #include <time.h>
 #include <vector>
 #include <string>
-
-#ifndef __CHANNELS_H__
-#define __CHANNELS_H__
+#include <map>
 
 #define CM_TOPICLOCK 1
 #define CM_NOEXTERNAL 2
@@ -30,6 +31,8 @@
 #define CM_SECRET 16
 #define CM_PRIVATE 32
 
+class userrec;
+
 /** Holds an entry for a ban list, exemption list, or invite list.
  * This class contains a single element in a channel list, such as a banlist.
  */
@@ -112,7 +115,7 @@ class chanrec : public Extensible
        /** User list (casted to char*'s to stop forward declaration stuff)
         * (chicken and egg scenario!)
         */
-       std::vector<char*> internal_userlist;
+       std::map<char*,char*> internal_userlist;
        
        /** Channel topic.
         * If this is an empty string, no channel topic is set.
@@ -215,7 +218,7 @@ class chanrec : public Extensible
         *
         * @return This function returns a vector of userrec pointers, each of which has been casted to char* to prevent circular references
         */
-       std::vector<char*> *GetUsers();
+       std::map<char*,char*> *GetUsers();
 
        /** Creates a channel record and initialises it with default values
         */
@@ -258,6 +261,7 @@ class ucrec : public classbase
 chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override);
 chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local);
 void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason);
+void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents);
 
 #endif