From 2244d6fc634856e9076cf282bf20ec2344d86bdc Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 Jun 2014 10:14:12 +0000 Subject: [PATCH] remove not implemented "prevent managing forwards", if we want to implement it we will do so on per account basis --- mail/inc/class.mail_hooks.inc.php | 2 +- mail/lang/egw_en.lang | 2 -- mail/templates/default/config.tpl | 13 +++---------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index e504ae13f7..854366dbeb 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -802,7 +802,7 @@ class mail_hooks * * Example: if (!mail_hooks::access("managerfolders")) return; * - * @param string $feature "createaccounts", "managefolders", "forwards", "notifications", "filters", + * @param string $feature "createaccounts", "managefolders", "notifications", "filters", * "notificationformailviaemail", "editfilterrules", "absentnotice", "aclmanagement" * @return boolean true if user has access, false if not */ diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 157a2cc08f..0f48b00987 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -94,7 +94,6 @@ do not auto create folders mail en do not auto create folders do you really want to delete folder %1 ? mail en Do you really want to DELETE Folder %1 ? do you want to be asked for confirmation before attaching selected messages to new mail? mail en Do you want to be asked for confirmation before attaching selected messages to new mail? do you want to be asked for confirmation before moving selected messages to another folder? mail en Do you want to be asked for confirmation before moving selected messages to another folder? -do you want to prevent the editing/setup for forwarding of mails via settings (, even if sieve is enabled)? mail en Do you want to prevent the editing/setup for forwarding of mails via settings (, even if SIEVE is enabled)? do you want to prevent the editing/setup of filter rules (, even if sieve is enabled)? mail en Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)? do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if sieve is enabled)? mail en Do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if SIEVE is enabled)? do you want to prevent the editing/setup of the absent/vacation notice (, even if sieve is enabled)? mail en Do you want to prevent the editing/setup of the absent/vacation notice (, even if SIEVE is enabled)? @@ -286,7 +285,6 @@ please supply the message to send with auto-responses mail en Please supply the post mail en post prevent managing filters mail en Prevent managing filters prevent managing folders mail en Prevent managing folders -prevent managing forwards mail en Prevent managing forwards prevent managing notifications mail en Prevent managing notifications prevent managing vacation notice mail en Prevent managing vacation notice primary profile mail en Primary Profile diff --git a/mail/templates/default/config.tpl b/mail/templates/default/config.tpl index e94b80db7d..b32605bcb1 100755 --- a/mail/templates/default/config.tpl +++ b/mail/templates/default/config.tpl @@ -44,34 +44,27 @@ {call_mail_hooks::deny_managefolders} - - {lang_Prevent_managing_forwards}
- {lang_Do_you_want_to_prevent_the_editing/setup_for_forwarding_of_mails_via_settings_(,_even_if_SIEVE_is_enabled)?} - - {call_mail_hooks::deny_forwards} - - {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}