From 8cb92d1551b08bef554052b84a2457b5807bc87a Mon Sep 17 00:00:00 2001
From: Penny Leach <penny@she.geek.nz>
Date: Sat, 26 Apr 2008 11:33:07 +1200
Subject: [PATCH] xhtml strict

---
 comp/blog.php    | 2 +-
 comp/flickr.php  | 8 ++++----
 comp/lastfm.php  | 2 +-
 comp/twitter.php | 2 +-
 include/main.inc | 2 +-
 lib/general.php  | 5 +++++
 style.css        | 1 +
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/comp/blog.php b/comp/blog.php
index 97d7cda..d2876f0 100644
--- a/comp/blog.php
+++ b/comp/blog.php
@@ -5,7 +5,7 @@ function comp_blog() {
     if ($data = parse_rss(get_config('blog_rss'))) {
         echo '            <ul>' . "\n";
         foreach ($data->content as $item) {
-            echo '                <li><a href="' . $item->link . '">' . $item->title . '</a></li>' . "\n";;
+            echo '                <li><a href="' . $item->link . '">' . hsc($item->title) . '</a></li>' . "\n";;
         }
         echo '                <li class="last"><a href="' . get_config('blog_url') . '"> ... more</a></li>' . "\n";
         echo '            </ul>' . "\n";
diff --git a/comp/flickr.php b/comp/flickr.php
index 329b639..ae7cdc7 100644
--- a/comp/flickr.php
+++ b/comp/flickr.php
@@ -15,10 +15,10 @@ function comp_flickr() {
     // no nice formatting here, whtespace fucks the browser
     echo "\n";
     foreach ((array)$photos['photo'] as $photo) {
-        echo "<a href=$photos_url$photo[id]>";
-        echo "<img border='0' alt='$photo[title]' ".
-            "src=" . $f->buildPhotoURL($photo, "Square") . ">";
-        echo "</a>";
+        echo '<a href="' . $photos_url . $photo['id'] . '">';
+        echo '<img alt="' . $photo['itle'] . '" ' .
+            'src="' . $f->buildPhotoURL($photo, 'Square') . '" />';
+        echo '</a>';
         $i++;
     }
     echo "\n";
diff --git a/comp/lastfm.php b/comp/lastfm.php
index 800f200..948641b 100644
--- a/comp/lastfm.php
+++ b/comp/lastfm.php
@@ -5,7 +5,7 @@ function comp_lastfm() {
     if ($data = parse_rss('http://ws.audioscrobbler.com/1.0/user/' . get_config('lastfm_username') . '/recenttracks.rss')) {
         echo '                 <ul>' . "\n";
         foreach ($data->content as $item) {
-            echo '                <li><a href="' . $item->link . '">' . $item->title  . '</a></li>' . "\n";
+            echo '                <li><a href="' . $item->link . '">' . hsc($item->title)  . '</a></li>' . "\n";
         }
         echo '                <li class="last"><a href="http://last.fm/user/' . get_config('lastfm_username') . '/">... more</a></li>' . "\n";
         echo '            </ul>' . "\n";
diff --git a/comp/twitter.php b/comp/twitter.php
index 4dab86a..63b7866 100644
--- a/comp/twitter.php
+++ b/comp/twitter.php
@@ -5,7 +5,7 @@ function comp_twitter() {
     if ($data = parse_rss('http://twitter.com/statuses/user_timeline/' . get_config('twitter_username') . '.rss')) {
         echo '            <ul>' . "\n";
         foreach ($data->content as $item) {
-            echo '                <li><a href="' . $item->link . '">' . substr($item->title, strlen(get_config('twitter_username')) + 2) . '</a></li>' . "\n";
+            echo '                <li><a href="' . $item->link . '">' . hsc(substr($item->title, strlen(get_config('twitter_username')) + 2)) . '</a></li>' . "\n";
         }
         echo '                <li class="last"><a href="http://twitter.com/' . get_config('twitter_username') . '/">... more</a></li>' . "\n";
         echo '            </ul>' . "\n";
diff --git a/include/main.inc b/include/main.inc
index 54a6022..8495d67 100644
--- a/include/main.inc
+++ b/include/main.inc
@@ -26,5 +26,5 @@ ksort($whorepile);
             ?>.  christ.  at least I never got livejournal.</p>
             <p>I don't have an rss feed for this mashup. use friendfeed instead, or an individual site's feed.</p>
             <p>thanks to <a href="http://nothing.net.nz">vex</a> for the vserver</p>
-            <p><a href="mailto:penny@mjollnir.org">send me email!</a>
+            <p><a href="mailto:penny@mjollnir.org">send me email!</a></p>
             <span class="mind"><b>On my mind</b>: <a href="http://mahara.org">mahara</a>, more tattoos, less tattoos, moodle gsoc, Europe</span>
diff --git a/lib/general.php b/lib/general.php
index fab6aa5..f11df08 100644
--- a/lib/general.php
+++ b/lib/general.php
@@ -88,4 +88,9 @@ function parse_rss($url) {
     }
     return $data;
 }
+
+function hsc($str) {
+    return htmlspecialchars($str, ENT_COMPAT, 'UTF-8');
+}
+
 ?>
diff --git a/style.css b/style.css
index 47336bd..51ef487 100644
--- a/style.css
+++ b/style.css
@@ -66,6 +66,7 @@ div#flickr {
 }
 div#flickr img {
     margin:5px;
+    border:0px;
 }
 
 div#main {
-- 
2.39.5