]> git.wh0rd.org - tt-rss.git/blobdiff - modules/pref-feeds.php
prefs: add bookmarklet to subscribe to feeds
[tt-rss.git] / modules / pref-feeds.php
index f6ab572fa8c9849b62b7f574f922f8c3bce68951..dc3553d109f3f94c55f71659972bf5ac8db341bd 100644 (file)
@@ -33,7 +33,7 @@
                        $feed_id = db_escape_string($_REQUEST["feed_id"]);
 
                        if (is_file($icon_file) && $feed_id) {
-                               if (filesize($icon_file) < 2000) {
+                               if (filesize($icon_file) < 20000) {
                                        
                                        $result = db_query($link, "SELECT id FROM ttrss_feeds
                                                WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
                        /* Update method */
 
-                       if (ALLOW_SELECT_UPDATE_METHOD) {
-                               $update_method = db_fetch_result($result, 0, "update_method");
+                       $update_method = db_fetch_result($result, 0, "update_method");
 
-                               print " " . __('using') . " ";
-                               print_select_hash("update_method", $update_method, $update_methods);                    
-                       }
+                       print " " . __('using') . " ";
+                       print_select_hash("update_method", $update_method, $update_methods);                    
 
                        $purge_interval = db_fetch_result($result, 0, "purge_interval");
 
                                $checked = "";
                        }
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                $disabled = "";
                                $label_class = "";
                        } else {
 
                        /* Update method */
 
-                       if (ALLOW_SELECT_UPDATE_METHOD) {
-                               print " " . __('using') . " ";
-                               print_select_hash("update_method", $update_method, $update_methods, 
-                                       "disabled");                    
-                               batch_edit_cbox("update_method");
-                       }
+                       print " " . __('using') . " ";
+                       print_select_hash("update_method", $update_method, $update_methods, 
+                               "disabled");                    
+                       batch_edit_cbox("update_method");
 
                        /* Purge intl */
 
                                __('Cache images locally')."</label>";
 
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                print "&nbsp;"; batch_edit_cbox("cache_images", "cache_images_l");
                        }
 
                                $parent_qpart = 'parent_feed = NULL';
                        }
 
-                       if (ENABLE_SIMPLEPIE && SIMPLEPIE_CACHE_IMAGES) {
+                       if (SIMPLEPIE_CACHE_IMAGES) {
                                $cache_images_qpart = "cache_images = $cache_images,";
                        } else {
                                $cache_images_qpart = "";
 
                if ($subop == "categorize") {
 
-                       if (!WEB_DEMO_MODE) {
 
-                               $ids = split(",", db_escape_string($_REQUEST["ids"]));
-
-                               $cat_id = db_escape_string($_REQUEST["cat_id"]);
+                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
-                               if ($cat_id == 0) {
-                                       $cat_id_qpart = 'NULL';
-                               } else {
-                                       $cat_id_qpart = "'$cat_id'";
-                               }
+                       $cat_id = db_escape_string($_REQUEST["cat_id"]);
 
-                               db_query($link, "BEGIN");
+                       if ($cat_id == 0) {
+                               $cat_id_qpart = 'NULL';
+                       } else {
+                               $cat_id_qpart = "'$cat_id'";
+                       }
 
-                               foreach ($ids as $id) {
-                               
-                                       db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
-                                               WHERE id = '$id' AND parent_feed IS NULL
-                                               AND owner_uid = " . $_SESSION["uid"]);
+                       db_query($link, "BEGIN");
 
-                                       # update linked feed categories
-                                       db_query($link, "UPDATE ttrss_feeds SET
-                                               cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND 
-                                               owner_uid = " . $_SESSION["uid"]);
+                       foreach ($ids as $id) {
+                       
+                               db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+                                       WHERE id = '$id' AND parent_feed IS NULL
+                                       AND owner_uid = " . $_SESSION["uid"]);
 
-                               }
+                               # update linked feed categories
+                               db_query($link, "UPDATE ttrss_feeds SET
+                                       cat_id = $cat_id_qpart WHERE parent_feed = '$id' AND 
+                                       owner_uid = " . $_SESSION["uid"]);
 
-                               db_query($link, "COMMIT");
                        }
 
+                       db_query($link, "COMMIT");
+
                }
 
                if ($subop == "editCats") {
 
                        if ($action == "add") {
 
-                               if (!WEB_DEMO_MODE) {
-       
-                                       $feed_cat = db_escape_string(trim($_REQUEST["cat"]));
        
+                               $feed_cat = db_escape_string(trim($_REQUEST["cat"]));
+
+                               $result = db_query($link,
+                                       "SELECT id FROM ttrss_feed_categories
+                                       WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
+
+                               if (db_num_rows($result) == 0) {
+                                       
                                        $result = db_query($link,
-                                               "SELECT id FROM ttrss_feed_categories
-                                               WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
-       
-                                       if (db_num_rows($result) == 0) {
-                                               
-                                               $result = db_query($link,
-                                                       "INSERT INTO ttrss_feed_categories (owner_uid,title) 
-                                                       VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
-       
-                                       } else {
-       
-                                               print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", 
-                                                       $feed_cat));
-                                       }
+                                               "INSERT INTO ttrss_feed_categories (owner_uid,title) 
+                                               VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
 
+                               } else {
+
+                                       print_warning(T_sprintf("Category <b>$%s</b> already exists in the database.", 
+                                               $feed_cat));
                                }
+
                        }
 
                        if ($action == "remove") {
                                __('Search')."</button>
                        </div>";
                
-               print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
+               print "<button onclick=\"quickAddFeed()\">"
                        .__('Subscribe to feed')."</button> ";
 
-               print "<button onclick=\"javascript:editSelectedFeed()\">".
+               print "<button onclick=\"editSelectedFeed()\">".
                        __('Edit feeds')."</button> ";
 
                if (get_pref($link, 'ENABLE_FEED_CATS')) {
                print "<button onclick=\"javascript:removeSelectedFeeds()\">"
                        .__('Unsubscribe')."</button> ";
 
-               print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-                       <option value=\"facDefault\" selected>".__('More actions...')."</option>";
-
-               if (FORCE_ARTICLE_PURGE == 0) {
-                       print 
-                               "<option value=\"facPurge\">".__('Manual purge')."</option>";
-               }
+               if (defined('_ENABLE_FEED_DEBUGGING')) {
 
-               print "
-                       <option value=\"facClear\">".__('Clear feed data')."</option>
-                       <option value=\"facRescore\">".__('Rescore articles')."</option>";
-
-               print "</select>";
+                       print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
+                               <option value=\"facDefault\" selected>".__('More actions...')."</option>";
+       
+                       if (FORCE_ARTICLE_PURGE == 0) {
+                               print 
+                                       "<option value=\"facPurge\">".__('Manual purge')."</option>";
+                       }
+       
+                       print "
+                               <option value=\"facClear\">".__('Clear feed data')."</option>
+                               <option value=\"facRescore\">".__('Rescore articles')."</option>";
+       
+                       print "</select>";
 
-/*             if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
-                       print " <input type=\"submit\" class=\"button\"
-                               id=\"top25_feeds_btn\"
-                               onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
-               } */
+               }
 
                $feeds_sort = db_escape_string($_REQUEST["sort"]);
 
 
                print "&nbsp;"; */
 
+               print "<p>" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings.");
+
+               print "<div class=\"insensitive\">" . __("Note: Only main settings profile can be migrated using OPML.") . "</div>";
+
+               print "</p>";
+
                print "<iframe name=\"upload_iframe\"
                        style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
                print "<button onclick=\"gotoExportOpml()\">".
                        __('Export OPML')."</button>";
 
+               if (!get_pref($link, "_PREFS_OPML_PUBLISH_KEY")){
+                       set_pref($link, "_PREFS_OPML_PUBLISH_KEY", generate_publish_key());
+               }
+
+               print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
+
+               print "<div class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") .                  "</div>" . "</p>";
+
+               print "<button onclick=\"return displayDlg('pubOPMLUrl')\">".
+                       __('Display URL')."</button> ";
+
 
-               print "<h3>" . __("Firefox Integration") . "</h3>";
+               if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
+       
+                       print "<h3>" . __("Firefox Integration") . "</h3>";
                 
-               print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+                       print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
 
-               print "<p";
+                       print "<p";
 
-               print "<button onclick='window.navigator.registerContentHandler(" .
+                       print "<button onclick='window.navigator.registerContentHandler(" .
                       "\"application/vnd.mozilla.maybe.feed\", " .
                       "\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
                                                         __('Click here to register this site as a feed reader.') . 
                                "</button>";
 
-               print "</p>";
+                       print "</p>";
+               }
+
+               print "<h3>".__("Subscribing via bookmarklet")."</h3>";
+
+               print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
+
+               $bm_subscribe_url = str_replace('%s', '', add_feed_url());
+
+               $confirm_str = __('Subscribe to %s in Tiny Tiny RSS?');
+
+               $bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
+
+               print "<a href=\"$bm_url\" class='visibleLink'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
 
                print "<h3>".__("Published articles")."</h3>";
 
 
                print "<button onclick=\"return displayDlg('pubUrl')\">".
                        __('Display URL')."</button> ";
-
+               
 
        }
 
 
                                if ($mode == 1) {
 
-                                       $feed_url = htmlspecialchars($line["feed_url"]);
+                                       $feed_url = $line["feed_url"];
                                        $subscribers = $line["subscribers"];
-       
+
                                        $det_result = db_query($link, "SELECT site_url,title,id 
                                                FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
        
        
                                        $class = ($feedctr % 2) ? "even" : "odd";
        
+                                       $feed_url = htmlspecialchars($line["feed_url"]);
+
                                        if ($details["site_url"]) {
                                                $site_url = "<a target=\"_blank\" href=\"".
                                                        htmlspecialchars($details["site_url"])."\">