X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=a2815b8a536560b5fe970d94c8c30c585747aaba;hb=11916574f67962dce1d7a2fdf7ef6a3d2d1fa49f;hp=f43141c383152294499f8f9c24c6b15908094bf1;hpb=deb18ee9cfa531a87141aea61171c6899ef7d687;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index f43141c38..a2815b8a5 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -54,8 +54,10 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
+#include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
+#include "server.h"
 #include "users.h"
 #include "channels.h"
 #include "timer.h"
@@ -564,7 +566,7 @@ class CoreExport InspIRCd
 	 * @param mask A nick!user\@host masak to match against
 	 * @return True i the mask is valid
 	 */
-	bool IsValidMask(const std::string &mask);
+	static bool IsValidMask(const std::string& mask);
 
 	/** Strips all color codes from the given string
 	 * @param sentence The string to strip from
@@ -620,18 +622,6 @@ class CoreExport InspIRCd
 	 */
 	int PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype);
 
-	/** Check if a given server is a uline.
-	 * An empty string returns true, this is by design.
-	 * @param server The server to check for uline status
-	 * @return True if the server is a uline OR the string is empty
-	 */
-	bool ULine(const std::string& server);
-
-	/** Returns true if the uline is 'silent' (doesnt generate
-	 * remote connect notices etc).
-	 */
-	bool SilentULine(const std::string& server);
-
 	/** Returns the full version string of this ircd
 	 * @return The version string
 	 */
@@ -684,7 +674,7 @@ class CoreExport InspIRCd
 
 	/** Return a time_t as a human-readable string.
 	 */
-	std::string TimeString(time_t curtime);
+	static std::string TimeString(time_t curtime);
 
 	/** Begin execution of the server.
 	 * NOTE: this function NEVER returns. Internally,