Modified: web/php-bugs/trunk/include/functions.php
===================================================================
--- web/php-bugs/trunk/include/functions.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/include/functions.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -1381,7 +1381,8 @@

 	$query = 'SELECT b.id, b.package_name, b.bug_type, b.email, b.reporter_name,
 		b.sdesc, b.ldesc, b.php_version, b.php_os,
-		b.status, b.ts1, b.ts2, b.assign, UNIX_TIMESTAMP(b.ts1) AS submitted,
+		b.status, b.ts1, b.ts2, b.assign,
+		UNIX_TIMESTAMP(b.ts1) AS submitted,
 		UNIX_TIMESTAMP(b.ts2) AS modified,
 		COUNT(bug=b.id) AS votes,
 		SUM(reproduced) AS reproduced, SUM(tried) AS tried,

Modified: web/php-bugs/trunk/include/query.php
===================================================================
--- web/php-bugs/trunk/include/query.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/include/query.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -48,8 +48,8 @@
 		SELECT SQL_CALC_FOUND_ROWS
 		bugdb.*,
 		TO_DAYS(NOW())-TO_DAYS(bugdb.ts2) AS unchanged,
-		UNIX_TIMESTAMP(ts1) as ts1a,
-		UNIX_TIMESTAMP(ts2) as ts2a
+		UNIX_TIMESTAMP(ts1) AS submitted,
+		UNIX_TIMESTAMP(ts2) AS modified
 		FROM bugdb
 	';


Modified: web/php-bugs/trunk/www/rss/rdf.php
===================================================================
--- web/php-bugs/trunk/www/rss/rdf.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/www/rss/rdf.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -1,14 +1,15 @@
 <?php
+
 $desc = "{$bug['package_name']} {$bug['bug_type']}\nReported by ";
 if ($bug['handle']) {
 	$desc .= "{$bug['handle']}\n";
 } else {
 	$desc .= substr($bug['email'], 0, strpos($bug['email'], '@')) . "@...\n";
 }
-$desc .= date(DATE_ATOM, $bug['ts1a']) . "\n";
+$desc .= date(DATE_ATOM, $bug['submitted']) . "\n";
 $desc .= "PHP: {$bug['php_version']}, OS: {$bug['php_os']}, Package Version: {$bug['package_version']}\n\n";
 $desc .= $bug['ldesc'];
