diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-14 14:44:28 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-14 14:44:28 +0000 |
| commit | 8b6b85c19528de8f0d35ab766d7559ad519869b3 (patch) | |
| tree | 53f954bf81daaeb4edfd653f8ae0ecfa7ebdeb69 | |
| parent | 262b54d0a8d203842a2b04585f08e4102bdbb7e0 (diff) | |
Moved some other stuff into ServerConfig
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2416 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | include/inspircd_io.h | 2 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 10 | ||||
| -rw-r--r-- | src/inspircd.cpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/inspircd_io.h b/include/inspircd_io.h index 70d381b9f..feb67617d 100644 --- a/include/inspircd_io.h +++ b/include/inspircd_io.h @@ -31,7 +31,7 @@ #define SPARSE 40 #define NONE 50 -class ServerConfig +class ServerConfig : public classbase { private: std::vector<std::string> include_stack; diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 9e153c2f5..b9dec4a40 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -763,12 +763,12 @@ chanrec* FindChan(const char* chan) long GetMaxBans(char* name) { char CM[MAXBUF]; - for (int count = 0; count < ConfValueEnum("banlist",&Config->config_f); count++) + for (int count = 0; count < Config->ConfValueEnum("banlist",&Config->config_f); count++) { - ConfValue("banlist","chan",count,CM,&Config->config_f); + Config->ConfValue("banlist","chan",count,CM,&Config->config_f); if (match(name,CM)) { - ConfValue("banlist","limit",count,CM,&Config->config_f); + Config->ConfValue("banlist","limit",count,CM,&Config->config_f); return atoi(CM); } } @@ -992,7 +992,7 @@ int usercount(chanrec *c) char* Passwd(userrec *user) { - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) + for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { if (match(user->host,i->host) && (i->type == CC_ALLOW)) { @@ -1004,7 +1004,7 @@ char* Passwd(userrec *user) bool IsDenied(userrec *user) { - for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++) + for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { if (match(user->host,i->host) && (i->type == CC_DENY)) { diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 002b3ca52..15915607d 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1896,11 +1896,11 @@ int BindPorts() { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; int clientportcount = 0; - for (int count = 0; count < ConfValueEnum("bind",&Config->config_f); count++) + for (int count = 0; count < Config->ConfValueEnum("bind",&Config->config_f); count++) { - ConfValue("bind","port",count,configToken,&Config->config_f); - ConfValue("bind","address",count,Addr,&Config->config_f); - ConfValue("bind","type",count,Type,&Config->config_f); + Config->ConfValue("bind","port",count,configToken,&Config->config_f); + Config->ConfValue("bind","address",count,Addr,&Config->config_f); + Config->ConfValue("bind","type",count,Type,&Config->config_f); if (strcmp(Type,"servers")) { // modules handle server bind types now, |