extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle access space in front for switch from plain text to html too

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-07 14:54:44 +00:00
parent 5a49a57c5f
commit 0773d1ad3a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -525,7 +525,7 @@ class mail_compose
if ($content['is_plain'] && $content['mimeType']=='html') if ($content['is_plain'] && $content['mimeType']=='html')
{ {
// the possible font span should only be applied on first load or on switch plain->html // the possible font span should only be applied on first load or on switch plain->html
$isFirstLoad = true; $isFirstLoad = "switchedplaintohtml";
//error_log(__METHOD__.__LINE__.$content['mail_plaintext']); //error_log(__METHOD__.__LINE__.$content['mail_plaintext']);
$suppressSigOnTop = true; $suppressSigOnTop = true;
$content['mail_plaintext'] = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$content['mail_plaintext']); $content['mail_plaintext'] = str_replace(array("\r\n","\n","\r"),array("<br>","<br>","<br>"),$content['mail_plaintext']);
@ -1106,7 +1106,7 @@ class mail_compose
{ {
$disableRuler = true; $disableRuler = true;
} }
$font_span =''; $font_span = $font_part = '';
if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) { if($content['mimeType'] == 'html' /*&& trim($content['body'])==''*/) {
// User preferences for style // User preferences for style
$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font']; $font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
@ -1160,7 +1160,7 @@ class mail_compose
} }
else else
{ {
$content['body'] = ($font_span?$font_span:/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body']; $content['body'] = ($font_span?($isFirstLoad == "switchedplaintohtml"?$font_part:$font_span):/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad == "switchedplaintohtml"?"</span>":"");
} }
//error_log(__METHOD__.__LINE__.$content['body']); //error_log(__METHOD__.__LINE__.$content['body']);