Fixed o

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 28d0e0dd8568642a739f700e2f07880674e66b8c..f0356021672bf6b90485f58ea2b02946eba9e854 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -301,6 +301,7 @@ $ACLD['addressbook']=  array("addressbook","add", "delete",
       "facsimileTelephoneNumber", "pager");
 $ACLD['fonreport']     =  array("fonreport", "src", "dst", "channel", "lastapp", "disposition", "duration");
 $ACLD['faxreport']     =  array("faxreport");
+$ACLD['connectivity']=  array("connectivity");
 $ACLD['logview']       =  array("logview");
 $ACLD['mailqueue']     =  array("mailqueue","unhold_all","hold_all","del_all","requeue_all","unhold","hold","del","requeue","query","header");
 $ACLD['ldapmanager']=  array("ldapmanager","import","export","xlsexport","csvimport");

diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc
index 1cad08b5d0cc9ca6f9a5b07333b1a4ac562bd8ba..10e755504de0b84ac45a130584e30b9acd36ad2e 100644 (file)
--- a/plugins/personal/connectivity/class_connectivity.inc
+++ b/plugins/personal/connectivity/class_connectivity.inc
@@ -51,7 +51,7 @@ class connectivity extends plugin
 
     /* Do we represent a valid account? */
     if ($this->parent == NULL){
-      $enabled= false;
+      $enabled= true;
       foreach ($this->plugin_name as $name){
         if ($this->plugin[$name]->is_account){
           $enabled= true;

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index fcba8b86ff86b8c9e6528bff90715d7eb0210b7f..b82c905b17248d4907d4174551cd0babfae14a26 100644 (file)
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -163,7 +163,7 @@ class opengwAccount extends plugin
        
         /* Create Team membership */ 
         $str = "";
-        if($this->is_account){
+        if(($this->is_account)&&(chkacl($this->acl,"TeamIDs")=="")){
           $dis = "";
         }else{
           $dis = " disabled ";

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index 595a5cbcfefbda90504fd54edb10e1ab9c172648..5fed11c45f1c2625a0b1101d53a3050a98d081da 100644 (file)
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -107,7 +107,10 @@ if (!$remove_lock){
   /* Are we in edit mode? */
   $in_edit_mode= false;
   foreach ($connectivity->plugin_name as $name){
-    $in_edit_mode|= $connectivity->plugin[$name]->is_account;
+    $acls = get_module_permission($acl, "$name", $ui->dn);
+    if($acls != "#none#"){
+      $in_edit_mode|= true;
+    }
   }
   if ($in_edit_mode){
     $display.="<div align='right'>";