extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Instead of new and old values, store unified diff in database for multiline strings

Browse Source
This commit is contained in:
nathangray 2019-02-26 15:13:47 -07:00
parent f71b9ba093
commit ae000be2bc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/Storage/Tracking.php
View File

@ -18,6 +18,8 @@ use EGroupware\Api;
// explicitly reference classes still in phpgwapi or otherwise outside api // explicitly reference classes still in phpgwapi or otherwise outside api
use notifications; use notifications;
use Text_Diff_Renderer_unified;
/** /**
* Abstract base class for trackering: * Abstract base class for trackering:
* - logging all modifications of an entry * - logging all modifications of an entry
@ -451,6 +453,19 @@ abstract class Tracking
$this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]); $this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]);
} }
} }
else if (is_string($data[$name]) && is_string($old[$name]) && (
strpos($data[$name], PHP_EOL) !== FALSE || strpos($old[$name], PHP_EOL) !== FALSE))
{
// Multiline string, just store diff
$diff = new \Text_Diff('auto', array(explode("\n",$data[$name]), explode("\n",$old[$name])));
$renderer = new \Text_Diff_Renderer_unified();
$this->historylog->add(
$status,
$data[$this->id_field],
$renderer->render($diff),
'***diff***'
);
}
else else
{ {
//error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]); //error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]);

3
composer.json
View File

@ -84,7 +84,8 @@
"egroupware/tracker": "self.version", "egroupware/tracker": "self.version",
"egroupware/z-push-dev": "self.version", "egroupware/z-push-dev": "self.version",
"egroupware/activesync": "self.version", "egroupware/activesync": "self.version",
"egroupware/adodb-php": "self.version" "egroupware/adodb-php": "self.version",
"pear-pear.horde.org/Horde_Text_Diff": "^2.2"
}, },
"require-dev": { "require-dev": {
}, },