QA: Restore rendering of SVG on Windows

include/global.php

@@ -232,9 +232,6 @@
 if ($config['cacti_server_os'] == 'win32') {
 	$config['base_path']    = str_replace("\\", "/", substr(dirname(__FILE__),0,-8));
 	$config['library_path'] = $config['base_path'] . '/lib';
-
-	/* used for php-snmp support */
-	putenv('MIB_DIRS=c:/usr/share/snmp/mibs');
 } else {
 	$config['base_path']    = preg_replace("/(.*)[\/]include/", "\\1", dirname(__FILE__));
 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));

lib/rrd.php

@@ -419,16 +419,22 @@ function __rrd_execute($command_line, $log_to_stdout, $output_flag, $rrdtool_pip
 }
 
 function rrdtool_trim_output(&$output) {
+	global $config;
+
 	/* When using RRDtool with proc_open for long strings
 	 * and using the '-' to handle standard in from inside
 	 * the process, RRDtool automatically appends stderr
 	 * to stdout for batch programs to parse the output
 	 * string.  So, therefore, we have to prune that
 	 * output.
 	 */
-	$okpos = strrpos($output, 'OK u:');
-	if ($okpos !== false) {
-		$output = substr($output, 0, $okpos);
+	if ($config['cacti_server_os'] == 'win32') {
+		$output = rtrim($output, "OK \n\r");
+	} else {
+		$okpos = strrpos($output, 'OK u:');
+		if ($okpos !== false) {
+			$output = substr($output, 0, $okpos);
+		}
 	}
 }