From 195180b64d679540d4303f2205fe1488ff946dd8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 11:18:35 +0300
Subject: minor refactoring: normalize some function names; cleanup; etc

---
 classes/article.php      | 4 ++--
 classes/feeds.php        | 2 +-
 classes/pref/feeds.php   | 4 ++--
 classes/pref/filters.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'classes')

diff --git a/classes/article.php b/classes/article.php
index 43bcb5049..50a61a019 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -456,7 +456,7 @@ class Article extends Handler_Protected {
 #				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
 #					$filename . " (" . $ctype . ")" . "</a>";
 
-				$entry = "<div onclick=\"openUrlPopup('".htmlspecialchars($url)."')\"
+				$entry = "<div onclick=\"popupOpenUrl('".htmlspecialchars($url)."')\"
 					dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
 
 				array_push($entries_html, $entry);
@@ -536,7 +536,7 @@ class Article extends Handler_Protected {
 				else
 					$filename = "";
 
-				$rv .= "<div onclick='openUrlPopup(\"".htmlspecialchars($entry["url"])."\")'
+				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
 
 			};
diff --git a/classes/feeds.php b/classes/feeds.php
index 3eeee5d5e..b548205ed 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1006,7 +1006,7 @@ class Feeds extends Handler_Protected {
 
 		print "<div style=\"clear : both\">
 			<input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
-					onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
+					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'>
 				<label for=\"feedDlg_loginCheck\">".
 				__('This feed requires authentication.')."</div>";
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index a04b0108b..43570c740 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -640,7 +640,7 @@ class Pref_Feeds extends Handler_Protected {
 			$auth_checked = $auth_enabled ? 'checked' : '';
 			print "<div style=\"clear : both\">
 				<input type=\"checkbox\" $auth_checked name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedEditDlg_loginCheck\"
-						onclick='checkboxToggleElement(this, \"feedEditDlg_loginContainer\")'>
+						onclick='displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
 					<label for=\"feedEditDlg_loginCheck\">".
 				__('This feed requires authentication.')."</div>";
 
@@ -1656,7 +1656,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div style=\"clear : both\">
 			<input type=\"checkbox\" name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedDlg_loginCheck\"
-					onclick='checkboxToggleElement(this, \"feedDlg_loginContainer\")'>
+					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'>
 				<label for=\"feedDlg_loginCheck\">".
 				__('Feeds require authentication.')."</div>";
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 451b591bc..e3503d545 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -153,7 +153,7 @@ class Pref_Filters extends Handler_Protected {
 
 				$id = $line['id'];
 				$tmp .= "<td width='5%' align='center'><img style='cursor : pointer' title='".__("Preview article")."'
-					src='images/information.png' onclick='openArticlePopup($id)'></td><td>";
+					src='images/information.png' onclick='popupOpenArticle($id)'></td><td>";
 
 				/*foreach ($filter['rules'] as $rule) {
 					$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
-- 
cgit v1.2.3