From 779ebb4a63ee8ec4d5feba11ca713d2bce9dfd71 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 23 Jul 2024 13:50:02 -0700
Subject: [PATCH] Fix redirection to first log

---
 logviewer/config      | 1 -
 logviewer/config.info | 2 +-
 logviewer/index.cgi   | 8 +++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/logviewer/config b/logviewer/config
index d10b47e1b..5117f93a8 100644
--- a/logviewer/config
+++ b/logviewer/config
@@ -1,4 +1,3 @@
-skip_index=1
 lines=100
 others=1
 reverse=1
diff --git a/logviewer/config.info b/logviewer/config.info
index fbb3e32aa..984fe805a 100644
--- a/logviewer/config.info
+++ b/logviewer/config.info
@@ -1,4 +1,4 @@
-skip_index=Open log view on module load,1,1-Yes,0-No
+skip_index=Redirect to first log file?,1,1-Yes,0-No
 lines=Default number of lines to display,0,6
 refresh=Seconds between log view refreshes,3,Never
 others=Show logs from other modules,1,1-Yes,0-No
diff --git a/logviewer/index.cgi b/logviewer/index.cgi
index c3ddab01a..dceb0bdf5 100755
--- a/logviewer/index.cgi
+++ b/logviewer/index.cgi
@@ -143,11 +143,9 @@ if (!@acols) {
 	}
 
 # If we jump directly to logs just redirect
-if ($config{'skip_index'} == 1) {
-	if ($lnks[0]) {
-		&redirect($lnks[0]);
-		exit;
-		}
+if ($config{'skip_index'} == 1 && $lnks[0]) {
+	&redirect($lnks[0]);
+	return;
 	}
 
 # Print the header