commited a patch from randy, regarding the handling of the message table links within subfolders for the draft-folder

This commit is contained in:
Klaus Leithoff 2008-05-20 06:40:14 +00:00
parent 8c88cad7a4
commit b16f65078a
2 changed files with 4 additions and 3 deletions

View File

@ -370,7 +370,8 @@
$headerTable = $this->uiwidgets->messageTable( $headerTable = $this->uiwidgets->messageTable(
$headers, $headers,
$listMode, $listMode,
$_folderName,
$GLOBALS['egw_info']['user']['preferences']['felamimail']['message_newwindow'], $GLOBALS['egw_info']['user']['preferences']['felamimail']['message_newwindow'],
$GLOBALS['egw_info']['user']['preferences']['felamimail']['rowOrderStyle'] $GLOBALS['egw_info']['user']['preferences']['felamimail']['rowOrderStyle']
); );

View File

@ -214,7 +214,7 @@
// $_folderType 0: normal imap folder 1: sent folder 2: draft folder // $_folderType 0: normal imap folder 1: sent folder 2: draft folder
// $_rowStyle felamimail or outlook // $_rowStyle felamimail or outlook
function messageTable($_headers, $_folderType, $_readInNewWindow, $_rowStyle='felamimail') function messageTable($_headers, $_folderType, $_folderName, $_readInNewWindow, $_rowStyle='felamimail')
{ {
$this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL); $this->t =& CreateObject('phpgwapi.Template',EGW_APP_TPL);
$this->t->set_file(array("body" => 'mainscreen.tpl')); $this->t->set_file(array("body" => 'mainscreen.tpl'));
@ -352,7 +352,7 @@
$linkData = array ( $linkData = array (
'menuaction' => 'felamimail.uicompose.composeFromDraft', 'menuaction' => 'felamimail.uicompose.composeFromDraft',
'icServer' => 0, 'icServer' => 0,
'folder' => base64_encode($GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder']), 'folder' => base64_encode($_folderName),
'uid' => $header['uid'], 'uid' => $header['uid'],
'id' => $header['id'], 'id' => $header['id'],
); );