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

allow folder or mailbox as parameter to pass the folder to be selected in composeFromDraft/composeAsNew/composeAsForward functions (folder has precedence over mailbox)

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-05 08:58:03 +00:00
parent 6f0f6838cb
commit 76f1f1ab23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
felamimail/inc/class.uicompose.inc.php
View File

@ -200,7 +200,7 @@
$replyID = $_GET['reply_id']; $replyID = $_GET['reply_id'];
$replyIds = explode(',',$replyID); $replyIds = explode(',',$replyID);
$icServer = $this->bofelamimail->profileID; $icServer = $this->bofelamimail->profileID;
$folder = base64_decode($_GET['folder']); $folder = (isset($_GET['folder'])?base64_decode($_GET['folder']):base64_decode($_GET['mailbox']));
//_debug_array(array('reply_id'=>$replyIds,'folder'=>$folder)); //_debug_array(array('reply_id'=>$replyIds,'folder'=>$folder));
if (!empty($folder) && !empty($replyID) ) { if (!empty($folder) && !empty($replyID) ) {
// this fill the session data with the values from the original email // this fill the session data with the values from the original email
@ -728,7 +728,7 @@
function composeFromDraft() { function composeFromDraft() {
$icServer = (int)$_GET['icServer']; $icServer = (int)$_GET['icServer'];
$folder = base64_decode($_GET['folder']); $folder = (isset($_GET['folder'])?base64_decode($_GET['folder']):base64_decode($_GET['mailbox']));
$replyID = $_GET['uid']; $replyID = $_GET['uid'];
if (!empty($folder) && !empty($replyID) ) { if (!empty($folder) && !empty($replyID) ) {
@ -933,7 +933,7 @@
function composeAsNew() { function composeAsNew() {
$icServer = (int)$_GET['icServer']; $icServer = (int)$_GET['icServer'];
$folder = base64_decode($_GET['folder']); $folder = (isset($_GET['folder'])?base64_decode($_GET['folder']):base64_decode($_GET['mailbox']));
$replyID = $_GET['reply_id']; $replyID = $_GET['reply_id'];
$partID = $_GET['part_id']; $partID = $_GET['part_id'];
if (!empty($folder) && !empty($replyID) ) { if (!empty($folder) && !empty($replyID) ) {