From 020f062a76746a313fae9c82fbcf9b37fcc9d459 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 15:43:07 +0300
Subject: feeds: unify naming

---
 plugins/af_comics/filters/af_comics_gocomics.php         | 2 +-
 plugins/af_comics/filters/af_comics_gocomics_farside.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/af_comics')

diff --git a/plugins/af_comics/filters/af_comics_gocomics.php b/plugins/af_comics/filters/af_comics_gocomics.php
index 949b7a235..6c5c7c0d3 100644
--- a/plugins/af_comics/filters/af_comics_gocomics.php
+++ b/plugins/af_comics/filters/af_comics_gocomics.php
@@ -11,7 +11,7 @@ class Af_Comics_Gocomics extends Af_ComicFilter {
 
 	public function on_subscribe($url) {
 		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+			return '<?xml version="1.0" encoding="utf-8"?>'; // Get _is_html() to return false.
 		else
 			return false;
 	}
diff --git a/plugins/af_comics/filters/af_comics_gocomics_farside.php b/plugins/af_comics/filters/af_comics_gocomics_farside.php
index 9663da8f9..89322209d 100644
--- a/plugins/af_comics/filters/af_comics_gocomics_farside.php
+++ b/plugins/af_comics/filters/af_comics_gocomics_farside.php
@@ -11,7 +11,7 @@ class Af_Comics_Gocomics_FarSide extends Af_ComicFilter {
 
 	public function on_subscribe($url) {
 		if (preg_match("#^https?://www\.thefarside\.com#", $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+			return '<?xml version="1.0" encoding="utf-8"?>'; // Get _is_html() to return false.
 		else
 			return false;
 	}
-- 
cgit v1.2.3-54-g00ecf


From 9ac6741d2476944b77e8665e8ff9a9d811848908 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 12:25:33 +0300
Subject: af_comics: markup cleanup

---
 plugins/af_comics/init.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/af_comics')

diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index c99d4b1d8..c8a8f8637 100755
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -47,11 +47,6 @@ class Af_Comics extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
-			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
-
-		print "<p>" . __("The following comics are currently supported:") . "</p>";
-
 		$comics = [];
 
 		foreach ($this->filters as $f) {
@@ -62,17 +57,22 @@ class Af_Comics extends Plugin {
 
 		asort($comics);
 
-		print "<ul class='panel panel-scrollable list list-unstyled'>";
-		foreach ($comics as $comic) {
-			print "<li>$comic</li>";
-		}
-		print "</ul>";
+		?>
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>photo</i> <?= __('Feeds supported by af_comics') ?>">
 
-		print_notice("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).");
+			<h3><?= __("The following comics are currently supported:") ?></h3>
 
-		print_notice('Drop any updated filters into <code>filters.local</code> in plugin directory.');
+			<ul class='panel panel-scrollable list list-unstyled'>
+				<?php foreach ($comics as $comic) { ?>
+					<li><?= htmlspecialchars($comic) ?></li>
+				<?php } ?>
+			</ul>
 
-		print "</div>";
+			<?= format_notice("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).") ?>
+			<?= format_notice('Drop any updated filters into <code>filters.local</code> in plugin directory.') ?>
+		</div>
+		<?php
 	}
 
 	function hook_article_filter($article) {
-- 
cgit v1.2.3-54-g00ecf