Skip to content

Drop old references to use HTML and jQuery CSS settings #2162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 3 commits into from
Dec 3, 2024
Merged

Drop old references to use HTML and jQuery CSS settings #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d0f6c
Drop old references to use HTML and jQuery CSS settings
Crabcyborg Dec 3, 2024
d00a602
Also drop references to accordion JS
Crabcyborg Dec 3, 2024
ce39c2f
Also drop old CSS
Crabcyborg Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions classes/models/FrmSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ 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;
public $admin_bar;

public $success_msg;
Expand Down Expand Up @@ -136,11 +132,7 @@ 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,
'admin_bar' => false,

're_multi' => 1,
Expand Down Expand Up @@ -406,7 +398,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', '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;
}
Expand Down
4 changes: 1 addition & 3 deletions classes/models/FrmUsage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,7 @@ private function settings() {
);
$pass_settings = array(
'load_style',
'use_html',
'fade_form',
'jquery_css',
're_type',
're_lang',
're_multi',
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions classes/views/frm-settings/misc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,'#')" />
Expand Down