From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 11 May 2010 07:49:41 +0000 (+0000)
Subject: Updated get_ou it receives values from the config registry now.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1df1df487595b0a98d80ffa276d2dbf52e55d7b;p=gosa.git

Updated get_ou it receives values from the config registry now.

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

diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
index 23e61cc9c..344ee5ddd 100644
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -253,7 +253,7 @@ class mailMethodCyrus extends mailMethod{
         }
 
         /* Autocreate configured default folders */ 
-        $folders= $this->config->get_cfg_value("mailAccount","cyrusAutocreateFolders");
+        $folders= $this->config->get_cfg_value("mailMethodCyrus","cyrusAutocreateFolders");
         if ($folders) {
           $foldersToCreate= explode(",", $folders);
           $cyrus_delim= $this->cyrusUseSlashes?"/":".";
@@ -289,7 +289,7 @@ class mailMethodCyrus extends mailMethod{
     $cfg= $this->ServerList[$this->MailServer];
     @imap_setacl ($this->imap_handle, $this->account_id, $cfg["admin"], "lrswipcda");
 
-    if ($this->config->boolValueIsTrue("mailAccount","cyrusDeleteMailbox")){
+    if ($this->config->boolValueIsTrue("mailMethodCyrus","cyrusDeleteMailbox")){
       if (!imap_deletemailbox($this->imap_handle, $cfg["connect"].$this->account_id)){
         $this->error = imap_last_error();
         return (FALSE);
@@ -611,6 +611,38 @@ class mailMethodCyrus extends mailMethod{
 
     $sieve->sieve_logout();
   }
+
+  static function plInfo()
+  {
+      return (
+              array(
+                  "plProperties"  => 
+                  array(
+                      array(
+                          "name"          => "cyrusAutocreateFolders",
+                          "type"          => "bool",
+                          "default"       => TRUE,
+                          "description"   => "The 'cyrusDeleteMailbox' statement determines if GOsa should remove the mailbox from your IMAP server or keep it after the account is deleted in LDAP.",
+                          "check"         => "gosaProperty::isBool",
+                          "migrate"       => "",
+                          "group"         => "mail",
+                          "mandatory"     => FALSE
+                          ),
+                      array(
+                          "name"          => "cyrusAutocreateFolders",
+                          "type"          => "string",
+                          "default"       => "",
+                          "description"   => _("The 'cyrusAutocreateFolders' statement contains a comma seperated list of personal IMAP folders that should be created along initial account creation."), 
+                          "check"         => "gosaProperty::isString",
+                          "migrate"       => "",
+                          "group"         => "mail",
+                          "mandatory"     => FALSE
+                          )
+                          )
+                          )
+                          );
+  }
+    
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: