Author: ralfbecker
Date: Mon Apr 25 09:57:40 2016
New Revision: 55819
URL: http://svn.stylite.de/viewvc/egroupware?rev=55819&view=rev
Log:
use new et2 site config
Added:
trunk/mail/templates/default/config.xet (with props)
Removed:
trunk/mail/templates/default/config.tpl
Modified:
trunk/mail/inc/class.mail_hooks.inc.php
trunk/mail/lang/egw_de.lang
trunk/mail/lang/egw_en.lang
Modified: trunk/mail/inc/class.mail_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_hooks.inc.php?rev=55819&r1=55818&r2=55819&view=diff
==============================================================================
--- trunk/mail/inc/class.mail_hooks.inc.php (original)
+++ trunk/mail/inc/class.mail_hooks.inc.php Mon Apr 25 09:57:40 2016
@@ -680,26 +680,6 @@
}
/**
- * 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
*
* Example: if (!mail_hooks::access("managerfolders")) return;
Modified: trunk/mail/lang/egw_de.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/lang/egw_de.lang?rev=55819&r1=55818&r2=55819&view=diff
==============================================================================
--- trunk/mail/lang/egw_de.lang (original)
+++ trunk/mail/lang/egw_de.lang Mon Apr 25 09:57:40 2016
@@ -549,3 +549,4 @@
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
Modified: trunk/mail/lang/egw_en.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/lang/egw_en.lang?rev=55819&r1=55818&r2=55819&view=diff
==============================================================================
--- trunk/mail/lang/egw_en.lang (original)
+++ trunk/mail/lang/egw_en.lang Mon Apr 25 09:57:40 2016
@@ -549,3 +549,4 @@
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
Added: trunk/mail/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/default/config.xet?rev=55819&view=auto
==============================================================================
--- trunk/mail/templates/default/config.xet (added)
+++ trunk/mail/templates/default/config.xet Mon Apr 25 09:57:40 2016
@@ -1,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>
Propchange: trunk/mail/templates/default/config.xet
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/mail/templates/default/config.xet
------------------------------------------------------------------------------
svn:keywords = Author Date Id Rev URL
Propchange: trunk/mail/templates/default/config.xet
------------------------------------------------------------------------------
svn:mime-type = text/xml
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
eGroupWare-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.