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

Add default vacation notice message to vacation notice text if there is no custom message

Browse Source
This commit is contained in:
Hadi Nategh 2014-06-27 14:49:24 +00:00
parent 4471a45147
commit c5ac80225b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,14 @@ class mail_sieve
* @var boolean * @var boolean
*/ */
var $is_admin_vac = false; var $is_admin_vac = false;
/**
* siteConfigs
*
* @var array
*/
var $mailConfig = array();
/** /**
* Constructor * Constructor
*/ */
@ -56,13 +63,14 @@ class mail_sieve
{ {
$this->displayCharset = translation::charset(); $this->displayCharset = translation::charset();
$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']); $this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']);
$this->mailConfig = config::read('mail');
$acc_id = isset($_GET['acc_id']) ? (int)$_GET['acc_id'] : egw_cache::getSession(__CLASS__, 'acc_id'); $acc_id = isset($_GET['acc_id']) ? (int)$_GET['acc_id'] : egw_cache::getSession(__CLASS__, 'acc_id');
if ($acc_id > 0) if ($acc_id > 0)
{ {
$this->account = emailadmin_account::read($acc_id); $this->account = emailadmin_account::read($acc_id);
} }
$this->restoreSessionData(); $this->restoreSessionData();
} }
@ -527,6 +535,7 @@ class mail_sieve
{ {
$content['forwards'] = ''; $content['forwards'] = '';
} }
if (empty($vacation['text']) && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
//Set default value for days new entry //Set default value for days new entry
if (empty($content['days'])) if (empty($content['days']))
{ {