syndicated feeds: force sort by last_read for published

[tt-rss.git] / classes / handler / public.php

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 4d6c117eb5b5931e6da6dd740fcd1f3e89a594e8..d3c3fc094cba5d6bd38dbf7a64643c4fb23ea031 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -2,7 +2,8 @@
 class Handler_Public extends Handler {
 
        private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-               $limit, $search, $search_mode, $match_on, $view_mode = false, $format = 'atom') {
+               $limit, $offset, $search, $search_mode, $match_on,
+               $view_mode = false, $format = 'atom') {
 
                require_once "lib/MiniTemplator.class.php";
 
@@ -19,9 +20,12 @@ class Handler_Public extends Handler {
                        $date_sort_field = "date_entered";
                }
 
+               if ($feed == -2)
+                       $date_sort_field = "last_read";
+
                $qfh_ret = queryFeedHeadlines($this->link, $feed,
                        $limit, $view_mode, $is_cat, $search, $search_mode,
-                       $match_on, "$date_sort_field DESC", 0, $owner_uid);
+                       $match_on, "$date_sort_field DESC", $offset, $owner_uid);
 
                $result = $qfh_ret[0];
                $feed_title = htmlspecialchars($qfh_ret[1]);
@@ -199,7 +203,7 @@ class Handler_Public extends Handler {
                $result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles,ttrss_users
                        WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
-               print "<select style='width: 100%' name='profile'>";
+               print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
 
                print "<option value='0'>" . __("Default profile") . "</option>";
 
@@ -333,6 +337,7 @@ class Handler_Public extends Handler {
                $key = db_escape_string($_REQUEST["key"]);
                $is_cat = $_REQUEST["is_cat"] != false;
                $limit = (int)db_escape_string($_REQUEST["limit"]);
+               $offset = (int)db_escape_string($_REQUEST["offset"]);
 
                $search = db_escape_string($_REQUEST["q"]);
                $match_on = db_escape_string($_REQUEST["m"]);
@@ -359,7 +364,7 @@ class Handler_Public extends Handler {
 
                if ($owner_id) {
                        $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-                               $search, $search_mode, $match_on, $view_mode, $format);
+                               $offset, $search, $search_mode, $match_on, $view_mode, $format);
                } else {
                        header('HTTP/1.1 403 Forbidden');
                }
@@ -413,11 +418,11 @@ class Handler_Public extends Handler {
                                <input type="hidden" name="op" value="sharepopup">
                                <input type="hidden" name="action" value="share">
 
-                               <tr><td><?php echo __("Title:") ?></td>
+                               <tr><td align='right'><?php echo __("Title:") ?></td>
                                <td width='80%'><input name='title' value="<?php echo $title ?>"></td></tr>
-                               <tr><td><?php echo __("URL:") ?></td>
+                               <tr><td align='right'><?php echo __("URL:") ?></td>
                                <td><input name='url' value="<?php echo $url ?>"></td></tr>
-                               <tr><td><?php __("Content:") ?></td>
+                               <tr><td align='right'><?php echo __("Content:") ?></td>
                                <td><input name='content' value=""></td></tr>
 
                                <script type='text/javascript'>document.forms[0].title.focus();</script>
@@ -443,12 +448,12 @@ class Handler_Public extends Handler {
                        ?>
 
                        <form action="public.php?return=<?php echo $return ?>"
-                               method="POST" id="loginForm" name="loginForm" onsubmit="return validateLoginForm(this)">
+                               method="POST" id="loginForm" name="loginForm">
 
                        <input type="hidden" name="op" value="login">
 
                        <table height='100%' width='100%'><tr><td colspan='2'>
-                       <tr><td colspan='2'><h1><?php echo __("Not logged in") ?></h1></td></tr>
+                       <h1><?php echo __("Not logged in") ?></h1></td></tr>
 
                        <tr><td align="right"><?php echo __("Login:") ?></td>
                        <td align="right"><input name="login"
@@ -480,8 +485,6 @@ class Handler_Public extends Handler {
 
        function login() {
 
-               print_r($_REQUEST);
-
                $_SESSION["prefs_cache"] = array();
 
                if (!SINGLE_USER_MODE) {
@@ -555,7 +558,7 @@ class Handler_Public extends Handler {
                                break;
                        case 4:
                                print_notice(__("Multiple feed URLs found."));
-                               $feed_urls = get_feeds_from_html($feed_url);
+                               $feed_urls = $rc["feeds"];
                                break;
                        case 5:
                                print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));