holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed warning of calling createRowID static with incompatible $this, it work before because mail_ui as well as mail_compose define $this->mail_bo

Browse Source
This commit is contained in:
Ralf Becker 2015-01-26 15:04:36 +00:00
parent f01cfd4a41
commit 8c3360cda9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mail/inc/class.mail_compose.inc.php
View File

@ -101,7 +101,7 @@ class mail_compose
$this->mailPreferences =& $this->mail_bo->mailPreferences; $this->mailPreferences =& $this->mail_bo->mailPreferences;
} }
} }
/** /**
* Provide toolbar actions used for compose toolbar * Provide toolbar actions used for compose toolbar
* @param array $content content of compose temp * @param array $content content of compose temp
@ -110,6 +110,7 @@ class mail_compose
*/ */
function getToolbarActions($content) function getToolbarActions($content)
{ {
$group = 0;
$actions = array( $actions = array(
'send' => array( 'send' => array(
'caption' => 'Send', 'caption' => 'Send',
@ -183,7 +184,7 @@ class mail_compose
'children' => array(), 'children' => array(),
'toolbarDefault' => true, 'toolbarDefault' => true,
'hint' => 'Select the message priority tag', 'hint' => 'Select the message priority tag',
), ),
'save2vfs' => array ( 'save2vfs' => array (
'caption' => 'Save to VFS', 'caption' => 'Save to VFS',
@ -218,7 +219,7 @@ class mail_compose
{ {
$actions['prty']['children'][$content['priority']]['default'] = true; $actions['prty']['children'][$content['priority']]['default'] = true;
} }
return $actions; return $actions;
} }
@ -1240,7 +1241,7 @@ class mail_compose
if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3; if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed //$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
$etpl = new etemplate_new('mail.compose'); $etpl = new etemplate_new('mail.compose');
$etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions($_content)); $etpl->setElementAttribute('composeToolbar', 'actions', $this->getToolbarActions($_content));
if ($content['mimeType']=='html') if ($content['mimeType']=='html')
{ {
@ -1526,7 +1527,7 @@ class mail_compose
} }
} }
// if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort)) // if the message is located within the draft folder, add it as last drafted version (for possible cleanup on abort))
if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::createRowID($_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder); if ($mail_bo->isDraftFolder($_folder)) $this->sessionData['lastDrafted'] = mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid);//array('uid'=>$_uid,'folder'=>$_folder);
$this->sessionData['uid'] = $_uid; $this->sessionData['uid'] = $_uid;
$this->sessionData['messageFolder'] = $_folder; $this->sessionData['messageFolder'] = $_folder;
$this->sessionData['isDraft'] = true; $this->sessionData['isDraft'] = true;
@ -2455,7 +2456,7 @@ class mail_compose
$messageUid = ($messageUid===true ? $status['uidnext'] : $messageUid); $messageUid = ($messageUid===true ? $status['uidnext'] : $messageUid);
if (is_array($this->mail_bo->getMessageHeader($messageUid, '',false, false, $folder))) if (is_array($this->mail_bo->getMessageHeader($messageUid, '',false, false, $folder)))
{ {
$draft_id = mail_ui::createRowID($folder, $messageUid); $draft_id = mail_ui::generateRowID($this->mail_bo->profileID, $folder, $messageUid);
if ($content['lastDrafted'] != $draft_id && isset($content['lastDrafted'])) if ($content['lastDrafted'] != $draft_id && isset($content['lastDrafted']))
{ {
$dhA = mail_ui::splitRowID($content['lastDrafted']); $dhA = mail_ui::splitRowID($content['lastDrafted']);
@ -3090,7 +3091,7 @@ class mail_compose
* @param int $_searchStringLength * @param int $_searchStringLength
* @param boolean $_returnList * @param boolean $_returnList
* @param int $_mailaccountToSearch * @param int $_mailaccountToSearch
* @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
* @return type * @return type
*/ */
function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) { function ajax_searchFolder($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) {