From: hickert Date: Mon, 19 Dec 2005 08:40:29 +0000 (+0000) Subject: iw3c X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6cfd558a538b48f6be535c87f2e8bc46c9722d1;p=gosa.git 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 1e5f7457f..bd996fbf9 100644 --- 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 96a8c370d..e6cbf0e0b 100644 --- a/plugins/personal/connectivity/main.inc +++ b/plugins/personal/connectivity/main.inc @@ -132,7 +132,7 @@ if (!$remove_lock){ } $display.=""; } - $display.= "

\n"; +// $display.= "

\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 ff94ad601..a7fc460d1 100644 --- a/plugins/personal/connectivity/opengw.tpl +++ b/plugins/personal/connectivity/opengw.tpl @@ -1,14 +1,17 @@

 {t}Opengroupware{/t}

- +
- +
@@ -18,7 +21,10 @@ {t}Template user{/t} :  @@ -28,13 +34,16 @@ {t}Locked{/t} : 
{t}Location team{/t} :  - {html_options values=$validLocationTeams output=$validLocationTeam selected=$LocationTeam} - {html_options values=$validTemplateUsers output=$validTemplateUser selected=$TemplateUser} - +
- +
{t}Teams{/t} :  diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl index f7405d3af..b8243cda6 100644 --- a/plugins/personal/connectivity/proxy.tpl +++ b/plugins/personal/connectivity/proxy.tpl @@ -26,19 +26,31 @@ @@ -49,21 +61,33 @@  
- {html_options values=$hours output=$hours selected=$starthour}  :  - {html_options values=$minutes output=$minutes selected=$startminute}  -  - + {html_options values=$hours output=$hours selected=$stophour}  :  - {html_options values=$minutes output=$minutes selected=$stopminute} -
- +   - + {html_options options=$quota_unit selected=$quota_u} - {html_options options=$quota_time selected=$gosaProxyQuotaPeriod}