Reverted to orginal handling, because the new implementation doesn't work here...

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

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index fe4ca325d24dd791811e997f9d1ef124e6a20177..727082d23c76a7f22ff42e3ee9481e04f2522426 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -48,14 +48,8 @@ class proxyAccount extends plugin
     foreach (array("F", "T", "B", "N") as $val){
       if (is_integer(strpos($this->gosaProxyAcctFlags, "$val"))) {
         $smarty->assign("filter$val", "checked");
-
-        // Create state variable for checkbox (Used in proxy.tpl)
-        $smarty->assign($val."state", "");
       } else {
         $smarty->assign("filter$val", "");
-        
-        // Create state variable for checkbox (Used in proxy.tpl)
-        $smarty->assign($val."state", "disabled");
       }
     }
 
@@ -116,26 +110,6 @@ class proxyAccount extends plugin
   }
 
 
-  /* Check values */
-  function check()
-  {
-    $message= array();
-    
-    /* We've got only one value to check for positive integer or emtpy field */
-    if ($this->is_account){
-      if (isset($_POST["quota_size"])){
-        if ($_POST["quota_size"] == ""){
-          $message[]= _("Numerical value for Quota Setting is empty.");
-        }
-        else if ($_POST["quota_size"] <= 0){
-          $message[]= _("Numerical value for Quota Setting is not valid.");
-        }
-      }
-    }
-    
-    return $message;
-  }
-  
   /* Save data to object */
   function save_object()
   {
@@ -180,17 +154,14 @@ class proxyAccount extends plugin
       /* Save quota values */
       if (chkacl ($this->acl, "gosaProxyQuota") == ""){
         $old= $this->gosaProxyQuota;
-        if(isset($_POST["quota_size"]) && isset($_POST["quota_unit"])){
-          $this->gosaProxyQuota= $_POST["quota_size"].$_POST["quota_unit"];
-        }
+        $this->gosaProxyQuota= $_POST["quota_size"].$_POST["quota_unit"];
         $this->is_modified= ($old != $this->gosaProxyQuota)?TRUE:$this->is_modified;
         $old= $this->gosaProxyQuotaPeriod;
-        if(isset($_POST["gosaProxyQuotaPeriod"])){
-          $this->gosaProxyQuotaPeriod = $_POST["gosaProxyQuotaPeriod"];
-        }
+        $this->gosaProxyQuotaPeriod = $_POST["gosaProxyQuotaPeriod"];
         $this->is_modified= ($old != $this->gosaProxyQuotaPeriod)?TRUE:$this->is_modified;
       }
     }
+
   }
 
 

diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl
index 24650cc0d3003449178afdfe188fce607fa00b8a..fcb63344b5a4d4fad0b10ef383d27d702f562d52 100644 (file)
--- a/plugins/personal/connectivity/proxy.tpl
+++ b/plugins/personal/connectivity/proxy.tpl
@@ -1,53 +1,33 @@
-<h2>{if $tabbed eq 1}<input type="checkbox" id="proxy" name="proxy" value="B" {$proxyState} {$gosaProxyAcctFlagsACL} 
-       onclick="
-               changeState('filterF'); 
-               changeState('filterT'); 
-               changeState('filterB'); 
-               changeTripleSelectState('proxy', 'filterT', 'startHour'); 
-               changeTripleSelectState('proxy', 'filterT', 'startMinute'); 
-               changeTripleSelectState('proxy', 'filterT', 'stopHour'); 
-               changeTripleSelectState('proxy', 'filterT', 'stopMinute'); 
-               changeTripleSelectState('proxy', 'filterB', 'quota_size'); 
-               changeTripleSelectState('proxy', 'filterB', 'quota_unit'); 
-               changeTripleSelectState('proxy', 'filterB', 'gosaProxyQuotaPeriod');"
-       >
-       {/if}{t}Proxy account{/t}</h2>
-
+<h2>{if $tabbed eq 1}<input type="checkbox" name="proxy" value="B" {$proxyState} {$gosaProxyAcctFlagsACL} onclick="changeState('filterF'); changeState('filterT'); changeState('startHour'); changeState('startMinute'); changeState('stopHour'); changeState('stopMinute'); changeState('filterB'); changeState('quota_size'); changeState('quota_unit'); changeState('gosaProxyQuotaPeriod');">{/if}{t}Proxy account{/t}</h2>
 <table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
    <td>
