]> git.wh0rd.org - tt-rss.git/blobdiff - classes/handler/public.php
fix inline flash/html5 audio player
[tt-rss.git] / classes / handler / public.php
index 3f65275a3d6a9ffef64090d3d7bf9297fea805bd..ca6144bdff5a5844e19f8f626234d7f1546fda46 100644 (file)
@@ -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]);
@@ -276,36 +280,6 @@ class Handler_Public extends Handler {
                header("Location: index.php");
        }
 
-       function fbexport() {
-
-               $access_key = db_escape_string($_POST["key"]);
-
-               // TODO: rate limit checking using last_connected
-               $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances
-                       WHERE access_key = '$access_key'");
-
-               if (db_num_rows($result) == 1) {
-
-                       $instance_id = db_fetch_result($result, 0, "id");
-
-                       $result = db_query($this->link, "SELECT feed_url, site_url, title, subscribers
-                               FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
-
-                       $feeds = array();
-
-                       while ($line = db_fetch_assoc($result)) {
-                               array_push($feeds, $line);
-                       }
-
-                       db_query($this->link, "UPDATE ttrss_linked_instances SET
-                               last_status_in = 1 WHERE id = '$instance_id'");
-
-                       print json_encode(array("feeds" => $feeds));
-               } else {
-                       print json_encode(array("error" => array("code" => 6)));
-               }
-       }
-
        function share() {
                $uuid = db_escape_string($_REQUEST["key"]);
 
@@ -333,6 +307,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 +334,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');
                }
@@ -372,12 +347,17 @@ class Handler_Public extends Handler {
        }
 
        function sharepopup() {
+               if (SINGLE_USER_MODE) {
+                       login_sequence($this->link);
+               }
+
                header('Content-Type: text/html; charset=utf-8');
                print "<html>
                                <head>
                                        <title>Tiny Tiny RSS</title>
                                        <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
                                        <script type=\"text/javascript\" src=\"lib/prototype.js\"></script>
+                                       <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script>
                                        <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                                </head>
                                <body id='sharepopup'>";
@@ -391,8 +371,10 @@ class Handler_Public extends Handler {
                                $title = db_escape_string(strip_tags($_REQUEST["title"]));
                                $url = db_escape_string(strip_tags($_REQUEST["url"]));
                                $content = db_escape_string(strip_tags($_REQUEST["content"]));
+                               $labels = db_escape_string(strip_tags($_REQUEST["labels"]));
 
-                               create_published_article($this->link, $title, $url, $content, $_SESSION["uid"]);
+                               create_published_article($this->link, $title, $url, $content, $labels,
+                                       $_SESSION["uid"]);
 
                                print "<script type='text/javascript'>";
                                print "window.close();";
@@ -413,15 +395,29 @@ 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>
+                               <tr><td align='right'><?php echo __("Labels:") ?></td>
+                               <td><input name='labels' id="labels_value"
+                                       placeholder='Alpha, Beta, Gamma' value="">
+                               </td></tr>
+
+                               <tr><td>
+                                       <div class="autocomplete" id="labels_choices"
+                                               style="display : block"></div></td></tr>
 
                                <script type='text/javascript'>document.forms[0].title.focus();</script>
 
+                               <script type='text/javascript'>
+                                       new Ajax.Autocompleter('labels_value', 'labels_choices',
+                                  "backend.php?op=rpc&method=completeLabels",
+                                  { tokens: ',', paramName: "search" });
+                               </script>
+
                                <tr><td colspan='2'>
                                        <div style='float : right' class='insensitive-small'>
                                        <?php echo __("Shared article will appear in the Published feed.") ?>
@@ -443,12 +439,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"
@@ -520,6 +516,10 @@ class Handler_Public extends Handler {
        }
 
        function subscribe() {
+               if (SINGLE_USER_MODE) {
+                       login_sequence($this->link);
+               }
+
                if ($_SESSION["uid"]) {
 
                        $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
@@ -553,7 +553,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));