more dialog-related cleanup

2 files changed, 8 insertions, 8 deletions

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 659f7e183..086bf04f4 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -26,7 +26,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	function batch_edit_cbox($elem, $label = false) {
 		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
-			onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
+			onchange=\"App.dialogOf(this).toggleField(this, '$elem', '$label')\">";
 	}
 
 	function renamecat() {
@@ -807,7 +807,8 @@ class Pref_Feeds extends Handler_Protected {
 			$title = htmlspecialchars($title, ENT_QUOTES);
 
 			print "<footer>
-				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
+				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
+					onclick='App.dialogOf(this).unsubscribeFeed($feed_id, \"$title\")'>".
 					__('Unsubscribe')."</button>
 				<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".__('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".__('Cancel')."</button>
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 62f6fc1a0..a24a05b05 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -2,8 +2,7 @@
 class Pref_Filters extends Handler_Protected {
 
 	function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getfiltertree", "newrule",
-			"newaction", "savefilterorder");
+		$csrf_ignored = array("index", "getfiltertree", "savefilterorder");
 
 		return array_search($method, $csrf_ignored) !== false;
 	}
@@ -857,10 +856,10 @@ class Pref_Filters extends Handler_Protected {
 		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ContentFilters\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"return dijit.byId('filterNewRuleDlg').execute()\">".
+		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'>".
 			($rule ? __("Save rule") : __('Add rule'))."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterNewRuleDlg').hide()\">".
+		print "<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
 			__('Cancel')."</button>";
 
 		print "</footer>";
@@ -950,10 +949,10 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<footer>";
 
-		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick=\"return dijit.byId('filterNewActionDlg').execute()\">".
+		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'>".
 			($action ? __("Save action") : __('Add action'))."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('filterNewActionDlg').hide()\">".
+		print "<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
 			__('Cancel')."</button>";
 
 		print "</footer>";