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

remove calls to removed htmlspecialchars method

Browse Source
This commit is contained in:
Ralf Becker 2014-09-30 12:36:46 +00:00
parent 25eae3cd06
commit 648649e03f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1969,7 +1969,7 @@ class mail_compose
//_debug_array($bodyParts); //_debug_array($bodyParts);
$styles = mail_bo::getStyles($bodyParts); $styles = mail_bo::getStyles($bodyParts);
$fromAddress = mail_bo::htmlspecialchars(implode(', ', str_replace(array('<','>'),array('[',']'),$headers['FROM']))); $fromAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$headers['FROM']));
$toAddressA = array(); $toAddressA = array();
$toAddress = ''; $toAddress = '';
@ -1978,7 +1978,7 @@ class mail_compose
} }
if (count($toAddressA)>0) if (count($toAddressA)>0)
{ {
$toAddress = mail_bo::htmlspecialchars(implode(', ', str_replace(array('<','>'),array('[',']'),$toAddressA))); $toAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$toAddressA));
$toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n"); $toAddress = @htmlspecialchars(lang("to")).": ".$toAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
} }
$ccAddressA = array(); $ccAddressA = array();
@ -1988,7 +1988,7 @@ class mail_compose
} }
if (count($ccAddressA)>0) if (count($ccAddressA)>0)
{ {
$ccAddress = mail_bo::htmlspecialchars(implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA))); $ccAddress = implode(', ', str_replace(array('<','>'),array('[',']'),$ccAddressA));
$ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n"); $ccAddress = @htmlspecialchars(lang("cc")).": ".$ccAddress.($bodyParts['0']['mimeType'] == 'text/html'?"<br>":"\r\n");
} }
if($bodyParts['0']['mimeType'] == 'text/html') { if($bodyParts['0']['mimeType'] == 'text/html') {
@ -2345,7 +2345,7 @@ class mail_compose
} }
$mail_bo->closeConnection(); $mail_bo->closeConnection();
} }
/** /**
* Save compose mail as draft * Save compose mail as draft
* *
@ -2355,19 +2355,19 @@ class mail_compose
{ {
$response = egw_json_response::get(); $response = egw_json_response::get();
$success = true; $success = true;
// check if default account is changed then we need to change profile // check if default account is changed then we need to change profile
if (!empty($content['serverID']) && $content['serverID'] != $this->mail_bo->profileID) if (!empty($content['serverID']) && $content['serverID'] != $this->mail_bo->profileID)
{ {
$this->changeProfile($content['serverID']); $this->changeProfile($content['serverID']);
} }
$formData = array_merge($content, array( $formData = array_merge($content, array(
'isDrafted' => 1, 'isDrafted' => 1,
'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')], 'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')],
'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value 'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value
)); ));
//Saving draft procedure //Saving draft procedure
try try
{ {
@ -2412,7 +2412,7 @@ class mail_compose
} }
if ($success) $msg = lang('Message saved successfully.'); if ($success) $msg = lang('Message saved successfully.');
// Include new information to json respose, because we need them in client-side callback // Include new information to json respose, because we need them in client-side callback
$response->data(array( $response->data(array(
'draftedId' => $draft_id, 'draftedId' => $draft_id,
@ -2452,7 +2452,7 @@ class mail_compose
} }
return $_emailAddressList; return $_emailAddressList;
} }
/** /**
* Save message as draft to specific folder * Save message as draft to specific folder
* *