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

* Mail: deal with folderstructure issues when working with shared folders (others or shared) on constructing the mail foldertree

Browse Source
This commit is contained in:
Klaus Leithoff 2015-03-10 15:54:14 +00:00
parent a2cf0787b0
commit fdf614beb8
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mail/inc/class.mail_ui.inc.php
View File

@ -847,6 +847,8 @@ class mail_ui
$cmblevelsCt = count($cmblevels); $cmblevelsCt = count($cmblevels);
} }
//error_log(__METHOD__.__LINE__.function_backtrace()); //error_log(__METHOD__.__LINE__.function_backtrace());
// needed in setOutStructure for namespace consistency in folderstructure of others and/or shared
$nameSpace = $this->mail_bo->_getNameSpaces();
foreach($folderObjects as $key => $obj) foreach($folderObjects as $key => $obj)
{ {
//error_log(__METHOD__.__LINE__.array2string($key)); //error_log(__METHOD__.__LINE__.array2string($key));
@ -910,7 +912,7 @@ class mail_ui
} }
$oA['parent'] = $parentName; $oA['parent'] = $parentName;
$this->setOutStructure($oA,$out,$obj->delimiter); $this->setOutStructure($oA,$out,$obj->delimiter,true,$nameSpace);
$c++; $c++;
} }
if (!is_null($_nodeID) && $_nodeID !=0 && $_returnNodeOnly==true) if (!is_null($_nodeID) && $_nodeID !=0 && $_returnNodeOnly==true)
@ -956,9 +958,11 @@ class mail_ui
* @param array &$out, out array * @param array &$out, out array
* @param string $del needed as glue for parent/child operation / comparsion * @param string $del needed as glue for parent/child operation / comparsion
* @param boolean $createMissingParents a missing parent, instead of throwing an exception * @param boolean $createMissingParents a missing parent, instead of throwing an exception
* @param array $nameSpace used to check on creation of nodes in namespaces other than personal
* as clearance for access may be limited to a single branch-node of a tree
* @return void * @return void
*/ */
function setOutStructure($data, &$out, $del='.', $createMissingParents=true) function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array())
{ {
//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')"); //error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
$components = $data['path']; $components = $data['path'];
@ -982,16 +986,34 @@ class mail_ui
if (!is_array($insert) || !isset($insert['item'])) if (!is_array($insert) || !isset($insert['item']))
{ {
// throwing an exeption here seems to be unrecoverable, even if the cause is a something that can be handeled by the mailserver // throwing an exeption here seems to be unrecoverable,
// even if the cause is a something that can be handeled by the mailserver
if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!"); if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
break; // should we hit the break? if in personal: sure, something is wrong with the folderstructure
} // if in shared or others we may proceed as access to folders may very well be limited to
foreach($insert['item'] as &$item) // a single folder within the tree
{ $break = true;
if ($item['id'] == $parent.$component) foreach ($nameSpace as $nsp)
{ {
$insert =& $item; // if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
break; // we want to create the node in question as we meet the above considerations
if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::$delimiter.$nsp['prefix'])===0)
{
if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::$delimiter.$nsp['prefix']);
$break=false;
}
}
if ($break) break;
}
if ($insert['item'])
{
foreach($insert['item'] as &$item)
{
if ($item['id'] == $parent.$component)
{
$insert =& $item;
break;
}
} }
} }
if ($item['id'] != $parent.$component) if ($item['id'] != $parent.$component)