remove some unused code reported by phpmd

diff --git a/classes/article.php b/classes/article.php
index 398132d1200b5b1f412f0e9dcdb8cf2984a7bcae..f796bf6302b74417eeb5a2f36f8ae687fe60c330 100644 (file)
--- 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 d1b5745e70a5f44341f20fa3e9828b71123738af..25a194bed5546aef134ec41059c77b10aa9bda69 100644 (file)
--- 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 8d4c052dc9e270063d6c001ac47804e961e1113c..ea3967911f1a96bbccd807f5d38d0ed4e1dc71bc 100644 (file)
--- 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 32c25b511d32d2bddac2b2c073a62900768e0f17..383654df3f7ac5e77c3d436f41c307c3d2c2036f 100644 (file)
--- 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 4c51d220c2303cae87fb7cb64f8c2f1f43bfc0ce..7d541ded183d2185746139c963edd765bc2c6dd8 100644 (file)
--- 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 43da6d04dd996c5fb229f7eef2189b91b3111896..2e1e841fc48524db6b812065f7cb0f9b3f7978ee 100644 (file)
--- 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 3e7d467fa44753c2a74bc69f80e22df6d3422b71..1fb40a0d669f8210786a3490925243262568bae0 100644 (file)
--- 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 7d55e6ba8a8b36c013117082af52b17a4e15fa2d..b4de44a74ebd298d6dc05fde88c9a6ef9b6be332 100644 (file)
--- 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);
                }
        }
 

diff --git a/include/digest.php b/include/digest.php
index 4427936e58cab7893f1233db08102bba1c1705d5..71ee6d2036e4affed3f099d263adf59c3f5d2291 100644 (file)
--- a/include/digest.php
+++ b/include/digest.php
@@ -127,8 +127,6 @@
                        ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
                        LIMIT $limit");
 
-               $cur_feed_title = "";
-
                $headlines_count = db_num_rows($result);
 
                $headlines = array();

diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index d35f1ebf85ca898ed55a0cd38d1ad2e77b046ef0..8907aa9e4ece796ca39b10f3f7611ea650eb5fa9 100644 (file)
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -63,7 +63,7 @@
                                htmlspecialchars($line["title"])."</span></a>";
 
                                $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/pub_set.svg'
+                                                       href=\"$feed_url\"><img src='images/pub_set.png'
                                                        style='vertical-align : middle'></a>";
 
                                $rv .= "<li>$check_box $feed_url $site_url".
@@ -72,7 +72,6 @@
                        } else if ($mode == 2) {
                                $feed_url = htmlspecialchars($line["feed_url"]);
                                $site_url = htmlspecialchars($line["site_url"]);
-                               $title = htmlspecialchars($line["title"]);
 
                                $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
                                                        type=\"checkbox\">";
@@ -92,7 +91,7 @@
                                htmlspecialchars($line["title"])."</span></a>";
 
                                $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/pub_set.svg'
+                                                       href=\"$feed_url\"><img src='images/pub_set.png'
                                                        style='vertical-align : middle'></a>";
 
 

diff --git a/include/functions.php b/include/functions.php
index 8e8832a58a2dedb3200c9682e9b64fd6d48fb020..48f6218e1e92f9d781f960eefd90036e9ba13b4f 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1613,7 +1613,6 @@
                                AND ttrss_counters_cache.feed_id = id";
 
                $result = db_query($query);
-               $fctrs_modified = false;
 
                while ($line = db_fetch_assoc($result)) {
 
@@ -2922,7 +2921,6 @@
 
                                        $fragment = $doc->createDocumentFragment();
                                        $text = $child->textContent;
-                                       $stubs = array();
 
                                        while (($pos = mb_stripos($text, $word)) !== false) {
                                                $fragment->appendChild(new DomText(mb_substr($text, 0, $pos)));
@@ -3104,19 +3102,16 @@
        }
 
        function format_warning($msg, $id = "") {
-               global $link;
                return "<div class=\"warning\" id=\"$id\">
                        <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
        }
 
        function format_notice($msg, $id = "") {
-               global $link;
                return "<div class=\"notice\" id=\"$id\">
                        <span><img src=\"images/information.png\"></span><span>$msg</span></div>";
        }
 
        function format_error($msg, $id = "") {
-               global $link;
                return "<div class=\"error\" id=\"$id\">
                        <span><img src=\"images/alert.png\"></span><span>$msg</span></div>";
        }
@@ -3225,8 +3220,6 @@
 
                        $line = db_fetch_assoc($result);
 
-                       $tag_cache = $line["tag_cache"];
-
                        $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
                        unset($line["tag_cache"]);
 
@@ -3382,7 +3375,7 @@
                                        $rv['content'] .= "&nbsp;";
 
                                        $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                       $rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.svg'></a>";
+                                       $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
 
                                        $rv['content'] .= "</div>";
                                }
@@ -4268,9 +4261,9 @@
                        $fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
                        curl_close($curl);
 
-                       $oline='';
-                       foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
-                       $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
+#                      $oline='';
+#                      foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
+#                      $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
 #                      $handle = @fopen('./curl.error.log', 'a');
 #                      fwrite($handle, $line);
                        return FALSE;

diff --git a/include/labels.php b/include/labels.php
index 6e0bfcb987548a3806c4fa1232fea457b78a8f9c..4149864b3b66a41853cffa1214337c9cca994385 100644 (file)
--- a/include/labels.php
+++ b/include/labels.php
@@ -109,7 +109,7 @@
 
                if (!$label_id) return;
 
-               $result = db_query(
+               db_query(
                        "DELETE FROM ttrss_user_labels2
                        WHERE
                                label_id = '$label_id' AND