holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new et2 site config

Browse Source
This commit is contained in:
Ralf Becker 2016-04-25 07:57:40 +00:00
parent 1fb53f8e0e
commit 893f449992
5 changed files with 89 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mail/inc/class.mail_hooks.inc.php
View File

@ -679,26 +679,6 @@ class mail_hooks
return true; 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 '<input type="hidden" value="" name="newsettings['.$name.']" />'.
$accountsel->selection('newsettings['.$name.']', 'deny_prefs', $arguments[0][$name], 'groups', 4);
}
/** /**
* Check if current user has access to a specific feature * Check if current user has access to a specific feature
* *

1
mail/lang/egw_de.lang
View File

@ -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 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 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 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

1
mail/lang/egw_en.lang
View File

@ -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 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 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 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

103
mail/templates/default/config.tpl
View File

@ -1,103 +0,0 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
{hidden_vars}
<table border="0" align="center">
<tr class="th">
<td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
</tr>
<tr>
<td colspan="2">&nbsp;<i><font color="red">{error}</i></font></td>
</tr>
<!-- END header -->
<!-- BEGIN body -->
<tr class="th">
<td colspan="2"><b>{lang_Deny_certain_groups_access_to_following_features}</b></td>
</tr>
<tr class="row_on">
<td>
<b>{lang_Create_new_account}</b>
</td>
<td>{call_mail_hooks::deny_createaccount}</td>
</tr>
<tr class="row_off">
<td>
<b>{lang_Prevent_managing_folders}</b><br/>
{lang_Do_you_want_to_prevent_the_managing_of_folders_(creation,_accessrights_AND_subscribtion)?}
</td>
<td>{call_mail_hooks::deny_managefolders}</td>
</tr>
<tr class="row_on">
<td>
<b>{lang_Prevent_managing_notifications}</b><br/>
{lang_Do_you_want_to_prevent_the_editing/setup_of_notification_by_mail_to_other_emailadresses_if_emails_arrive_(,_even_if_SIEVE_is_enabled)?}
</td>
<td>{call_mail_hooks::deny_notificationformailviaemail}</td>
</tr>
<tr class="row_off">
<td>
<b>{lang_Prevent_managing_filters}</b><br/>
{lang_Do_you_want_to_prevent_the_editing/setup_of_filter_rules_(,_even_if_SIEVE_is_enabled)?}
</td>
<td>{call_mail_hooks::deny_editfilterrules}</td>
</tr>
<tr class="row_on">
<td>
<b>{lang_Prevent_managing_vacation_notice}</b><br/>
{lang_Do_you_want_to_prevent_the_editing/setup_of_the_absent/vacation_notice_(,_even_if_SIEVE_is_enabled)?}
</td>
<td>{call_mail_hooks::deny_absentnotice}</td>
</tr>
<tr class="row_off">
<td>
<b>{lang_restrict_acl_management}</b><br/>
{lang_effective_only_if_server_supports_ACL_at_all}
</td>
<td>{call_mail_hooks::deny_aclmanagement}</td>
</tr>
<tr class="th">
<td colspan="2"><b>{lang_mail}</b> - {lang_sieve}</td>
</tr>
<tr class="row_on">
<td>
<b>{lang_vacation_notice}</b><br/>
{lang_provide_a_default_vacation_text,_(used_on_new_vacation_messages_when_there_was_no_message_set_up_previously)}
</td>
<td><textarea name="newsettings[default_vacation_text]" cols="50" rows="8">{value_default_vacation_text}</textarea></td>
</tr>
<tr class="th">
<td colspan="2"><b>{lang_Miscellaneous}</b></td>
</tr>
<tr class="row_off">
<td> <b>{lang_examine_namespace_to_retrieve_folders_in_others_and_shared}</b><br/>
{lang_only_needed_for_some_servers,_that_do_not_return_all_folders_on_root_level_queries_to_retrieve_all_folders_for_that_level}
</td>
<td>
<select name="newsettings[examineNamespace]">
<option value=""{selected_examineNamespace_False}>{lang_No}</option>
<option value="True"{selected_examineNamespace_True}>{lang_Yes}</option>
</select>
</td>
</tr>
<tr class="row_on">
<td>
<b>{lang_Disable_use_of_flowed_lines_in_plain_text_mails_(RFC3676)}</b><br>
{lang_Some_clients_fail_to_detect_correct_charset,_if_flowed_lines_are_enabled.}
</td>
<td>
<select name="newsettings[disable_rfc3676_flowed]">
<option value=""{selected_disable_rfc3676_flowed}>{lang_No}</option>
<option value="True"{selected_disable_rfc3676_flowed_True}>{lang_Yes}</option>
</select>
</td>
</tr>
<!-- END body -->
<!-- BEGIN footer -->
<tr valign="bottom" style="height: 30px;">
<td colspan="2">
{submit}{cancel}
</td>
</tr>
</table>
</form>
<!-- END footer -->

87
mail/templates/default/config.xet Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ -->
<overlay>
<template id="mail.config" template="" lang="" group="0" version="16.1">
<grid width="100%" class="admin-config egwGridView_grid">
<columns>
<column width="60%"/>
<column/>
</columns>
<rows>
<row>
<description value="Deny certain groups access to following features" span="all" class="subHeader"/>
</row>
<row>
<description value="Create new account"/>
<select-account id="newsettings[deny_createaccount]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<vbox>
<description value="Prevent managing folders"/>
<description value="Do you want to prevent the managing of folders (creation, accessrights AND subscribtion)?"/>
</vbox>
<select-account id="newsettings[deny_managefolders]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<vbox>
<description value="Prevent managing notifications"/>
<description value="Do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if SIEVE is enabled)?"/>
</vbox>
<select-account id="newsettings[deny_notificationformailviaemail]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<vbox>
<description value="Prevent managing filters"/>
<description value="Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)?"/>
</vbox>
<select-account id="newsettings[deny_editfilterrules]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<vbox>
<description value="Prevent managing vacation notice"/>
<description value="Do you want to prevent the editing/setup of the absent/vacation notice (, even if SIEVE is enabled)?"/>
</vbox>
<select-account id="newsettings[deny_absentnotice]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<vbox>
<description value="restrict acl management"/>
<description value="effective only if server supports ACL at all"/>
</vbox>
<select-account id="newsettings[deny_aclmanagement]" account_type="groups" multiple="true" tags="true" width="100%"/>
</row>
<row>
<description value="Sieve" span="all" class="subHeader"/>
</row>
<row>
<description value="provide a default vacation text, (used on new vacation messages when there was no message set up previously)"/>
<textbox id="newsettings[default_vacation_text]" cols="50" rows="8"/>
</row>
<row>
<description value="Miscellaneous" span="all" class="subHeader"/>
</row>
<row>
<vbox>
<description value="examine namespace to retrieve folders in others and shared"/>
<description value="only needed for some servers, that do not return all folders on root level queries to retrieve all folders for that level"/>
</vbox>
<select id="newsettings[examineNamespace]">
<option value="">No</option>
<option value="True">Yes</option>
</select>
</row>
<row>
<vbox>
<description value="Disable use of flowed lines in plain text mails (RFC3676)"/>
<description value="Some clients fail to detect correct charset, if flowed lines are enabled."/>
</vbox>
<select id="newsettings[disable_rfc3676_flowed]">
<option value="">No</option>
<option value="True">Yes</option>
</select>
</row>
</rows>
</grid>
</template>
</overlay>