Use OS provided DejaVu font for RHEL/CentOS/SLES/Ubuntu

Cacti · Mar 5, 2022 · 7da16bb · 7da16bb
1 parent 2f189bd
commit 7da16bb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/include/fonts/DejaVuSans-Bold.ttf b/include/fonts/DejaVuSans-Bold.ttf
diff --git a/include/fonts/DejaVuSansCondensed-Bold.ttf b/include/fonts/DejaVuSansCondensed-Bold.ttf
diff --git a/include/global_arrays.php b/include/global_arrays.php
@@ -2796,4 +2796,10 @@
 	3 => __('Aggregate'),
 );
 
+$dejavu_paths = array(
+	'/usr/share/fonts/dejavu/', //RHEL/CentOS
+	'/usr/share/fonts/truetype/', //SLES
+	'/usr/share/fonts/truetype/dejavu/' //Ubuntu
+);
+
 api_plugin_hook('config_arrays');
diff --git a/lib/functions.php b/lib/functions.php
@@ -5436,7 +5436,7 @@ function padleft($pad = '', $value = '', $min = 2) {
 }
 
 function get_classic_tabimage($text, $down = false) {
-	global $config;
+	global $config, $dejavu_paths;
 
 	$images = array(
 		false => 'tab_template_blue.gif',
@@ -5464,8 +5464,14 @@ function get_classic_tabimage($text, $down = false) {
 	$wrapsize = 12;
 
 	if (file_exists($config['base_path'] . '/images/' . $images[$down])) {
+		foreach ($dejavu_paths as $dejavupath) {
+			if (file_exists($dejavupath)) {
+				$font_path = $dejavupath;
+			}
+		}
+
 		$originalpath = getenv('GDFONTPATH');
-		putenv('GDFONTPATH=' . $config['base_path'] . '/include/fonts/');
+		putenv('GDFONTPATH=' . $font_path);
 
 		$template = imagecreatefromgif ($config['base_path'] . '/images/' . $images[$down]);
 

diff --git a/lib/rrd.php b/lib/rrd.php
@@ -3577,7 +3577,7 @@ function rrdtool_parse_error($string) {
 }
 
 function rrdtool_create_error_image($string, $width = '', $height = '') {
-	global $config;
+	global $config, $dejavu_paths;
 
 	$string = rrdtool_parse_error($string);
 
@@ -3592,7 +3592,12 @@ function rrdtool_create_error_image($string, $width = '', $height = '') {
 	$shadeb      = '999999';
 
 	if ($config['cacti_server_os'] == 'unix') {
-		$font_file = '/usr/share/fonts/dejavu/DejaVuSans.ttf';
+		foreach ($dejavu_paths as $dejavupath) {
+			if (file_exists($dejavupath . '/DejaVuSans.ttf')) {
+				$font_file = $dejavupath . '/DejaVuSans.ttf';
+				break;
+			}
+		}
 	} else {
 		$font_file = 'C:/Windows/Fonts/Arial.ttf';
 	}