From 092073efc926fa2f44fe2b9d16bfdb6fcd9fef62 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 11 May 2010 07:58:44 +0000 Subject: [PATCH] Moved properties to class mailAccount git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18334 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../mail/class_mail-methods-cyrus.inc | 36 +------ .../mail/personal/mail/class_mailAccount.inc | 95 ++++++++++++------- 2 files changed, 62 insertions(+), 69 deletions(-) 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 344ee5ddd..23e61cc9c 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("mailMethodCyrus","cyrusAutocreateFolders"); + $folders= $this->config->get_cfg_value("mailAccount","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("mailMethodCyrus","cyrusDeleteMailbox")){ + if ($this->config->boolValueIsTrue("mailAccount","cyrusDeleteMailbox")){ if (!imap_deletemailbox($this->imap_handle, $cfg["connect"].$this->account_id)){ $this->error = imap_last_error(); return (FALSE); @@ -611,38 +611,6 @@ 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: diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc index 6783e1a3a..2a56f1f52 100644 --- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc +++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc @@ -1411,41 +1411,66 @@ class mailAccount extends plugin */ static function plInfo() { - return (array( - "plShortName" => _("Mail"), - "plDescription" => _("Mail settings"), - "plSelfModify" => TRUE, - "plDepends" => array("user"), // This plugin depends on - "plPriority" => 4, // Position in tabs - "plSection" => array("personal" => _("My account")), - "plCategory" => array("users"), - "plOptions" => array(), - - "plProvidedAcls" => array( - "mail" => _("Mail address"), - "gosaMailServer" => _("Mail server"), - "gosaMailQuota" => _("Quota size"), - - "gosaMailDeliveryModeV" => _("Add vacation information"), // This is flag of gosaMailDeliveryMode - "gosaVacationMessage" => _("Vacation message"), - - "gosaMailDeliveryModeS" => _("Use spam filter"), // This is flag of gosaMailDeliveryMode - "gosaSpamSortLevel" => _("Spam level"), - "gosaSpamMailbox" => _("Spam mail box"), - - "sieveManagement" => _("Sieve management"), - - "gosaMailDeliveryModeR" => _("Reject due to mailsize"), // This is flag of gosaMailDeliveryMode - "gosaMailMaxSize" => _("Mail max size"), - - "gosaMailForwardingAddress" => _("Forwarding address"), - "gosaMailDeliveryModeL" => _("Local delivery"), // This is flag of gosaMailDeliveryMode - "gosaMailDeliveryModeI" => _("No delivery to own mailbox "), // This is flag of gosaMailDeliveryMode - "gosaMailAlternateAddress" => _("Mail alternative addresses"), - - "gosaMailForwardingAddress" => _("Forwarding address"), - "gosaMailDeliveryModeC" => _("Use custom sieve script")) // This is flag of gosaMailDeliveryMode - )); + return (array( + "plShortName" => _("Mail"), + "plDescription" => _("Mail settings"), + "plSelfModify" => TRUE, + "plDepends" => array("user"), // This plugin depends on + "plPriority" => 4, // Position in tabs + "plSection" => array("personal" => _("My account")), + "plCategory" => array("users"), + "plOptions" => array(), + + "plProperties" => + array( + array( + "name" => "cyrusDeleteMailbox", + "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 + ) + ), + + + "plProvidedAcls" => array( + "mail" => _("Mail address"), + "gosaMailServer" => _("Mail server"), + "gosaMailQuota" => _("Quota size"), + + "gosaMailDeliveryModeV" => _("Add vacation information"), // This is flag of gosaMailDeliveryMode + "gosaVacationMessage" => _("Vacation message"), + + "gosaMailDeliveryModeS" => _("Use spam filter"), // This is flag of gosaMailDeliveryMode + "gosaSpamSortLevel" => _("Spam level"), + "gosaSpamMailbox" => _("Spam mail box"), + + "sieveManagement" => _("Sieve management"), + + "gosaMailDeliveryModeR" => _("Reject due to mailsize"), // This is flag of gosaMailDeliveryMode + "gosaMailMaxSize" => _("Mail max size"), + + "gosaMailForwardingAddress" => _("Forwarding address"), + "gosaMailDeliveryModeL" => _("Local delivery"), // This is flag of gosaMailDeliveryMode + "gosaMailDeliveryModeI" => _("No delivery to own mailbox "), // This is flag of gosaMailDeliveryMode + "gosaMailAlternateAddress" => _("Mail alternative addresses"), + + "gosaMailForwardingAddress" => _("Forwarding address"), + "gosaMailDeliveryModeC" => _("Use custom sieve script")) // This is flag of gosaMailDeliveryMode + )); } -- 2.30.2