Index: trunk/ippMonitor/scripts/generate
===================================================================
--- trunk/ippMonitor/scripts/generate	(revision 15954)
+++ trunk/ippMonitor/scripts/generate	(revision 15969)
@@ -217,8 +217,8 @@
 	($type, $line) = split (" ", $code[$i], 2);
 	if ($type eq "PHP") {
-	    printf FILE "$line\n";
+	    print FILE "$line\n";
 	}
 	if ($type eq "HTML") {
-	    printf FILE "?> $line <?\n";
+	    print FILE "?> $line <?\n";
 	}
     }
@@ -232,9 +232,9 @@
 	($label, $value, $string) = &parse_label ($show[$i]);
 	if ($show[$i] eq "none")  { next; }
-	# printf FILE "echo \"<th class=\\\"list\\\"> $name[$i] </th>\\n\";\n";
+	# print FILE "echo \"<th class=\\\"list\\\"> $name[$i] </th>\\n\";\n";
 	if ($label eq "op") {
-	    printf FILE "write_table_header (\"list\", \"$name[$i]\", \"$opf{$value}\", \$buttonLink, \$ID, '$myFile');\n";
+	    print FILE "write_table_header (\"list\", \"$name[$i]\", \"$opf{$value}\", \$buttonLink, \$ID, '$myFile');\n";
 	} else {
-	    printf FILE "write_table_header (\"list\", \"$name[$i]\", \"$field[$i]\", \$buttonLink, \$ID, '$myFile');\n";
+	    print FILE "write_table_header (\"list\", \"$name[$i]\", \"$field[$i]\", \$buttonLink, \$ID, '$myFile');\n";
 	}
     }
@@ -252,7 +252,7 @@
 	$field = &parse_fieldname ($field);
 
-	printf FILE "  if ($field $testline) {\n";
-	printf FILE "    \$class = \"$class\";\n";
-	printf FILE "  }\n";
+	print FILE "  if ($field $testline) {\n";
+	print FILE "    \$class = \"$class\";\n";
+	print FILE "  }\n";
     }
 }
@@ -262,12 +262,12 @@
 
     if ($WHERE) {
-	printf FILE "\$WHERE = \"WHERE $WHERE\";\n";
+	print FILE "\$WHERE = \"WHERE $WHERE\";\n";
     }	
     for ($i = 0; $i < @field; $i++) {
 	$value = $field[$i];
 	if ($value eq "*") { next; }
-	printf FILE "\$WHERE = check_restrict ('$value', \$WHERE);\n";
-    }
-    printf FILE "\$WHERE = check_ordering (\$WHERE);\n";
+	print FILE "\$WHERE = check_restrict ('$value', \$WHERE);\n";
+    }
+    print FILE "\$WHERE = check_ordering (\$WHERE);\n";
 }
 
@@ -278,5 +278,5 @@
 	$value = $field[$i];
 	if ($value eq "*") { next; }
-	printf FILE "\$buttonLink = button_restrict ('$value', \$buttonLink);\n";
+	print FILE "\$buttonLink = button_restrict ('$value', \$buttonLink);\n";
     }
 }
@@ -296,5 +296,5 @@
 	    # create the basic link variable
 	    if ($link[$i]) {
-		printf FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
+		print FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
 		# add extra GET data to target
 		if ($extras[$i]) { &parse_extras ($linkarg{$extras[$i]}); } 
@@ -312,5 +312,5 @@
 	    # create the basic link variable
 	    if ($link[$i]) {
-		printf FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
+		print FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
 		# add extra GET data to target
 		if ($extras[$i]) { &parse_extras ($linkarg{$extras[$i]}); } 
@@ -325,5 +325,6 @@
 	if (($label eq "image") && !$link[$i]) {
 	    # print the actual table cell line with the image...
-	    printf FILE "  echo \"<td class=\\\"\$class\\\"><img src=\\\"$image{$value}\\\"></td>\\n\";\n";
+	    print FILE "  echo \"<td class=\\\"\$class\\\">\n";
+	    print FILE "  echo \"              <img src=\\\"$image{$value}\\\"></td>\\n\";\n";
 	    next;
 	}
@@ -331,9 +332,9 @@
 	if (($label eq "image") && $link[$i]) {
 	    # create the basic link 
-	    printf FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
+	    print FILE "  \$link = \"$link[$i]\" . \"?menu=$MENU&\" . \$ID['link'];\n";
 	    # add extra php data to target
 	    if ($extras[$i]) { &parse_extras ($linkarg{$extras[$i]}); } 
 	    # print the actual table cell line with the link...
-	    printf FILE "  echo \"<td class=\\\"\$class\\\"><a href=\\\"\$link\\\"> <img src=\\\"$image{$value}\\\"> </a></td>\\n\";\n";
+	    print FILE "  echo \"<td class=\\\"\$class\\\"><a href=\\\"\$link\\\"> <img src=\\\"$image{$value}\\\"> </a></td>\\n\";\n";
 	    next;
 	}
@@ -347,7 +348,7 @@
 	if ($field[$i] eq "*")  { 
 	    # * fields create an empty cell 
-	    printf FILE "echo \"<td> &nbsp; </td>\\n\";\n";
+	    print FILE "echo \"<td> &nbsp; </td>\\n\";\n";
 	} else {
-	    printf FILE "write_query_row ('$field[$i]', $width[$i]);\n";
+	    print FILE "write_query_row ('$field[$i]', $width[$i]);\n";
 	}
     }
@@ -408,5 +409,5 @@
     for ($i = 0; $i < @extfields; $i++) {
 	($label, $value, $outline) = &parse_label ($extfields[$i]);
-	printf FILE "  \$link = \$link . \"&$outline\";\n";
+	print FILE "  \$link = \$link . \"&$outline\";\n";
     }
 }