]> git.wh0rd.org - tt-rss.git/blobdiff - modules/pref-feeds.php
code cleanup; remove unnecessary callbacks; rework subscribtion dialog
[tt-rss.git] / modules / pref-feeds.php
index 190d8905528bee176c9f5059f2a33b44962397a8..9d33461afc8b3762d6f92f4f16039b31d9d38b1b 100644 (file)
 
                if ($subop == "browse") {
 
-                       if (!ENABLE_FEED_BROWSER) {
-                               print __("Feed browser is administratively disabled.");
-                               return;
-                       }
-
                        print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
                        
                        print "<div class=\"infoBoxContents\">";
                                <img style='display : none' 
                                        id='feed_browser_spinner' src='images/indicator_white.gif'>
                                <input name=\"search\" size=\"20\" type=\"search\"
-                               onfocus=\"javascript:disableHotkeys();\" 
-                               onblur=\"javascript:enableHotkeys();\"
-                               onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:updateFeedBrowser()\" value=\"".__('Search')."\">
+                                       onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
+                               <button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>
                        </div>";
 
                        print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
 
                        print __("limit:");
 
-                       print " <select name=\"limit\">";
+                       print " <select name=\"limit\" onchange='updateFeedBrowser()'>";
 
                        foreach (array(25, 50, 100, 200) as $l) {
                                $issel = ($l == $limit) ? "selected" : "";
                        
                        print "</select> ";
 
-                       print "
-                               <input type=\"submit\" class=\"button\"
-                                       onclick=\"updateFeedBrowser()\" value=\"".__('Show')."\">";
-
                        print "<p>";
 
                        $owner_uid = $_SESSION["uid"];
 
                        print "<ul class='browseFeedList' id='browseFeedList'>";
-                       $subscribe_btn_disabled = print_feed_browser($link, $search, 25) == 0 ? "disabled" : "";
+                       print_feed_browser($link, $search, 25);
                        print "</ul>";
 
                        print "<div align='center'>
-                               <input type=\"submit\" class=\"button\" id=\"feed_browser_subscribe\"
-                               $subscribe_btn_disabled
-                               onclick=\"feedBrowserSubscribe()\" value=\"".__('Subscribe')."\">
-                               <input type='submit' class='button'                     
-                               onclick=\"closeInfoBox()\" value=\"".__('Cancel')."\"></div>";
+                               <button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
+                               <button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
 
                        print "</div>";
                        return;
 
                        print "<div class='dlgButtons'>
                                <div style=\"float : left\">
-                                       <input type='submit' class='button'                     
-                                       onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\">
+                               <button onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+                                       __('Unsubscribe')."</button>
                                </div>
-                               <input type=\"submit\" class=\"button\" 
-                               onclick=\"return feedEditSave()\" value=\"".__('Save')."\">
-                               <input type='submit' class='button'                     
-                               onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+                               <button onclick=\"return feedEditSave()\">".__('Save')."</button>
+                               <button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
                                </div>";
 
                        return;
                }
 
                if ($subop == "add") {
-               
-                       if (!WEB_DEMO_MODE) {
 
-                               $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
-                               $cat_id = db_escape_string($_REQUEST["cat_id"]);
-                               $p_from = db_escape_string($_REQUEST["from"]);
-
-                               /* only read authentication information from POST */
-
-                               $auth_login = db_escape_string(trim($_POST["auth_login"]));
-                               $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
-
-                               if ($p_from != 'tt-rss') {
-                                       print "<html>
-                                               <head>
-                                                       <title>Tiny Tiny RSS</title>
-                                                       <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
-                                               </head>
-                                               <body>
-                                               <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
-                                                       alt=\"Tiny Tiny RSS\"/> 
-                                               <h1>Subscribe to feed...</h1>";
-                               }
+                       $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+                       $cat_id = db_escape_string($_REQUEST["cat_id"]);
+                       $p_from = db_escape_string($_REQUEST["from"]);
 
-                               if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) {
-                                       print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-                               } else {
-                                       print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-                               }
+                       /* only read authentication information from POST */
 
-                               if ($p_from != 'tt-rss') {
-                                       $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
+                       $auth_login = db_escape_string(trim($_POST["auth_login"]));
+                       $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
 
+                       if ($p_from != 'tt-rss') {
+                               print "<html>
+                                       <head>
+                                               <title>Tiny Tiny RSS</title>
+                                               <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
+                                       </head>
+                                       <body>
+                                       <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
+                                               alt=\"Tiny Tiny RSS\"/> 
+                                       <h1>Subscribe to feed...</h1>";
+                       }
 
-                                       $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
+                       $rc = subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass);
+
+                       switch ($rc) {
+                       case 1: 
+                               print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                               break;
+                       case 2:
+                               print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                               break;
+                       case 0:
+                               print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                               break;
+                       }
 
-                                       $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                               feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+                       if ($p_from != 'tt-rss') {
+                               $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
 
-                                       $feed_id = db_fetch_result($result, 0, "id");
 
-                                       print "<p>";
+                               $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
 
-                                       if ($feed_id) {
-                                               print "<form method=\"GET\" style='display: inline' 
-                                                       action=\"$tp_uri\">
-                                                       <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
-                                                       <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
-                                                       <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
-                                                       <input type=\"submit\" value=\"".__("Edit subscription options")."\">
-                                                       </form>";
-                                       }
+                               $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+                                       feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+
+                               $feed_id = db_fetch_result($result, 0, "id");
 
-                                       print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
-                                               <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
-                                               </form></p>";
+                               print "<p>";
 
-                                       print "</body></html>";
-                                       return;
+                               if ($feed_id) {
+                                       print "<form method=\"GET\" style='display: inline' 
+                                               action=\"$tp_uri\">
+                                               <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
+                                               <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
+                                               <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
+                                               <input type=\"submit\" value=\"".__("Edit subscription options")."\">
+                                               </form>";
                                }
 
+                               print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
+                                       <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+                                       </form></p>";
+
+                               print "</body></html>";
+                               return;
                        }
                }
 
                        print "<div class=\"prefGenericAddBox\">
                                <input id=\"fadd_cat\" 
                                        onkeypress=\"return filterCR(event, addFeedCat)\"
-                                       onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
-                                       onchange=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
-                                       size=\"40\">&nbsp;
-                               <input 
-                                       type=\"submit\" class=\"button\" disabled=\"true\" id=\"catadd_submit_btn\"
-                                       onclick=\"javascript:addFeedCat()\" value=\"".__('Create category')."\"></div>";
+                                       size=\"40\">
+                                       <button onclick=\"javascript:addFeedCat()\">".
+                                       __('Create category')."</button></div>";
        
                        $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
                                WHERE owner_uid = ".$_SESSION["uid"]."
 
                        if (db_num_rows($result) != 0) {
 
-                               print "<table width=\"100%\" class=\"prefFeedCatList\" 
-                                       cellspacing=\"0\">";
-
-                               print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-                               ".__('Select:')." 
+                               print   __('Select:')." 
                                        <a href=\"javascript:selectPrefRows('fcat', true)\">".__('All')."</a>,
-                                       <a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>
-                                       </td></tr>";
-
-                               print "</table>";
+                                       <a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>";
 
                                print "<div class=\"prefFeedCatHolder\">";
 
                                print "<p>".__('No feed categories defined.')."</p>";
                        }
 
-                       print "<div style='float : right'>
-                               <input type='submit' class='button'                     
-                               onclick=\"selectTab('feedConfig')\" value=\"".__('Close this window')."\"></div>";
+                       print "<div class='dlgButtons'>
+                               <div style='float : left'>
+                               <button onclick=\"return removeSelectedFeedCats()\">".
+                               __('Remove')."</button>
+                               </div>";
 
-                       print "<div id=\"catOpToolbar\">";
-       
-                       print "
-                               <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"return removeSelectedFeedCats()\" value=\"".__('Remove')."\">";
-       
-                       print "</div>";
+                       print "<button onclick=\"selectTab('feedConfig')\">".
+                               __('Close this window')."</button></div>";
 
                        print "</div>";
 
                        $feed_search = $_SESSION["prefs_feed_search"];
                }
 
