Moved some other stuff into ServerConfig

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index 6af23d3b0e1cbc7ca00ff2418c903bfd837f7e27..573289db918027d73f71482fdce0d3999b3c0862 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -53,45 +53,17 @@ using namespace std;
 #define nspace std
 #endif
 
+extern ServerConfig* Config;
+
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-
-extern int LogLevel;
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
-extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
-
-extern int debugging;
 extern int WHOWAS_STALE;
 extern int WHOWAS_MAX;
-extern int DieDelay;
 extern time_t startup_time;
-extern int NetBufferSize;
-int MaxWhoResults;
-extern time_t nb_start;
-
 extern std::vector<std::string> module_names;
-
 extern int boundPortCount;
-extern int portCount;
-
-extern int ports[MAXSOCKS];
-
 extern std::stringstream config_f;
-
-extern FILE *log_file;
-
 extern time_t TIME;
 
 using namespace std;
@@ -168,8 +140,7 @@ void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
 
 bool chanrec::IsCustomModeSet(char mode)
 {
-       log(DEBUG,"Checking ISCustomModeSet: %c %s",mode,this->custom_modes);
-       return (strchr(this->custom_modes,mode) != 0);
+       return (strchr(this->custom_modes,mode));
 }
 
 std::string chanrec::GetModeParameter(char mode)