From e4996cd8a48bb543206fd34f5e9f92ca557af9dc Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 23 Aug 2007 12:16:38 +0000 Subject: [PATCH] Updated selectable values for kolabFolderType attribute git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7124 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupMail.inc | 13 ++++++++++--- plugins/admin/groups/mail.tpl | 7 +++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index 02ed6f8ef..d0cef9802 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -607,14 +607,21 @@ class mailgroup extends plugin } if(isset($this->config->current['MAILMETHOD'])&&preg_match("/olab/i",$this->config->current['MAILMETHOD'])){ + $smarty->assign("kolab", TRUE); + $smarty->assign("JS",$_SESSION['js']); $smarty->assign("kolabFolderType_Types", array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks') , 'journal' => _('Journals'), 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes'))); - $smarty->assign("kolabFolderType_SubTypes", array( '' => _('Unspecified'), 'inbox' => _("Inbox") , - 'drafts' => _("Drafts"), 'sentitems' => _("Sent items"), - 'junkemail' => _("Junk mail"))); + if($this->kolabFolderType_Type == "mail"){ + $smarty->assign("kolabFolderType_SubTypes", array( + '' => _('Unspecified'), 'inbox' => _("Inbox") , + 'drafts' => _("Drafts"), 'sentitems' => _("Sent items"), + 'junkemail' => _("Junk mail"))); + }else{ + $smarty->assign("kolabFolderType_SubTypes", array( 'default' => _("Default"))); + } $smarty->assign("kolabFolderType_Type", $this->kolabFolderType_Type); $smarty->assign("kolabFolderType_SubType", $this->kolabFolderType_SubType); }else{ diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl index 87294edfa..ffbcc3e22 100644 --- a/plugins/admin/groups/mail.tpl +++ b/plugins/admin/groups/mail.tpl @@ -43,12 +43,15 @@ {t}Folder type{/t} - {html_options options=$kolabFolderType_Types selected=$kolabFolderType_Type} - {html_options options=$kolabFolderType_SubTypes selected=$kolabFolderType_SubType} + {if !$JS} + + {/if} {/if} -- 2.30.2