From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 7 Dec 2005 09:10:28 +0000 (+0000)
Subject: Fixed o
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e22b01fc71acb094c1f75ef63d8108aa670b369f;p=gosa.git

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 28d0e0dd8..f03560216 100644
--- 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 1cad08b5d..10e755504 100644
--- 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 fcba8b86f..b82c905b1 100644
--- 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 595a5cbcf..5fed11c45 100644
--- 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'>";