-$desc = '<pre>' . utf8_encode(htmlspecialchars($desc)) . '</pre>';
+$desc = '<pre>' . clean($desc) . '</pre>';

 $state = 'http://xmlns.com/baetle/#Open';
 switch ($bug['status']) {
@@ -62,7 +63,7 @@
 	<channel rdf:about="<?php echo $uri; ?>">
 		<title><?php echo $bug['package_name']; ?> Bug #<?php echo intval($bug['id']); ?></title>
 		<link><?php echo $uri; ?></link>
-		<description><?php echo utf8_encode(htmlspecialchars("[{$bug['status']}] {$bug['sdesc']}")); ?></description>
+		<description><?php echo clean("[{$bug['status']}] {$bug['sdesc']}"); ?></description>

 		<dc:language>en-us</dc:language>
 		<dc:creator><?php echo $site; ?>-webmaster@lists.php.net</dc:creator>
@@ -84,17 +85,17 @@
 	</channel>

 	<btl:Bug rdf:about="<?php echo $uri; ?>">
-		<btl:summary><?php echo utf8_encode(htmlspecialchars($bug['sdesc'])); ?></btl:summary>
-		<btl:description><?php echo utf8_encode(htmlspecialchars($bug['ldesc'])); ?></btl:description>
+		<btl:summary><?php echo clean($bug['sdesc']); ?></btl:summary>
+		<btl:description><?php echo clean($bug['ldesc']); ?></btl:description>
 		<wf:state rdf:resource="<?php echo $state; ?>" />
 	</btl:Bug>

 	<item rdf:about="<?php echo $uri; ?>">
-		<title><?php echo utf8_encode(htmlspecialchars(substr($bug['email'], 0, strpos($bug['email'], '@')))) . "@... [{$bug['ts1']}]"; ?></title>
+		<title><?php echo clean(substr($bug['email'], 0, strpos($bug['email'], '@'))), "@... [{$bug['ts1']}]"; ?></title>
 		<link><?php echo $uri; ?></link>
 		<description><![CDATA[<?php echo $desc; ?>]]></description>
 		<content:encoded><![CDATA[<?php echo $desc; ?>]]></content:encoded>
-		<dc:date><?php echo date(DATE_ATOM, $bug['ts1a']); ?></dc:date>
+		<dc:date><?php echo date(DATE_ATOM, $bug['submitted']); ?></dc:date>
 	</item>

 <?php
@@ -109,17 +110,17 @@
 			<title>
 <?php
 		if ($comment['handle']) {
-			echo utf8_encode(htmlspecialchars($comment['handle'])) . " [$displayts]";
+			echo clean($comment['handle']) . " [$displayts]";
 		} else {
-			echo utf8_encode(htmlspecialchars(substr($comment['email'], 0, strpos($comment['email'], '@')))) . "@... [$displayts]";
+			echo clean(substr($comment['email'], 0, strpos($comment['email'], '@'))), "@... [$displayts]";
 		}
 ?>
 			</title>

 			<link><?php echo $uri; ?>#<?php echo $comment['added']; ?></link>

-			<description><![CDATA[<pre><?php echo utf8_encode(htmlspecialchars($comment['comment'])); ?></pre>]]></description>
-			<content:encoded><![CDATA[<pre><?php echo utf8_encode(htmlspecialchars($comment['comment'])); ?></pre>]]></content:encoded>
+			<description><![CDATA[<pre><?php echo clean($comment['comment']); ?></pre>]]></description>
+			<content:encoded><![CDATA[<pre><?php echo clean($comment['comment']); ?></pre>]]></content:encoded>
 			<dc:date><?php echo date(DATE_ATOM, $comment['added']); ?></dc:date>
 		</item>
 <?php } ?>

Modified: web/php-bugs/trunk/www/rss/rss.php
===================================================================
--- web/php-bugs/trunk/www/rss/rss.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/www/rss/rss.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -7,37 +7,36 @@
 } else {
 	$desc .= substr($bug['email'], 0, strpos($bug['email'], '@')) . "@...\n";
 }
-$desc .= date(DATE_ATOM, $bug['ts1a']) . "\n";
+$desc .= date(DATE_RSS, $bug['submitted']) . "\n";
 $desc .= "PHP: {$bug['php_version']}, OS: {$bug['php_os']}, Package Version: {$bug['package_version']}\n\n";
 $desc .= $bug['ldesc'];
-$desc = '<pre>' . utf8_encode(htmlspecialchars($desc)) . '</pre>';
-
+$desc = '<pre>' . clean($desc) . '</pre>';
+
 ?>
-<rss version="2.0">
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<title><?php echo "{$bug['package_name']} Bug #{$bug['id']}"; ?></title>
 		<link><?php echo $uri; ?></link>
-		<description><?php echo utf8_encode(htmlspecialchars("[{$bug['status']}] {$bug['sdesc']}")); ?></description>
-		<pubDate><?php echo date('r',$bug['ts1a']); ?></pubDate>
-		<lastBuildDate><?php echo date('r',$bug['ts2a']); ?></lastBuildDate>
-
+		<description><?php echo clean("[{$bug['status']}] {$bug['sdesc']}"); ?></description>
+		<pubDate><?php echo date('r', $bug['submitted']); ?></pubDate>
+		<lastBuildDate><?php echo date('r', ($bug['modified']) ? $bug['modified'] : $bug['submitted']); ?></lastBuildDate>
+		<atom:link href="<?php echo "http://{$site_url}{$basedir}/rss/bug.php?id={$bug['id']}&amp;format=rss2"; ?>" rel="self" type="application/rss+xml" />
 		<item>
-			<title><?php echo utf8_encode(($bug['handle'])? htmlspecialchars($bug['handle']):htmlspecialchars(substr($bug['email'], 0, strpos($bug['email'], '@'))) . "@... [{$bug['ts1']}]"); ?></title>
+			<title><?php echo ($bug['handle']) ? clean($bug['handle']) : clean(substr($bug['email'], 0, strpos($bug['email'], '@'))), "@... [{$bug['ts1']}]"; ?></title>
 			<description><![CDATA[ <?php echo $desc; ?> ]]></description>
