flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1319 from mc-server/webadminfixes

Browse Source 
A couple of fixes for issues with the webadmin
This commit is contained in:
Mattes D 2014-08-13 13:22:26 +02:00
commit 6f1fa8f26f
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/WebAdmin.cpp
View File

@ -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) void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request)
{ {
if (!a_Request.HasAuth()) 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: // Check if the contents should be wrapped in the template:
AString URL = a_Request.GetBareURL(); AString BareURL = a_Request.GetBareURL();
ASSERT(URL.length() > 0); ASSERT(BareURL.length() > 0);
bool ShouldWrapInTemplate = ((URL.length() > 1) && (URL[1] != '~')); bool ShouldWrapInTemplate = ((BareURL.length() > 1) && (BareURL[1] != '~'));
// Retrieve the request data: // Retrieve the request data:
cWebadminRequestData * Data = (cWebadminRequestData *)(a_Request.GetUserData()); cWebadminRequestData * Data = (cWebadminRequestData *)(a_Request.GetUserData());
@ -215,7 +193,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
HTTPTemplateRequest TemplateRequest; HTTPTemplateRequest TemplateRequest;
TemplateRequest.Request.Username = a_Request.GetAuthUsername(); TemplateRequest.Request.Username = a_Request.GetAuthUsername();
TemplateRequest.Request.Method = a_Request.GetMethod(); TemplateRequest.Request.Method = a_Request.GetMethod();
TemplateRequest.Request.Path = URL.substr(1); TemplateRequest.Request.Path = BareURL.substr(1);
if (Data->m_Form.Finish()) if (Data->m_Form.Finish())
{ {
@ -258,7 +236,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
return; return;
} }
AString BaseURL = GetBaseURL(URL); AString BaseURL = GetBaseURL(BareURL);
AString Menu; AString Menu;
Template = "{CONTENT}"; Template = "{CONTENT}";
AString FoundPlugin; AString FoundPlugin;

3
src/WebAdmin.h
View File

@ -208,9 +208,6 @@ protected:
/** The HTTP server which provides the underlying HTTP parsing, serialization and events */ /** The HTTP server which provides the underlying HTTP parsing, serialization and events */
cHTTPServer m_HTTPServer; cHTTPServer m_HTTPServer;
AString GetTemplate(void);
/** Handles requests coming to the "/webadmin" or "/~webadmin" URLs */ /** Handles requests coming to the "/webadmin" or "/~webadmin" URLs */
void HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request); void HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request);