Fixed two files (#5077)

Cacti · Dec 12, 2022 · d3675f9 · d3675f9
1 parent 651f332
commit d3675f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/layout.js b/include/layout.js
@@ -3306,7 +3306,7 @@ function checkForRedirects(data, href) {
 		document.location = urlPath + 'logout.php?action=disabled';
 	} else if (data.indexOf('cactiRedirect') >= 0) {
 		if (typeof href == 'undefined' || href == null) {
-			document.location = stripHeaderSuppression(document.location);
+			document.location = stripHeaderSuppression(document.location.href);
 		} else {
 			document.location = stripHeaderSuppression(href);
 		}
@@ -3953,7 +3953,7 @@ function initializeGraphs(disable_cache) {
 
 		var graph_height = $(this).attr('graph_height');
 		var graph_width  = $(this).attr('graph_width');
-		var error_url    = 'graph_view.php';
+		var error_url    = urlPath + 'graph_view.php';
 
 		closeDateFilters();
 

diff --git a/lib/functions.php b/lib/functions.php
@@ -6543,11 +6543,11 @@ function get_include_relpath($path) {
 	} elseif (file_exists($basePath . $path)) {
 		$npath = $path;
 	} elseif (debounce_run_notification('missing:' . $path)) {
-		$path = str_replace($basePath, '', $path);
+		$npath = str_replace($basePath, '', $path);
 
-		cacti_log(sprintf('WARNING: Key Cacti Include File %s missing.  Please locate and replace this file', $config['base_path'] . '/' . $path), false, 'WEBUI');
+		cacti_log(sprintf('WARNING: Key Cacti Include File %s missing.  Please locate and replace this file', $config['base_path'] . '/' . $npath), false, 'WEBUI');
 
-		admin_email(__('Cacti System Warning'), __('WARNING:  Key Cacti Include File %s missing.  Please locate and replace this file', $config['base_path'] . '/' . $path));
+		admin_email(__('Cacti System Warning'), __('WARNING:  Key Cacti Include File %s missing.  Please locate and replace this file', $config['base_path'] . '/' . $npath));
 	}
 
 	return $npath;
@@ -6576,7 +6576,7 @@ function get_md5_include_css($path) {
 		return '';
 	}
 
-	return '<link href=\''. $config['url_path'] . $npath . '?' . get_md5_hash($npath) . '\' type=\'text/css\' rel=\'stylesheet\'>' . PHP_EOL;
+	return '<link href=\''. $config['url_path'] . $relpath . '?' . get_md5_hash($relpath) . '\' type=\'text/css\' rel=\'stylesheet\'>' . PHP_EOL;
 }
 
 function is_resource_writable($path) {