Updated acls

[gosa.git] / plugins / personal / connectivity / class_kolabAccount.inc

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index f0e1b62c16e12150f0be55e0dcff085e151d02ff..9f08ea9110e4bdad8c1c550f80f08d79ec042c9e 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -5,11 +5,6 @@ class kolabAccount extends plugin
   var $plHeadline       = "Kolab";
   var $plDescription    = "This does something";
 
-  /* CLI vars */
-  var $cli_summary      = "Manage users Kolab account";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* Kolab attributes */
   var $kolabInvitationPolicy  = array();
   var $kolabFreeBusyFuture    = 60;
@@ -74,6 +69,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 +161,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', '');
     }
 
@@ -403,6 +401,19 @@ class kolabAccount extends plugin
     $this->is_modified= TRUE;
   }
 
+
+  /* Return plugin informations for acl handling  */
+  function plInfo()
+  {
+    return (array(     
+          "plDescription"         => _("Koalb account settings"),
+          "plSelfModify"          => TRUE,
+          "plDepends"             => array("objectClass" => "gosaAccount"),
+          "kolabFreeBusyFuture"   => _("Free busy future"),
+          "unrestrictedMailSize"  => _("Mail size restriction"),
+          "calFBURL"              => _("Free busy information"),
+          "kolabDelegate"         => _("Delegations")));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: