From b8852ec1824416541fe54d3ec4ab303a1411f338 Mon Sep 17 00:00:00 2001
From: XLixl4snSU <111450124+XLixl4snSU@users.noreply.github.com>
Date: Thu, 2 Mar 2023 13:14:18 +0100
Subject: [PATCH] Various improvements

- View rsync logs from web
- Design improvements
---
 webserver_files/root/css/style.css           | 19 ++++++++++++++--
 webserver_files/root/output-single-rsync.php | 21 +++++++++++++++++
 webserver_files/root/output-single.php       |  2 +-
 webserver_files/root/output.php              |  2 +-
 webserver_files/root/show-log.php            |  4 ++--
 webserver_files/root/show-rsync-log.php      | 24 ++++++++++++++++++++
 6 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 webserver_files/root/output-single-rsync.php
 create mode 100644 webserver_files/root/show-rsync-log.php
diff --git a/webserver_files/root/css/style.css b/webserver_files/root/css/style.css
index d5d0547..145d04d 100644
--- a/webserver_files/root/css/style.css
+++ b/webserver_files/root/css/style.css
@@ -33,8 +33,19 @@ button {
   display: flex;
   margin: auto;
   margin-bottom: 10px;
-  color: blue;
+  color: hotpink;
   font-size: 20px;
+  font-weight: bold;
+  border-radius: 14px;
+  padding: 10px;
+}
+
+a {
+  color: hotpink;
+}
+
+a:link {
+  text-decoration: none;
 }
 
 .log_block{
@@ -57,4 +68,8 @@ box-shadow: rgba(0, 0, 0, 0.8) 0px 10px 25px;
   button {
   font-size: 30px;
   }
-}
\ No newline at end of file
+}
+
+#overview {
+  font-size: 22px;    
+} 
diff --git a/webserver_files/root/output-single-rsync.php b/webserver_files/root/output-single-rsync.php
new file mode 100644
index 0000000..ac83c50
--- /dev/null
+++ b/webserver_files/root/output-single-rsync.php
@@ -0,0 +1,21 @@
+<?php 
+require_once __DIR__.'/../assets/vendor/autoload.php';
+use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
+$converter = new AnsiToHtmlConverter();
+$date = $_GET['date'];
+$date = basename("$date");
+$filename = "../logs/rsync-" . $date . ".log";
+?>
+<h2>Rsync logs for backup of <?php echo $date ?></h2>
+<?php
+$fh = fopen($filename, 'r');
+if(filesize($filename) > 0) {
+  $pageText = fread($fh, filesize($filename));
+  $erg = $converter->convert($pageText);
+  $erg = str_replace("color: white","color: black",$erg);
+  $erg = str_replace("background-color: black;","",$erg);
+  echo nl2br($erg);
+} else {
+  echo "Error. This log does not exist.";
+}
+?>
diff --git a/webserver_files/root/output-single.php b/webserver_files/root/output-single.php
index dc6380f..58028ff 100644
--- a/webserver_files/root/output-single.php
+++ b/webserver_files/root/output-single.php
@@ -6,7 +6,7 @@
 $date = basename("$date");
 $filename = "../logs/backup_script-" . $date . ".log";
 ?>
-<h2>Logs for backup of <?php echo $date ?></h2>
+<h2>Logs for backup of <?php echo $date ?> <a href="/show-rsync-log?date=<?php echo $date ?>">(rsync)</a></h2>
 <?php
 $fh = fopen($filename, 'r');
 if(filesize($filename) > 0) {
diff --git a/webserver_files/root/output.php b/webserver_files/root/output.php
index 4a2d56c..5e8be51 100644
--- a/webserver_files/root/output.php
+++ b/webserver_files/root/output.php
@@ -24,7 +24,7 @@
 }
 
 ?>
-<h2>Last Backup: <?php echo $first_log_date ?></h2>
+<h2>Last Backup: <?php echo $first_log_date ?> <a href="/show-rsync-log?date=<?php echo $first_log_date ?>">(rsync)</a></h2>
 <?php
 $fh = fopen($first_log, 'r');
 $pageText = fread($fh, 25000);
diff --git a/webserver_files/root/show-log.php b/webserver_files/root/show-log.php
index b2a1e31..0005fef 100644
--- a/webserver_files/root/show-log.php
+++ b/webserver_files/root/show-log.php
@@ -20,5 +20,5 @@
 <div id="main" class="log_block">
 Loading...
 </div>
-<button type=button onclick="window.location.href='/';">Back</button>
-</body>
\ No newline at end of file
+<button type=button onclick="window.location.href='javascript:history.back()';">Back</button>
+</body>
diff --git a/webserver_files/root/show-rsync-log.php b/webserver_files/root/show-rsync-log.php
new file mode 100644
index 0000000..3b7a064
--- /dev/null
+++ b/webserver_files/root/show-rsync-log.php
@@ -0,0 +1,24 @@
+<head>
+<title>SFTP-Backup log of <?php echo $date?></title>
+<meta name="title" content="example" />
+<link rel="stylesheet" href="css/style.css" type="text/css" />
+</head>
+
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+<script type="text/javascript">
+     $(function(){
+       
+       var date=window.location.search.substr(1)
+       $.get(`output-single-rsync.php?${date}`, function(data){
+		document.getElementById("main").innerHTML=data;            
+       });
+    });
+</script>
+
+<body>
+<h1>Single log</h1>
+<div id="main" class="log_block">
+Loading...
+</div>
+<button type=button onclick="window.location.href='javascript:history.back()';">Back</button>
+</body>
