extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-11 07:50:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

-moved the emailadmin related strings to emailadmin

Browse Source 
-removed the manual setting of the link to the emailadmin, and moved it to emailadmin's hooks
-support the (user/group id change for emailadmin table/fields
This commit is contained in:
Klaus Leithoff 2008-08-07 10:31:54 +00:00
parent 0e4244b440
commit c19f247316
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_cmd_change_account_id.inc.php
View File

@ -78,13 +78,11 @@ class admin_cmd_change_account_id extends admin_cmd
'egw_cal_user' => array(array('cal_user_id','cal_user_type' => 'u')), // cal_user_id for cal_user_type='u' 'egw_cal_user' => array(array('cal_user_id','cal_user_type' => 'u')), // cal_user_id for cal_user_type='u'
), ),
'emailadmin' => array( 'emailadmin' => array(
'egw_emailadmin' => false, 'egw_emailadmin' => array(array('ea_user','ea_user > 0'),array('ea_group','ea_group < 0')),
), ),
'felamimail' => array( 'felamimail' => array(
'egw_felamimail_accounts' => 'fm_owner', 'egw_felamimail_accounts' => 'fm_owner',
'egw_felamimail_cache' => 'fmail_accountid', // afaik not used in 1.4+
'egw_felamimail_displayfilter' => 'fmail_filter_accountid', 'egw_felamimail_displayfilter' => 'fmail_filter_accountid',
'egw_felamimail_folderstatus' => 'fmail_accountid', // afaik not used in 1.4+
'egw_felamimail_signatures' => 'fm_accountid', 'egw_felamimail_signatures' => 'fm_accountid',
), ),
'infolog' => array( 'infolog' => array(

11
admin/inc/class.uiaccounts.inc.php
View File

@ -823,16 +823,7 @@
'extradata' => 'menuaction=admin.uiaclmanager.list_apps' 'extradata' => 'menuaction=admin.uiaclmanager.list_apps'
); );
} }
// not sure if this realy belongs here, or only in edit_user
if ($_GET['account_id'] && // can't set it on add
$GLOBALS['egw_info']['user']['apps']['emailadmin']) // rights to access emailadmin
{
$GLOBALS['menuData'][] = array(
'description' => 'eMailAdmin: User assigned Profile',
'url' => '/index.php',
'extradata' => 'menuaction=emailadmin.emailadmin_ui.listProfiles'
);
}
// NDEE210804 // NDEE210804
// added for different way of handling ldap entries inside account manager // added for different way of handling ldap entries inside account manager
// we show this only, if accounts are stored in ldap // we show this only, if accounts are stored in ldap

1
admin/setup/egw_de.lang
View File

@ -190,7 +190,6 @@ egroupware directory admin de eGroupWare Verzeichnis
either install id and config password needed or the remote hash! admin de Sie benötigen entweder die Install ID oder das Konfigurationspasswort oder den Remote Hash either install id and config password needed or the remote hash! admin de Sie benötigen entweder die Install ID oder das Konfigurationspasswort oder den Remote Hash
email account active admin de E-Mail-Konto aktiv email account active admin de E-Mail-Konto aktiv
email address admin de E-Mail-Adresse email address admin de E-Mail-Adresse
emailadmin: user assigned profile admin de eMailAdmin: Vordefiniertes Benutzerprofil
enable debug-messages admin de Debug-Meldungen einschalten enable debug-messages admin de Debug-Meldungen einschalten
enable the soap service admin de soap Service einschalten enable the soap service admin de soap Service einschalten
enable the spellcheck in the ritch text editor ? admin de Aktiviere die Rechtschreibprüfung im RichText Editor enable the spellcheck in the ritch text editor ? admin de Aktiviere die Rechtschreibprüfung im RichText Editor

1
admin/setup/egw_en.lang
View File

@ -190,7 +190,6 @@ egroupware directory admin en eGroupWare directory
either install id and config password needed or the remote hash! admin en Either Install ID AND config password needed OR the remote hash! either install id and config password needed or the remote hash! admin en Either Install ID AND config password needed OR the remote hash!
email account active admin en email account active email account active admin en email account active
email address admin en email address email address admin en email address
emailadmin: user assigned profile admin en eMailAdmin: User assigned Profile
enable debug-messages admin en Enable debug-messages enable debug-messages admin en Enable debug-messages
enable the soap service admin en Enable the soap service enable the soap service admin en Enable the soap service
enable the spellcheck in the ritch text editor ? admin en Enable the spellcheck in the ritch text editor ? enable the spellcheck in the ritch text editor ? admin en Enable the spellcheck in the ritch text editor ?