From 46b74480809a224464a95cead5d722137d71bb2f Mon Sep 17 00:00:00 2001
From: Florian Schaal <info@schaal-24.de>
Date: Fri, 24 May 2019 13:04:02 +0200
Subject: [PATCH] add cron to last commit _ datalog-viewer

---
 interface/web/monitor/dataloghistory_view.php         | 11 +++++++++--
 .../web/monitor/lib/lang/de_dataloghistory_view.lng   |  1 +
 .../web/monitor/lib/lang/en_dataloghistory_view.lng   |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/web/monitor/dataloghistory_view.php b/interface/web/monitor/dataloghistory_view.php
index 78d4db0451..c18860c360 100644
--- a/interface/web/monitor/dataloghistory_view.php
+++ b/interface/web/monitor/dataloghistory_view.php
@@ -61,6 +61,8 @@ if(!$data = unserialize(stripslashes($record['data']))) {
 	$data = unserialize($record['data']);
 }
 
+$out = describe($record['dbtable'], $data, $out);
+
 switch ($record['action']) {
 	case 'i':
 		$inserts = array();
@@ -73,7 +75,6 @@ switch ($record['action']) {
 		$app->tpl->setLoop('inserts', $inserts);
 		break;
 	case 'u':
-		$out = describe($record['dbtable'], $data, $out);
 		$updates = array();
 		foreach ($data['new'] as $key=>$value) {
 			if ($value != $data['old'][$key]) {
@@ -134,6 +135,10 @@ function describe($dbtable, $data, $out) {
 		case 'client':
 			$check = 'username';
 		break;
+		case 'cron':
+			$temp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);
+			$out['describe_data'] = $temp['domain'];
+		break;
 		case 'directive_snippets':
 			$check = 'name';
 		break;
@@ -184,7 +189,9 @@ function describe($dbtable, $data, $out) {
 		break;
 	}
 
-	$out['describe_data'] = @(isset($data['old'][$check]) && $data['old'][$check] != $data['new'][$check])?$data['old'][$check].'/'.$data['new'][$check]:$data['new'][$check];
+	 if(!isset($out['describe_data'])) {
+		$out['describe_data'] = @(isset($data['old'][$check]) && $data['old'][$check] != $data['new'][$check])?$data['old'][$check].'/'.$data['new'][$check]:$data['new'][$check];
+	}
 
 	return $out;
 }
diff --git a/interface/web/monitor/lib/lang/de_dataloghistory_view.lng b/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
index 0359f21e0d..de331bfebc 100644
--- a/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
+++ b/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
@@ -24,6 +24,7 @@ $wb['btn_cancel_txt'] = 'Zurück';
 $wb['undo_txt'] = 'Rückgängig machen';
 $wb['undo_confirmation_txt'] = 'Soll diese Änderung wirklich rückgängig gemacht werden?';
 $wb['describe_client'] = 'Username';
+$wb['describe_cron'] = 'Webseite';
 $wb['describe_directive_snippets'] = 'Direktiven Schnippsel';
 $wb['describe_domain'] = 'Domain';
 $wb['describe_ftp_user'] = 'FTP-User';
diff --git a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
index 523018aae3..bdb961ffa9 100644
--- a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
+++ b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
@@ -24,6 +24,7 @@ $wb['btn_cancel_txt'] = 'Back';
 $wb['undo_txt'] = 'Undo action';
 $wb['undo_confirmation_txt'] = 'Do you really want to undo this action?';
 $wb['describe_client'] = 'Username';
+$wb['describe_cron'] = 'Website';
 $wb['describe_directive_snippets'] = 'Direktive Snippet';
 $wb['describe_domain'] = 'Domain';
 $wb['describe_ftp_user'] = 'FTP-User';
-- 
GitLab