Merge branch 'master' into add-light-mode

NagiosEnterprises · Dec 16, 2024 · 98616ed · 98616ed
2 parents 66e6135 + 4832ead
commit 98616ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Changelog b/Changelog
@@ -6,6 +6,7 @@ Nagios Core 4 Change Log
 ------------------
 * Fix unreachable notifications (Dylan Anderson)
 * Add light option in new exfoliation theme (Dylan Anderson)
+* Fix authentication in trends.cgi (Dylan Anderson)
 
 4.5.8 - 2024-11-19
 ------------------

diff --git a/cgi/trends.c b/cgi/trends.c
@@ -317,9 +317,6 @@ int main(int argc, char **argv) {
 	/* get the arguments passed in the URL */
 	process_cgivars();
 
-	/* get authentication information */
-	get_authentication_information(&current_authdata);
-
 	result = read_all_object_configuration_data(main_config_file, READ_ALL_OBJECT_DATA);
 	if(result == ERROR) {
 		if(mode == CREATE_HTML) {
@@ -343,6 +340,9 @@ int main(int argc, char **argv) {
 
 	document_header(TRUE);
 
+	/* get authentication information */
+	get_authentication_information(&current_authdata);
+
 	if(compute_time_from_parts == TRUE)
 		compute_report_times();
 

diff --git a/html/main.php b/html/main.php
@@ -30,7 +30,7 @@
 						"Click here to watch the entire Nagios Core 4 Tour!</a>";
 	<?php } ?>
 	$(document).ready(function() {
-		var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER']); ?>";
+		var user = "<?php echo htmlspecialchars($_SERVER['REMOTE_USER'] ?? ''); ?>";
 
 		<?php if ($cfg["enable_page_tour"]) { ?>
 			vBoxId += ";" + user;