1 files changed, 19 insertions, 7 deletions

diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index d679a097c..94b95dbcf 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -116,6 +116,9 @@ public:
 	/** Stops the HTTP server, if it was started. */
 	void Stop(void);
 
+	/** Loads the login template. Returns true if the loading succeeds, false if not. */
+	bool LoadLoginTemplate(void);
+
 	void AddPlugin(cWebPlugin * a_Plugin);
 	void RemovePlugin(cWebPlugin * a_Plugin);
 
@@ -132,16 +135,22 @@ public:
 	/** Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style) */
 	AString GetBaseURL(const AString & a_URL);
 
-	/** Escapes text passed into it, so it can be embedded into html. */
-	static AString GetHTMLEscapedString(const AString & a_Input);
-
 	AString GetIPv4Ports(void) const { return m_PortsIPv4; }
 	AString GetIPv6Ports(void) const { return m_PortsIPv6; }
 
 	// tolua_end
 
+	/** Escapes text passed into it, so it can be embedded into html. */
+	static AString GetHTMLEscapedString(const AString & a_Input);
+	
+	/** Escapes the string for use in an URL */
+	static AString GetURLEncodedString(const AString & a_Input);
+
 	/** Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style) */
-	AString GetBaseURL(const AStringVector& a_URLSplit);
+	static AString GetBaseURL(const AStringVector & a_URLSplit);
+
+	/** Returns the content type from the file extension. If the extension isn't in the list, the function returns "text/html" */
+	static AString GetContentTypeFromFileExt(const AString & a_FileExtension);
 
 protected:
 	/** Common base class for request body data handlers */
@@ -202,18 +211,21 @@ protected:
 	/** The Lua template script to provide templates: */
 	cLuaState m_TemplateScript;
 
+	/** The template that provides the login site: */
+	AString m_LoginTemplate;
+
 	/** The HTTP server which provides the underlying HTTP parsing, serialization and events */
 	cHTTPServer m_HTTPServer;
 
-
-	AString GetTemplate(void);
-
 	/** Handles requests coming to the "/webadmin" or "/~webadmin" URLs */
 	void HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request);
 
 	/** Handles requests for the root page */
 	void HandleRootRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request);
 
+	/** Handles requests for a file */
+	void HandleFileRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request);
+
 	// cHTTPServer::cCallbacks overrides:
 	virtual void OnRequestBegun   (cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override;
 	virtual void OnRequestBody    (cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, size_t a_Size) override;