extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed emailadmin_imap to switch emailadmin_sieve to exceptions and handle these for vacation now

Browse Source
This commit is contained in:
Ralf Becker 2014-05-20 15:39:20 +00:00
parent 86eb361233
commit f27fbd3fc8
2 changed files with 75 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mail/inc/class.mail_sieve.inc.php
View File

@ -79,16 +79,16 @@ class mail_sieve
var $mail_admin = false;
/**
* emailadmin_imap account object
* account object
*
* @var type
* @var emailadmin_imap
*/
var $account;
/**
* flag to check if vacation is called from admin
*
* @var type
* @var boolean
*/
var $is_admin_vac = false;
@ -456,43 +456,32 @@ class mail_sieve
/**
* Fetch Vacation rules and predefined Addresses from mailserver
*
* @param {array} $vacation
* @param {string} $msg
* @param {sting} $accountID
* @param string $accountID
*
* @return {array} return multi-dimentional array of vacation and aliases
* @return array return multi-dimentional array of vacation and aliases
*/
function getVacation(&$vacation,&$msg, $accountID = null)
function getVacation($accountID = null)
{
if(!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
{
throw new egw_exception_no_permission();
}
$icServer = $this->is_admin_vac? $this->account->imapServer($accountID):$this->account->imapServer();
$ret = $icServer->getScript($this->scriptName);
if(!is_string($ret) && !isset($ret))
{
if(PEAR::isError($error = $icServer->retrieveRules($this->scriptName)) )
try {
if ($this->is_admin_vac)
{
$vacation = array();
$icServer = $this->account->imapServer($accountID);
$vacation = $icServer->getVacationUser($accountID);
}
else
{
if ($this->is_admin_vac)
{
$vacation = $icServer->getVacationUser($accountID);
}
else
{
$vacation = $icServer->getVacation();
}
$icServer = $this->account->imapServer();
$icServer->retrieveRules($this->scriptName);
$vacation = $icServer->getVacation();
}
}
else
catch(Exception $e)
{
// something went wrong
if ($error) $msg = lang($error);
egw_framework::window_close(lang($e->getMessage()));
}
if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
@ -559,7 +548,7 @@ class mail_sieve
if ( $this->account->acc_sieve_enabled)
{
$vacRules = $this->getVacation($vacation,$msg, $account_id);
$vacRules = $this->getVacation($account_id);
if ($this->timed_vacation)
{

9
mail/js/app.js
View File

@ -2817,12 +2817,15 @@ app.classes.mail = AppJS.extend(
},
/**
* Edit vacation message
*
* @todo get the account id and open the relevant vacation, ATM alway open vacation rules which is set in preferences
* @param {action} _action
* @param {sender} _senders
*/
edit_vacation: function()
edit_vacation: function(_action, _senders)
{
this.egw.open_link('mail.mail_sieve.editVacation','_blank','700x480');
var acc_id = parseInt(_senders[0].id);
this.egw.open_link('mail.mail_sieve.editVacation&acc_id='+acc_id,'_blank','700x480');
},
/**