summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-13 13:22:26 +0200
committerMattes D <github@xoft.cz>2014-08-13 13:22:26 +0200
commit6f1fa8f26f3a48fca08a8535fedea9706e3e3145 (patch)
tree5e84c171c98c3dd49f012733032dd83e0c712a39 /src
parentMerge pull request #1296 from mc-server/LuaAPI (diff)
parentFixed shadowing variable (diff)
downloadcuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar.gz
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar.bz2
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar.lz
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar.xz
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.tar.zst
cuberite-6f1fa8f26f3a48fca08a8535fedea9706e3e3145.zip
Diffstat (limited to 'src')
-rw-r--r--src/WebAdmin.cpp32
-rw-r--r--src/WebAdmin.h3
2 files changed, 5 insertions, 30 deletions
diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp
index ab6925e55..23eedbd14 100644
--- a/src/WebAdmin.cpp
+++ b/src/WebAdmin.cpp
@@ -159,28 +159,6 @@ void cWebAdmin::Stop(void)
-AString cWebAdmin::GetTemplate()
-{
- AString retVal = "";
-
- char SourceFile[] = "webadmin/template.html";
-
- cFile f;
- if (!f.Open(SourceFile, cFile::fmRead))
- {
- return "";
- }
-
- // copy the file into the buffer:
- f.ReadRestOfFile(retVal);
-
- return retVal;
-}
-
-
-
-
-
void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request)
{
if (!a_Request.HasAuth())
@@ -198,9 +176,9 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
}
// Check if the contents should be wrapped in the template:
- AString URL = a_Request.GetBareURL();
- ASSERT(URL.length() > 0);
- bool ShouldWrapInTemplate = ((URL.length() > 1) && (URL[1] != '~'));
+ AString BareURL = a_Request.GetBareURL();
+ ASSERT(BareURL.length() > 0);
+ bool ShouldWrapInTemplate = ((BareURL.length() > 1) && (BareURL[1] != '~'));
// Retrieve the request data:
cWebadminRequestData * Data = (cWebadminRequestData *)(a_Request.GetUserData());
@@ -215,7 +193,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
HTTPTemplateRequest TemplateRequest;
TemplateRequest.Request.Username = a_Request.GetAuthUsername();
TemplateRequest.Request.Method = a_Request.GetMethod();
- TemplateRequest.Request.Path = URL.substr(1);
+ TemplateRequest.Request.Path = BareURL.substr(1);
if (Data->m_Form.Finish())
{
@@ -258,7 +236,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
return;
}
- AString BaseURL = GetBaseURL(URL);
+ AString BaseURL = GetBaseURL(BareURL);
AString Menu;
Template = "{CONTENT}";
AString FoundPlugin;
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index f48e8ce9e..aefc1d145 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -208,9 +208,6 @@ protected:
/** 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);