From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 4 Jul 2006 05:32:33 +0000 (+0000)
Subject: Fixed generic/connectivity kolabAccount
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=26dbc488fc745965586ec6ce8854c29fa69a38d3;p=gosa.git

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 f0e1b62c1..6fcbd06f9 100644
--- 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 8810ca686..56ef2bbc3 100644
--- 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>