-    <table width="100%" cellpadding=0>
-    <tr><td>
+    <table border=0 width="100%" cellpadding=0>
+    <tr><td colspan=2>
     <input type="checkbox" name="filterF" id="filterF" value="F" {$filterF} {$gosaProxyAcctFlagsACL} {$pstate}>
     {t}Filter unwanted content (i.e. pornographic or violence related){/t}
     </td></tr>
      <tr>
       <td width="50%">
-    <input type="checkbox" name="filterT" id="filterT" value="T" {$filterT} {$gosaProxyAcctFlagsACL} {$pstate}
-       onclick="
-               changeSubselectState('filterT', 'startHour'); 
-               changeSubselectState('filterT', 'startMinute'); 
-               changeSubselectState('filterT', 'stopHour'); 
-               changeSubselectState('filterT', 'stopMinute'); 
-       ">
+    <input type="checkbox" name="filterT" id="filterT" value="T" {$filterT} {$gosaProxyAcctFlagsACL} {$pstate}>
     {t}Limit proxy access to working time{/t}
     <br>
     <table style="margin-left:20px;">
      <tr>
       <td>
-        <select size="1" id="startHour" name="startHour" {$gosaProxyWorkingStartACL} {$Tstate}>
+        <select size="1" id="startHour" name="startHour" {$gosaProxyWorkingStartACL} {$pstate}>
          {html_options values=$hours output=$hours selected=$starthour}
         </select>
         &nbsp;:&nbsp;
-        <select size="1" id="startMinute" name="startMinute" {$gosaProxyWorkingStartACL} {$Tstate}>
+        <select size="1" id="startMinute" name="startMinute" {$gosaProxyWorkingStartACL} {$pstate}>
          {html_options values=$minutes output=$minutes selected=$startminute}
         </select>
         &nbsp;-&nbsp;
-        <select size="1" id="stopHour" name="stopHour" {$gosaProxyWorkingStopACL} {$Tstate}>
+        <select size="1" id="stopHour" name="stopHour" {$gosaProxyWorkingStopACL} {$pstate}>
          {html_options values=$hours output=$hours selected=$stophour}
         </select>
         &nbsp;:&nbsp;
-        <select size="1" id="stopMinute" name="stopMinute" {$gosaProxyWorkingStopACL} {$Tstate}>
+        <select size="1" id="stopMinute" name="stopMinute" {$gosaProxyWorkingStopACL} {$pstate}>
          {html_options values=$minutes output=$minutes selected=$stopminute}
         </select>
       </td>
@@ -58,24 +38,19 @@
      &nbsp;
    </td>
       <td>
-    <input type="checkbox" id="filterB" name="filterB" value="B" {$filterB} {$pstate} {$gosaProxyAcctFlagsACL}
-       onclick="
-               changeSubselectState('filterB', 'quota_size'); 
-               changeSubselectState('filterB', 'quota_unit'); 
-               changeSubselectState('filterB', 'gosaProxyQuotaPeriod');
-       ">
+    <input type="checkbox" id="filterB" name="filterB" value="B" {$filterB} {$pstate} {$gosaProxyAcctFlagsACL}>
     {t}Restrict proxy usage by quota{/t}
     <br>
     <table style="margin-left:20px;">
      <tr>
       <td>
-       <input name="quota_size" id="quota_size" size=7 maxlength=10 {$Bstate} {$gosaProxyQuotaACL} value="{$quota_size}">
+       <input name="quota_size" id="quota_size" size=7 maxlength=10 {$pstate} {$gosaProxyQuotaACL} value="{$quota_size}">
        &nbsp;
-       <select size="1" name="quota_unit" id="quota_unit" {$Bstate} {$gosaProxyQuotaACL}>
+       <select size="1" name="quota_unit" id="quota_unit" {$pstate} {$gosaProxyQuotaACL}>
        {html_options options=$quota_unit selected=$quota_u}
        </select>
-       {t}per{/t}
-       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod" {$Bstate} {$gosaProxyQuotaACL}>
+       {t}per{/t} {$pstate}
+       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod" {$pstate} {$gosaProxyQuotaACL}>
         {html_options options=$quota_time selected=$gosaProxyQuotaPeriod}
        </select>
       </td>