From 69dcf982f447faf890e63c3a7c851b18b40547c1 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 26 Jul 2006 05:59:37 +0000 Subject: [PATCH] Added pptp acls git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4301 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../connectivity/class_pptpAccount.inc | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc index fdb110b1e..1f0627488 100644 --- a/plugins/personal/connectivity/class_pptpAccount.inc +++ b/plugins/personal/connectivity/class_pptpAccount.inc @@ -53,7 +53,13 @@ class pptpAccount extends plugin $smarty->assign("wstate", "disabled"); } - $smarty->assign('gosapptpACL', chkacl($this->acl, 'gosapptp')); + + + if(($this->is_account && $this->acl_is_removeable()) || (!$this->is_account && $this->acl_is_createable())) { + $smarty->assign('gosapptpACL', ""); + }else{ + $smarty->assign('gosapptpACL', " disabled "); + } $display.= $smarty->fetch (get_template_path('pptp.tpl', TRUE, dirname(__FILE__))); return ($display); @@ -61,7 +67,7 @@ class pptpAccount extends plugin function remove_from_parent() { - if(chkacl($this->acl, 'gosapptp') == ""){ + if($this->acl_is_removeable()) /* Cancel if there's nothing to do here */ if (!$this->initially_was_account){ return; @@ -91,10 +97,14 @@ class pptpAccount extends plugin if (isset($_POST['connectivityTab'])){ if (isset($_POST['pptp'])){ if (!$this->is_account && $_POST['pptp'] == "B"){ - $this->is_account= TRUE; + if($this->acl_is_createable()){ + $this->is_account= TRUE; + } } } else { - $this->is_account= FALSE; + if($this->acl_is_removeable()){ + $this->is_account= FALSE; + } } } @@ -133,8 +143,7 @@ class pptpAccount extends plugin } - /* Return plugin informations for acl handling - #FIXME This is only an enable/disable checkbox for this account, there is possibly a better solution available later */ + /* Return plugin informations for acl handling */ function plInfo() { return (array( @@ -148,7 +157,6 @@ class pptpAccount extends plugin "plOptions" => array(), "plProvidedAcls" => array( - "pptpServerAccount" => "!!! FIXME "._("PPTP account")) )); } } -- 2.30.2