summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/commands.h7
-rw-r--r--include/inspircd.h17
2 files changed, 13 insertions, 11 deletions
diff --git a/include/commands.h b/include/commands.h
index 81e28fbaf..24fad4b3c 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -29,13 +29,6 @@
#include "channels.h"
#include "modules.h"
-bool is_uline(const char* server);
-long duration(const char* str);
-bool host_matches_everyone(const std::string &mask, userrec* user);
-bool ip_matches_everyone(const std::string &ip, userrec* user);
-bool nick_matches_everyone(const std::string &nick, userrec* user);
-int operstrcmp(const char* data,const char* input);
-
/* XXX Serious WTFness XXX
*
* Well, unless someone invents a wildcard or
diff --git a/include/inspircd.h b/include/inspircd.h
index 2ae54134e..00f6aef9c 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -126,6 +126,12 @@ class InspIRCd : public classbase
char ReadBuffer[65535];
+ const long duration_m;
+ const long duration_h;
+ const long duration_d;
+ const long duration_w;
+ const long duration_y;
+
public:
time_t startup_time;
ModeParser* ModeGrok;
@@ -283,8 +289,6 @@ class InspIRCd : public classbase
bool IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user);
- bool IsUlined(const std::string &server);
-
void AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
void AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname);
@@ -305,8 +309,6 @@ class InspIRCd : public classbase
bool DelELine(const std::string &hostmask);
- long CalcDuration(const std::string &duration);
-
bool IsValidMask(const std::string &mask);
void AddSocket(InspSocket* sock);
@@ -321,6 +323,13 @@ class InspIRCd : public classbase
void DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream);
+ bool nick_matches_everyone(const std::string &nick, userrec* user);
+ bool ip_matches_everyone(const std::string &ip, userrec* user);
+ bool host_matches_everyone(const std::string &mask, userrec* user);
+ long duration(const char* str);
+ int operstrcmp(const char* data,const char* input);
+ bool is_uline(const char* server);
+
std::string GetRevision();
std::string GetVersionString();
void WritePID(const std::string &filename);