Fixed generic/connectivity kolabAccount

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

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index f0e1b62c16e12150f0be55e0dcff085e151d02ff..6fcbd06f9e8a6f6353c05b18d57a7d89a596d99f 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -74,6 +74,7 @@ class kolabAccount extends plugin
       $smarty->assign("$val", $this->$val);
       $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
     }
+    $smarty->assign("kolabAccountACL", chkacl($this->acl, "kolabAccountACL"));
 
     /* Check for invitation action */
     $nr= 0;
@@ -165,7 +166,9 @@ class kolabAccount extends plugin
     /* Transfer account states for this union */
     if (isset($this->parent) && $this->parent->by_object['mailAccount']->is_account){
       $smarty->assign('mail_account', 'true');
-    } else {
+    } elseif($this-> initially_was_account && (isset($this->attrs['objectClass']) && (in_array("kolabInetOrgPerson",$this->attrs['objectClass'])))){
+      $smarty->assign('mail_account', 'true');
+    }else{
       $smarty->assign('mail_account', '');
     }
 

diff --git a/plugins/personal/connectivity/kolab.tpl b/plugins/personal/connectivity/kolab.tpl
index 8810ca6867fb7785c65ccf42cdec6b3628d32dd6..56ef2bbc3cbc96f89b78eac31a495d051bf9b6ac 100644 (file)
--- a/plugins/personal/connectivity/kolab.tpl
+++ b/plugins/personal/connectivity/kolab.tpl
@@ -13,8 +13,9 @@
        changeState('calFBURL');
        changeState('kolabFreeBusyFuture');
        changeState('kolabInvitationPolicy');
-       {$changeState}  
-">
+       {$changeState}"
+       {$kolabAccountACL}
+>
 <b>{t}Kolab account{/t}</b>
 <br>
 <br>