support custom order in generated feeds (closes #709)

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 727976a82ed73125cdfe13380de3f2fa6014be3a..12f1624732c097d5fd56f52420d74359eb0e1ca2 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -3,7 +3,7 @@ class Handler_Public extends Handler {
 
        private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
                $limit, $offset, $search, $search_mode,
-               $view_mode = false, $format = 'atom') {
+               $view_mode = false, $format = 'atom', $order = false) {
 
                require_once "lib/MiniTemplator.class.php";
 
@@ -21,6 +21,18 @@ class Handler_Public extends Handler {
                else if ($feed == -1)
                        $date_sort_field = "last_marked DESC";
 
+               switch ($order) {
+               case "title":
+                       $date_sort_field = "ttrss_entries.title";
+                       break;
+               case "date_reverse":
+                       $date_sort_field = "date_entered, updated";
+                       break;
+               case "feed_dates":
+                       $date_sort_field = "updated DESC";
+                       break;
+               }
+
                $qfh_ret = queryFeedHeadlines($feed,
                        1, $view_mode, $is_cat, $search, $search_mode,
                        $date_sort_field, $offset, $owner_uid,
@@ -337,6 +349,7 @@ class Handler_Public extends Handler {
                $search = $this->dbh->escape_string($_REQUEST["q"]);
                $search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
                $view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
+               $order = $this->dbh->escape_string($_REQUEST["order"]);
 
                $format = $this->dbh->escape_string($_REQUEST['format']);
 
@@ -358,7 +371,7 @@ class Handler_Public extends Handler {
 
                if ($owner_id) {
                        $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-                               $offset, $search, $search_mode, $view_mode, $format);
+                               $offset, $search, $search_mode, $view_mode, $format, $order);
                } else {
                        header('HTTP/1.1 403 Forbidden');
                }