diff options
| author | Alexander Harkness <bearbin@gmail.com> | 2013-08-07 19:37:03 +0200 |
|---|---|---|
| committer | Alexander Harkness <bearbin@gmail.com> | 2013-08-07 19:37:03 +0200 |
| commit | be7a6d7a6679fd17e88e9f5131036d69978e4151 (patch) | |
| tree | 8e1b46a9b8ac8d3d47a65f903a63e063e5550e94 /source/WebAdmin.cpp | |
| parent | Drag in the latest core changes. (diff) | |
| parent | Merge pull request #48 from mc-server/BlockTracing (diff) | |
| download | cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.gz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.bz2 cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.lz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.xz cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.tar.zst cuberite-be7a6d7a6679fd17e88e9f5131036d69978e4151.zip | |
Diffstat (limited to 'source/WebAdmin.cpp')
| -rw-r--r-- | source/WebAdmin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp index 3d04ce8f3..be7efa18d 100644 --- a/source/WebAdmin.cpp +++ b/source/WebAdmin.cpp @@ -178,7 +178,7 @@ void cWebAdmin::Request_Handler(webserver::http_request* r) if (!bDontShowTemplate) { // New Lua web template - bLuaTemplateSuccessful = WebAdmin->m_pTemplate->CallFunction("ShowPage", sLuaUsertype(WebAdmin, "cWebAdmin"), sLuaUsertype(&TemplateRequest, "HTTPTemplateRequest"), Template); + bLuaTemplateSuccessful = WebAdmin->m_pTemplate->CallShowPage(*WebAdmin, TemplateRequest, Template); } if (!bLuaTemplateSuccessful) @@ -274,14 +274,14 @@ bool cWebAdmin::Init( int a_Port ) m_Port = a_Port; m_IniFile = new cIniFile("webadmin.ini"); - if( m_IniFile->ReadFile() ) + if (m_IniFile->ReadFile()) { - m_Port = m_IniFile->GetValueI("WebAdmin", "Port", 8080 ); + m_Port = m_IniFile->GetValueI("WebAdmin", "Port", 8080); } // Initialize the WebAdmin template script and load the file m_pTemplate->Initialize(); - if (!m_pTemplate->LoadFile( FILE_IO_PREFIX "webadmin/template.lua") || !m_pTemplate->Execute()) + if (!m_pTemplate->LoadFile(FILE_IO_PREFIX "webadmin/template.lua")) { LOGWARN("Could not load WebAdmin template."); } |