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

force currentapp = mail for compose and display popups; changed approach

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-17 10:47:35 +00:00
parent b98326fb0c
commit 57e0008ac9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_bo.inc.php
View File

@ -5292,7 +5292,7 @@ class mail_bo
$mailObject->set('error_count',0); $mailObject->set('error_count',0);
$sendOK = $openComposeWindow = $openAsDraft = null; $sendOK = $openComposeWindow = $openAsDraft = null;
//error_log(__METHOD__.__LINE__.' Id To Merge:'.$val); //error_log(__METHOD__.__LINE__.' Id To Merge:'.$val);
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' && if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
count($SendAndMergeTocontacts) > 1 && count($SendAndMergeTocontacts) > 1 &&
is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
{ {
@ -5375,7 +5375,7 @@ class mail_bo
$mailObject->MessageID = ''; $mailObject->MessageID = '';
$mailObject->ClearAllRecipients(); $mailObject->ClearAllRecipients();
$mailObject->ClearCustomHeaders(); $mailObject->ClearCustomHeaders();
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' && if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
{ {
$contact = $bo_merge->contacts->read($val); $contact = $bo_merge->contacts->read($val);

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

@ -1210,7 +1210,7 @@ class mail_compose
$sel_options['mimeType'] = self::$mimeTypes; $sel_options['mimeType'] = self::$mimeTypes;
$sel_options['priority'] = self::$priorities; $sel_options['priority'] = self::$priorities;
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'; //$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
$etpl = new etemplate_new('mail.compose'); $etpl = new etemplate_new('mail.compose');
if ($content['mimeType']=='html') if ($content['mimeType']=='html')
@ -1338,7 +1338,7 @@ class mail_compose
} }
// Merge does not work correctly (missing to) if current app is not addressbook // Merge does not work correctly (missing to) if current app is not addressbook
$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook'; //$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
// Actually do the merge // Actually do the merge
if(count($merge_ids) <= 1) if(count($merge_ids) <= 1)
@ -2741,7 +2741,7 @@ class mail_compose
} }
// Merge does not work correctly (missing to) if current app is not addressbook // Merge does not work correctly (missing to) if current app is not addressbook
$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook'; //$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
// Actually do the merge // Actually do the merge
$results = $this->mail_bo->importMessageToMergeAndSend( $results = $this->mail_bo->importMessageToMergeAndSend(

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

@ -1794,7 +1794,7 @@ unset($query['actions']);
$mailBody = $this->get_load_email_data($uid, $partID, $mailbox, $htmlOptions,false); $mailBody = $this->get_load_email_data($uid, $partID, $mailbox, $htmlOptions,false);
//error_log(__METHOD__.__LINE__.$mailBody); //error_log(__METHOD__.__LINE__.$mailBody);
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
$GLOBALS['egw_info']['flags']['currentapp'] = 'mail'; //$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
$etpl = new etemplate_new('mail.display'); $etpl = new etemplate_new('mail.display');
// Set cell attributes directly // Set cell attributes directly
/* /*