fix: Update the deepness favicon (#8419)

* fix: Update the deepness favicon

(cherry picked from commit 3a59295162)

* QA: If the SVG is present, it's all we need.

(cherry picked from commit ee0b4c84ed)

* fix: Update such that the modern svg favicon can render

lib/functions.php

@@ -9191,12 +9191,17 @@ function get_md5_include_css(string $path, bool $async = false, string|null $the
  * @param string|null $theme Theme to use
  * @param string|null $file  File to include
  * @param string|null $rel   Rel type output when not null (eg, icon, shortcut icon)
+ * @param string|null $type  Icon type output when not null (eg, image/svg+xml)
  * @param string|null $sizes Sizes output when not null (eg, 96x96)
  *
  * @return string
  */
-function get_md5_include_icon(string $path, bool $async = false, string|null $theme = null, string|null $file = null, string|null $rel = null, string|null $sizes = null) : string {
+function get_md5_include_icon(string $path, bool $async = false, string|null $theme = null, string|null $file = null, string|null $rel = null, string|null $type = null, string|null $sizes = null) : string {
+	if ($type === null) {
 		$format = '<link href=\'%s\' type=\'text/css\' %s%s>';
+	} else {
+		$format = "<link href='%s' type='$type' %s%s>";
+	}
 
 	if (!empty($rel)) {
 		$rel = " rel='" . htmlspecialchars($rel) . "'";

lib/html.php

@@ -3109,7 +3109,7 @@ function html_spikekill_js() : void {
  * @return void
  */
 function html_common_header(string $title, string $selectedTheme = '') : void {
-	global $path2calendar, $path2timepicker, $path2colorpicker, $path2ms, $path2msfilter;
+	global $config, $path2calendar, $path2timepicker, $path2colorpicker, $path2ms, $path2msfilter;
 
 	if ($selectedTheme == '') {
 		$selectedTheme = get_selected_theme();
@@ -3261,13 +3261,11 @@ function html_common_header(string $title, string $selectedTheme = '') : void {
 		var zoom_i18n_zoom_out_factor = '<?php print __esc('Zoom Out Factor'); ?>';
 		var zoom_i18n_zoom_out_positioning = '<?php print __esc('Zoom Out Positioning'); ?>';
 		var zoom_outOfRangeTitle='<?php print __esc('Zoom Window Out of Range'); ?>';
-		var zoom_outOfRangeMessage= <?php print cacti_js_encode(__esc('Zoom Dates before January 1, 1993 are not supported in Cacti!  Pick a ' .
-			'more recent date.')); ?>;
+		var zoom_outOfRangeMessage= <?php print cacti_js_encode(__esc('Zoom Dates before January 1, 1993 are not supported in Cacti!  Pick a more recent date.')); ?>;
 	</script>
 	<?php
-	// Global icons
-	print get_md5_include_icon('images', theme: $selectedTheme, file: 'favicon.ico', rel: 'shortcut icon');
-	print get_md5_include_icon('images', theme: $selectedTheme, file: 'cacti_logo.gif', rel: 'icon', sizes: '96x96');
+
+	print get_md5_include_icon('images', theme: $selectedTheme, file: 'favicon.svg', rel: 'icon', type: 'image/svg+xml');
 
 	// Global styles that can be overloaded by themes css as required.
 	print get_md5_include_css('include/css/jquery.contextMenu.css');