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

* eMail: fix problem for folder preferences did not overrule folders set by getSpecialUseFolders

Browse Source
This commit is contained in:
Klaus Leithoff 2013-09-12 13:57:38 +00:00
parent 1c815af123
commit 8ebbaeed82
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
felamimail/inc/class.bofelamimail.inc.php
View File

@ -2737,8 +2737,13 @@
} }
if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders)) self::$specialUseFolders = $this->getSpecialUseFolders(); if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders)) self::$specialUseFolders = $this->getSpecialUseFolders();
//highest precedence //highest precedence (user defined profiles, or set by specialUseFolder routine)
$_folderName = $this->mailPreferences->ic_server[$this->profileID]->$types[$_type]['profileKey']; $_folderName = $this->mailPreferences->ic_server[$this->profileID]->$types[$_type]['profileKey'];
// check if there is a pref, over- writing/ruling the previous (Folder MUST exist)
if (!empty($_folderName) && (!empty($this->mailPreferences->preferences[$types[$_type]['prefName']]) &&
$this->mailPreferences->preferences[$types[$_type]['prefName']]!='none' &&
$_folder != $this->mailPreferences->preferences[$types[$_type]['prefName']] &&
self::folderExists($this->mailPreferences->preferences[$types[$_type]['prefName']],true))) $_folderName = false;
//check prefs next //check prefs next
if (empty($_folderName)) $_folderName = $this->mailPreferences->preferences[$types[$_type]['prefName']]; if (empty($_folderName)) $_folderName = $this->mailPreferences->preferences[$types[$_type]['prefName']];
// does the folder exist??? // does the folder exist???