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

prevent redirect on display (when messagelocation is draft or template) when called from importMessageFromVFS2DraftAndDisplay

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-24 11:48:24 +00:00
parent fc18f4d1ab
commit 1b295f5c63
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1731,8 +1731,10 @@ unset($query['actions']);
$rowID = $_requesteddata['id']; $rowID = $_requesteddata['id'];
//unset($_REQUEST); //unset($_REQUEST);
} }
$preventRedirect=false;
if(isset($_GET['id'])) $rowID = $_GET['id']; if(isset($_GET['id'])) $rowID = $_GET['id'];
if(isset($_GET['part'])) $partID = $_GET['part']; if(isset($_GET['part'])) $partID = $_GET['part'];
if(isset($_GET['mode'])) $preventRedirect = ($_GET['mode']=='display'?true:false);
$htmlOptions = $this->mail_bo->htmlOptions; $htmlOptions = $this->mail_bo->htmlOptions;
if (!empty($_GET['tryastext'])) $htmlOptions = "only_if_no_text"; if (!empty($_GET['tryastext'])) $htmlOptions = "only_if_no_text";
if (!empty($_GET['tryashtml'])) $htmlOptions = "always_display"; if (!empty($_GET['tryashtml'])) $htmlOptions = "always_display";
@ -1741,7 +1743,7 @@ unset($query['actions']);
$uid = $hA['msgUID']; $uid = $hA['msgUID'];
$mailbox = $hA['folder']; $mailbox = $hA['folder'];
//error_log(__METHOD__.__LINE__.array2string($hA)); //error_log(__METHOD__.__LINE__.array2string($hA));
if ($this->mail_bo->isDraftFolder($mailbox) || $this->mail_bo->isTemplateFolder($mailbox)) if (!$preventRedirect && ($this->mail_bo->isDraftFolder($mailbox) || $this->mail_bo->isTemplateFolder($mailbox)))
{ {
egw::redirect_link('/index.php',array('menuaction'=>'mail.mail_compose.compose','id'=>$rowID,'from'=>'composefromdraft')); egw::redirect_link('/index.php',array('menuaction'=>'mail.mail_compose.compose','id'=>$rowID,'from'=>'composefromdraft'));
} }
@ -3140,7 +3142,7 @@ blockquote[type=cite] {
function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display') function importMessageFromVFS2DraftAndDisplay($formData='',$mode='display')
{ {
if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData']; if (empty($formData)) if (isset($_REQUEST['formData'])) $formData = $_REQUEST['formData'];
//error_log(array2string($formData)); //error_log(__METHOD__.__LINE__.':'.array2string($formData).' Mode:'.$mode.'->'.function_backtrace());
$draftFolder = $this->mail_bo->getDraftFolder(false); $draftFolder = $this->mail_bo->getDraftFolder(false);
$importID = mail_bo::getRandomString(); $importID = mail_bo::getRandomString();
// name should be set to meet the requirements of checkFileBasics // name should be set to meet the requirements of checkFileBasics
@ -3177,6 +3179,11 @@ blockquote[type=cite] {
unset($linkData['deleteDraftOnClose']); unset($linkData['deleteDraftOnClose']);
$linkData['method'] ='importMessageToMergeAndSend'; $linkData['method'] ='importMessageToMergeAndSend';
} }
else
{
$linkData['mode']=$mode;
}
} }
catch (egw_exception_wrong_userinput $e) catch (egw_exception_wrong_userinput $e)
{ {