From 18d0f6cfe9144e6d19eb52501dcb8a9b237f9fe7 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 3 Dec 2024 15:06:52 -0400
Subject: [PATCH 1/3] Drop old references to use HTML and jQuery CSS settings

---
 classes/models/FrmSettings.php      |  6 +-----
 classes/models/FrmUsage.php         |  4 +---
 classes/views/frm-settings/misc.php | 10 ----------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/classes/models/FrmSettings.php b/classes/models/FrmSettings.php
index 77d2c4e311..9dcedc39ca 100644
--- a/classes/models/FrmSettings.php
+++ b/classes/models/FrmSettings.php
@@ -8,8 +8,6 @@ class FrmSettings {
 	public $option_name = 'frm_options';
 	public $menu;
 	public $mu_menu;
-	public $use_html;
-	public $jquery_css;
 	public $accordion_js;
 	public $fade_form;
 	public $old_css;
@@ -136,8 +134,6 @@ public function default_options() {
 		return array(
 			'menu'                      => apply_filters( 'frm_default_menu', 'Formidable' ),
 			'mu_menu'                   => 0,
-			'use_html'                  => true,
-			'jquery_css'                => false,
 			'accordion_js'              => false,
 			'fade_form'                 => false,
 			'old_css'                   => false,
@@ -406,7 +402,7 @@ private function update_settings( $params ) {
 		$this->from_email        = $params['frm_from_email'];
 		$this->currency          = $params['frm_currency'];
 
-		$checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
+		$checkboxes = array( 'mu_menu', 're_multi', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
 		foreach ( $checkboxes as $set ) {
 			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
 		}
diff --git a/classes/models/FrmUsage.php b/classes/models/FrmUsage.php
index 55a946953c..ba3c0b7872 100644
--- a/classes/models/FrmUsage.php
+++ b/classes/models/FrmUsage.php
@@ -197,9 +197,7 @@ private function settings() {
 		);
 		$pass_settings = array(
 			'load_style',
-			'use_html',
 			'fade_form',
-			'jquery_css',
 			're_type',
 			're_lang',
 			're_multi',
@@ -375,7 +373,7 @@ private function forms() {
 	private function form_field_count( $form_id ) {
 		global $wpdb;
 
-		$join = $wpdb->prefix . 'frm_fields fi LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)';
+		$join = $wpdb->prefix . 'frm_fields fi JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)';
 
 		$field_query = array(
 			'or'             => 1,
diff --git a/classes/views/frm-settings/misc.php b/classes/views/frm-settings/misc.php
index 7b1ff1d788..2ce4083933 100644
--- a/classes/views/frm-settings/misc.php
+++ b/classes/views/frm-settings/misc.php
@@ -41,16 +41,6 @@
 	<?php } ?>
 </p>
 
-<?php
-/*
-Deprecated setting. This is always on now.
-Leave this for now for backward compatibility.
-This is to prevent this from being disabled.
-Pro could possibly check for `use_html` and think it is still false.
-*/
-?>
-<input type="hidden" name="frm_use_html" value="1" />
-
 <p class="frm_uninstall">
 	<label>
 		<input type="checkbox" id="frm-uninstall-box" value="1" onchange="frm_show_div('frm_uninstall_now',this.checked,true,'#')" />

From d00a6028b592509ce7f487aab0bb0d1a63e932d3 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 3 Dec 2024 15:12:46 -0400
Subject: [PATCH 2/3] Also drop references to accordion JS

---
 classes/models/FrmSettings.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/classes/models/FrmSettings.php b/classes/models/FrmSettings.php
index 9dcedc39ca..f88ac05e89 100644
--- a/classes/models/FrmSettings.php
+++ b/classes/models/FrmSettings.php
@@ -8,7 +8,6 @@ class FrmSettings {
 	public $option_name = 'frm_options';
 	public $menu;
 	public $mu_menu;
-	public $accordion_js;
 	public $fade_form;
 	public $old_css;
 	public $admin_bar;
@@ -134,7 +133,6 @@ public function default_options() {
 		return array(
 			'menu'                      => apply_filters( 'frm_default_menu', 'Formidable' ),
 			'mu_menu'                   => 0,
-			'accordion_js'              => false,
 			'fade_form'                 => false,
 			'old_css'                   => false,
 			'admin_bar'                 => false,
@@ -402,7 +400,7 @@ private function update_settings( $params ) {
 		$this->from_email        = $params['frm_from_email'];
 		$this->currency          = $params['frm_currency'];
 
-		$checkboxes = array( 'mu_menu', 're_multi', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
+		$checkboxes = array( 'mu_menu', 're_multi', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' );
 		foreach ( $checkboxes as $set ) {
 			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
 		}

From ce39c2f3b51bca0f9b63b9c1439f435b290bcf25 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 3 Dec 2024 15:14:00 -0400
Subject: [PATCH 3/3] Also drop old CSS

---
 classes/models/FrmSettings.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/models/FrmSettings.php b/classes/models/FrmSettings.php
index f88ac05e89..2469d53510 100644
--- a/classes/models/FrmSettings.php
+++ b/classes/models/FrmSettings.php
@@ -9,7 +9,6 @@ class FrmSettings {
 	public $menu;
 	public $mu_menu;
 	public $fade_form;
-	public $old_css;
 	public $admin_bar;
 
 	public $success_msg;
@@ -134,7 +133,6 @@ public function default_options() {
 			'menu'                      => apply_filters( 'frm_default_menu', 'Formidable' ),
 			'mu_menu'                   => 0,
 			'fade_form'                 => false,
-			'old_css'                   => false,
 			'admin_bar'                 => false,
 
 			're_multi'                  => 1,