Modified: web/php-news/trunk/article.php
===================================================================
--- web/php-news/trunk/article.php	2011-05-23 15:03:08 UTC (rev 311354)
+++ web/php-news/trunk/article.php	2011-05-23 15:44:02 UTC (rev 311355)
@@ -235,12 +235,12 @@
 				continue;
 			}
 			$res2 = nntp_cmd($s, "XPATH $v",223)
-			or print("<!-- failed to get reference article id ".htmlspecialchars($v)." -->");
+			or print("<!-- failed to get reference article id ".htmlspecialchars($v, ENT_QUOTES, "UTF-8")." -->");
 			list(,$v)  = split("/", trim($res2));
 			if (empty($v)) {
 				continue;
 			}
-			echo "<a href=\"/$group/".htmlspecialchars(urlencode($v))."\">".($c++)."</a>&nbsp;";
+			echo "<a href=\"/$group/".htmlspecialchars(urlencode($v), ENT_QUOTES, "UTF-8")."\">".($c++)."</a>&nbsp;";
 		}
 		echo "</td>\n";
 	}
@@ -250,7 +250,7 @@
 		echo '     <td class="headervalue">';
 		$r = explode(",", chop($headers["newsgroups"]));
 		while (list($k,$v) = each($r)) {
-			echo "<a href=\"/".htmlspecialchars(urlencode($v))."\">".htmlspecialchars($v)."</a>&nbsp;";
+			echo "<a href=\"/".htmlspecialchars(urlencode($v), ENT_QUOTES, "UTF-8")."\">".htmlspecialchars($v, ENT_QUOTES, "UTF-8")."</a>&nbsp;";
 		}
 		echo "</td>\n";
 	}
@@ -268,7 +268,7 @@
 // Based off navbar() in group.php
 function navbar($group, $current) {

-	$group = htmlspecialchars($group, ENT_QUOTES);
+	$group = htmlspecialchars($group, ENT_QUOTES, "UTF-8");

 	echo '  <table border="0" cellpadding="2" cellspacing="2" width="100%">' . "\n";
 	echo '   <tr class="alisthead">' . "\n";

Modified: web/php-news/trunk/common.inc
===================================================================
--- web/php-news/trunk/common.inc	2011-05-23 15:03:08 UTC (rev 311354)
+++ web/php-news/trunk/common.inc	2011-05-23 15:44:02 UTC (rev 311355)
@@ -119,16 +119,16 @@
 function format_author($a, $charset) {
 	$a = recode_header($a, $charset);
 	if (preg_match("/^\s*(.+)\s+\\(\"?(.+?)\"?\\)\s*$/",$a,$ar)) {
-		return "<a href=\"mailto:".htmlspecialchars(urlencode(spam_protect($ar[1])))."\" class=\"email fn n\">".str_replace(" ", "&nbsp;", htmlspecialchars($ar[2]))."</a>";
+		return "<a href=\"mailto:".htmlspecialchars(urlencode(spam_protect($ar[1])), ENT_QUOTES, "UTF-8")."\" class=\"email fn n\">".str_replace(" ", "&nbsp;", htmlspecialchars($ar[2], ENT_QUOTES, "UTF-8"))."</a>";
 	}
 	if (preg_match("/^\s*\"?(.+?)\"?\s*<(.+)>\s*$/",$a,$ar)) {
-		return "<a href=\"mailto:".htmlspecialchars(urlencode(spam_protect($ar[2])))."\" class=\"email fn n\">".str_replace(" ", "&nbsp;", htmlspecialchars($ar[1]))."</a>";
+		return "<a href=\"mailto:".htmlspecialchars(urlencode(spam_protect($ar[2])), ENT_QUOTES, "UTF-8")."\" class=\"email fn n\">".str_replace(" ", "&nbsp;", htmlspecialchars($ar[1], ENT_QUOTES, "UTF-8"))."</a>";
 	}
 	if (ereg("@",$a)) {
 		$a = spam_protect($a);
-		return "<a href=\"mailto:".htmlspecialchars(urlencode($a))."\" class=\"email fn n\">".htmlspecialchars($a)."</a>";
+		return "<a href=\"mailto:".htmlspecialchars(urlencode($a, ENT_QUOTES, "UTF-8"))."\" class=\"email fn n\">".htmlspecialchars($a, ENT_QUOTES, "UTF-8")."</a>";
 	}
-	return str_replace(" ", "&nbsp;", htmlspecialchars($a));
+	return str_replace(" ", "&nbsp;", htmlspecialchars($a, ENT_QUOTES, "UTF-8"));
 }

 function format_subject($s, $charset) {
@@ -141,7 +141,7 @@
 	} else {
 		$s = wordwrap($s, 150);
 	}
-	return nl2br(htmlspecialchars($s));
+	return nl2br(htmlspecialchars($s, ENT_QUOTES, "UTF-8"));
 }


