105c105,109
< 
---
> 	
> 	# XXX TODO
> 	# This path should be defined as a configuration directive, so that
> 	# open_basedir warnings are not thrown when the paths don't exist.
> 	
121c125
< 
---
> 		
130,143c134,149
< 
< 		if (preg_match("/(\d+)x(\d+)/", $output[0], $matches)) {
< 			$retval["xsize"] = $matches[1];
< 			$retval["ysize"] = $matches[2];
< 		} else {
< 			$rrd_error_val = $output[0];
< 			return false;
< 		}
< 
< 		array_shift($output);
< 
< 		$retval["calcpr"] = array();
< 		foreach ($output as $index => $value) {
< 			$retval["calcpr"][$index] = $value;
---
> 		
> 		if (is_array($output) && !empty($output)) {
> 			if (preg_match("/(\d+)x(\d+)/", $output[0], $matches)) {
> 				$retval["xsize"] = $matches[1];
> 				$retval["ysize"] = $matches[2];
> 			} else {
> 				$rrd_error_val = $output[0];
> 				return false;
> 			}
> 			
> 			array_shift($output);
> 	
> 			$retval["calcpr"] = array();
> 			foreach ($output as $index => $value) {
> 				$retval["calcpr"][$index] = $value;
> 			}
144a151
> 		
292c299
< 	$readfile = @file($seenfile);
---
> 	$readfile = file($seenfile);
899c906,908
< 		asErr("rrd_graph(): $msg");
---
> 		if (!empty($msg)) {
> 			asErr("rrd_graph(): $msg");
> 		}
1008c1017
< 
---
> 	
1053c1062
< 	if ($file != "." && is_dir("$libdir/$file")) {
---
> 	if ($file != "." && $file != '..' && is_dir("$libdir/$file")) {
1069c1078
< 	if ($file != "." && is_dir("$libdir/$file")) {
---
> 	if ($file != "." && $file != '..' && is_dir("$libdir/$file")) {
1091a1101,1103
> }
> else {
> 	$legend_msg = '';