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

* Mail: do not hierarchy delimiter inside folder names as it may break the folder structure

Browse Source
This commit is contained in:
Hadi Nategh 2018-10-17 18:02:36 +02:00
parent 9be59b55bf
commit 730b2b7d51
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4010,7 +4010,12 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
$error=''; $error='';
$created = false; $created = false;
$response = Api\Json\Response::get();
$del = $this->mail_bo->getHierarchyDelimiter(flase);
if (strpos($_new, $del) !== FALSE)
{
return $response->call('egw.message', lang('failed to rename %1 ! Reason: %2 is not allowed!',$_parent, $del));
}
if ($_parent) if ($_parent)
{ {
$parent = $this->mail_bo->decodeEntityFolderName($_parent); $parent = $this->mail_bo->decodeEntityFolderName($_parent);
@ -4075,7 +4080,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if (!empty($new)) $this->mail_bo->reopen($new); if (!empty($new)) $this->mail_bo->reopen($new);
} }
$response = Api\Json\Response::get();
if ($created===true && $error =='') if ($created===true && $error =='')
{ {
$this->mail_bo->resetFolderObjectCache($profileID); $this->mail_bo->resetFolderObjectCache($profileID);
@ -4111,12 +4116,20 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
function ajax_renameFolder($_folderName, $_newName) function ajax_renameFolder($_folderName, $_newName)
{ {
if (Mail::$debug) error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName)); if (Mail::$debug) error_log(__METHOD__.__LINE__.' OldFolderName:'.array2string($_folderName).' NewName:'.array2string($_newName));
//error_log(__METHOD__.__LINE__.array2string($oA));
$response = Api\Json\Response::get();
$del = $this->mail_bo->getHierarchyDelimiter(false);
if (strpos($_newName, $del) !== FALSE)
{
return $response->call('egw.message', lang('failed to rename %1 ! Reason: %2 is not allowed!',$_folderName, $del));
}
if ($_folderName) if ($_folderName)
{ {
Api\Translation::add_app('mail'); Api\Translation::add_app('mail');
$decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName); $decodedFolderName = $this->mail_bo->decodeEntityFolderName($_folderName);
$_newName = $this->mail_bo->decodeEntityFolderName($_newName); $_newName = $this->mail_bo->decodeEntityFolderName($_newName);
$del = $this->mail_bo->getHierarchyDelimiter(false);
$oA = array(); $oA = array();
list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2); list($profileID,$folderName) = explode(self::$delimiter,$decodedFolderName,2);
$hasChildren = false; $hasChildren = false;