Moving fixes to JSP.

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

src/java/org/jivesoftware/wildfire/mediaproxy/MediaProxyService.java

@@ -45,7 +45,7 @@ public class MediaProxyService extends BasicModule
     private PacketRouter router;
 
     private MediaProxy mediaProxy = null;
-    private boolean enabled = true;
+    private boolean enabled = false;
 
     public static final String NAMESPACE = "http://www.jivesoftware.com/protocol/rtpbridge";
 
@@ -232,7 +232,7 @@ public class MediaProxyService extends BasicModule
         catch (NumberFormatException e) {
             // Do nothing let the default values to be used.
         }
-        setEnabled(JiveGlobals.getBooleanProperty("mediaproxy.enabled"));
+        this.enabled = JiveGlobals.getBooleanProperty("mediaproxy.enabled");
     }
 
     /**

src/web/media-proxy.jsp

@@ -31,11 +31,11 @@
     boolean save = request.getParameter("update") != null;
     boolean success = false;
 
-    long keepAliveDelay = 3600;
-    long lifetime = 0;
-    int minPort = 10000;
-    int maxPort = 20000;
-    boolean enabled = true;
+    long keepAliveDelay = mediaProxyService.getIdleTime();
+    long lifetime = mediaProxyService.getLifetime();
+    int minPort = mediaProxyService.getMinPort();
+    int maxPort = mediaProxyService.getMaxPort();
+    boolean enabled = mediaProxyService.isEnabled();
 
     if (save) {
         keepAliveDelay = ParamUtils.getLongParameter(request, "idleTimeout", keepAliveDelay);