OF-61: Display and log the correct admin interface

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11497 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java

@@ -300,6 +300,9 @@ public class AdminConsolePlugin implements Plugin {
     private void logAdminConsolePorts() {
         // Log what ports the admin console is running on.
         String listening = LocaleUtils.getLocalizedString("admin.console.listening");
+        String hostname = getBindInterface() == null ?
+                XMPPServer.getInstance().getServerInfo().getXMPPDomain() :
+                getBindInterface();
         boolean isPlainStarted = false;
         boolean isSecureStarted = false;
         for (Connector connector : adminServer.getConnectors()) {
@@ -313,18 +316,16 @@ public class AdminConsolePlugin implements Plugin {
 
         if (isPlainStarted && isSecureStarted) {
             log(listening + ":" + System.getProperty("line.separator") +
-                    "  http://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
+                    "  http://" + hostname + ":" +
                     adminPort + System.getProperty("line.separator") +
-                    "  https://" + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" +
+                    "  https://" + hostname + ":" +
                     adminSecurePort);
         }
         else if (isSecureStarted) {
-            log(listening + " https://" +
-                    XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" + adminSecurePort);
+            log(listening + " https://" + hostname + ":" + adminSecurePort);
         }
         else if (isPlainStarted) {
-            log(listening + " http://" +
-                    XMPPServer.getInstance().getServerInfo().getXMPPDomain() + ":" + adminPort);
+            log(listening + " http://" + hostname + ":" + adminPort);
         }
     }
 

src/web/index.jsp

@@ -534,7 +534,7 @@
     </tr>
     <% } %>
     <tr>
-        <td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td>
+        <td><%= adminConsolePlugin.getBindInterface() == null ? LocaleUtils.getLocalizedString("ports.all_ports") : adminConsolePlugin.getBindInterface() %></td>
         <td><%= adminConsolePlugin.getAdminUnsecurePort() %></td>
         <td><img src="images/blank.gif" width="1" height="1" alt=""></td>
         <td><fmt:message key="ports.admin_console" /></td>
@@ -544,7 +544,7 @@
         if (adminConsolePlugin.getAdminSecurePort() > 0) {
     %>
     <tr>
-        <td><%= interfaceName == null ? LocaleUtils.getLocalizedString("ports.all_ports") : interfaceName %></td>
+        <td><%= adminConsolePlugin.getBindInterface() == null ? LocaleUtils.getLocalizedString("ports.all_ports") : adminConsolePlugin.getBindInterface() %></td>
         <td><%= adminConsolePlugin.getAdminSecurePort() %></td>
         <td><img src="images/lock.gif" width="16" height="16" border="0" alt=""/></td>
         <td><fmt:message key="ports.admin_console" /></td>