mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mark displayed diffs.

Browse Source
This commit is contained in:
Tony Murray
2016-02-10 17:16:59 -06:00
parent b5106f4e17
commit 0e8ea8b6b2
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
html/pages/device/showconfig.inc.php
View File

@@ -136,6 +136,7 @@ if (is_admin()) {
if ($version > 0) { // if we know the version doesn't exist, don't even try to fetch it
$previous_text = file_get_contents($config['oxidized']['url'].'/node/version/view?node='.$device['hostname'].'&group='.(!empty($node_info['group']) ? $node_info['group'] : '').'&oid='.$oid.'&date='.urlencode($date).'&num='.$version.'&format=text');
if (!empty($previous_text)) {
$previous_version = array('oid'=>$oid, 'date'=>$date, 'version'=>$version);
$text = xdiff_string_diff($text, $previous_text); // requires pecl xdiff
}
} else {
@@ -182,10 +183,18 @@ if (is_admin()) {
foreach ($config_versions as $version) {
echo '<option value="'.$version['oid'].'|'.$version['date'].'|'.$config_total.'" ';
if ($current_version['oid'] == $version['oid']) {
echo 'selected>*';
if (is_array($previous_version)) {
echo 'selected>+';
}
else {
echo 'selected>*';
}
}
else if ($previous_version['oid'] == $version['oid']) {
echo '>&nbsp;-';
}
else {
echo '>';
echo '>&nbsp;&nbsp;';
}
echo $i.' :: '.$version['date'].'</option>';
$i--;
@@ -219,11 +228,11 @@ if (is_admin()) {
}//end if
if (!empty($text)) {
// if (!empty($previous_text)) {
if (is_array($previous_version)) {
$language = 'diff';
// } else {
// $language = 'ios';
// }
} else {
$language = 'ios';
}
$geshi = new GeSHi($text, $language);
// $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS);
$geshi->set_overall_style('color: black;');