Add feed fixes from Ryan <ryan@ryanflint.com>, rename 'Host of' to 'Hosting', and fix ordering for favicon code.

webtools/partytool/views/feeds/comments.thtml

@@ -3,13 +3,13 @@
   <channel>
     <pubDate><?php echo date('r'); ?></pubDate>
     <description><?php echo APP_NAME." - Latest Comments"; ?></description>
-    <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$pid); ?></link>
+    <link><?php echo APP_BASE.$html->url('/parties/view/'.$pid); ?></link>
     <title><?php echo APP_NAME." - Latest Comments"; ?></title>
     <?php foreach($comments as $comment): ?>
     <item>
       <title><![CDATA[<?php echo substr($comment['comments']['text'], 0, 25).'...'; ?>]]></title>
       <description><?php echo $comment['comments']['text'] ?></description>
-      <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$comment['comments']['assoc'].'#c'.$comment['comments']['id']); ?></link>
+      <link><?php echo APP_BASE.$html->url('/parties/view/'.$comment['comments']['assoc'].'#c'.$comment['comments']['id']); ?></link>
     </item>
     <?php endforeach; ?>
    </channel>

webtools/partytool/views/feeds/ical.thtml

@@ -1,19 +1,19 @@
 BEGIN:VCALENDAR
 X-WR-CALNAME:<?php echo APP_NAME."\n"; ?>
 X-WR-CALDESC:Upcoming Parties
-PRODID:-//<?php echo $_SERVER["SERVER_NAME"]; ?>//calendar//EN
+PRODID:-//<?php echo APP_BASE; ?>//calendar//EN
 VERSION:2.0
 CALSCALE:GREGORIAN
 METHOD:PUBLISH
 <?php foreach($events as $event): ?>
 BEGIN:VEVENT
-UID:<?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$event['Feeds']['id'])."\n"; ?>
+UID:<?php echo APP_BASE.$html->url('/parties/view/'.$event['Feeds']['id'])."\n"; ?>
 DTSTAMP:<?php echo date('Ymd\This\Z', $event['Feeds']['date'])."\n"; ?>
 LOCATION:<?php echo str_replace(",", "\,", $event['Feeds']['address'])."\n"; ?>
 SUMMARY:<?php echo $event['Feeds']['name']."\n"; ?>
 DTSTART:<?php echo date('Ymd\This', $event['Feeds']['date'])."\n"; ?>
 DURATION:PT<?php echo $event['Feeds']['duration']; ?>H
-URL:<?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$event['Feeds']['id'])."\n"; ?>
+URL:<?php echo APP_BASE.$html->url('/parties/view/'.$event['Feeds']['id'])."\n"; ?>
 STATUS:<?php echo (($event['Feeds']['confirmed'] == 1) ? "CONFIRMED" : "TENTATIVE")."\n"; ?>
 DESCRIPTION
  <?php echo $event['Feeds']['name']." \r\n"; ?>

webtools/partytool/views/feeds/index.thtml

@@ -3,12 +3,12 @@
   <channel>
     <pubDate><?php echo date('r'); ?></pubDate>
     <description><?php echo APP_NAME." - Party Count"; ?></description>
-    <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+    <link><?php echo APP_BASE.$html->url('/'); ?></link>
     <title><?php echo APP_NAME." - Party Count"; ?></title>
     <item>
       <title><?php echo $count; ?></title>
       <description>Total Parties</description>
-      <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+      <link><?php echo APP_BASE.$html->url('/'); ?></link>
     </item>
    </channel>
 </rss>

webtools/partytool/views/feeds/latest.thtml

@@ -3,13 +3,13 @@
   <channel>
     <pubDate><?php echo date('r'); ?></pubDate>
     <description><?php echo APP_NAME." - Latest Parties"; ?></description>
-    <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+    <link><?php echo APP_BASE.$html->url('/'); ?></link>
     <title><?php echo APP_NAME." - Latest Parties"; ?></title>
     <?php foreach($latest as $party): ?> 
     <item>
       <title><?php echo $party['Feeds']['name'] ?></title>
       <description><?php echo $party['Feeds']['vname'] ?></description>
-      <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$party['Feeds']['id']); ?></link>
+      <link><?php echo APP_BASE.$html->url('/parties/view/'.$party['Feeds']['id']); ?></link>
     </item>
     <?php endforeach; ?>
    </channel>

webtools/partytool/views/feeds/upcoming.thtml

@@ -3,13 +3,13 @@
   <channel>
     <pubDate><?php echo date('r'); ?></pubDate>
     <description><?php echo APP_NAME." - Upcoming Parties"; ?></description>
-    <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+    <link><?php echo APP_BASE.$html->url('/'); ?></link>
     <title><?php echo APP_NAME." - Upcoming Parties"; ?></title>
     <?php foreach($latest as $party): ?> 
     <item>
       <title><![CDATA[<?php echo $party['Feeds']['name'] ?>]]></title>
       <description><?php echo date('Y-m-d H:i', $party['Feeds']['date']); ?></description>
-      <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$party['Feeds']['id']); ?></link>
+      <link><?php echo APP_BASE.$html->url('/parties/view/'.$party['Feeds']['id']); ?></link>
     </item>
     <?php endforeach; ?>
    </channel>

webtools/partytool/views/feeds/users.thtml

@@ -3,12 +3,12 @@
   <channel>
     <pubDate><?php echo date('r'); ?></pubDate>
     <description><?php echo APP_NAME." - Total Users"; ?></description>
-    <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+    <link><?php echo APP_BASE.$html->url('/'); ?></link>
     <title><?php echo APP_NAME." - Total Users"; ?></title>
     <item>
       <title><?php echo $count; ?></title>
       <description>Total Users</description>
-      <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/'); ?></link>
+      <link><?php echo APP_BASE.$html->url('/'); ?></link>
     </item>
    </channel>
 </rss>

webtools/partytool/views/layouts/default.thtml

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title><?php echo APP_NAME." - ".$title_for_layout?></title>
-    <link rel="shortcut icon" href="<?php echo $html->url('/favicon.ico'); ?>" type="image/x-icon"/>
+    <link rel="shortcut icon" type="image/x-icon" href="<?php echo $html->url('/favicon.ico'); ?>"/>
     <link rel="stylesheet" type="text/css" href="<?php echo $html->url('/css/main.css'); ?>"/>
     <link rel="alternate" type="application/rss+xml" href="<?php echo $html->url('/feeds/latest'); ?>"/>
   </head>

webtools/partytool/views/users/view.thtml

@@ -24,7 +24,7 @@
   }
   
   if (!empty($hparties)) {
-    echo "Host of: ";
+    echo "Hosting: ";
     $c = count($hparties) - 1;
     $i = 0;
     
@@ -41,4 +41,4 @@
 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>" type="text/javascript"></script>
 <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
 <div id="map" style="height: 200px; width: 350px;"></div>
-<?php endif; ?>
+<?php endif; ?>