]> git.wh0rd.org - tt-rss.git/blobdiff - classes/handler/public.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #245 from shibuya246/master
[tt-rss.git] / classes / handler / public.php
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 7fa74410763a6b3d7438e5eb903cd5ff1683e926..205853eae6765211d8e03e6c1ac7e11eef453e6a 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,
@@ -98,6 +110,8 @@ class Handler_Public extends Handler {
                                        date(DATE_RFC822, strtotime($line["updated"])), true);
 
                                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+                               
+                               $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true);
 
                                $tags = get_article_tags($line["id"], $owner_uid);
 
@@ -225,7 +239,7 @@ class Handler_Public extends Handler {
        function getProfiles() {
                $login = $this->dbh->escape_string($_REQUEST["login"]);
 
-               $result = $this->dbh->query("SELECT * FROM ttrss_settings_profiles,ttrss_users
+               $result = $this->dbh->query("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
                        WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
                print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
@@ -337,6 +351,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 +373,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');
                }
@@ -382,7 +397,7 @@ class Handler_Public extends Handler {
                header('Content-Type: text/html; charset=utf-8');
                print "<html><head><title>Tiny Tiny RSS</title>";
 
-               stylesheet_tag("utility.css");
+               stylesheet_tag("css/utility.css");
                javascript_tag("lib/prototype.js");
                javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
@@ -553,7 +568,7 @@ class Handler_Public extends Handler {
                        print "<html>
                                <head>
                                        <title>Tiny Tiny RSS</title>
-                                       <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
+                                       <link rel=\"stylesheet\" type=\"text/css\" href=\"css/utility.css\">
                                        <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                                </head>
                                <body>
@@ -732,10 +747,12 @@ class Handler_Public extends Handler {
        }
 
        function forgotpass() {
+               startup_gettext();
+
                header('Content-Type: text/html; charset=utf-8');
                print "<html><head><title>Tiny Tiny RSS</title>";
 
-               stylesheet_tag("utility.css");
+               stylesheet_tag("css/utility.css");
                javascript_tag("lib/prototype.js");
 
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
@@ -825,6 +842,8 @@ class Handler_Public extends Handler {
        }
 
        function dbupdate() {
+               startup_gettext();
+
                if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
                        $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
                        render_login_form();
@@ -835,7 +854,7 @@ class Handler_Public extends Handler {
                        <head>
                        <title>Database Updater</title>
                        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-                       <link rel="stylesheet" type="text/css" href="utility.css"/>
+                       <link rel="stylesheet" type="text/css" href="css/utility.css"/>
                        </head>
                        <style type="text/css">
                                span.ok { color : #009000; font-weight : bold; }
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/