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

fixed multiline fields in notification message were all in one line

Browse Source
This commit is contained in:
Ralf Becker 2011-07-02 09:36:21 +00:00
parent dbced2bf48
commit a89430ae8e
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
etemplate/inc/class.bo_tracking.inc.php
View File

@ -834,7 +834,7 @@ abstract class bo_tracking
if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values
$body .= $this->format_line($html_email,$detail['type'],$modified, $body .= $this->format_line($html_email,$detail['type'],$modified,
$detail['label'] ? $detail['label'].': ' : '', $detail['value']); $detail['label'] ? $detail['label'] : '', $detail['value']);
} }
if ($html_email) if ($html_email)
{ {
@ -856,6 +856,7 @@ abstract class bo_tracking
*/ */
protected function format_line($html_mail,$type,$modified,$line,$data=null) protected function format_line($html_mail,$type,$modified,$line,$data=null)
{ {
//error_log(__METHOD__.'('.array2string($html_mail).",'$type',".array2string($modified).",'$line',".array2string($data).')');
$content = ''; $content = '';
if ($html_mail) if ($html_mail)
@ -881,10 +882,10 @@ abstract class bo_tracking
break; break;
case 'multiline': case 'multiline':
// Only Convert nl2br on non-html content // Only Convert nl2br on non-html content
$pos = strpos($line, '<br'); if (strpos($data, '<br') === false)
if ($pos===false)
{ {
$line = nl2br($line); $data = nl2br($this->html_content_allow ? $data : html::htmlspecialchars($data));
$this->html_content_allow = true; // to NOT do htmlspecialchars again
} }
break; break;
case 'reply': case 'reply':
@ -895,7 +896,7 @@ abstract class bo_tracking
} }
$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:''); $style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:'');
$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($data?'':'" colspan="2').'">'; $content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data?'" width="20%':'" colspan="2').'">';
} }
else // text-mail else // text-mail
{ {
@ -905,30 +906,27 @@ abstract class bo_tracking
} }
$content .= $line; $content .= $line;
if ($data) if ($html_mail)
{ {
if ($html_mail) if ($line && $data) $content .= '</td><td style="'.$style.'">';
if ($type == 'link')
{ {
$content .= '</td><td style="'.$style.'">'; // the link is often too long for html boxes chunk-split allows to break lines if needed
if ($type == 'link') $content .= html::a_href(chunk_split($data,40,'&#8203'),$data,'','target="_blank"');
{ }
// the link is often too long for html boxes chunk-split allows to break lines if needed elseif ($this->html_content_allow)
$content .= html::a_href(chunk_split($data,40,'&#8203'),$data,'','target="_blank"'); {
} $content .= html::activate_links($data);
elseif ($this->html_content_allow)
{
$content .= html::activate_links($data);
}
else
{
$content .= html::htmlspecialchars($data);
}
} }
else else
{ {
$content .= ' '.$data; $content .= html::htmlspecialchars($data);
} }
} }
else
{
$content .= ($content?': ':'').$data;
}
if ($html_mail) $content .= '</td></tr>'; if ($html_mail) $content .= '</td></tr>';
$content .= "\n"; $content .= "\n";