Fixed user acl priority

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

diff --git a/plugins/personal/connectivity/class_intranetAccount.inc b/plugins/personal/connectivity/class_intranetAccount.inc
index c7555eb86e93f0a15bbf6a7519e2e88efee6c0f3..de19b3efb7ee4fbcd0de5a73435932431b8ceeaa 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "plSelfModify"        => TRUE,
 
           "plProvidedAcls"  => array()

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 12e89323e30928bde5719d3fcad22876e0f10c98..edd020dcb8d85e67e409980af1ca80ea9fd8c6cc 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 8a07e60f5704068c007827bd9f57386030970616..8a5ba5211f7f48231c9079a64819cd30d6a3a4a7 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 caf7c4a8c51326d5a606f28dd7c734f59682db44..38d878ecbdb2bbdfcc00271c363cfdeb77e8e6db 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 ab17e81abe946bb56d0c10ce369db625c57d24c8..ed56648d62826fd44e33437d97e2077f66526915 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 ecbf26e94a677157dbffe50805420ab53720116f..ee9042f45f60f1126a9ab42e241ad8fe918da320 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 52baf5ca232f7b6884a668658d8abd552d741424..a7c1a452988fef669582cc896190b32286a32ca4 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 dbd3869a5e7917090989c8e2535343420faf974e..e1914d1511eb65e02149bf06b0827a260ade8d95 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 a1c3f59fe5322388dcfc4604ee2131447bb4181d..1597e543606a7d333ae394feff3268bce306b87a 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 738dda5d377a8c7878a1b8cf86fbbe5393dac157..506c1f72a03f3b95ef8f8e28df6172709ed59405 100644 (file)
--- 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")."&nbsp;:&nbsp;<u>"._("Connectivity addon")."</u>",
           "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 78451c543c11bf96ec34ba3539c0f46f7458a67c..9478ccb42029f33c617a03e01df2e884dc633195 100644 (file)
--- 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 6d5a630f950789512da731976cc6af0a6fbd3ec3..614fa5df6eb0f41fdc460170a00607b68f43841b 100644 (file)
--- 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.= "<p class=\"plugbottom\">";
 
     /* Are we in edit mode? */