composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

$this->head_html(log)$ and $this->head(log)$ now support both text and HTML case logs.

Browse Source 
SVN:trunk[4136]
This commit is contained in:
Denis Flaven
2016-05-25 08:59:26 +00:00
parent eab0320ef0
commit b97b9bf1d5
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/attributedef.class.inc.php
View File

@@ -2915,10 +2915,10 @@ class AttributeCaseLog extends AttributeLongText
return $value->GetText();
case 'head':
return $value->GetLatestEntry();
return $value->GetLatestEntry('text');
case 'head_html':
return '<div class="caselog_entry">'.str_replace( array( "\r\n", "\n", "\r"), "<br/>", htmlentities($value->GetLatestEntry(), ENT_QUOTES, 'UTF-8')).'</div>';
return $value->GetLatestEntry('html');
case 'html':
return $value->GetAsEmailHtml();

30
core/ormcaselog.class.inc.php
View File

@@ -651,12 +651,38 @@ class ormCaseLog {
/**
* Get the latest entry from the log
* @param string The expected output format text|html
* @return string
*/
public function GetLatestEntry()
public function GetLatestEntry($sFormat = 'text')
{
$sRes = '';
$aLastEntry = end($this->m_aIndex);
$sRes = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
$sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
switch($sFormat)
{
case 'text':
if ($aLastEntry['format'] == 'text')
{
$sRes = $sRaw;
}
else
{
$sRes = utils::HtmlToText($sRaw);
}
break;
case 'html':
if ($aLastEntry['format'] == 'text')
{
$sRes = utils::TextToHtml($sRaw);
}
else
{
$sRes = $sRaw;
}
break;
}
return $sRes;
}