Merge pull request #469 from mc-server/Android_Update

Android update

src/WebAdmin.cpp

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

src/WebAdmin.h

@@ -132,6 +132,9 @@ public:
 	/// Escapes text passed into it, so it can be embedded into html.
 	static AString GetHTMLEscapedString(const AString & a_Input);
 
+	AString GetIPv4Ports(void) const { return m_PortsIPv4; }
+	AString GetIPv6Ports(void) const { return m_PortsIPv6; }
+
 	// tolua_end
 
 	/// 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;
 
+	AString m_PortsIPv4;
+	AString m_PortsIPv6;
+
 	/// The Lua template script to provide templates:
 	cLuaState m_TemplateScript;