Index: trunk/htdocs/cacher/sub/entrylist.tpl.php
===================================================================
--- trunk/htdocs/cacher/sub/entrylist.tpl.php	(revision 1143)
+++ trunk/htdocs/cacher/sub/entrylist.tpl.php	(revision 1146)
@@ -61,5 +61,4 @@
 
 TR;
-	$name     = htmlspecialchars($entry['name']);
 	$hits     = number_format($entry['hits']);
 	$size     = size($entry['size']);
@@ -81,5 +80,6 @@
 
 	if ($isphp) {
-		$namelink = $name;
+		$hname = htmlspecialchars($entry['name']);
+		$namelink = $hname;
 		echo <<<ENTRY
 			<td>{$entry['cache_name']} {$i}</td>
@@ -88,10 +88,15 @@
 	}
 	else {
+		$name = $entry['name'];
+		if (!empty($config['enable_eval'])) {
+			$name = var_export($name, true);
+		}
+		$uname = urlencode($name);
+		$hname = htmlspecialchars(str_replace("\0", "\\0", $entry['name']));
 		echo <<<ENTRY
-			<td><label><input type="checkbox" name="remove[]" value="{$name}"/>{$entry['cache_name']} {$i}</label></td>
+			<td><label><input type="checkbox" name="remove[]" value="{$hname}"/>{$entry['cache_name']} {$i}</label></td>
 
 ENTRY;
-		$uname = urlencode($entry['name']);
-		$namelink = "<a href=\"edit.php?name=$uname\">$name</a>";
+		$namelink = "<a href=\"edit.php?name=$uname\">$hname</a>";
 	}