X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fglobals.h;h=2de2ba11bcd2f248950f60f334d869c3be0fa5d8;hb=e56613b0035f2e9acf912af4ab68ad410100e1ea;hp=146ffb582ac54951ecb3e17c9f3d5f4c473bfbd6;hpb=740b09e2aee345c6fde199986d8eab6e0db224e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/globals.h b/include/globals.h
index 146ffb582..2de2ba11b 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,39 +14,24 @@
 #ifndef __WORLD_H
 #define __WORLD_H
 
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
-#include <string>
+#include <vector>
 #include <deque>
-#include "users.h"
-#include "channels.h"
+#include <map>
+
+/** A cached text file stored with its contents as lines
+ */
+typedef std::deque< std::string > file_cache;
 
-typedef std::deque<std::string> file_cache;
+/** A configuration key and value pair
+ */
+typedef std::pair< std::string, std::string > KeyVal;
+
+/** A list of related configuration keys and values
+ */
+typedef std::vector< KeyVal > KeyValList;
 
-void WriteOpers(char* text, ...);
-void log(int level, char *text, ...);
-void Write(int sock,char *text, ...);
-void WriteServ(int sock, char* text, ...);
-void WriteFrom(int sock, userrec *user,char* text, ...);
-void WriteTo(userrec *source, userrec *dest,char *data, ...);
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...);
-int common_channels(userrec *u, userrec *u2);
-void WriteCommon(userrec *u, char* text, ...);
-void WriteCommonExcept(userrec *u, char* text, ...);
-void WriteWallOps(userrec *source, bool local_only, char* text, ...);
-int isnick(const char *n);
-userrec* Find(std::string nick);
-chanrec* FindChan(const char* chan);
-char* cmode(userrec *user, chanrec *chan);
-std::string getservername();
-std::string getnetworkname();
-std::string getadminname();
-std::string getadminemail();
-std::string getadminnick();
-void readfile(file_cache &F, const char* fname);
-int ModeDefiend(char c, int i);
+/** An entire config file, built up of KeyValLists
+ */
+typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
 #endif