public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:15:55 +00:00
Code Issues Releases Wiki Activity

update phpmd ruleset to use (subset) of cleancode

Browse Source 
fix various minor issues reported by static analysis
remove redundant php closing tag from several more files
This commit is contained in:
Andrew Dolgov
2017-04-26 20:57:36 +03:00
parent ea79a0e033
commit 21ce7d9ec0
53 changed files with 138 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/af_comics/af_comics_template.php
View File

@@ -6,9 +6,8 @@ class Af_Comics_Template extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
//$owner_uid = $article["owner_uid"];
return false;
}
}
?>
}

3
plugins/af_comics/filter_base.php
View File

@@ -2,5 +2,4 @@
abstract class Af_ComicFilter {
public abstract function supported();
public abstract function process(&$article);
}
?>
}

10
plugins/af_comics/filters/af_comics_cad.php
View File

@@ -6,17 +6,12 @@ class Af_Comics_Cad extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
if (strpos($article["link"], "cad-comic.com/cad/") !== FALSE) {
if (strpos($article["title"], "News:") === FALSE) {
$doc = new DOMDocument();
@$doc->loadHTML(fetch_file_contents($article["link"]));
$basenode = false;
if ($doc) {
if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('(//img[contains(@src, "/comics/cad-")])')->item(0);
@@ -32,5 +27,4 @@ class Af_Comics_Cad extends Af_ComicFilter {
return false;
}
}
?>
}

10
plugins/af_comics/filters/af_comics_comicclass.php
View File

@@ -6,8 +6,6 @@ class Af_Comics_ComicClass extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
if (strpos($article["guid"], "loadingartist.com") !== FALSE) {
// lol at people who block clients by user agent
@@ -18,11 +16,8 @@ class Af_Comics_ComicClass extends Af_ComicFilter {
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
$doc = new DOMDocument();
@$doc->loadHTML($res);
$basenode = false;
if ($doc) {
if (@$doc->loadHTML($res)) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//div[@class="comic"]')->item(0);
@@ -36,5 +31,4 @@ class Af_Comics_ComicClass extends Af_ComicFilter {
return false;
}
}
?>
}

10
plugins/af_comics/filters/af_comics_comicpress.php
View File

@@ -7,8 +7,6 @@ class Af_Comics_ComicPress extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
if (strpos($article["guid"], "bunicomic.com") !== FALSE ||
strpos($article["guid"], "buttersafe.com") !== FALSE ||
strpos($article["guid"], "extrafabulouscomics.com") !== FALSE ||
@@ -23,11 +21,8 @@ class Af_Comics_ComicPress extends Af_ComicFilter {
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
$doc = new DOMDocument();
@$doc->loadHTML($res);
$basenode = false;
if ($doc) {
if (@$doc->loadHTML($res)) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//div[@id="comic"]')->item(0);
@@ -41,5 +36,4 @@ class Af_Comics_ComicPress extends Af_ComicFilter {
return false;
}
}
?>
}

9
plugins/af_comics/filters/af_comics_darklegacy.php
View File

@@ -6,7 +6,6 @@ class Af_Comics_DarkLegacy extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
if (strpos($article["guid"], "darklegacycomics.com") !== FALSE) {
@@ -20,11 +19,8 @@ class Af_Comics_DarkLegacy extends Af_ComicFilter {
$res = $fetch_last_error_content;
$doc = new DOMDocument();
@$doc->loadHTML($res);
$basenode = false;
if ($doc) {
if (@$doc->loadHTML($res)) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//div[@class="comic"]')->item(0);
@@ -39,5 +35,4 @@ class Af_Comics_DarkLegacy extends Af_ComicFilter {
return false;
}
}
?>
}

22
plugins/af_comics/filters/af_comics_dilbert.php
View File

@@ -19,30 +19,11 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
$doc = new DOMDocument();
@$doc->loadHTML($res);
$basenode = false;
if ($doc) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//img[contains(@class, "img-comic")]')->item(0);
/* $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
$matches = array();
foreach ($entries as $entry) {
if (preg_match("/dyn\/str_strip\/.*strip\.gif$/", $entry->getAttribute("src"), $matches)) {
$entry->setAttribute("src",
rewrite_relative_url("http://dilbert.com/",
$matches[0]));
$basenode = $entry;
break;
}
} */
if ($basenode) {
$article["content"] = $doc->saveXML($basenode);
}
@@ -53,5 +34,4 @@ class Af_Comics_Dilbert extends Af_ComicFilter {
return false;
}
}
?>
}

9
plugins/af_comics/filters/af_comics_explosm.php
View File

@@ -6,16 +6,12 @@ class Af_Comics_Explosm extends Af_ComicFilter {
}
function process(&$article) {
$owner_uid = $article["owner_uid"];
if (strpos($article["link"], "explosm.net/comics") !== FALSE) {
$doc = new DOMDocument();
@$doc->loadHTML(fetch_file_contents($article["link"]));
$basenode = false;
if ($doc) {
if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('(//img[@id="main-comic"])')->item(0);
@@ -29,5 +25,4 @@ class Af_Comics_Explosm extends Af_ComicFilter {
return false;
}
}
?>
}

19
plugins/af_comics/filters/af_comics_pa.php
View File

@@ -8,16 +8,13 @@ class Af_Comics_Pa extends Af_ComicFilter {
function process(&$article) {
if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
if ($debug_enabled) {
/*if ($debug_enabled) {
_debug("af_pennyarcade: Processing comic");
}
}*/
$doc = new DOMDocument();
$doc->loadHTML(fetch_file_contents($article["link"]));
$basenode = false;
if ($doc) {
if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('(//div[@id="comicFrame"])')->item(0);
@@ -30,13 +27,12 @@ class Af_Comics_Pa extends Af_ComicFilter {
}
if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
if ($debug_enabled) {
/*if ($debug_enabled) {
_debug("af_pennyarcade: Processing news post");
}
}*/
$doc = new DOMDocument();
$doc->loadHTML(fetch_file_contents($article["link"]));
if ($doc) {
if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXPath($doc);
$entries = $xpath->query('(//div[@class="post"])');
@@ -75,5 +71,4 @@ class Af_Comics_Pa extends Af_ComicFilter {
return false;
}
}
?>
}

6
plugins/af_comics/filters/af_comics_pvp.php
View File

@@ -13,9 +13,8 @@ class Af_Comics_Pvp extends Af_ComicFilter {
"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
$doc = new DOMDocument();
@$doc->loadHTML($res);
if ($doc) {
if (@$doc->loadHTML($res)) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//section[@class="comic-art"]')->item(0);
@@ -29,5 +28,4 @@ class Af_Comics_Pvp extends Af_ComicFilter {
return false;
}
}
?>
}

8
plugins/af_comics/filters/af_comics_tfd.php
View File

@@ -15,11 +15,8 @@ class Af_Comics_Tfd extends Af_ComicFilter {
if (!$res) return $article;
$doc = new DOMDocument();
@$doc->loadHTML(fetch_file_contents($article["link"]));
$basenode = false;
if ($doc) {
if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXPath($doc);
$basenode = $xpath->query('//img[contains(@src, ".gif")]')->item(0);
@@ -32,5 +29,4 @@ class Af_Comics_Tfd extends Af_ComicFilter {
return false;
}
}
?>
}

8
plugins/af_comics/filters/af_comics_twp.php
View File

@@ -10,11 +10,8 @@ class Af_Comics_Twp extends Af_ComicFilter {
if (strpos($article["link"], "threewordphrase.com") !== FALSE) {
$doc = new DOMDocument();
@$doc->loadHTML(fetch_file_contents($article["link"]));
$basenode = false;
if ($doc) {
if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
$xpath = new DOMXpath($doc);
$basenode = $xpath->query("//td/center/img")->item(0);
@@ -29,5 +26,4 @@ class Af_Comics_Twp extends Af_ComicFilter {
return false;
}
}
?>
}

3
plugins/af_comics/filters/af_comics_whomp.php
View File

@@ -33,5 +33,4 @@ class Af_Comics_Whomp extends Af_ComicFilter {
return false;
}
}
?>
}

9
plugins/af_comics/init.php
View File

@@ -63,18 +63,18 @@ class Af_Comics extends Plugin {
}
function hook_article_filter($article) {
$owner_uid = $article["owner_uid"];
foreach ($this->filters as $f) {
if ($f->process($article))
break;
}
return $article;
}
// GoComics dropped feed support so it needs to be handled when fetching the feed.
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
function hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass) {
if ($auth_login || $auth_pass)
return $feed_data;
@@ -143,5 +143,4 @@ class Af_Comics extends Plugin {
return 2;
}
}
?>
}