-			<pubDate><?php echo date("r",$bug['ts1a']);?></pubDate>
+			<pubDate><?php echo date('r', $bug['submitted']); ?></pubDate>
 			<guid><?php echo $uri; ?></guid>
 		</item>
-
 <?php
 	foreach ($comments as $comment) {
 		if (empty($comment['registered'])) continue;
-		$displayts = date('Y-m-d H:i', $comment['added'] - date('Z', $comment['added']));
+		$displayts = date(DATE_RSS, $comment['added']);
 ?>
 			<item>
-				<title><?php echo utf8_encode( ($comment['handle'])? htmlspecialchars($comment['handle']) . " [$displayts]": htmlspecialchars(substr($comment['email'], 0, strpos($comment['email'], '@')) . "@... [$displayts]")); ?></title>
-				<description><![CDATA[ <?php echo "<pre>".utf8_encode(htmlspecialchars($comment['comment']))."</pre>"; ?>]]></description>
-				<pubDate><?php echo date("r",$comment['added']); ?></pubDate>
-				<guid><?php echo $uri."#".$comment['added']; ?></guid>
+				<title><?php echo clean(($comment['handle']) ? $comment['handle'] . " [$displayts]" : substr($comment['email'], 0, strpos($comment['email'], '@')) . "@... [$displayts]"); ?></title>
+				<description><![CDATA[ <?php echo '<pre>', clean($comment['comment']), '</pre>'; ?>]]></description>
+				<pubDate><?php echo date('r', $comment['added']); ?></pubDate>
+				<guid><?php echo $uri, '#', $comment['added']; ?></guid>
 			</item>
 <?php } ?>
 	</channel>

Modified: web/php-bugs/trunk/www/rss/search.php
===================================================================
--- web/php-bugs/trunk/www/rss/search.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/www/rss/search.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -39,7 +39,7 @@
 xmlns:admin="http://webns.net/mvcb/" xmlns:content="http://purl.org/rss/1.0/modules/content/">';
 echo "\n  <channel rdf:about=\"http://{$site_url}{$basedir}/rss/search.php\">\n";
 echo "	<title>{$siteBig} Bug Search Results</title>\n";
-echo "	<link>http://{$site_url}{$basedir}/rss/search.php?" , htmlspecialchars(http_build_query($_GET)) , "</link>\n";
+echo "	<link>http://{$site_url}{$basedir}/rss/search.php?" , clean(http_build_query($_GET)) , "</link>\n";
 echo "	<description>Search Results</description>\n";
 echo "	<dc:language>en-us</dc:language>\n";
 echo "	<dc:creator>{$site}-webmaster@lists.php.net</dc:creator>\n";
@@ -64,26 +64,24 @@
 	   	} else {
 	   		$desc .= substr($row['email'], 0, strpos($row['email'], '@')) . "@...\n";
 		}
-		$desc .= date(DATE_ATOM, $row['ts1a']) . "\n";
+		$desc .= date(DATE_ATOM, $row['submitted']) . "\n";
 		$desc .= "PHP: {$row['php_version']}, OS: {$row['php_os']}, Package Version: {$row['package_version']}\n\n";
 		$desc .= $row['ldesc'];
-		$desc = '<pre>' . utf8_encode(htmlspecialchars($desc)) . '</pre>';
+		$desc = '<pre>' . clean($desc) . '</pre>';

 		echo "	  <rdf:li rdf:resource=\"http://{$site_url}{$basedir}/{$row['id']}\" />\n";
 		$items .= "  <item rdf:about=\"http://{$site_url}{$basedir}/{$row['id']}\">\n";
