diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/api.php | 10 | ||||
-rw-r--r-- | classes/article.php | 2 | ||||
-rw-r--r-- | classes/auth/base.php | 6 | ||||
-rw-r--r-- | classes/db/prefs.php | 3 | ||||
-rwxr-xr-x | classes/feeds.php | 14 | ||||
-rw-r--r-- | classes/logger/syslog.php | 3 | ||||
-rw-r--r-- | classes/opml.php | 23 | ||||
-rw-r--r-- | classes/plugin.php | 3 | ||||
-rw-r--r-- | classes/pluginhost.php | 2 | ||||
-rwxr-xr-x | classes/pref/filters.php | 2 | ||||
-rw-r--r-- | classes/pref/users.php | 1 | ||||
-rwxr-xr-x | classes/rpc.php | 2 |
12 files changed, 37 insertions, 34 deletions
diff --git a/classes/api.php b/classes/api.php index c43a78ebe..895ea5261 100644 --- a/classes/api.php +++ b/classes/api.php @@ -1,5 +1,4 @@ <?php - class API extends Handler { const API_LEVEL = 14; @@ -309,7 +308,7 @@ class API extends Handler { get_feed_access_key(-2, false); $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB); - $pubsub_result = $p->publish_update($rss_link); + $p->publish_update($rss_link); } } @@ -418,7 +417,7 @@ class API extends Handler { $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]); if (!ini_get("open_basedir")) { - update_rss_feed($feed_id, true); + update_rss_feed($feed_id); } $this->wrap(self::STATUS_OK, array("status" => "OK")); @@ -658,6 +657,9 @@ class API extends Handler { return $feeds; } + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ static function api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, @@ -677,7 +679,7 @@ class API extends Handler { if (!$cache_images && time() - $last_updated > 120) { include "rssfuncs.php"; - update_rss_feed($feed_id, true, true); + update_rss_feed($feed_id, true); } else { db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01' WHERE id = '$feed_id'"); diff --git a/classes/article.php b/classes/article.php index 4126843af..2e7a05e0b 100644 --- a/classes/article.php +++ b/classes/article.php @@ -361,7 +361,7 @@ class Article extends Handler_Protected { $labels = get_article_labels($id, $_SESSION["uid"]); array_push($reply["info-for-headlines"], - array("id" => $id, "labels" => format_article_labels($labels, $id))); + array("id" => $id, "labels" => format_article_labels($labels))); } } diff --git a/classes/auth/base.php b/classes/auth/base.php index 69acd0985..26b6e4ab7 100644 --- a/classes/auth/base.php +++ b/classes/auth/base.php @@ -6,10 +6,16 @@ class Auth_Base { $this->dbh = Db::get(); } + /** + * @SuppressWarnings(unused) + */ function check_password($owner_uid, $password) { return false; } + /** + * @SuppressWarnings(unused) + */ function authenticate($login, $password) { return false; } diff --git a/classes/db/prefs.php b/classes/db/prefs.php index 3e92bb89b..0d4ebc2d2 100644 --- a/classes/db/prefs.php +++ b/classes/db/prefs.php @@ -23,8 +23,6 @@ class Db_Prefs { } function cache() { - $profile = false; - $user_id = $_SESSION["uid"]; @$profile = $_SESSION["profile"]; @@ -129,7 +127,6 @@ class Db_Prefs { @$profile = $_SESSION["profile"]; } else { $user_id = sprintf("%d", $user_id); - $prefs_cache = false; } if ($profile) { diff --git a/classes/feeds.php b/classes/feeds.php index 48c4ad199..4c4972d76 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -13,7 +13,7 @@ class Feeds extends Handler_Protected { private function format_headline_subtoolbar($feed_site_url, $feed_title, $feed_id, $is_cat, $search, - $view_mode, $error, $feed_last_updated) { + $error, $feed_last_updated) { $catchup_sel_link = "catchupSelection()"; @@ -153,7 +153,7 @@ class Feeds extends Handler_Protected { } private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, - $next_unread_feed, $offset, $vgr_last_feed = false, + $offset, $vgr_last_feed = false, $override_order = false, $include_children = false, $check_first_id = false, $skip_first_id_check = false) { @@ -203,7 +203,7 @@ class Feeds extends Handler_Protected { if (!$cache_images && time() - $last_updated > 120) { include "rssfuncs.php"; - update_rss_feed($feed, true, true); + update_rss_feed($feed, true); } else { $this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01' WHERE id = '$feed'"); @@ -306,7 +306,7 @@ class Feeds extends Handler_Protected { $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url, $feed_title, - $feed, $cat_view, $search, $view_mode, + $feed, $cat_view, $search, $last_error, $last_updated); $headlines_count = is_numeric($result) ? 0 : $this->dbh->num_rows($result); @@ -361,7 +361,7 @@ class Feeds extends Handler_Protected { if (!is_array($labels)) $labels = get_article_labels($id); $labels_str = "<span class=\"HLLCTR-$id\">"; - $labels_str .= format_article_labels($labels, $id); + $labels_str .= format_article_labels($labels); $labels_str .= "</span>"; if (count($topmost_article_ids) < 3) { @@ -937,7 +937,7 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) $timing_info = print_checkpoint("04", $timing_info); $ret = $this->format_headlines_list($feed, $method, - $view_mode, $limit, $cat_view, $next_unread_feed, $offset, + $view_mode, $limit, $cat_view, $offset, $vgroup_last_feed, $override_order, true, $check_first_id, $skip_first_id_check); //$topmost_article_ids = $ret[0]; @@ -1231,7 +1231,7 @@ class Feeds extends Handler_Protected { if ($do_update) { include "rssfuncs.php"; - update_rss_feed($feed_id, true, true); + update_rss_feed($feed_id, true); } ?></pre> diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php index b8b5260a0..044160601 100644 --- a/classes/logger/syslog.php +++ b/classes/logger/syslog.php @@ -1,6 +1,9 @@ <?php class Logger_Syslog { + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ function log_error($errno, $errstr, $file, $line, $context) { switch ($errno) { diff --git a/classes/opml.php b/classes/opml.php index 04516dde4..0ad5ddf3c 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -251,7 +251,7 @@ class Opml extends Handler_Protected { // Import - private function opml_import_feed($doc, $node, $cat_id, $owner_uid) { + private function opml_import_feed($node, $cat_id, $owner_uid) { $attrs = $node->attributes; $feed_title = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250)); @@ -284,7 +284,7 @@ class Opml extends Handler_Protected { } } - private function opml_import_label($doc, $node, $owner_uid) { + private function opml_import_label($node, $owner_uid) { $attrs = $node->attributes; $label_name = $this->dbh->escape_string($attrs->getNamedItem('label-name')->nodeValue); @@ -301,7 +301,7 @@ class Opml extends Handler_Protected { } } - private function opml_import_preference($doc, $node, $owner_uid) { + private function opml_import_preference($node) { $attrs = $node->attributes; $pref_name = $this->dbh->escape_string($attrs->getNamedItem('pref-name')->nodeValue); @@ -315,7 +315,7 @@ class Opml extends Handler_Protected { } } - private function opml_import_filter($doc, $node, $owner_uid) { + private function opml_import_filter($node) { $attrs = $node->attributes; $filter_type = $this->dbh->escape_string($attrs->getNamedItem('filter-type')->nodeValue); @@ -386,8 +386,6 @@ class Opml extends Handler_Protected { } private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) { - $body = $doc->getElementsByTagName('body'); - $default_cat_id = (int) get_feed_category('Imported feeds', false); if ($root_node) { @@ -442,16 +440,16 @@ class Opml extends Handler_Protected { switch ($cat_title) { case "tt-rss-prefs": - $this->opml_import_preference($doc, $node, $owner_uid); + $this->opml_import_preference($node); break; case "tt-rss-labels": - $this->opml_import_label($doc, $node, $owner_uid); + $this->opml_import_label($node, $owner_uid); break; case "tt-rss-filters": - $this->opml_import_filter($doc, $node, $owner_uid); + $this->opml_import_filter($node); break; default: - $this->opml_import_feed($doc, $node, $dst_cat_id, $owner_uid); + $this->opml_import_feed($node, $dst_cat_id, $owner_uid); } } } @@ -461,19 +459,14 @@ class Opml extends Handler_Protected { function opml_import($owner_uid) { if (!$owner_uid) return; - $debug = isset($_REQUEST["debug"]); $doc = false; -# if ($debug) $doc = DOMDocument::load("/tmp/test.opml"); - if ($_FILES['opml_file']['error'] != 0) { print_error(T_sprintf("Upload failed with error code %d", $_FILES['opml_file']['error'])); return; } - $tmp_file = false; - if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) { $tmp_file = tempnam(CACHE_DIR . '/upload', 'opml'); diff --git a/classes/plugin.php b/classes/plugin.php index 09204098b..5041de0c4 100644 --- a/classes/plugin.php +++ b/classes/plugin.php @@ -22,6 +22,9 @@ class Plugin { return array(); } + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ function is_public_method($method) { return false; } diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 3c2d7931e..48ef43e0a 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -288,7 +288,7 @@ class PluginHost { } } - function load_data($force = false) { + function load_data() { if ($this->owner_uid) { $result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage WHERE owner_uid = '".$this->owner_uid."'"); diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 5629f530c..f3836d8e1 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -130,7 +130,7 @@ class Pref_Filters extends Handler_Protected { while ($line = db_fetch_assoc($result)) { $rc = get_article_filters(array($filter), $line['title'], $line['content'], $line['link'], - false, $line['author'], explode(",", $line['tag_cache'])); + $line['author'], explode(",", $line['tag_cache'])); if (count($rc) > 0) { diff --git a/classes/pref/users.php b/classes/pref/users.php index f211a8f2f..215f05646 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -251,7 +251,6 @@ class Pref_Users extends Handler_Protected { $login = db_fetch_result($result, 0, "login"); $email = db_fetch_result($result, 0, "email"); - $salt = db_fetch_result($result, 0, "salt"); $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $tmp_user_pwd = make_password(8); diff --git a/classes/rpc.php b/classes/rpc.php index ca8ce39ad..008ed876a 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -453,7 +453,7 @@ class RPC extends Handler_Protected { $search_query = $this->dbh->escape_string($_REQUEST['search_query']); $search_lang = $this->dbh->escape_string($_REQUEST['search_lang']); - catchup_feed($feed_id, $is_cat, false, false, $mode, [$search_query, $search_lang]); + catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]); print json_encode(array("message" => "UPDATE_COUNTERS")); } |