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

Fixed getting configure button going to port 0.

Browse Source
This commit is contained in:
STRWarrior 2013-12-24 14:44:24 +01:00
parent 155f1751ce
commit b424877448
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android/jni/app-android.cpp
View File

@ -123,10 +123,9 @@ extern "C" jboolean Java_com_mcserver_MCServerActivity_NativeIsServerRunning( JN
extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz ) extern "C" jint Java_com_mcserver_MCServerActivity_NativeGetWebAdminPort( JNIEnv* env, jobject thiz )
{ {
cIniFile IniFile; if( pRoot != NULL && pRoot->GetWebAdmin() != NULL )
if (IniFile.ReadFile("/sdcard/mcserver/webadmin.ini"))
{ {
return IniFile.GetValueI("WebAdmin", "Port"); return atoi(pRoot->GetWebAdmin()->GetIPv4Ports().c_str());
} }
return 0; return 0;
} }

6
src/WebAdmin.cpp
View File

@ -100,10 +100,10 @@ bool cWebAdmin::Init(void)
LOGD("Initialising WebAdmin..."); LOGD("Initialising WebAdmin...");
AString PortsIPv4 = m_IniFile.GetValueSet("WebAdmin", "Port", "8080"); m_PortsIPv4 = m_IniFile.GetValueSet("WebAdmin", "Port", "8080");
AString PortsIPv6 = m_IniFile.GetValueSet("WebAdmin", "PortsIPv6", ""); m_PortsIPv6 = m_IniFile.GetValueSet("WebAdmin", "PortsIPv6", "");
if (!m_HTTPServer.Initialize(PortsIPv4, PortsIPv6)) if (!m_HTTPServer.Initialize(m_PortsIPv4, m_PortsIPv6))
{ {
return false; return false;
} }

6
src/WebAdmin.h
View File

@ -132,6 +132,9 @@ public:
/// Escapes text passed into it, so it can be embedded into html. /// Escapes text passed into it, so it can be embedded into html.
static AString GetHTMLEscapedString(const AString & a_Input); static AString GetHTMLEscapedString(const AString & a_Input);
AString GetIPv4Ports(void) const { return m_PortsIPv4; }
AString GetIPv6Ports(void) const { return m_PortsIPv6; }
// tolua_end // tolua_end
/// Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style) /// Returns the prefix needed for making a link point to the webadmin root from the given URL ("../../../webadmin"-style)
@ -180,6 +183,9 @@ protected:
PluginList m_Plugins; PluginList m_Plugins;
AString m_PortsIPv4;
AString m_PortsIPv6;
/// The Lua template script to provide templates: /// The Lua template script to provide templates:
cLuaState m_TemplateScript; cLuaState m_TemplateScript;