diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index faa8c590ab..f7b4f73051 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -679,26 +679,6 @@ class mail_hooks return true; } - /** - * Hook returning options for deny_* groups - * - * @param string $name function name - * @param array $arguments - * @return string html - */ - public static function __callStatic($name, $arguments) - { - if (substr($name, 0, 5) != 'deny_') - { - if ($name == 'edit_user') return; // to ease upgrade, as hook is removed - throw new egw_exception_wrong_parameter("No method $name!"); - } - $accountsel = new uiaccountsel(); - - return ''. - $accountsel->selection('newsettings['.$name.']', 'deny_prefs', $arguments[0][$name], 'groups', 4); - } - /** * Check if current user has access to a specific feature * diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index f38c8ba501..52df20fbfd 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -549,3 +549,4 @@ you need to install mailvelope plugin available for chrome and firefox from %1. you need to save the message as draft first before to be able to save it into vfs mail de Sie müssen die E-Mail zuerst als Entwurf speichern, bevor Sie die Mail im EGroupware Dateimanager speichern können. you will loose current message body, unless you save it to your clipboard! mail de Sie werden Ihren aktuellen Nachrichtentext verlieren, sofern Sie ihn nicht in der Zwischenablage speichern! you've got new mail mail de Sie haben neue E-Mails +examine namespace to retrieve folders in others and shared mail de Untersuche Namespace für Mail-Ordner in den Bereichen OTHERS and SHARED diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index e09094f2ec..653b092eb4 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -549,3 +549,4 @@ you need to install mailvelope plugin available for chrome and firefox from %1. you need to save the message as draft first before to be able to save it into vfs mail en You need to save the message as draft first before to be able to save it into VFS you will loose current message body, unless you save it to your clipboard! mail en You will loose current message body, unless you save it to your clipboard! you've got new mail mail en You've got new mail +examine namespace to retrieve folders in others and shared mail en Examine Namespace to retrieve Folders in OTHERS and SHARED diff --git a/mail/templates/default/config.tpl b/mail/templates/default/config.tpl deleted file mode 100755 index 12220d0cf8..0000000000 --- a/mail/templates/default/config.tpl +++ /dev/null @@ -1,103 +0,0 @@ - -
-{hidden_vars} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 {title}
 {error}
{lang_Deny_certain_groups_access_to_following_features}
- {lang_Create_new_account} - {call_mail_hooks::deny_createaccount}
- {lang_Prevent_managing_folders}
- {lang_Do_you_want_to_prevent_the_managing_of_folders_(creation,_accessrights_AND_subscribtion)?} - 		{call_mail_hooks::deny_managefolders}
- {lang_Prevent_managing_notifications}
- {lang_Do_you_want_to_prevent_the_editing/setup_of_notification_by_mail_to_other_emailadresses_if_emails_arrive_(,_even_if_SIEVE_is_enabled)?} - 		{call_mail_hooks::deny_notificationformailviaemail}
- {lang_Prevent_managing_filters}
- {lang_Do_you_want_to_prevent_the_editing/setup_of_filter_rules_(,_even_if_SIEVE_is_enabled)?} - 		{call_mail_hooks::deny_editfilterrules}
- {lang_Prevent_managing_vacation_notice}
- {lang_Do_you_want_to_prevent_the_editing/setup_of_the_absent/vacation_notice_(,_even_if_SIEVE_is_enabled)?} - 		{call_mail_hooks::deny_absentnotice}
- {lang_restrict_acl_management}
- {lang_effective_only_if_server_supports_ACL_at_all} - 		{call_mail_hooks::deny_aclmanagement}
{lang_mail} - {lang_sieve}
- {lang_vacation_notice}
- {lang_provide_a_default_vacation_text,_(used_on_new_vacation_messages_when_there_was_no_message_set_up_previously)} -
{lang_Miscellaneous}
{lang_examine_namespace_to_retrieve_folders_in_others_and_shared}
- {lang_only_needed_for_some_servers,_that_do_not_return_all_folders_on_root_level_queries_to_retrieve_all_folders_for_that_level} - 		- -
- {lang_Disable_use_of_flowed_lines_in_plain_text_mails_(RFC3676)}
- {lang_Some_clients_fail_to_detect_correct_charset,_if_flowed_lines_are_enabled.} - 		- -
- {submit}{cancel} -
-
- diff --git a/mail/templates/default/config.xet b/mail/templates/default/config.xet new file mode 100644 index 0000000000..3669e054da --- /dev/null +++ b/mail/templates/default/config.xet @@ -0,0 +1,87 @@ + + + + + +