]> 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
fix night theme css
[tt-rss.git] / classes / handler / public.php
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 4ae65e494dcd815f569f5ab5261a957f821b1f05..a5b7f94bed87350c064fe2ec88d9eee82ef6be31 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -15,14 +15,11 @@ class Handler_Public extends Handler {
                if (!$limit) $limit = 60;
 
                $date_sort_field = "date_entered DESC, updated DESC";
-               $date_check_field = "date_entered";
 
                if ($feed == -2 && !$is_cat) {
                        $date_sort_field = "last_published DESC";
-                       $date_check_field = "last_published";
                } else if ($feed == -1 && !$is_cat) {
                        $date_sort_field = "last_marked DESC";
-                       $date_check_field = "last_marked";
                }
 
                switch ($order) {
@@ -36,25 +33,6 @@ class Handler_Public extends Handler {
                        $date_sort_field = "updated DESC";
                        break;
                }
-
-               $params = array(
-                       "owner_uid" => $owner_uid,
-                       "feed" => $feed,
-                       "limit" => 1,
-                       "view_mode" => $view_mode,
-                       "cat_view" => $is_cat,
-                       "search" => $search,
-                       "override_order" => $date_sort_field,
-                       "include_children" => true,
-                       "ignore_vfeed_group" => true,
-                       "offset" => $offset,
-                       "start_ts" => $start_ts
-               );
-
-               $qfh_ret = Feeds::queryFeedHeadlines($params);
-
-               $result = $qfh_ret[0];
-
                $params = array(
                        "owner_uid" => $owner_uid,
                        "feed" => $feed,
@@ -314,7 +292,7 @@ class Handler_Public extends Handler {
        function rss() {
                $feed = $_REQUEST["id"];
                $key = $_REQUEST["key"];
-               $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
+               $is_cat = $_REQUEST["is_cat"];
                $limit = (int)$_REQUEST["limit"];
                $offset = (int)$_REQUEST["offset"];
 
@@ -324,7 +302,7 @@ class Handler_Public extends Handler {
                $start_ts = $_REQUEST["ts"];
 
                $format = $_REQUEST['format'];
-               $orig_guid = sql_bool_to_bool($_REQUEST["orig_guid"]);
+               $orig_guid = $_REQUEST["orig_guid"];
 
                if (!$format) $format = 'atom';
 
@@ -375,12 +353,11 @@ class Handler_Public extends Handler {
                <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
                <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
 
-               echo stylesheet_tag("css/utility.css");
                echo stylesheet_tag("css/default.css");
                echo javascript_tag("lib/prototype.js");
                echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls");
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                       </head><body id='sharepopup'>";
+                       </head><body id='sharepopup' class='ttrss_utility'>";
 
                $action = $_REQUEST["action"];
 
@@ -560,14 +537,15 @@ class Handler_Public extends Handler {
                        header('Content-Type: text/html; charset=utf-8');
                        print "<html>
                                <head>
-                                       <title>Tiny Tiny RSS</title>
-                                       <link rel=\"stylesheet\" type=\"text/css\" href=\"css/utility.css\">
-                                       <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                                       <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
-                                       <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
+                                       <title>Tiny Tiny RSS</title>";
+                       print stylesheet_tag("css/default.css");
+
+            print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+                <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
+                <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
 
                                </head>
-                               <body>
+                               <body class='claro ttrss_utility'>
                                <img class=\"floatingLogo\" src=\"images/logo_small.png\"
                                        alt=\"Tiny Tiny RSS\"/>
                                        <h1>".__("Subscribe to feed...")."</h1><div class='content'>";
@@ -667,11 +645,12 @@ class Handler_Public extends Handler {
                <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
                <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
 
-               echo stylesheet_tag("css/utility.css");
+               echo stylesheet_tag("lib/dijit/themes/claro/claro.css");
+               echo stylesheet_tag("css/default.css");
                echo javascript_tag("lib/prototype.js");
 
                print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                       </head><body id='forgotpass'>";
+                       </head><body class='claro ttrss_utility'>";
 
                print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
                print "<h1>".__("Password recovery")."</h1>";
@@ -727,17 +706,17 @@ class Handler_Public extends Handler {
 
                        print "<fieldset>";
                        print "<label>".__("Login:")."</label>";
-                       print "<input type='text' name='login' value='' required>";
+                       print "<input class='input input-text' type='text' name='login' value='' required>";
                        print "</fieldset>";
 
                        print "<fieldset>";
                        print "<label>".__("Email:")."</label>";
-                       print "<input type='email' name='email' value='' required>";
+                       print "<input class='input input-text' type='email' name='email' value='' required>";
                        print "</fieldset>";
 
                        print "<fieldset>";
                        print "<label>".__("How much is two plus two:")."</label>";
-                       print "<input type='text' name='test' value='' required>";
+                       print "<input class='input input-text' type='text' name='test' value='' required>";
                        print "</fieldset>";
 
                        print "<p/>";
@@ -851,7 +830,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="css/utility.css"/>
+                       <link rel="stylesheet" type="text/css" href="css/default.css"/>
                        <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
                        <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
                        </head>
@@ -859,7 +838,7 @@ class Handler_Public extends Handler {
                                span.ok { color : #009000; font-weight : bold; }
                                span.err { color : #ff0000; font-weight : bold; }
                        </style>
-               <body>
+               <body class="claro ttrss_utility">
                        <script type='text/javascript'>
                        function confirmOP() {
                                return confirm("Update the database?");
@@ -874,7 +853,7 @@ class Handler_Public extends Handler {
 
                        <?php
                                @$op = $_REQUEST["subop"];
-                               $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
+                               $updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
 
                                if ($op == "performupdate") {
                                        if ($updater->isUpdateRequired()) {
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/