-               print "<div class=\"feedEditSearch\">
+               print "<div style='float : right'> 
                        <input id=\"feed_search\" size=\"20\" type=\"search\"
                                onfocus=\"javascript:disableHotkeys();\" 
                                onblur=\"javascript:enableHotkeys();\"
                                onchange=\"javascript:updateFeedList()\" value=\"$feed_search\">
-                       <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\">
+                       <button onclick=\"javascript:updateFeedList()\">".
+                               __('Search')."</button>
                        </div>";
                
-               print "<input onclick=\"javascript:displayDlg('quickAddFeed')\"
-                       type=\"submit\"
-                       class=\"button\" value=\"".__('Subscribe to feed')."\"> ";
+               print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
+                       .__('Subscribe to feed')."</button> ";
 
-               print "<input onclick=\"javascript:editSelectedFeed()\"
-                       type=\"submit\"
-                       class=\"button\" value=\"".__('Edit feeds')."\"> ";
+               print "<button onclick=\"javascript:editSelectedFeed()\">".
+                       __('Edit feeds')."</button> ";
 
                if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-                       print "<input onclick=\"javascript:editFeedCats()\"
-                               type=\"submit\"
-                               class=\"button\" value=\"".__('Edit categories')."\"> ";
+                       print "<button onclick=\"javascript:editFeedCats()\">".
+                               __('Edit categories')."</button> ";
                }
 
