Updated some connectivity acls

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4307 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index fe66e184f6f5d1cce71cd94b2c05f5926b919a56..09bf7c8208b0fc249d4b8d6540d7deb5adc00641 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -146,10 +146,10 @@ class pureftpdAccount extends plugin
       }
 
       if($this->acl_is_writeable("FTPQuotaFiles") && !is_id($this->FTPQuotaFiles)){
-        $message[]= _("Value specified as 'Files' is not valid.");
+        $message[]= _("Value specified as 'Quota files' is not valid.");
       }
       if($this->acl_is_writeable("FTPQuotaMBytes") && !is_id($this->FTPQuotaMBytes)){
-        $message[]= _("Value specified as 'Size' is not valid.");
+        $message[]= _("Value specified as 'Quota size' is not valid.");
       }
       if($this->acl_is_writeable("FTPUploadRatio") && !is_id($this->FTPUploadRatio)){
         $message[]= _("Value specified as 'Upload ratio' is not valid.");

diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl
index e4687fc4f5639efdc4ed1d46e9b2e7c1e8515fc0..c4851114a1d9a69148195f9dc53a05bbd99f828a 100644 (file)
--- a/plugins/personal/connectivity/proxy.tpl
+++ b/plugins/personal/connectivity/proxy.tpl
@@ -2,13 +2,17 @@
  <input type="checkbox" id="proxy" name="proxy" value="B" {$proxyState} {$proxyAccountACL} 
    onClick="
     {$changeA}
-       {if $gosaProxyFlagB_W} 
+
+{if $gosaProxyFlagF_W}
+       changeState('filterF');
+{/if}
+{if $gosaProxyFlagB_W} 
     changeTripleSelectState('proxy', 'filterB', 'quota_size'); 
-       {/if}
-       {if $gosaProxyQuotaPeriod_W} 
+{/if}
+{if $gosaProxyQuotaPeriod_W} 
     changeTripleSelectState('proxy', 'filterB', 'quota_unit'); 
     changeTripleSelectState('proxy', 'filterB', 'gosaProxyQuotaPeriod');
-       {/if}
+{/if}
    ">
  {t}Proxy account{/t}</h2>
 
@@ -38,25 +42,25 @@
       <td>
 
 {render acl=$gosaProxyWorkingTimeACL}
-        <select size="1" id="startHour" name="startHour" {if $Tstate!=""} disabled {/if}>
+        <select size="1" id="startHour" name="startHour" {if $Tstate!=""} disabled {/if} {$pstate}>
          {html_options values=$hours output=$hours selected=$starthour}
         </select>
 {/render}
         &nbsp;:&nbsp;
 {render acl=$gosaProxyWorkingTimeACL}
-        <select size="1" id="startMinute" name="startMinute" {if  $Tstate!=""} disabled {/if}>
+        <select size="1" id="startMinute" name="startMinute" {if  $Tstate!=""} disabled {/if} {$pstate}>
          {html_options values=$minutes output=$minutes selected=$startminute}
         </select>
 {/render}
         &nbsp;-&nbsp;
 {render acl=$gosaProxyWorkingTimeACL}
-        <select size="1" id="stopHour" name="stopHour" {if $Tstate!=""}disabled {/if}>
+        <select size="1" id="stopHour" name="stopHour" {if $Tstate!=""}disabled {/if} {$pstate}>
    {html_options values=$hours output=$hours selected=$stophour}
         </select>
 {/render}
         &nbsp;:&nbsp;
 {render acl=$gosaProxyWorkingTimeACL}
-        <select size="1" id="stopMinute" name="stopMinute" {if $Tstate!=""} disabled {/if}>
+        <select size="1" id="stopMinute" name="stopMinute" {if $Tstate!=""} disabled {/if} {$pstate} >
          {html_options values=$minutes output=$minutes selected=$stopminute}
         </select>
 {/render}
@@ -77,18 +81,18 @@
      <tr>
       <td>
 {render acl=$gosaProxyFlagBACL}
-       <input name="quota_size" id="quota_size" size=7 maxlength=10 value="{$quota_size}" {if $Bstate=="disabled"} disabled {/if}>
+       <input name="quota_size" id="quota_size" size=7 maxlength=10 value="{$quota_size}" {if $Bstate=="disabled"} disabled {/if} {$pstate}>
 {/render}
        &nbsp;
 {render acl=$gosaProxyQuotaPeriodACL}
-       <select size="1" name="quota_unit" id="quota_unit" {if $Bstate=="disabled" } disabled {/if}>
+       <select size="1" name="quota_unit" id="quota_unit" {if $Bstate=="disabled" } disabled {/if} {$pstate}>
        {html_options options=$quota_unit selected=$quota_u}
        </select>
 {/render}
     
        <LABEL for="gosaProxyQuotaPeriod">{t}per{/t}</LABEL>
 {render acl=$gosaProxyQuotaPeriodACL}
-       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod" {if $Bstate=="disabled"} disabled {/if}>
+       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod" {if $Bstate=="disabled"} disabled {/if} {$pstate}>
         {html_options options=$quota_time selected=$gosaProxyQuotaPeriod}
        </select>
 {/render}