Updated RSS

diff --git a/get.php b/get.php
index a2168e10b1a903af0417061073f4f2cffea98ad2..a90c9538eaf1e3dcf3ae7d2a9b40643ce631b5d2 100644 (file)
--- a/get.php
+++ b/get.php
@@ -6,8 +6,11 @@ $params = array();
 $params['user'] = isset($_GET['user']) ? $_GET['user'] : null;
 $params['id']   = isset($_GET['id']) ? $_GET['id'] : null;
 
+$pathinfo = pathinfo($_SERVER['REQUEST_URI']);
 $format = isset($pathinfo['extension']) ? $pathinfo['extension'] : null;
 
+$endpoint = str_replace('.'.$format, '', $endpoint);
+
 $dbh = get_db_connection();
 $dbh->beginTransaction();
 
@@ -24,7 +27,7 @@ try {
             $q->execute( array( $user['id'] ));
         }
     }
-    if ($params['id']) {
+    else if ($params['id']) {
         $q = $dbh->prepare("SELECT *, clumps.id as clump_id 
                             FROM clumps 
                             JOIN users 
@@ -49,7 +52,7 @@ catch(PDOException $e)
 }
 
 switch ($format) {
-case 'xml' :
+    case 'xml' :
     case 'rss' :
         include 'rss.php';
         exit;

diff --git a/rss.php b/rss.php
index fbadf1402e8fea56c33caa67602c5d6e2a91f8ed..3d07221f0aac292a314db1d4f0411bf44738444f 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -9,8 +9,8 @@
 
        <?php for($i = 0; $row = $q->fetch(); $i++ ): ?>
        <item>
-           <title><?php echo urlencode($row['title']) ?></title>
-           <link><?php echo urlencode($row['url']) ?></link>
+           <title><?php echo $row['title'] ?></title>
+           <link><?php echo $row['url'] ?></link>
            <pubDate><?php echo date('r', strtotime($row['date'])); ?></pubDate>
 
        </item>