diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/article.php | 1 | ||||
-rw-r--r-- | classes/dlg.php | 1 | ||||
-rw-r--r-- | classes/feeds.php | 22 | ||||
-rw-r--r-- | classes/handler/public.php | 10 | ||||
-rw-r--r-- | classes/pref/feeds.php | 8 | ||||
-rw-r--r-- | classes/pref/filters.php | 19 | ||||
-rw-r--r-- | classes/pref/prefs.php | 1 | ||||
-rw-r--r-- | classes/rpc.php | 13 |
8 files changed, 19 insertions, 56 deletions
diff --git a/classes/article.php b/classes/article.php index 398132d12..f796bf630 100644 --- a/classes/article.php +++ b/classes/article.php @@ -30,7 +30,6 @@ class Article extends Handler_Protected { $id = $this->dbh->escape_string($_REQUEST["id"]); $cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"])); $mode = $this->dbh->escape_string($_REQUEST["mode"]); - $omode = $this->dbh->escape_string($_REQUEST["omode"]); // in prefetch mode we only output requested cids, main article // just gets marked as read (it already exists in client cache) diff --git a/classes/dlg.php b/classes/dlg.php index d1b5745e7..25a194bed 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -16,7 +16,6 @@ class Dlg extends Handler_Protected { print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "</p>"; print "<div class=\"prefFeedOPMLHolder\">"; - $owner_uid = $_SESSION["uid"]; $this->dbh->query("BEGIN"); diff --git a/classes/feeds.php b/classes/feeds.php index 8d4c052dc..ea3967911 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -13,12 +13,6 @@ class Feeds extends Handler_Protected { $feed_id, $is_cat, $search, $search_mode, $view_mode, $error, $feed_last_updated) { - $page_prev_link = "viewFeedGoPage(-1)"; - $page_next_link = "viewFeedGoPage(1)"; - $page_first_link = "viewFeedGoPage(0)"; - - $catchup_page_link = "catchupPage()"; - $catchup_feed_link = "catchupCurrentFeed()"; $catchup_sel_link = "catchupSelection()"; $archive_sel_link = "archiveSelection()"; @@ -292,8 +286,6 @@ class Feeds extends Handler_Protected { $num_unread = 0; $cur_feed_title = ''; - $fresh_intl = get_pref("FRESH_ARTICLE_MAX_AGE") * 60 * 60; - if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); $expand_cdm = get_pref('CDM_EXPANDED'); @@ -557,7 +549,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\" id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>"; - $reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">"; + $reply['content'] .= "<div class=\"cdmHeader\">"; $reply['content'] .= "<div style=\"vertical-align : middle\">"; $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\" @@ -811,8 +803,6 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info); - $omode = $this->dbh->escape_string($_REQUEST["omode"]); - $feed = $this->dbh->escape_string($_REQUEST["feed"]); $method = $this->dbh->escape_string($_REQUEST["m"]); $view_mode = $this->dbh->escape_string($_REQUEST["view_mode"]); @@ -905,7 +895,7 @@ class Feeds extends Handler_Protected { //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; - $returned_feed = $ret[2]; + /* $returned_feed = $ret[2]; */ $disable_cache = $ret[3]; $vgroup_last_feed = $ret[4]; @@ -1085,20 +1075,18 @@ class Feeds extends Handler_Protected { print " <select dojoType=\"dijit.form.Select\" name=\"limit\" onchange=\"dijit.byId('feedBrowserDlg').update()\">"; foreach (array(25, 50, 100, 200) as $l) { - $issel = ($l == $limit) ? "selected=\"1\"" : ""; - print "<option $issel value=\"$l\">$l</option>"; + //$issel = ($l == $limit) ? "selected=\"1\"" : ""; + print "<option value=\"$l\">$l</option>"; } print "</select> "; print "</div>"; - $owner_uid = $_SESSION["uid"]; - require_once "feedbrowser.php"; print "<ul class='browseFeedList' id='browseFeedList'>"; - print make_feed_browser($search, 25); + print make_feed_browser("", 25); print "</ul>"; print "<div align='center'> diff --git a/classes/handler/public.php b/classes/handler/public.php index 32c25b511..383654df3 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -67,7 +67,7 @@ class Handler_Public extends Handler { $result = $qfh_ret[0]; $feed_title = htmlspecialchars($qfh_ret[1]); $feed_site_url = $qfh_ret[2]; - $last_error = $qfh_ret[3]; + /* $last_error = $qfh_ret[3]; */ $feed_self_url = get_self_url_prefix() . "/public.php?op=rss&id=$feed&key=" . @@ -404,17 +404,17 @@ class Handler_Public extends Handler { } function updateTask() { - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op); + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false); } function housekeepingTask() { - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", $op); + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false); } function globalUpdateFeeds() { RPC::updaterandomfeed_real($this->dbh); - PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op); + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false); } function sharepopup() { @@ -692,7 +692,7 @@ class Handler_Public extends Handler { function subscribe2() { $feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"])); $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]); - $from = $this->dbh->escape_string($_REQUEST["from"]); + /* $from = $this->dbh->escape_string($_REQUEST["from"]); */ $feed_urls = array(); /* only read authentication information from POST */ diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 4c51d220c..7d541ded1 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -395,7 +395,7 @@ class Pref_Feeds extends Handler_Protected { # print_r($data['items']); if (is_array($data) && is_array($data['items'])) { - $cat_order_id = 0; +# $cat_order_id = 0; $data_map = array(); $root_item = false; @@ -962,7 +962,7 @@ class Pref_Feeds extends Handler_Protected { if (!$batch) { - $result = $this->dbh->query("UPDATE ttrss_feeds SET + $this->dbh->query("UPDATE ttrss_feeds SET $category_qpart title = '$feed_title', feed_url = '$feed_link', update_interval = '$upd_intl', @@ -1573,8 +1573,6 @@ class Pref_Feeds extends Handler_Protected { # 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\" @@ -1639,8 +1637,6 @@ class Pref_Feeds extends Handler_Protected { # 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\" diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 43da6d04d..2e1e841fc 100644 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -88,7 +88,6 @@ class Pref_Filters extends Handler_Protected { $result = $qfh_ret[0]; - $articles = array(); $found = 0; print __("Articles matching this filter:"); @@ -103,9 +102,6 @@ class Pref_Filters extends Handler_Protected { $line = $p->hook_query_headlines($line, 100); } - $entry_timestamp = strtotime($line["updated"]); - $entry_tags = get_article_tags($line["id"], $_SESSION["uid"]); - $content_preview = $line["content_preview"]; if ($line["feed_title"]) @@ -174,24 +170,11 @@ class Pref_Filters extends Handler_Protected { owner_uid = ".$_SESSION["uid"]." ORDER BY order_id, title"); - $action_id = -1; $folder = array(); $folder['items'] = array(); while ($line = $this->dbh->fetch_assoc($result)) { - /* if ($action_id != $line["action_id"]) { - if (count($folder['items']) > 0) { - array_push($root['items'], $folder); - } - - $folder = array(); - $folder['id'] = $line["action_id"]; - $folder['name'] = __($line["action_name"]); - $folder['items'] = array(); - $action_id = $line["action_id"]; - } */ - $name = $this->getFilterName($line["id"]); $match_ok = false; @@ -471,7 +454,7 @@ class Pref_Filters extends Handler_Protected { $inverse = checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["inverse"])); $title = $this->dbh->escape_string($_REQUEST["title"]); - $result = $this->dbh->query("UPDATE ttrss_filters2 SET enabled = $enabled, + $this->dbh->query("UPDATE ttrss_filters2 SET enabled = $enabled, match_any_rule = $match_any_rule, inverse = $inverse, title = '$title' diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 3e7d467fa..1fb40a0d6 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -887,7 +887,6 @@ class Pref_Prefs extends Handler_Protected { if (!$otp_enabled) { $secret = $base32->encode(sha1($this->dbh->fetch_result($result, 0, "salt"))); - $topt = new \OTPHP\TOTP($secret); print QRcode::png("otpauth://totp/".urlencode($login). "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS")); diff --git a/classes/rpc.php b/classes/rpc.php index 7d55e6ba8..b4de44a74 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -95,7 +95,7 @@ class RPC extends Handler_Protected { WHERE orig_feed_id = '$id') = 0 AND id = '$id' AND owner_uid = ".$_SESSION["uid"]); - $rc = $this->dbh->affected_rows($result); + $this->dbh->affected_rows($result); } } @@ -138,7 +138,7 @@ class RPC extends Handler_Protected { $mark = "false"; } - $result = $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark, + $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark, last_marked = NOW() WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); @@ -148,8 +148,8 @@ class RPC extends Handler_Protected { function delete() { $ids = $this->dbh->escape_string($_REQUEST["ids"]); - $result = $this->dbh->query("DELETE FROM ttrss_user_entries - WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); + $this->dbh->query("DELETE FROM ttrss_user_entries + WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); purge_orphans(); @@ -258,7 +258,6 @@ class RPC extends Handler_Protected { function publ() { $pub = $_REQUEST["pub"]; $id = $this->dbh->escape_string($_REQUEST["id"]); - $note = trim(strip_tags($this->dbh->escape_string($_REQUEST["note"]))); if ($pub == "1") { $pub = "true"; @@ -266,7 +265,7 @@ class RPC extends Handler_Protected { $pub = "false"; } - $result = $this->dbh->query("UPDATE ttrss_user_entries SET + $this->dbh->query("UPDATE ttrss_user_entries SET published = $pub, last_published = NOW() WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); @@ -620,7 +619,7 @@ class RPC extends Handler_Protected { $p = new Publisher(PUBSUBHUBBUB_HUB); - $pubsub_result = $p->publish_update($rss_link); + /* $pubsub_result = */ $p->publish_update($rss_link); } } |