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

handle error and error-messages on folder-creation. Special handling when having flat folderstructure (no prefix present)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-11-20 14:59:26 +00:00
parent df39e04e95
commit adfa95b45d
2 changed files with 72 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -2130,13 +2130,13 @@ class emailadmin_imapbase
*
* @param string _parent the parent foldername
* @param string _folderName the new foldername
* @param bool _subscribe subscribe to the new folder
* @param string _error pass possible error back to caller
*
* @return mixed name of the newly created folder or false on error
*/
function createFolder($_parent, $_folderName, $_subscribe=false)
function createFolder($_parent, $_folderName, &$_error)
{
if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName, $_subscribe");
if (self::$debug) error_log(__METHOD__.' ('.__LINE__.') '."->"."$_parent, $_folderName");
$parent = $_parent;//$this->_encodeFolderName($_parent);
$folderName = $_folderName;//$this->_encodeFolderName($_folderName);
@ -2165,6 +2165,7 @@ class emailadmin_imapbase
}
catch (Exception $e)
{
$_error = lang('Could not create Folder %1 Reason: %2',$newFolderName,$e->getMessage());
error_log(__METHOD__.' ('.__LINE__.') '.' create Folder '.$newFolderName.'->'.$e->getMessage().' ('.$e->details.') Namespace:'.array2string($this->icServer->getNameSpaces()).function_backtrace());
return false;
}
@ -2755,7 +2756,9 @@ class emailadmin_imapbase
if ($_folderName && $_checkexistance && $_folderName !='none' && !$this->folderExists($_folderName,true)) {
try
{
if (($_folderName = $this->createFolder('', $_folderName, true))) $created = true;
$error = null;
if (($_folderName = $this->createFolder('', $_folderName, $error))) $created = true;
if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
}
catch(Exception $e)
{
@ -2789,8 +2792,10 @@ class emailadmin_imapbase
{
try
{
$this->createFolder('', $prefix.$types[$_type]['autoFolderName'], true);
$error = null;
$this->createFolder('', $prefix.$types[$_type]['autoFolderName'],$error);
$_folderName = $prefix.$types[$_type]['autoFolderName'];
if ($error) error_log(__METHOD__.' ('.__LINE__.') '.' Failed to create Folder '.$_folderName." for $_type:".$error);
}
catch(Exception $e)
{

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

@ -3484,21 +3484,57 @@ class mail_ui
function ajax_addFolder($_parentFolderName, $_newName)
{
//error_log(__METHOD__.__LINE__.' ParentFolderName:'.array2string($_parentFolderName).' NewName/Folder:'.array2string($_newName));
$errorMessage='';
if ($_parentFolderName)
{
$created = false;
$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_parentFolderName);
//the conversion is handeled by horde, frontend interaction is all utf-8
$_newName = $this->mail_bo->decodeEntityFolderName($_newName);
$del = $this->mail_bo->getHierarchyDelimiter(false);
list($profileID,$parentFolderName) = explode(self::$delimiter,$decodedFolderName,2);
if (is_numeric($profileID))
{
if ($profileID != $this->mail_bo->profileID) return; // only current connection
$del = $this->mail_bo->getHierarchyDelimiter(false);
//$del = $prefix = '';
//$nameSpace = $this->mail_bo->_getNameSpaces();
//error_log(__METHOD__.__LINE__.array2string($nameSpace));
// we expect something like that: data may differ!
//$nameSpace = Array(
// [0] => Array([prefix_present] => [prefix] => [delimiter] => /[type] => personal)
// [1] => Array([prefix_present] => 1[prefix] => Other Users/[delimiter] => /[type] => others)
// [2] => Array([prefix_present] => 1[prefix] => Shared Folders/[delimiter] => /[type] => shared)
//)
//
/*
foreach ($nameSpace as $nSp)
{
error_log(__METHOD__.__LINE__.array2string($nSp));
// personal is assumed to be the default
if ($nSp['type']=='personal')
{
$prefix = $nSp['prefix'];
$del = $nSp['delimiter'];
}
if ($parentFolderName && $nSp['prefix_present'] && stripos($parentFolderName,$nSp['prefix'])!==false && stripos($parentFolderName,$nSp['prefix'])<=strlen($nSp['delimiter']))
{
$prefix = $nSp['prefix'];
$del = $nSp['delimiter'];
break;
}
if (empty($parentFolderName) && !$nSp['prefix_present'])
{
$del = $nSp['delimiter'];
break;
}
}
if (empty($del)) $del = $this->mail_bo->getHierarchyDelimiter(false);
*/
$nA = explode($del,$_newName);
//error_log(__METHOD__.__LINE__."$folderName, $parentFolder, $_newName");
$oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
if (!!empty($parentFolderName)) $oldFolderInfo = $this->mail_bo->getFolderStatus($parentFolderName,false);
//error_log(__METHOD__.__LINE__.array2string($oldFolderInfo));
$this->mail_bo->reopen('INBOX');
@ -3509,21 +3545,42 @@ class mail_ui
$c=0;
foreach($nA as $sTName)
{
if(($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, true)))
$error=null;
if(($parentFolderName = $this->mail_bo->createFolder($parentFolderName, $sTName, $error)))
{
$c++;
}
else
{
$errorMessage .= $error;
}
}
if ($c==count($nA)) $created=true;
}
$this->mail_bo->reopen($parentName);
if (!empty($parentName)) $this->mail_bo->reopen($parentName);
}
//error_log(__METHOD__.__LINE__.array2string($oA));
if ($created===true)
{
$this->mail_bo->resetFolderObjectCache($profileID);
$response = egw_json_response::get();
$response->call('app.mail.mail_reloadNode',array($_parentFolderName=>$oldFolderInfo['shortDisplayName']));
if ( $oldFolderInfo['shortDisplayName'])
{
$nodeInfo = array($_parentFolderName=>$oldFolderInfo['shortDisplayName']);
}
else
{
$nodeInfo = array($profileID=>lang('INBOX'));
}
$response->call('app.mail.mail_reloadNode',$nodeInfo);
}
else
{
if ($errorMessage)
{
$response = egw_json_response::get();
$response->call('egw.message',$errorMessage);
}
}
}
}