iw3c

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

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 1e5f7457f9658038f591a2d4aa352a78a3bedd55..bd996fbf94acad004e39a4ef37e48166389d668c 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -48,12 +48,14 @@ class pureftpdAccount extends plugin
       $smarty->assign("$val", $this->$val);
       $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
     }
+    $smarty->assign("fstate", "");
     if ($this->is_account){
       $smarty->assign("pureftpdState", "checked");
       $smarty->assign("fstate", "");
     } else {
       $smarty->assign("pureftpdState", "");
       if($_SESSION['js']==1){
+        if($this->acl!="#none#")
         $smarty->assign("fstate", "disabled");
       }else{
         $smarty->assign("fstate", "");

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index 96a8c370d326b39322b1ac09a9d13eb0f705308d..e6cbf0e0bb87df614e9b4920f3c271ffd845d74c 100644 (file)
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -132,7 +132,7 @@ if (!$remove_lock){
     }
     $display.="</div>";
   }
-  $display.= "</p>\n";
+//  $display.= "</p>\n";
 
   /* Page header*/
   $display= print_header(get_template_path('images/proxy.png'),

diff --git a/plugins/personal/connectivity/opengw.tpl b/plugins/personal/connectivity/opengw.tpl
index ff94ad601c0dd89eec7f5b234f9da193ad2e2b3c..a7fc460d176527e339b5b61a18f88ac2d9c6a36f 100644 (file)
--- a/plugins/personal/connectivity/opengw.tpl
+++ b/plugins/personal/connectivity/opengw.tpl
@@ -1,14 +1,17 @@
 <h2><input type="checkbox" value="1" name="is_account" {$is_account} {$opengwAccountACL} onClick="document.mainform.submit();">&nbsp;{t}Opengroupware{/t}</h2>
-<table width="100%">
+<table width="100%" summary="">
        <tr>
                <td width="50%">
-                       <table>
+                       <table summary="">
                                <tr>
                                        <td>
                                                {t}Location team{/t} :&nbsp;
                                        </td>
                                        <td>
-                                               <select size="1" id="LocationTeam" name="LocationTeam" {$LocationTeamACL} {$OGWstate}>
+                                               <select size="1" id="LocationTeam" name="LocationTeam"
+                                                       {if $LocationTeamACL!="" || $OGWstate!=""}
+                                                               disabled 
+                                                       {/if}>
                                                        {html_options values=$validLocationTeams output=$validLocationTeam selected=$LocationTeam}
                                                </select>
                                        </td>
@@ -18,7 +21,10 @@
                                                {t}Template user{/t} :&nbsp;
                                        </td>
                                        <td>
-                                               <select size="1" id="TemplateUser" name="TemplateUser" {$TemplateUserACL} {$OGWstate}>
+                                               <select size="1" id="TemplateUser" name="TemplateUser"
+                                                       {if $TemplateUserACL!="" || $OGWstate!=""}
+                                                               disabled 
+                                                       {/if}>
                                                        {html_options values=$validTemplateUsers output=$validTemplateUser selected=$TemplateUser}
                                                </select>
                                        </td>
@@ -28,13 +34,16 @@
                                                {t}Locked{/t} :&nbsp; 
                                        </td>
                                        <td valign="top">
-                                               <input type="checkbox" value="1" name="is_locked" {$is_lockedCHK} {$is_lockedACL} {$OGWstate}>
+                                               <input type="checkbox" value="1" name="is_locked" 
+                                                  {if $is_lockedACL!="" || $OGWstate!=""}
+                                disabled
+                           {/if}>
                                        </td>
                                </tr>
                        </table>
                </td>
                <td valign="top" style="border-left: 1px solid rgb(160, 160, 160);">
-                       <table>
+                       <table summary="">
                                <tr>
                                        <td valign="top">
                                                {t}Teams{/t} :&nbsp; 

diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl
index f7405d3af19b02d94bc9b6a9962c08b1077d60dc..b8243cda6af70964a8235cf08e897c5ba47f3827 100644 (file)
--- a/plugins/personal/connectivity/proxy.tpl
+++ b/plugins/personal/connectivity/proxy.tpl
@@ -26,19 +26,31 @@
     <table summary="" style="margin-left:20px;">
      <tr>
       <td>
-        <select size="1" id="startHour" name="startHour" {$gosaProxyWorkingStartACL} {$Tstate}>
+        <select size="1" id="startHour" name="startHour"
+                       {if $gosaProxyWorkingStartACL!="" || $Tstate!=""}
+                               disabled        
+                       {/if}>
          {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"
+                       {if $gosaProxyWorkingStartACL!="" || $Tstate!=""}
+                               disabled        
+                       {/if}>
          {html_options values=$minutes output=$minutes selected=$startminute}
         </select>
         &nbsp;-&nbsp;
-        <select size="1" id="stopHour" name="stopHour" {$gosaProxyWorkingStopACL} {$Tstate}>
-         {html_options values=$hours output=$hours selected=$stophour}
+        <select size="1" id="stopHour" name="stopHour"
+                       {if $gosaProxyWorkingStopACL!="" || $Tstate!=""}
+                               disabled        
+                       {/if}>
+                       {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" 
+                       {if $gosaProxyWorkingStopACL!="" || $Tstate!=""}
+                               disabled        
+                       {/if}>
          {html_options values=$minutes output=$minutes selected=$stopminute}
         </select>
       </td>
@@ -49,21 +61,33 @@
      &nbsp;
    </td>
       <td>
-    <input type="checkbox" id="filterB" name="filterB" value="B" {$filterB} {$pstate} {$gosaProxyAcctFlagsACL} {$gosaProxyQuotaACL}
+    <input type="checkbox" id="filterB" name="filterB" value="B" {$filterB} 
+               {if $pstate=="disabled" || $gosaProxyAcctFlagsACL=="disabled" || $gosaProxyQuotaACL=="disabled"}
+                       disabled 
+               {/if} 
        onClick="{$changeB}">
     <LABEL for="quota_size">{t}Restrict proxy usage by quota{/t}</LABEL>
     <br>
     <table summary="" 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 value="{$quota_size}"
+               {if $Bstate=="disabled" || $gosaProxyQuotaACL=="disabled"}
+                       disabled 
+               {/if}>
        &nbsp;
-       <select size="1" name="quota_unit" id="quota_unit" {$Bstate} {$gosaProxyQuotaACL}>
-       {html_options options=$quota_unit selected=$quota_u}
+       <select size="1" name="quota_unit" id="quota_unit"
+               {if $Bstate=="disabled" || $gosaProxyQuotaACL=="disabled"}
+            disabled
+        {/if}>
+               {html_options options=$quota_unit selected=$quota_u}
        </select>
           
        <LABEL for="gosaProxyQuotaPeriod">{t}per{/t}</LABEL>
-       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod" {$Bstate} {$gosaProxyQuotaACL}>
+       <select size="1" name="gosaProxyQuotaPeriod" id="gosaProxyQuotaPeriod"
+               {if $Bstate=="disabled" || $gosaProxyQuotaACL=="disabled"}
+            disabled
+        {/if}>
         {html_options options=$quota_time selected=$gosaProxyQuotaPeriod}
        </select>
       </td>