Commit 967ff403 authored by Thiago Camargo's avatar Thiago Camargo Committed by thiago

Set Server Enable just after set all properties.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6600 b35dd754-fafc-0310-a699-88a17e54d16e
parent 59e84539
...@@ -42,8 +42,6 @@ ...@@ -42,8 +42,6 @@
JiveGlobals.setProperty("mediaproxy.enabled", String.valueOf(enabled)); JiveGlobals.setProperty("mediaproxy.enabled", String.valueOf(enabled));
mediaProxyService.setEnabled(enabled);
if (minPort > 0 && maxPort > 0) { if (minPort > 0 && maxPort > 0) {
if (maxPort - minPort > 1000) { if (maxPort - minPort > 1000) {
mediaProxyService.setMinPort(minPort); mediaProxyService.setMinPort(minPort);
...@@ -53,6 +51,8 @@ ...@@ -53,6 +51,8 @@
} }
} }
mediaProxyService.setEnabled(enabled);
success = true; success = true;
} }
...@@ -88,47 +88,47 @@ ...@@ -88,47 +88,47 @@
<% } %> <% } %>
<form action="media-proxy.jsp" method="post"> <form action="media-proxy.jsp" method="post">
<div class="jive-contentBoxHeader"> <div class="jive-contentBoxHeader">
Media Proxy Settings Media Proxy Settings
</div> </div>
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="proxyEnabled" value="true" id="rb02" <input type="radio" name="proxyEnabled" value="true" id="rb02"
<%= (enabled ? "checked" : "") %> > <%= (enabled ? "checked" : "") %> >
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"> <label for="rb02">
<b>Enabled</b> <b>Enabled</b>
- This server will act as a media proxy. - This server will act as a media proxy.
</label> </label>
<br> <br>
Session Idle Timeout:&nbsp<input type="text" size="5" maxlength="8" name="idleTimeout" Session Idle Timeout:&nbsp<input type="text" size="5" maxlength="8" name="idleTimeout"
value="<%=mediaProxyService.getIdleTime()/1000%>" value="<%=mediaProxyService.getIdleTime()/1000%>"
align="left"> align="left">
<input type="text" size="5" maxlength="10" name="port" <input type="text" size="5" maxlength="10" name="port"
value="<%= 38 %>" > value="<%= 38 %>">
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="proxyEnabled" value="false" id="rb01" <input type="radio" name="proxyEnabled" value="false" id="rb01"
<%= (!enabled ? "checked" : "") %> > <%= (!enabled ? "checked" : "") %> >
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"> <label for="rb01">
<b>Disabled</b> <b>Disabled</b>
- This server will not act as a media proxy. - This server will not act as a media proxy.
</label> </label>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form> </form>
...@@ -146,26 +146,26 @@ ...@@ -146,26 +146,26 @@
<tbody> <tbody>
<tr> <tr>
<td align="left">Idle Timeout:&nbsp<input type="text" size="20" <td align="left">Idle Timeout:&nbsp<input type="text" size="20"
maxlength="100" maxlength="100"
name="keepalivedelay" name="keepalivedelay"
value="<%=mediaProxyService.getIdleTime()%>" value="<%=mediaProxyService.getIdleTime()%>"
align="left"> align="left">
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left">Port Range: Min&nbsp<input type="text" size="20" <td align="left">Port Range: Min&nbsp<input type="text" size="20"
maxlength="100" maxlength="100"
name="minport" name="minport"
value="<%=mediaProxyService.getMinPort()%>" value="<%=mediaProxyService.getMinPort()%>"
align="left"> align="left">
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left">Max:&nbsp<input type="text" size="20" <td align="left">Max:&nbsp<input type="text" size="20"
maxlength="100" maxlength="100"
name="maxport" name="maxport"
value="<%=mediaProxyService.getMaxPort()%>" value="<%=mediaProxyService.getMaxPort()%>"
align="left"> align="left">
</td> </td>
</tr> </tr>
<tr> <tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment