Author: ralfbecker
New Revision: 55532
URL: http://svn.stylite.de/viewvc/egroupware?rev=55532&view=rev
Log:
moving emailadmin to api and admin, only emailadmin_hooks and tables still need moving
Added:
trunk/admin/inc/class.admin_mail.inc.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_wizard.inc.php
trunk/admin/templates/default/images/progress.gif
- copied unchanged from r55522, trunk/emailadmin/templates/default/images/progress.gif
trunk/admin/templates/default/mailaccount.xet
- copied, changed from r55522, trunk/emailadmin/templates/default/account.xet
trunk/admin/templates/default/mailwizard.folder.xet
- copied, changed from r55522, trunk/emailadmin/templates/default/wizard.folder.xet
trunk/admin/templates/default/mailwizard.sieve.xet
- copied, changed from r55522, trunk/emailadmin/templates/default/wizard.sieve.xet
trunk/admin/templates/default/mailwizard.smtp.xet
- copied, changed from r55522, trunk/emailadmin/templates/default/wizard.smtp.xet
trunk/admin/templates/default/mailwizard.xet
- copied, changed from r55522, trunk/emailadmin/templates/default/wizard.xet
trunk/admin/templates/mobile/mailaccount.xet
- copied, changed from r55522, trunk/emailadmin/templates/mobile/account.xet
trunk/admin/templates/mobile/mailwizard.folder.xet
- copied, changed from r55522, trunk/emailadmin/templates/mobile/wizard.folder.xet
trunk/admin/templates/mobile/mailwizard.sieve.xet
- copied, changed from r55522, trunk/emailadmin/templates/mobile/wizard.sieve.xet
trunk/admin/templates/mobile/mailwizard.smtp.xet
- copied, changed from r55522, trunk/emailadmin/templates/mobile/wizard.smtp.xet
trunk/admin/templates/mobile/mailwizard.xet
- copied, changed from r55522, trunk/emailadmin/templates/mobile/wizard.xet
trunk/egroupware/api/src/Mail/
trunk/egroupware/api/src/Mail.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
trunk/egroupware/api/src/Mail/Account.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_account.inc.php
trunk/egroupware/api/src/Mail/Cache.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_horde_cache.inc.php
trunk/egroupware/api/src/Mail/Credentials.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_credentials.inc.php
trunk/egroupware/api/src/Mail/Imap/
trunk/egroupware/api/src/Mail/Imap.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_imap.inc.php
trunk/egroupware/api/src/Mail/Imap/Cyrus.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_imap_cyrus.inc.php
trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php
- copied, changed from r55522, trunk/emailadmin/inc/class.dbmailqmailuser.inc.php
trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php
- copied, changed from r55522, trunk/emailadmin/inc/class.dbmaildbmailuser.inc.php
trunk/egroupware/api/src/Mail/Imap/Dovecot.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php
trunk/egroupware/api/src/Mail/Imap/Iface.php
- copied, changed from r55522, trunk/emailadmin/inc/class.defaultimap.inc.php
trunk/egroupware/api/src/Mail/Notifications.php
- copied, changed from r55530, trunk/emailadmin/inc/class.emailadmin_notifications.inc.php
trunk/egroupware/api/src/Mail/Script.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_script.inc.php
trunk/egroupware/api/src/Mail/Sieve.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_sieve.inc.php
trunk/egroupware/api/src/Mail/Smtp/
trunk/egroupware/api/src/Mail/Smtp.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp.inc.php
trunk/egroupware/api/src/Mail/Smtp/Ads.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_ads.inc.php
trunk/egroupware/api/src/Mail/Smtp/Dbmailuser.php
- copied, changed from r55522, trunk/emailadmin/inc/class.postfixdbmailuser.inc.php
trunk/egroupware/api/src/Mail/Smtp/Ldap.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
trunk/egroupware/api/src/Mail/Smtp/Mandriva.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_mandriva.inc.php
trunk/egroupware/api/src/Mail/Smtp/Oldqmailuser.php
- copied, changed from r55522, trunk/emailadmin/inc/class.postfixldap.inc.php
trunk/egroupware/api/src/Mail/Smtp/Qmail.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_qmail.inc.php
trunk/egroupware/api/src/Mail/Smtp/Sql.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_sql.inc.php
trunk/egroupware/api/src/Mail/Smtp/Suse.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_suse.inc.php
trunk/egroupware/api/src/Mail/Smtp/Univention.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_smtp_univention.inc.php
trunk/egroupware/api/src/Mail/Types.php
- copied, changed from r55522, trunk/emailadmin/inc/class.emailadmin_base.inc.php
trunk/egroupware/api/src/Mailer.php
- copied, changed from r55522, trunk/phpgwapi/inc/class.egw_mailer.inc.php
trunk/egroupware/api/src/Preferences.php
- copied, changed from r55522, trunk/phpgwapi/inc/class.preferences.inc.php
Removed:
trunk/emailadmin/inc/class.dbmaildbmailuser.inc.php
trunk/emailadmin/inc/class.dbmailqmailuser.inc.php
trunk/emailadmin/inc/class.defaultimap.inc.php
trunk/emailadmin/inc/class.defaultsmtp.inc.php
trunk/emailadmin/inc/class.emailadmin_account.inc.php
trunk/emailadmin/inc/class.emailadmin_base.inc.php
trunk/emailadmin/inc/class.emailadmin_credentials.inc.php
trunk/emailadmin/inc/class.emailadmin_horde_cache.inc.php
trunk/emailadmin/inc/class.emailadmin_imap.inc.php
trunk/emailadmin/inc/class.emailadmin_imap_cyrus.inc.php
trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php
trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
trunk/emailadmin/inc/class.emailadmin_notifications.inc.php
trunk/emailadmin/inc/class.emailadmin_script.inc.php
trunk/emailadmin/inc/class.emailadmin_sieve.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_ads.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_mandriva.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_qmail.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_sql.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_suse.inc.php
trunk/emailadmin/inc/class.emailadmin_smtp_univention.inc.php
trunk/emailadmin/inc/class.emailadmin_wizard.inc.php
trunk/emailadmin/inc/class.postfixdbmailuser.inc.php
trunk/emailadmin/inc/class.postfixinetorgperson.inc.php
trunk/emailadmin/inc/class.postfixldap.inc.php
trunk/emailadmin/templates/default/account.xet
trunk/emailadmin/templates/default/images/progress.gif
trunk/emailadmin/templates/default/wizard.folder.xet
trunk/emailadmin/templates/default/wizard.sieve.xet
trunk/emailadmin/templates/default/wizard.smtp.xet
trunk/emailadmin/templates/default/wizard.xet
trunk/emailadmin/templates/mobile/account.xet
trunk/emailadmin/templates/mobile/wizard.folder.xet
trunk/emailadmin/templates/mobile/wizard.sieve.xet
trunk/emailadmin/templates/mobile/wizard.smtp.xet
trunk/emailadmin/templates/mobile/wizard.xet
Modified:
trunk/admin/admin-cli.php
trunk/admin/inc/class.admin_hooks.inc.php
trunk/admin/inc/class.admin_passwordreset.inc.php
trunk/admin/js/app.js
trunk/admin/lang/egw_bg.lang
trunk/admin/lang/egw_ca.lang
trunk/admin/lang/egw_cs.lang
trunk/admin/lang/egw_da.lang
trunk/admin/lang/egw_de.lang
trunk/admin/lang/egw_el.lang
trunk/admin/lang/egw_en.lang
trunk/admin/lang/egw_es-es.lang
trunk/admin/lang/egw_et.lang
trunk/admin/lang/egw_eu.lang
trunk/admin/lang/egw_fa.lang
trunk/admin/lang/egw_fi.lang
trunk/admin/lang/egw_fr.lang
trunk/admin/lang/egw_hr.lang
trunk/admin/lang/egw_hu.lang
trunk/admin/lang/egw_id.lang
trunk/admin/lang/egw_it.lang
trunk/admin/lang/egw_iw.lang
trunk/admin/lang/egw_ja.lang
trunk/admin/lang/egw_ko.lang
trunk/admin/lang/egw_lo.lang
trunk/admin/lang/egw_lv.lang
trunk/admin/lang/egw_nl.lang
trunk/admin/lang/egw_no.lang
trunk/admin/lang/egw_pl.lang
trunk/admin/lang/egw_pt-br.lang
trunk/admin/lang/egw_pt.lang
trunk/admin/lang/egw_ru.lang
trunk/admin/lang/egw_rw.lang
trunk/admin/lang/egw_sk.lang
trunk/admin/lang/egw_sl.lang
trunk/admin/lang/egw_sv.lang
trunk/admin/lang/egw_tr.lang
trunk/admin/lang/egw_uk.lang
trunk/admin/lang/egw_vi.lang
trunk/admin/lang/egw_zh-tw.lang
trunk/admin/lang/egw_zh.lang
trunk/admin/templates/default/app.css
trunk/admin/templates/pixelegg/app.css
trunk/egroupware/api/src/Accounts.php
trunk/egroupware/api/src/Accounts/Sql.php
trunk/egroupware/api/src/Accounts/Univention.php
trunk/egroupware/api/src/Auth/Pam.php
trunk/egroupware/api/src/Html/HtmLawed.php
trunk/emailadmin/doc/postfix_tcp_map_ads.php
trunk/emailadmin/inc/class.emailadmin_hooks.inc.php
trunk/emailadmin/lang/ (props changed)
trunk/emailadmin/setup/setup.inc.php
trunk/emailadmin/setup/tables_update.inc.php
trunk/mail/inc/class.mail_acl.inc.php
trunk/mail/inc/class.mail_bo.inc.php
trunk/mail/inc/class.mail_compose.inc.php
trunk/mail/inc/class.mail_hooks.inc.php
trunk/mail/inc/class.mail_integration.inc.php
trunk/mail/inc/class.mail_sieve.inc.php
trunk/mail/inc/class.mail_tree.inc.php
trunk/mail/inc/class.mail_ui.inc.php
trunk/mail/inc/class.mail_wizard.inc.php
trunk/mail/inc/class.mail_zpush.inc.php
trunk/mail/lang/ (props changed)
trunk/mail/profile.php
trunk/mail/setup/setup.inc.php
trunk/phpgwapi/categories.php
trunk/phpgwapi/inc/class.common.inc.php
trunk/phpgwapi/inc/class.egw_mailer.inc.php
trunk/phpgwapi/inc/class.preferences.inc.php
trunk/setup/inc/class.setup_cmd_ldap.inc.php
trunk/setup/setup-cli.php
trunk/tracker/inc/class.tracker_bo.inc.php
trunk/tracker/inc/class.tracker_mailhandler.inc.php
— trunk/admin/admin-cli.php (original)
+++ trunk/admin/admin-cli.php Mon Mar 28 20:51:38 2016
@@ -6,7 +6,7 @@
- */
case ‘–check-acl’;
return do_check_acl();
@@ -281,11 +282,12 @@
/**
- Give a usage message and exit
-
-
-
@param string $action=null
-
-
@param int $ret=0 exit-code
-
-
@param string $action =null
-
-
@param int $ret =0 exit-code
*/
function usage($action=null,$ret=0)
{
- unset($action);
$cmd = basename($_SERVER[‘argv’][0]);
echo “Usage: $cmd --command admin-account[@domain],admin-password,options,… [–schedule {YYYY-mm-dd|+1 week|+5 days}] [–requested 'Name '] [–comment ‘comment …’] [–remote {id|name}] [–skip-checks] [–dry-run]\n\n”;
@@ -355,15 +357,16 @@
try {
admin_cmd::parse_account($account,false);
-
foreach($data as &$value) // existing account --> empty values mean dont change, not set them empty!
{
if ((string)$value === '') $value = null;
}
}
catch (Exception $e) { // new group
-
unset($e); // not used
$data['account_lid'] = $account;
$account = false;
- }
run_command(new admin_cmd_edit_group($account,$data));
}
@@ -386,7 +389,7 @@
-
-
@param boolean $run_addaccount_hook=null default run hook depending on account existence, true=allways run addaccount hook
-
-
@param boolean $run_addaccount_hook =null default run hook depending on account existence, true=allways run addaccount hook
*/
function do_edit_user($args,$run_addaccount_hook=null)
{
@@ -419,15 +422,16 @@
try {
admin_cmd::parse_account($account,true);
-
foreach($data as &$value) // existing account --> empty values mean dont change, not set them empty!
{
if ((string)$value === '') $value = null;
}
}
catch (Exception $e) { // new account
-
unset($e); // not used
$data['account_lid'] = $account;
$account = false;
- }
run_command(new admin_cmd_edit_user($account,$data,null,$run_addaccount_hook));
}
@@ -435,8 +439,8 @@
- Delete a given acount from eGW
-
-
@param int/string $account account-name of -id
-
-
@param int/string $new_user=0 for users only: account to move the entries too
-
-
@param boolean $is_user=true are we called for a user or group
-
-
@param int/string $new_user =0 for users only: account to move the entries too
-
-
@param boolean $is_user =true are we called for a user or group
-
@return int 0 on success, 2-4 otherwise (see source)
*/
function do_delete_account($account,$new_user=0,$is_user=true)
@@ -487,8 +491,9 @@
error_reporting(error_reporting() & ~E_NOTICE);
$codes = array(‘Ok’);
- foreach(file(FILE) as $n => $line)
- {
- foreach(file(FILE) as $line)
- {
-
$matches = null;
if (preg_match('/fail\(([0-9]+),(.*)\);/',$line,$matches))
{
//echo "Line $n: $matches[1]: $matches[2]\n";
@@ -510,6 +515,8 @@
*/
function do_subscribe_other($account_lid,$pw=null)
{
-
unset($account_lid, $pw);
-
/* ToDo: this cant work, not even in 14.x
if (!($account_id = $GLOBALS[‘egw’]->accounts->name2id($account_lid)))
{
throw new egw_exception_wrong_userinput(lang(“Unknown account: %1 !!!”,$account_lid),15);
@@ -544,14 +551,14 @@
if (!$pw) $mailbox = str_replace('INBOX','user'.$delimiter.$account_lid,$mailbox);
-/* $rights = $icServer->getACL($mailbox);
-
echo "getACL($mailbox)\n";
-
foreach($rights as $data)
-
{
-
echo $data['USER'].' '.$data['RIGHTS']."\n";
-
}*/
-
//$rights = $icServer->getACL($mailbox);
-
//echo "getACL($mailbox)\n";
-
//foreach($rights as $data)
-
//{
-
// echo $data['USER'].' '.$data['RIGHTS']."\n";
-
//}
echo "subscribing $mailbox for $account_lid\n";
//$icServer->subscribeMailbox($mailbox);
//exit;
— trunk/admin/inc/class.admin_hooks.inc.php (original)
+++ trunk/admin/inc/class.admin_hooks.inc.php Mon Mar 28 20:51:38 2016
@@ -219,6 +219,42 @@
‘icon’ => ‘cancel’,
);
}
+
-
// currently no way to deny Admins access to administrate mail
-
// we could add a deny check as for other admin functionality
-
{
-
$actions[] = array(
-
'id' => 'mail_account',
-
'caption' => 'mail account',
-
'url' => 'menuaction=admin.admin_mail.edit&account_id=$id',
-
'popup' => '720x530',
-
'icon' => 'mail/navbar',
-
);
-
-
$emailadmin = Api\Mail\Account::get_default();
-
if ($emailadmin->acc_smtp_type && $emailadmin->acc_smtp_type !== 'EGroupware\Api\Mail\Smtp')
-
{
-
$actions[] = array (
-
'id' => 'mail_activeAccounts',
-
'caption' => '(de)activate mail accounts',
-
'icon' => 'mail/navbar',
-
'children' => array (
-
'active' => array (
-
'caption' => 'activate',
-
'onExecute' => 'javaScript:app.admin.emailadminActiveAccounts',
-
'icon' => 'check',
-
'allowOnMultiple' => true
-
),
-
'inactive' => array (
-
'caption' => 'deactivate',
-
'onExecute' => 'javaScript:app.admin.emailadminActiveAccounts',
-
'icon' => 'bullet',
-
'allowOnMultiple' => true
-
)
-
)
-
);
-
}
-
}
return $actions;
}
}
— trunk/emailadmin/inc/class.emailadmin_wizard.inc.php (original)
+++ trunk/admin/inc/class.admin_mail.inc.php Mon Mar 28 20:51:38 2016
@@ -10,6 +10,9 @@
+use EGroupware\Api;
+use EGroupware\Api\Mail;
+
/**
- Wizard to create mail accounts
-
@@ -21,7 +24,7 @@
-
-
- replace host in MX with (imap|smtp) or mail
/
-class emailadmin_wizard
+class admin_mail
{
/*
- Enable logging of IMAP communication to given path, eg. /tmp/autoconfig.log
@@ -36,28 +39,28 @@
-
- Used as static::APP_CLASS in etemplate::exec(), to allow mail app extending this class.
*/
- const APP_CLASS = ‘emailadmin.emailadmin_wizard.’;
- const SSL_NONE = emailadmin_account::SSL_NONE;
- const SSL_NONE = Mail\Account::SSL_NONE;
/**
- 1: STARTTLS on regular tcp connection/port
*/
- const SSL_STARTTLS = emailadmin_account::SSL_STARTTLS;
- const SSL_STARTTLS = Mail\Account::SSL_STARTTLS;
/**
- 3: SSL (inferior to TLS!)
*/
- const SSL_SSL = emailadmin_account::SSL_SSL;
- const SSL_SSL = Mail\Account::SSL_SSL;
/**
- 2: require TLS version 1+, no SSL version 2 or 3
*/
- const SSL_TLS = emailadmin_account::SSL_TLS;
- const SSL_TLS = Mail\Account::SSL_TLS;
/**
- 8: if set, verify certifcate (currently not implemented in Horde_Imap_Client!)
*/
- const SSL_VERIFY = emailadmin_account::SSL_VERIFY;
-
Api\Preferences::setlocale(LC_MESSAGES);
}
/**
@@ -165,9 +168,9 @@
public function add(array $content=array(), $msg=’’, $msg_type=‘success’)
{
// otherwise we cant switch to ckeditor in edit
-
Api\Html\CkEditorConfig::set_csp_script_src_attrs();
-
-
$tpl = new Api\Etemplate('admin.mailwizard');
if (empty($content['account_id']))
{
$content['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -268,7 +271,7 @@
$e = null;
try {
@@ -323,19 +326,19 @@
switch($e->getCode())
{
case Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED:
-
etemplate_new::set_validation_error('acc_imap_username', lang($e->getMessage()));
-
etemplate_new::set_validation_error('acc_imap_password', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_imap_username', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_imap_password', lang($e->getMessage()));
break;
case Horde_Imap_Client_Exception::SERVER_CONNECT:
-
$tpl = new Api\Etemplate('admin.mailwizard');
$tpl->exec(static::APP_CLASS.'autoconfig', $content, $sel_options, $readonlys, $content, 2);
}
@@ -375,7 +378,7 @@
if (self::$debug) _egw_log_exception($e);
}
-
$tpl = new Api\Etemplate('admin.mailwizard.folder');
$tpl->exec(static::APP_CLASS.'folder', $content, $sel_options, array(), $content);
}
@@ -528,14 +531,14 @@
$e = null;
try {
-
$content['sieve_output'] .= "\n".Api\DateTime::to('now', 'H:i:s').": Trying $ssl_label connection to $content[acc_sieve_host]:$port ...\n";
$content['acc_sieve_port'] = $port;
$sieve = new Horde\ManageSieve(array(
'host' => $content['acc_sieve_host'],
'port' => $content['acc_sieve_port'],
'secure' => self::$ssl2secure[(string)array_search($content['acc_sieve_ssl'], self::$ssl2type)],
'timeout' => self::TIMEOUT,
@@ -575,15 +578,15 @@
case 61: // connection refused
case 60: // connection timed out (imap.googlemail.com returns that for none-ssl/4190/2000)
case 65: // no route ot host (imap.googlemail.com returns that for ssl/5190)
-
etemplate_new::set_validation_error('acc_sieve_host', lang($e->getMessage()));
-
etemplate_new::set_validation_error('acc_sieve_port', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_sieve_host', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_sieve_port', lang($e->getMessage()));
break;
}
$content['msg'] = lang('No sieve support detected, either fix configuration manually or leave it switched off.');
$content['acc_sieve_enabled'] = 0;
}
$sel_options['acc_sieve_ssl'] = self::$ssl_types;
-
$tpl = new Api\Etemplate('admin.mailwizard.sieve');
$tpl->exec(static::APP_CLASS.'sieve', $content, $sel_options, $readonlys, $content, 2);
}
@@ -689,7 +692,7 @@
$e = null;
try {
@@ -773,18 +776,18 @@
case Horde_Smtp_Exception::LOGIN_AUTHENTICATIONFAILED:
case Horde_Smtp_Exception::LOGIN_REQUIREAUTHENTICATION:
case Horde_Smtp_Exception::UNSPECIFIED:
-
etemplate_new::set_validation_error('acc_smtp_username', lang($e->getMessage()));
-
etemplate_new::set_validation_error('acc_smtp_password', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_smtp_username', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_smtp_password', lang($e->getMessage()));
break;
case Horde_Smtp_Exception::SERVER_CONNECT:
-
etemplate_new::set_validation_error('acc_smtp_host', lang($e->getMessage()));
-
etemplate_new::set_validation_error('acc_smtp_port', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_smtp_host', lang($e->getMessage()));
-
Api\Etemplate::set_validation_error('acc_smtp_port', lang($e->getMessage()));
break;
}
}
$sel_options['acc_smtp_ssl'] = self::$ssl_types;
-
$tpl = new Api\Etemplate('admin.mailwizard.smtp');
$tpl->exec(static::APP_CLASS.'smtp', $content, $sel_options, $readonlys, $content, 2);
}
@@ -809,8 +812,8 @@
{
if (stripos($_GET[‘msg’],‘fatal error:’)!==false || $_GET[‘msg_type’] == ‘error’) $msg_type = ‘error’;
}
-
if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0) ) emailadmin_imapbase::unsetCachedObjects($content['acc_id']?$content['acc_id']:$_GET['acc_id']);
-
$tpl = new etemplate_new('emailadmin.account');
-
if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0) ) Mail::unsetCachedObjects($content['acc_id']?$content['acc_id']:$_GET['acc_id']);
-
$tpl = new Api\Etemplate('admin.mailaccount');
if (!is_array($content) || !empty($content['acc_id']) && isset($content['old_acc_id']) && $content['acc_id'] != $content['old_acc_id'])
{
@@ -818,16 +821,16 @@
if ($this->is_admin && isset($_GET[‘account_id’]))
{
$content[‘called_for’] = (int)$_GET[‘account_id’];
@@ -835,7 +838,7 @@
//error_log(METHOD.LINE.’.’.array2string($content[‘acc_id’]));
}
}
@@ -856,7 +859,7 @@
if ($content[‘acc_id’] > 0)
{
try {
-
$account = Mail\Account::read($content['acc_id'], $this->is_admin && $content['called_for'] ?
$content['called_for'] : $GLOBALS['egw_info']['user']['account_id']);
$account->getUserData(); // quota, aliases, forwards etc.
$content += $account->params;
@@ -865,7 +868,7 @@
self::fix_account_id_0($content[‘account_id’]);
// read identities (of current user) and mark std identity
-
$content['identities'] = iterator_to_array(emailadmin_account::identities($account, true, 'name', $content['called_for']));
-
$content['identities'] = iterator_to_array(Mail\Account::identities($account, true, 'name', $content['called_for']));
$content['std_ident_id'] = $content['ident_id'];
$content['identities'][$content['std_ident_id']] = lang('Standard identity');
// change self::SSL_NONE (=0) to "no" used in sel_options
@@ -874,7 +877,7 @@
if (!$content[‘acc_’.$type.‘ssl’]) $content['acc’.$type.’_ssl’] = ‘no’;
}
}
@@ -914,15 +917,15 @@
);
}
// ensure correct values for single user mail accounts (we only hide them client-side)
-
$edit_access = Mail\Account::check_access(EGW_ACL_EDIT, $content);
// disable notification save-default and use-default, if only one account or no edit-rights
$tpl->disableElement('notify_save_default', !$is_multiple || !$edit_access);
@@ -948,7 +951,7 @@
if (($this->is_admin || $content[‘acc_further_identities’]) &&
$content[‘ident_id’] > 0 && $content[‘std_ident_id’] != $content[‘ident_id’])
{
@@ -963,17 +966,17 @@
($this->is_admin || $content[‘acc_further_identities’]) &&
$content[‘std_ident_id’] != $content[‘ident_id’])
{
@@ -986,12 +989,12 @@
}
$new_account = !($content[‘acc_id’] > 0);
// check for deliveryMode=“forwardOnly”, if a forwarding-address is given
-
etemplate_new::set_validation_error('mailForwardingAddress', lang('Field must not be empty !!!'));
-
throw new egw_exception_wrong_userinput(lang('You need to specify a forwarding address, when checking "%1"!', lang('Forward only')));
-
Api\Etemplate::set_validation_error('mailForwardingAddress', lang('Field must not be empty !!!'));
-
throw new Api\Exception\WrongUserinput(lang('You need to specify a forwarding address, when checking "%1"!', lang('Forward only')));
}
// set notifications to store according to checkboxes
if ($content['notify_save_default'])
@@ -1004,7 +1007,7 @@
$content[‘called_for’] : $GLOBALS[‘egw_info’][‘user’][‘account_id’];
}
self::fix_account_id_0($content[‘account_id’], true);
@@ -1012,10 +1015,10 @@
if ($content[‘acc_id’] && $content[‘notify_use_default’])
{
// delete own ones
@@ -1030,7 +1033,7 @@
{
$content[‘accounts’] = array($content[‘acc_id’] => ‘’) + $content[‘accounts’];
}
@@ -1038,27 +1041,27 @@
i
