holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: Fix set vacation via admin does not work anymore

Browse Source
This commit is contained in:
Hadi Nategh 2016-08-02 16:44:14 +02:00
parent e192ed4bbd
commit 5b8f161d1d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_hooks.inc.php
View File

@ -594,7 +594,7 @@ class mail_hooks
public static function access($feature)
{
static $config=null;
if ($GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_info']['user']['apps']['emailadmin'])
if ($GLOBALS['egw_info']['user']['apps']['admin'])
{
return true; // allways give admins or emailadmins all rights, even if they are in a denied group
}

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

@ -67,7 +67,7 @@ class mail_sieve
function __construct()
{
$this->displayCharset = Api\Translation::charset();
$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']);
$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']);
$this->mailConfig = Api\Config::read('mail');
$acc_id = isset($_GET['acc_id']) ? (int)$_GET['acc_id'] : Api\Cache::getSession(__CLASS__, 'acc_id');