@@ -155,7 +155,7 @@
 	} else {
 		$s = wordwrap($s, 150);
 	}
-	return $s;
+	return htmlspecialchars($s, ENT_QUOTES, "UTF-8");
 }

 function format_date($d) {

Modified: web/php-news/trunk/group.php
===================================================================
--- web/php-news/trunk/group.php	2011-05-23 15:03:08 UTC (rev 311354)
+++ web/php-news/trunk/group.php	2011-05-23 15:44:02 UTC (rev 311355)
@@ -43,7 +43,7 @@
 	error("Failed to get xover data");
 }

-$host = htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES);
+$host = htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES, "UTF-8");
 switch($format) {
 	case 'rss':
 	header("Content-type: text/xml");
@@ -102,7 +102,7 @@
 		echo "  <item>\n";
 		echo "   <link>http://$host/$group/$n</link>\n";
 		echo "   <title>", format_subject($subj, $charset), "</title>\n";
-		echo "   <description>", htmlspecialchars(format_author($author, $charset)), "</description>\n";
+		echo "   <description>", htmlspecialchars(format_author($author, $charset), ENT_QUOTES, "UTF-8"), "</description>\n";
 		echo "   <pubDate>$date822</pubDate>\n";
 		echo "  </item>\n";
 		break;
@@ -110,7 +110,7 @@
 		echo " <item>\n";
 		echo "  <title>", format_subject($subj, $charset), "</title>\n";
 		echo "  <link>http://$host/$group/$n</link>\n";
-		echo "  <description>", htmlspecialchars(format_author($author, $charset)), "</description>\n";
+		echo "  <description>", htmlspecialchars(format_author($author, $charset), ENT_QUOTES, "UTF-8"), "</description>\n";
 		echo "  <pubDate>$date822</pubDate>\n";
 		echo " </item>\n";
 		break;
@@ -149,18 +149,18 @@
 	echo '    <td class="nav">';
 	if ($i > $f) {
 		$p = max($i-20,$f);
-		echo "<a href=\"/" . htmlspecialchars($g) . "/start/$p\"><b>&laquo; previous</b></a>";
+		echo "<a href=\"/" . htmlspecialchars($g, ENT_QUOTES, "UTF-8") . "/start/$p\"><b>&laquo; previous</b></a>";
 	} else {
 		echo "&nbsp;";
 	}
 	echo '</td>' . "\n";
 	$j = min($i + 20, $l);
 	$c = $l - $f + 1;
-	echo '    <td align="center" class="alisthead">'.htmlspecialchars($g)." ($i-$j of $c)</td>\n";
+	echo '    <td align="center" class="alisthead">'.htmlspecialchars($g, ENT_QUOTES, "UTF-8")." ($i-$j of $c)</td>\n";
 	echo '    <td align="right" class="nav">';
 	if ($i+20 <= $l) {
 		$n = min($i + 20, $l - 19);
-		echo "<a href=\"/" . htmlspecialchars($g) . "/start/$n\"><b>next &raquo;</b></a>";
+		echo "<a href=\"/" . htmlspecialchars($g, ENT_QUOTES, "UTF-8") . "/start/$n\"><b>next &raquo;</b></a>";
 	}
 	else {
 		echo "&nbsp;";

Modified: web/php-news/trunk/index.php
===================================================================
--- web/php-news/trunk/index.php	2011-05-23 15:03:08 UTC (rev 311354)
+++ web/php-news/trunk/index.php	2011-05-23 15:44:02 UTC (rev 311355)
@@ -56,8 +56,8 @@
       <h1>Welcome!</h1>
       <p>
        This is a completely experimental interface to the PHP mailing lists as
-       reflected on the <a href="news://<?php echo htmlspecialchars($_SERVER['HTTP_HOST'],ENT_QUOTES); ?>/">
-       <?php echo htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES); ?> NNTP server</a>.
+       reflected on the <a href="news://<?php echo htmlspecialchars($_SERVER['HTTP_HOST'],ENT_QUOTES,"UTF-8"); ?>/">
+       <?php echo htmlspecialchars($_SERVER['HTTP_HOST'], ENT_QUOTES, "UTF-8"); ?> NNTP server</a>.
       </p>
       <p>
        There may be a little more info in the <a href="README">README</a> file.

Modified: web/php-news/trunk/search.php
===================================================================
--- web/php-news/trunk/search.php	2011-05-23 15:03:08 UTC (rev 311354)
+++ web/php-news/trunk/search.php	2011-05-23 15:44:02 UTC (rev 311355)
@@ -56,7 +56,7 @@
       # yeah, this is a pretty dumb round-trip on formatting the time. whatever.
       echo $m > 0 ? format_date(strftime("%c", $m)) : "&nbsp;";
       echo "</td></tr>\n";
-      echo "<tr class=\"$class\"><td></td><td colspan=\"3\">".nl2br(htmlspecialchars($b))."</td></tr>\n";
+      echo "<tr class=\"$class\"><td></td><td colspan=\"3\">".nl2br(htmlspecialchars($b, ENT_QUOTES, "UTF-8"))."</td></tr>\n";
     }
     echo "</table>";
     navbar($q,$first,$last,$found,$wordinfo,$time);
