]> git.wh0rd.org - tt-rss.git/blobdiff - classes/dlg.php
move inactiveFeeds and feedsWithErrors to pref-feeds; fix element id collisions
[tt-rss.git] / classes / dlg.php
index 2701a98b29d961bd7ebca098a899f5540ef59a13..d6a3a0fbeb0816c464eb8d7322a78f03b4472123 100644 (file)
@@ -305,15 +305,21 @@ class Dlg extends Handler_Protected {
                print "</form>";
 
                print "<div class=\"dlgButtons\">
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return feedBrowser()\">".__('More feeds')."</button>
-                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>
+                       <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
+
+               if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
+                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return feedBrowser()\">".__('More feeds')."</button>";
+               }
+
+               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>
                        </div>";
 
                //return;
        }
 
        function feedBrowser() {
+               if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
                $browser_search = db_escape_string($_REQUEST["search"]);
 
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
@@ -438,285 +444,6 @@ class Dlg extends Handler_Protected {
                </div>";
        }
 
-       function quickAddFilter() {
-               $active_feed_id = db_escape_string($_REQUEST["param"]);
-
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-filters\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"quiet\" value=\"1\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"add\">";
-               print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"csrf_token\" value=\"".$_SESSION['csrf_token']."\">";
-
-               $result = db_query($this->link, "SELECT id,description
-                       FROM ttrss_filter_types ORDER BY description");
-
-               $filter_types = array();
-
-               while ($line = db_fetch_assoc($result)) {
-                       //array_push($filter_types, $line["description"]);
-                       $filter_types[$line["id"]] = __($line["description"]);
-               }
-
-               print "<div class=\"dlgSec\">".__("Match")."</div>";
-
-               print "<div class=\"dlgSecCont\">";
-
-               print "<span id=\"filterDlg_dateModBox\" style=\"display : none\">";
-
-               $filter_params = array(
-                       "before" => __("before"),
-                       "after" => __("after"));
-
-               print_select_hash("filter_date_modifier", "before",
-                       $filter_params, 'dojoType="dijit.form.Select"');
-
-               print "&nbsp;</span>";
-
-               print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                        required=\"true\" id=\"filterDlg_regExp\"
-                        style=\"font-size : 16px\"
-                        name=\"reg_exp\" value=\"$reg_exp\"/>";
-
-               print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
-               print "&nbsp;<button dojoType=\"dijit.form.Button\"
-                       onclick=\"return filterDlgCheckDate()\">".
-                       __('Check it')."</button>";
-               print "</span>";
-
-               print "<hr/>" .  __("on field") . " ";
-               print_select_hash("filter_type", 1, $filter_types,
-                       'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
-
-               print "<hr/>";
-
-               print __("in") . " ";
-
-               print "<span id='filterDlg_feeds'>";
-               print_feed_select($this->link, "feed_id", $active_feed_id,
-                       'dojoType="dijit.form.FilteringSelect"');
-               print "</span>";
-
-               print "<span id='filterDlg_cats' style='display : none'>";
-               print_feed_cat_select($this->link, "cat_id", $active_cat_id,
-                       'dojoType="dijit.form.FilteringSelect"');
-               print "</span>";
-
-               print "</div>";
-
-               print "<div class=\"dlgSec\">".__("Perform Action")."</div>";
-
-               print "<div class=\"dlgSecCont\">";
-
-               print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
-                       onchange=\"filterDlgCheckAction(this)\">";
-
-               $result = db_query($this->link, "SELECT id,description FROM ttrss_filter_actions
-                       ORDER BY name");
-
-               while ($line = db_fetch_assoc($result)) {
-                       printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
-               }
-
-               print "</select>";
-
-               print "<span id=\"filterDlg_paramBox\" style=\"display : none\">";
-               print " " . __("with parameters:") . " ";
-               print "<input dojoType=\"dijit.form.TextBox\"
-                       id=\"filterDlg_actionParam\"
-                       name=\"action_param\">";
-
-               print_label_select($this->link, "action_param_label", $action_param,
-                'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"');
-
-               print "</span>";
-
-               print "&nbsp;"; // tiny layout hack
-
-               print "</div>";
-
-               print "<div class=\"dlgSec\">".__("Options")."</div>";
-               print "<div class=\"dlgSecCont\">";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
-                               <label for=\"enabled\">".__('Enabled')."</label><hr/>";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
-                       <label for=\"inverse\">".__('Inverse match')."</label><hr/>";
-
-               print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"cat_filter\" id=\"cat_filter\" onchange=\"filterDlgCheckCat(this)\">
-                               <label for=\"cat_filter\">".__('Apply to category')."</label><hr/>";
-
-
-               print "</div>";
-
-               print "<div class=\"dlgButtons\">";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
-                       __('Test')."</button> ";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
-                       __('Create')."</button> ";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".
-                       __('Cancel')."</button>";
-
-               print "</div>";
-       }
-
-       function inactiveFeeds() {
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_qpart = "NOW() - INTERVAL '3 months'";
-               } else {
-                       $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
-               }
-
-               $result = db_query($this->link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
-                               ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
-                       FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
-                               (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
-                                       ttrss_entries.id = ref_id AND
-                                               ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart
-                       AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND
-                               ttrss_user_entries.feed_id = ttrss_feeds.id AND
-                               ttrss_entries.id = ref_id
-                       GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
-                       ORDER BY last_article");
-
-               print "<div class=\"dialogNotice\">" . __("These feeds have not been updated with new content for 3 months (oldest first):") . "</div>";
-
-               print "<div dojoType=\"dijit.Toolbar\">";
-               print "<div dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Select')."</span>";
-               print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-               print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'all')\"
-                       dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-               print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'none')\"
-                       dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-               print "</div></div>";
-               print "</div>"; #toolbar
-
-               print "<div class=\"inactiveFeedHolder\">";
-
-               print "<table width=\"100%\" cellspacing=\"0\" id=\"prefInactiveFeedList\">";
-
-               $lnum = 1;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-                       $feed_id = $line["id"];
-                       $this_row_id = "id=\"FUPDD-$feed_id\"";
-
-                       # class needed for selectTableRows()
-                       print "<tr class=\"placeholder\" $this_row_id>";
-
-                       $edit_title = htmlspecialchars($line["title"]);
-
-                       # id needed for selectTableRows()
-                       print "<td width='5%' align='center'><input
-                               onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
-                               type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
-                       print "<td>";
-
-                       print "<a class=\"visibleLink\" href=\"#\" ".
-                               "title=\"".__("Click to edit feed")."\" ".
-                               "onclick=\"editFeed(".$line["id"].")\">".
-                               htmlspecialchars($line["title"])."</a>";
-
-                       print "</td><td class=\"insensitive\" align='right'>";
-                       print make_local_datetime($this->link, $line['last_article'], false);
-                       print "</td>";
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               print "</table>";
-               print "</div>";
-
-               print "<div class='dlgButtons'>";
-               print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
-                       .__('Unsubscribe from selected feeds')."</button> ";
-               print "</div>";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-
-       }
-
-       function feedsWithErrors() {
-               print "<div class=\"dialogNotice\">" . __("These feeds have not been updated because of errors:") . "</div>";
-
-               $result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url
-               FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
-
-               print "<div dojoType=\"dijit.Toolbar\">";
-               print "<div dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Select')."</span>";
-               print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-               print "<div onclick=\"selectTableRows('prefErrorFeedList', 'all')\"
-                       dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-               print "<div onclick=\"selectTableRows('prefErrorFeedList', 'none')\"
-                       dojoType=\"dijit.MenuItem\">".__('None')."</div>";
-               print "</div></div>";
-               print "</div>"; #toolbar
-
-               print "<div class=\"inactiveFeedHolder\">";
-
-               print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
-
-               $lnum = 1;
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
-                       $feed_id = $line["id"];
-                       $this_row_id = "id=\"FUPDD-$feed_id\"";
-
-                       # class needed for selectTableRows()
-                       print "<tr class=\"placeholder\" $this_row_id>";
-
-                       $edit_title = htmlspecialchars($line["title"]);
-
-                       # id needed for selectTableRows()
-                       print "<td width='5%' align='center'><input
-                               onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
-                               type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
-                       print "<td>";
-
-                       print "<a class=\"visibleLink\" href=\"#\" ".
-                               "title=\"".__("Click to edit feed")."\" ".
-                               "onclick=\"editFeed(".$line["id"].")\">".
-                               htmlspecialchars($line["title"])."</a>: ";
-
-                       print "<span class=\"insensitive\">";
-                       print htmlspecialchars($line["last_error"]);
-                       print "</span>";
-
-                       print "</td>";
-                       print "</tr>";
-
-                       ++$lnum;
-               }
-
-               print "</table>";
-               print "</div>";
-
-               print "<div class='dlgButtons'>";
-               print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
-                       .__('Unsubscribe from selected feeds')."</button> ";
-               print "</div>";
-
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').hide()\">".
-                       __('Close this window')."</button>";
-
-               print "</div>";
-       }
-
        function editArticleTags() {
 
                print __("Tags for this article (separated by commas):")."<br>";
@@ -899,7 +626,7 @@ class Dlg extends Handler_Protected {
                $details = "http://tt-rss.org/redmine/versions/show/$id";
                $download = "http://tt-rss.org/#Download";
 
-               print "<p align='center'>".__("You can try updating automatically using update.php")."</p>";
+               print "<p align='center'>".__("You can update using built-in updater in the Preferences or by using update.php")."</p>";
 
                print "<div style='text-align : center'>";
                print "<button dojoType=\"dijit.form.Button\"
@@ -1043,8 +770,7 @@ class Dlg extends Handler_Protected {
                                        placeHolder=\"".__("Password")."\"
                                        dojoType=\"dijit.form.TextBox\" type='password'
                                        style=\"width : 10em;\" name='pass'\">".
-                               " <p class='insensitive'>".__("OAuth will be used automatically for Twitter feeds.")."</p>
-                               </div>";
+                               "</div>";
 
                print "</td></tr><tr><td colspan='2'>";