-               print "<input onclick=\"javascript:removeSelectedFeeds()\"
-                       type=\"submit\"
-                       class=\"button\" value=\"".__('Unsubscribe')."\"> ";
+               print "<button onclick=\"javascript:removeSelectedFeeds()\">"
+                       .__('Unsubscribe')."</button> ";
 
 /*             print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
                        <option value=\"facDefault\" selected>".__('Other actions...')."</option>";
 
                        print "<p>";
 
-/*                     print "<div id=\"feedOpToolbar\">";
-
-                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-                               print __('Selection:') . " ";
-
-                               print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
-
-                               print " <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
-                                       __('Recategorize')."\">";
-                       }
-                               
-                       print "</div>"; */
-
                } else {
 
                        print "<p>";
                <form   enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
                ".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
                        <input type=\"hidden\" name=\"op\" value=\"Import\">
-                       <input class=\"button\" onclick=\"return validateOpmlImport();\"
-                               type=\"submit\" value=\"".__('Import')."\">
+                       <button onclick=\"return validateOpmlImport();\"
+                               type=\"submit\">".__('Import')."</button>
                                </form></div>";
 
                print "&nbsp;";
 
-               print "<input type=\"submit\" 
-                       class=\"button\" onclick=\"gotoExportOpml()\" 
-                               value=\"".__('Export OPML')."\">";                      
+               print "<button onclick=\"gotoExportOpml()\">".
+                       __('Export OPML')."</button>";
 
 
                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.');
-               print "</p><p> <a class='visibleLinkB' href='javascript:window.navigator.registerContentHandler(" .
+               print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+
+               print "<p";
+
+               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.') . "</a></p>";
+                                                        __('Click here to register this site as a feed reader.') . 
+                               "</button>";
 
+               print "</p>";
 
                print "<h3>".__("Published articles")."</h3>";
 
                
                print "<p>".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."</p>";
 
-               $url_path = article_publish_url($link);
+               print "<button onclick=\"return displayDlg('pubUrl')\">".
+                       __('Display URL')."</button> ";
 
-               print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
-
-               print "<p><input type=\"submit\" onclick=\"return pubRegenKey()\" class=\"button\"
-                       value=\"".__('Generate another link')."\">";
-               /* print " <input type=\"submit\" onclick=\"return pubToClipboard()\" class=\"button\"
-                       value=\"".__('Copy link to clipboard')."\">"; */
-               print "</p>";
 
        }
 
                return $feedctr;
 
        }
+
 ?>