@@ -84,7 +84,7 @@
   echo '<td width="20%">';
   $p = floor($first / 20);
   if ($p > 0) {
-    echo "<a href=\"search.php?q=".htmlspecialchars(urlencode($q))."&amp;p=".($p-1).($GLOBALS["t"]?"&amp;t=".$GLOBALS["t"]:"")."\"><b>&laquo; previous</b></a>";
+    echo "<a href=\"search.php?q=".htmlspecialchars(urlencode($q), ENT_QUOTES, "UTF-8")."&amp;p=".($p-1).($GLOBALS["t"]?"&amp;t=".$GLOBALS["t"]:"")."\"><b>&laquo; previous</b></a>";
   }
   else {
     echo "&nbsp;";
@@ -92,11 +92,11 @@
   echo '</td>';
   $j = min($i+20,$l);
   $c = $l - $f + 1;
-  echo '<td align="center" class="alisthead" width="60%">'.htmlspecialchars("found: $wordinfo in $time secs")." ($first-$last of $found)</td>";
+  echo '<td align="center" class="alisthead" width="60%">'.htmlspecialchars("found: $wordinfo in $time secs", ENT_QUOTES, "UTF-8")." ($first-$last of $found)</td>";
   echo '<td align="right" width="20%">';
   $maxpages = floor($found / 20);
   if ($p < $maxpages) {
-    echo "<a href=\"search.php?q=".htmlspecialchars(urlencode($q))."&amp;p=".($p+1).($GLOBALS["t"]?"&amp;t=".$GLOBALS["t"]:"")."\"><b>next &raquo;</b></a>";
+    echo "<a href=\"search.php?q=".htmlspecialchars(urlencode($q), ENT_QUOTES, "UTF-8")."&amp;p=".($p+1).($GLOBALS["t"]?"&amp;t=".$GLOBALS["t"]:"")."\"><b>next &raquo;</b></a>";
   }
   else {
     echo "&nbsp;";