-		$items .= '	<title>' . utf8_encode(htmlspecialchars("{$row['bug_type']} {$row['id']} [{$row['status']}] {$row['sdesc']}")) . "</title>\n";
+		$items .= '	<title>' . clean("{$row['bug_type']} {$row['id']} [{$row['status']}] {$row['sdesc']}") . "</title>\n";
 		$items .= "	<link>http://{$site_url}{$basedir}/{$row['id']}</link>\n";
 		$items .= '	<content:encoded><![CDATA[' .  $desc . "]]></content:encoded>\n";
 		$items .= '	<description><![CDATA[' . $desc . "]]></description>\n";
 		if (!$row['unchanged']) {
-			$items .= '	<dc:date>' . date(DATE_ATOM, $row['ts1a']) . "</dc:date>\n";
+			$items .= '	<dc:date>' . date(DATE_ATOM, $row['submitted']) . "</dc:date>\n";
 		} else {
-			$items .= '	<dc:date>' . date(DATE_ATOM, $row['ts2a']) . "</dc:date>\n";
+			$items .= '	<dc:date>' . date(DATE_ATOM, $row['modified']) . "</dc:date>\n";
 		}
-		$items .= '	<dc:creator>' . utf8_encode(htmlspecialchars(spam_protect($row['email']))) . "</dc:creator>\n";
-		$items .= '	<dc:subject>' .
-		   utf8_encode(htmlspecialchars($row['package_name'])) . ' ' .
-		   utf8_encode(htmlspecialchars($row['bug_type'])) . "</dc:subject>\n";
+		$items .= '	<dc:creator>' . clean(spam_protect($row['email'])) . "</dc:creator>\n";
+		$items .= '	<dc:subject>' . clean($row['package_name']) . ' ' . clean($row['bug_type']) . "</dc:subject>\n";
 		$items .= "  </item>\n";
 	}
 } else {
@@ -110,7 +108,7 @@
 	echo "<!--\n\n";
 	echo "The following warnings occured during your request:\n\n";
 	foreach($warnings as $warning) {
-		echo utf8_encode(htmlspecialchars('* ' . $warning)) . "\n";
+		echo clean('* ' . $warning) . "\n";
 	}
 	echo "-->\n";
 }

Modified: web/php-bugs/trunk/www/rss/xml.php
===================================================================
--- web/php-bugs/trunk/www/rss/xml.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/www/rss/xml.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -1,13 +1,13 @@
 <?php
 echo "<bug>\n";
 foreach ($bug as $key => $value) {
-	echo "  <$key>", utf8_encode(htmlspecialchars($value)), "</$key>\n";
+	echo "  <$key>", clean($value), "</$key>\n";
 }
 foreach ($comments as $comment) {
 	if (empty($comment['registered'])) continue;
 	echo "  <comment>\n";
 	foreach ($comment as $key => $value) {
-		echo "	<$key>", utf8_encode(htmlspecialchars($value)), "</$key>\n";
+		echo "	<$key>", clean($value), "</$key>\n";
 	}
 	echo "  </comment>\n";
 }

Modified: web/php-bugs/trunk/www/search.php
===================================================================
--- web/php-bugs/trunk/www/search.php	2010-03-09 18:20:37 UTC (rev 296004)
+++ web/php-bugs/trunk/www/search.php	2010-03-09 19:00:00 UTC (rev 296005)
@@ -15,17 +15,14 @@
 // Authenticate (Disabled for now, searching does not require knowledge of user level)
 //bugs_authenticate($user, $pw, $logged_in, $is_trusted_developer);

-$newrequest = $_REQUEST;
-if (isset($newrequest['PHPSESSID'])) {
-	unset($newrequest['PHPSESSID']);
-}
+$newrequest = http_build_query(array_merge($_GET, $_POST));

 if (!$count_only) {
 	response_header(
-		'Bugs :: Search',
-		" <link rel='alternate'
-				type='application/rdf+xml'
-				title='RSS feed' href='rss/search.php?" . http_build_query($newrequest) . "' />");
+		'Bugs :: Search', "
+			<link rel='alternate' type='application/rss+xml' title='Search bugs - RDF' href='rss/search.php?{$newrequest}' />
+			<link rel='alternate' type='application/rss+xml' title='Search bugs - RSS 2.0' href='rss/search.php?format=rss2&{$newrequest}' />
+	");
 }

 // Include common query handler (used also by rss/search.php)