Admin settings interface now completly functional for enabling and disabling.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/branches@5773 b35dd754-fafc-0310-a699-88a17e54d16e

Admin settings interface now completly functional for enabling and disabling.
git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/branches@5773 b35dd754-fafc-0310-a699-88a17e54d16e
8776b51a · Alex Wenckus · alex · 50c39cf8 · 8776b51a · 8776b51a
Commit 8776b51a authored Oct 20, 2006 by Alex Wenckus Committed by alex Oct 20, 2006
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 161 additions and 41 deletions

HttpServerManager.java ...src/java/org/jivesoftware/wildfire/HttpServerManager.java +140 -24

http-bind.jsp httpbind_branch/src/web/http-bind.jsp +21 -17

No files found.
--- a/httpbind_branch/src/java/org/jivesoftware/wildfire/HttpServerManager.java
+++ b/httpbind_branch/src/java/org/jivesoftware/wildfire/HttpServerManager.java
--- a/httpbind_branch/src/web/http-bind.jsp
+++ b/httpbind_branch/src/web/http-bind.jsp
@@ -19,24 +19,28 @@
    Map<String, String> errorMap = new HashMap<String, String>();

    if (request.getParameter("update") != null) {
-        boolean httpPortsDistinct = ParamUtils.getBooleanParameter(request, "httpPortsDistinct",
-                false);
-        int requestedPort;
-        int requestedSecurePort;
-        if (httpPortsDistinct) {
-            requestedPort = ParamUtils.getIntParameter(request, "port", -1);
-            requestedSecurePort = ParamUtils.getIntParameter(request, "securePort", -1);
-        }
-        else {
-            requestedPort = serverManager.getAdminUnsecurePort();
-            requestedSecurePort = serverManager.getAdminSecurePort();
-        }
-        try {
-            serverManager.setHttpBindPorts(requestedPort, requestedSecurePort);
-        }
-        catch (Exception e) {
-            errorMap.put("port", e.getMessage());
+        boolean isEnabled = ParamUtils.getBooleanParameter(request, "httpBindEnabled");
+        if (isEnabled) {
+            boolean httpPortsDistinct = ParamUtils.getBooleanParameter(request, "httpPortsDistinct",
+                    false);
+            int requestedPort;
+            int requestedSecurePort;
+            if (httpPortsDistinct) {
+                requestedPort = ParamUtils.getIntParameter(request, "port", -1);
+                requestedSecurePort = ParamUtils.getIntParameter(request, "securePort", -1);
+            }
+            else {
+                requestedPort = serverManager.getAdminUnsecurePort();
+                requestedSecurePort = serverManager.getAdminSecurePort();
+            }
+            try {
+                serverManager.setHttpBindPorts(requestedPort, requestedSecurePort);
+            }
+            catch (Exception e) {
+                errorMap.put("port", e.getMessage());
+            }
        }
+        serverManager.setHttpBindEnabled(isEnabled);
    }

    boolean isHttpBindEnabled = serverManager.isHttpBindEnabled();