diff options
author | madmaxoft <github@xoft.cz> | 2013-08-07 15:46:43 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-08-07 15:46:43 +0200 |
commit | 3d027a8928ee423ee6a475637752bd50a5f0d44c (patch) | |
tree | 82c6993605326422e188410dda8b897a28ce16ef /source/WebAdmin.cpp | |
parent | Merge pull request #47 from tonibm19/master (diff) | |
parent | Debuggers plugin: added the "/spidey" command. (diff) | |
download | cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar.gz cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar.bz2 cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar.lz cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar.xz cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.tar.zst cuberite-3d027a8928ee423ee6a475637752bd50a5f0d44c.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."); } |