--- couriergraph.cgi	2004-12-10 10:04:36.000000000 +0100
+++ wcouriergraph.cgi	2006-12-31 12:00:25.000000000 +0100
@@ -43,7 +43,9 @@
 	my $file = shift;
 	my $title = shift;
 	my $step = $range*$points_per_sample/$xpoints;
-
+	my $date = localtime(time);
+        $date =~ s|:|\\:|g unless $RRDs::VERSION < 1.199908;
+		
 	my ($graphret,$xs,$ys) = RRDs::graph($file,
 		'--imgformat', 'PNG',
 		'--width', $xpoints,
@@ -75,7 +77,7 @@
  		'GPRINT:rmimapd_login:MAX:max\: %.0lf logins/min\l',
   		'HRULE:0#000000',
   		'COMMENT:\s',
-		'COMMENT:['.localtime(time).']\l',
+		'COMMENT:['.$date.']\r'
 	);
 	my $ERR=RRDs::error;
 	die "ERROR: $ERR\n" if $ERR;
@@ -88,6 +90,9 @@
 	my $title = shift;
 	my $step = $range*$points_per_sample/$xpoints;
 
+	my $date = localtime(time);
+	$date =~ s|:|\\:|g unless $RRDs::VERSION < 1.199908;
+		
 	my ($graphret,$xs,$ys) = RRDs::graph($file,
 		'--imgformat', 'PNG',
 		'--width', $xpoints,
@@ -119,7 +124,7 @@
  		'GPRINT:rmimapd_ssl_login:MAX:max\: %.0lf logins/hour\l',
   		'HRULE:0#000000',
 	    
-		'COMMENT:['.localtime(time).']\l',
+		'COMMENT:['.$date.']\r',
 	);
 	my $ERR=RRDs::error;
 	die "ERROR: $ERR\n" if $ERR;