QA On #5492 - Bad solution for Linux

Cacti · Sep 30, 2023 · 490de70 · 490de70
1 parent c4bff1e
commit 490de70
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/lib/snmp.php b/lib/snmp.php
@@ -933,19 +933,17 @@ function snmp_escape_string($string) {
 	global $config;
 
 	if (!defined('SNMP_ESCAPE_CHARACTER')) {
-		if ($config['cacti_server_os'] == 'win32') {
-			define('SNMP_ESCAPE_CHARACTER', '"');
-		}
+		define('SNMP_ESCAPE_CHARACTER', '"');
+	}
 
+	if ($config['cacti_server_os'] == 'win32') {
 		if (substr_count($string, SNMP_ESCAPE_CHARACTER)) {
 			$string = str_replace(SNMP_ESCAPE_CHARACTER, "\\" . SNMP_ESCAPE_CHARACTER, $string);
 			return SNMP_ESCAPE_CHARACTER . $string . SNMP_ESCAPE_CHARACTER;
-		} else {
-			return cacti_escapeshellarg($string);
 		}
-	} else {
-		return cacti_escapeshellarg($string);
 	}
+
+	return cacti_escapeshellarg($string);
 }
 
 function snmp_get_method($type = 'walk', $version = 1, $context = '', $engineid = '',