From 6d39787864e98ccf6735d09c99dea6275ab400d3 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 2 Nov 2006 10:19:44 +0000 Subject: [PATCH] Fixed user acl priority git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4995 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../connectivity/class_intranetAccount.inc | 4 +-- .../connectivity/class_kolabAccount.inc | 4 +-- .../connectivity/class_opengwAccount.inc | 4 +-- .../connectivity/class_oxchangeAccount.inc | 4 +-- .../connectivity/class_phpgwAccount.inc | 4 +-- .../class_phpscheduleitAccount.inc | 4 +-- .../connectivity/class_pptpAccount.inc | 4 +-- .../connectivity/class_proxyAccount.inc | 4 +-- .../connectivity/class_pureftpdAccount.inc | 4 +-- .../connectivity/class_webdavAccount.inc | 4 +-- plugins/personal/netatalk/class_netatalk.inc | 2 +- plugins/personal/samba/main.inc | 26 ++++++++++++------- 12 files changed, 38 insertions(+), 30 deletions(-) diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc index c7555eb86..de19b3efb 100644 --- a/plugins/personal/connectivity/class_intranetAccount.inc +++ b/plugins/personal/connectivity/class_intranetAccount.inc @@ -176,12 +176,12 @@ class intranetAccount extends plugin return (array( "plShortName" => _("Intranet"), "plDepends" => array("user"), - "plPriority" => 1, // Position in tabs + "plPriority" => 25, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), - "plDescription" => _("Intranet account settings"), + "plDescription" => _("Intranet account settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plProvidedAcls" => array() diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc index 12e89323e..edd020dcb 100644 --- a/plugins/personal/connectivity/class_kolabAccount.inc +++ b/plugins/personal/connectivity/class_kolabAccount.inc @@ -444,10 +444,10 @@ class kolabAccount extends plugin { return (array( "plShortName" => _("Kolab"), - "plDescription" => _("Kolab account settings"), + "plDescription" => _("Kolab account settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 2, // Position in tabs + "plPriority" => 20, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc index 8a07e60f5..8a5ba5211 100644 --- a/plugins/personal/connectivity/class_opengwAccount.inc +++ b/plugins/personal/connectivity/class_opengwAccount.inc @@ -307,10 +307,10 @@ class opengwAccount extends plugin { return (array( "plShortName" => _("Opengroupware"), - "plDescription" => _("Open groupware account settings"), + "plDescription" => _("Open groupware account settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 3, // Position in tabs + "plPriority" => 26, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index caf7c4a8c..38d878ecb 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -948,10 +948,10 @@ class oxchangeAccount extends plugin { return (array( "plShortName" => _("Open xchange"), - "plDescription" => _("Open xchange account settings"), + "plDescription" => _("Open xchange account settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 4, // Position in tabs + "plPriority" => 27, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc index ab17e81ab..ed56648d6 100644 --- a/plugins/personal/connectivity/class_phpgwAccount.inc +++ b/plugins/personal/connectivity/class_phpgwAccount.inc @@ -140,10 +140,10 @@ class phpgwAccount extends plugin { return (array( "plShortName" => _("PHP GW"), - "plDescription" => _("PHP GW account settings"), + "plDescription" => _("PHP GW account settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 5, // Position in tabs + "plPriority" => 24, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_phpscheduleitAccount.inc b/plugins/personal/connectivity/class_phpscheduleitAccount.inc index ecbf26e94..ee9042f45 100644 --- a/plugins/personal/connectivity/class_phpscheduleitAccount.inc +++ b/plugins/personal/connectivity/class_phpscheduleitAccount.inc @@ -141,10 +141,10 @@ class phpscheduleitAccount extends plugin { return (array( "plShortName" => _("PHP Schedule it"), - "plDescription" => _("PHP Schedule it settings"), + "plDescription" => _("PHP Schedule it settings")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 6, // Position in tabs + "plPriority" => 29, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc index 52baf5ca2..a7c1a4529 100644 --- a/plugins/personal/connectivity/class_pptpAccount.inc +++ b/plugins/personal/connectivity/class_pptpAccount.inc @@ -156,10 +156,10 @@ class pptpAccount extends plugin { return (array( "plShortName" => _("PPTP"), - "plDescription" => _("PPTP account"), + "plDescription" => _("PPTP account")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 1, // Position in tabs + "plPriority" => 28, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc index dbd3869a5..e1914d151 100644 --- a/plugins/personal/connectivity/class_proxyAccount.inc +++ b/plugins/personal/connectivity/class_proxyAccount.inc @@ -288,10 +288,10 @@ class proxyAccount extends plugin { return (array( "plShortName" => _("Proxy"), - "plDescription" => _("Proxy account"), + "plDescription" => _("Proxy account")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 7, // Position in tabs + "plPriority" => 21, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc index a1c3f59fe..1597e5436 100644 --- a/plugins/personal/connectivity/class_pureftpdAccount.inc +++ b/plugins/personal/connectivity/class_pureftpdAccount.inc @@ -216,10 +216,10 @@ class pureftpdAccount extends plugin { return (array( "plShortName" => _("Ftp"), - "plDescription" => _("Pure ftp account"), + "plDescription" => _("Pure ftp account")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 8, // Position in tabs + "plPriority" => 22, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc index 738dda5d3..506c1f72a 100644 --- a/plugins/personal/connectivity/class_webdavAccount.inc +++ b/plugins/personal/connectivity/class_webdavAccount.inc @@ -139,10 +139,10 @@ class webdavAccount extends plugin { return (array( "plShortName" => _("WebDAV"), - "plDescription" => _("WebDAV account"), + "plDescription" => _("WebDAV account")." : "._("Connectivity addon")."", "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 9, // Position in tabs + "plPriority" => 23, // Position in tabs "plSection" => "personal", // This belongs to personal "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc index 78451c543..9478ccb42 100644 --- a/plugins/personal/netatalk/class_netatalk.inc +++ b/plugins/personal/netatalk/class_netatalk.inc @@ -342,7 +342,7 @@ class netatalk extends plugin { "plDescription" => _("Netatalk"), "plSelfModify" => TRUE, "plDepends" => array("user"), - "plPriority" => 1, + "plPriority" => 6, "plSection" => "personal", "plCategory" => array("users"), "plOptions" => array(), diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc index 6d5a630f9..614fa5df6 100644 --- a/plugins/personal/samba/main.inc +++ b/plugins/personal/samba/main.inc @@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +$display = ""; +$lock_msg = ""; if (!$remove_lock){ /* Reset requested? */ if (isset($_POST['edit_cancel']) || @@ -47,14 +49,16 @@ if (!$remove_lock){ /* Check locking */ if (($username= get_lock($ui->dn)) != ""){ $_SESSION['back_plugin']= $plug; - gen_locked_message ($username, $ui->dn); - exit (); - } + $_SESSION['LOCK_VARS_TO_USE'] = array("/^edit$/","/^plug$/"); + $lock_msg = gen_locked_message ($username, $ui->dn); + + }else{ - /* Lock the current entry */ - add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; + /* Lock the current entry */ + add_lock ($ui->dn, $ui->dn); + $_SESSION['dn']= $ui->dn; + $_SESSION['edit']= TRUE; + } } /* save changes to LDAP and disable edit mode */ @@ -79,7 +83,11 @@ if (!$remove_lock){ } /* Execute formular */ - $display= $sambaAccount->execute (); + if($lock_msg){ + $display.= $lock_msg; + }else{ + $display.= $sambaAccount->execute (); + } /* Store changes in session */ if (isset ($_SESSION['edit'])){ @@ -87,7 +95,7 @@ if (!$remove_lock){ } $info= ""; - if (($sambaAccount->is_account) && (!$sambaAccount->show_ws_dialog)){ + if (($sambaAccount->is_account) && (!$sambaAccount->show_ws_dialog) && empty($lock_msg)){ $display.= "

"; /* Are we in edit mode? */ -- 2.30.2