From 21ce7d9ec02b0bf7c6e0ac7c28bc7c1bb0a841c5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 26 Apr 2017 20:57:36 +0300
Subject: update phpmd ruleset to use (subset) of cleancode fix various minor
 issues reported by static analysis remove redundant php closing tag from
 several more files

---
 plugins/af_comics/filters/af_comics_cad.php        | 10 ++--------
 plugins/af_comics/filters/af_comics_comicclass.php | 10 ++--------
 plugins/af_comics/filters/af_comics_comicpress.php | 10 ++--------
 plugins/af_comics/filters/af_comics_darklegacy.php |  9 ++-------
 plugins/af_comics/filters/af_comics_dilbert.php    | 22 +---------------------
 plugins/af_comics/filters/af_comics_explosm.php    |  9 ++-------
 plugins/af_comics/filters/af_comics_pa.php         | 19 +++++++------------
 plugins/af_comics/filters/af_comics_pvp.php        |  6 ++----
 plugins/af_comics/filters/af_comics_tfd.php        |  8 ++------
 plugins/af_comics/filters/af_comics_twp.php        |  8 ++------
 plugins/af_comics/filters/af_comics_whomp.php      |  3 +--
 11 files changed, 25 insertions(+), 89 deletions(-)

(limited to 'plugins/af_comics/filters')

diff --git a/plugins/af_comics/filters/af_comics_cad.php b/plugins/af_comics/filters/af_comics_cad.php
index 43836724f..7c0670918 100644
--- a/plugins/af_comics/filters/af_comics_cad.php
+++ b/plugins/af_comics/filters/af_comics_cad.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_comicclass.php b/plugins/af_comics/filters/af_comics_comicclass.php
index 45698751b..56a5b9cf6 100644
--- a/plugins/af_comics/filters/af_comics_comicclass.php
+++ b/plugins/af_comics/filters/af_comics_comicclass.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_comicpress.php b/plugins/af_comics/filters/af_comics_comicpress.php
index 306837598..81994d90b 100644
--- a/plugins/af_comics/filters/af_comics_comicpress.php
+++ b/plugins/af_comics/filters/af_comics_comicpress.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_darklegacy.php b/plugins/af_comics/filters/af_comics_darklegacy.php
index c03919b1d..33c1eca5c 100644
--- a/plugins/af_comics/filters/af_comics_darklegacy.php
+++ b/plugins/af_comics/filters/af_comics_darklegacy.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_dilbert.php b/plugins/af_comics/filters/af_comics_dilbert.php
index 5faba7eb7..9eed7232a 100644
--- a/plugins/af_comics/filters/af_comics_dilbert.php
+++ b/plugins/af_comics/filters/af_comics_dilbert.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_explosm.php b/plugins/af_comics/filters/af_comics_explosm.php
index 30b7e24c9..35a2edd41 100644
--- a/plugins/af_comics/filters/af_comics_explosm.php
+++ b/plugins/af_comics/filters/af_comics_explosm.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_pa.php b/plugins/af_comics/filters/af_comics_pa.php
index 0848adbd0..ae5cabec0 100644
--- a/plugins/af_comics/filters/af_comics_pa.php
+++ b/plugins/af_comics/filters/af_comics_pa.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_pvp.php b/plugins/af_comics/filters/af_comics_pvp.php
index 2094e684e..1a1ccab3d 100644
--- a/plugins/af_comics/filters/af_comics_pvp.php
+++ b/plugins/af_comics/filters/af_comics_pvp.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_tfd.php b/plugins/af_comics/filters/af_comics_tfd.php
index eeec28fa3..78792d254 100644
--- a/plugins/af_comics/filters/af_comics_tfd.php
+++ b/plugins/af_comics/filters/af_comics_tfd.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_twp.php b/plugins/af_comics/filters/af_comics_twp.php
index ec43c1379..712d54a1d 100644
--- a/plugins/af_comics/filters/af_comics_twp.php
+++ b/plugins/af_comics/filters/af_comics_twp.php
@@ -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;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/plugins/af_comics/filters/af_comics_whomp.php b/plugins/af_comics/filters/af_comics_whomp.php
index 5bc6a14e7..3c2e0b0c7 100644
--- a/plugins/af_comics/filters/af_comics_whomp.php
+++ b/plugins/af_comics/filters/af_comics_whomp.php
@@ -33,5 +33,4 @@ class Af_Comics_Whomp extends Af_ComicFilter {
 
 		return false;
 	}
-}
-?>
+}
\ No newline at end of file
-- 
cgit v1.2.3