@@ -285,7 +285,7 @@  | 
                                                    ||
| 285 | 285 | 'type' => $field->type,  | 
                                                        
| 286 | 286 | );  | 
                                                        
| 287 | 287 | |
| 288 | - $this->array_content[ $field->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );  | 
                                                        |
| 288 | + $this->array_content[$field->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );  | 
                                                        |
| 289 | 289 | }  | 
                                                        
| 290 | 290 | |
| 291 | 291 | /**  | 
                                                        
@@ -21,7 +21,7 @@  | 
                                                    ||
| 21 | 21 | */  | 
                                                        
| 22 | 22 |  	public function set_upgrader( &$upgrader ) { | 
                                                        
| 23 | 23 |  		if ( is_object( $upgrader ) ) { | 
                                                        
| 24 | - $this->upgrader =& $upgrader;  | 
                                                        |
| 24 | + $this->upgrader = & $upgrader;  | 
                                                        |
| 25 | 25 | }  | 
                                                        
| 26 | 26 | }  | 
                                                        
| 27 | 27 | |
@@ -98,15 +98,15 @@ discard block  | 
                                                    ||
| 98 | 98 | self::prepare_field_output( $atts, $val );  | 
                                                        
| 99 | 99 | |
| 100 | 100 |  		if ( $atts['format'] != 'text' ) { | 
                                                        
| 101 | - $values[ $f->field_key ] = $val;  | 
                                                        |
| 101 | + $values[$f->field_key] = $val;  | 
                                                        |
| 102 | 102 |  			if ( $atts['entry'] && $f->type != 'textarea' ) { | 
                                                        
| 103 | - $prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );  | 
                                                        |
| 103 | + $prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );  | 
                                                        |
| 104 | 104 |  				if ( $prev_val != $val ) { | 
                                                        
| 105 | - $values[ $f->field_key . '-value' ] = $prev_val;  | 
                                                        |
| 105 | + $values[$f->field_key . '-value'] = $prev_val;  | 
                                                        |
| 106 | 106 | }  | 
                                                        
| 107 | 107 | }  | 
                                                        
| 108 | 108 |  		} else { | 
                                                        
| 109 | - $values[ $f->id ] = array(  | 
                                                        |
| 109 | + $values[$f->id] = array(  | 
                                                        |
| 110 | 110 | 'label' => $f->name,  | 
                                                        
| 111 | 111 | 'val' => $val,  | 
                                                        
| 112 | 112 | 'type' => $f->type,  | 
                                                        
@@ -120,9 +120,9 @@ discard block  | 
                                                    ||
| 120 | 120 |  	private static function fill_missing_fields( $atts, &$values ) { | 
                                                        
| 121 | 121 | _deprecated_function( __FUNCTION__, '2.04', 'instance of FrmEntryValues or FrmProEntryValues' );  | 
                                                        
| 122 | 122 | |
| 123 | -		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $atts['field']->id ] ) ) { | 
                                                        |
| 123 | +		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$atts['field']->id] ) ) { | 
                                                        |
| 124 | 124 | // In case include_blank is set  | 
                                                        
| 125 | - $atts['entry']->metas[ $atts['field']->id ] = '';  | 
                                                        |
| 125 | + $atts['entry']->metas[$atts['field']->id] = '';  | 
                                                        |
| 126 | 126 | $atts['entry'] = apply_filters( 'frm_prepare_entry_content', $atts['entry'], array( 'field' => $atts['field'] ) );  | 
                                                        
| 127 | 127 | self::fill_values_from_entry( $atts, $values );  | 
                                                        
| 128 | 128 | }  | 
                                                        
@@ -150,7 +150,7 @@ discard block  | 
                                                    ||
| 150 | 150 | 'type' => $f->type,  | 
                                                        
| 151 | 151 | );  | 
                                                        
| 152 | 152 | |
| 153 | - $values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );  | 
                                                        |
| 153 | + $values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );  | 
                                                        |
| 154 | 154 | }  | 
                                                        
| 155 | 155 | |
| 156 | 156 | /**  | 
                                                        
@@ -161,7 +161,7 @@ discard block  | 
                                                    ||
| 161 | 161 | |
| 162 | 162 | $f = $atts['field'];  | 
                                                        
| 163 | 163 |  		if ( $atts['entry'] ) { | 
                                                        
| 164 | - $prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );  | 
                                                        |
| 164 | + $prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );  | 
                                                        |
| 165 | 165 | $meta = array(  | 
                                                        
| 166 | 166 | 'item_id' => $atts['id'],  | 
                                                        
| 167 | 167 | 'field_id' => $f->id,  | 
                                                        
@@ -36,7 +36,7 @@  | 
                                                    ||
| 36 | 36 |  	public function validate( $args ) { | 
                                                        
| 37 | 37 | $errors = array();  | 
                                                        
| 38 | 38 |  		if ( $args['value'] != '' && ! is_email( $args['value'] ) ) { | 
                                                        
| 39 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );  | 
                                                        |
| 39 | + $errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );  | 
                                                        |
| 40 | 40 | }  | 
                                                        
| 41 | 41 | |
| 42 | 42 | return $errors;  | 
                                                        
@@ -39,7 +39,7 @@ discard block  | 
                                                    ||
| 39 | 39 | 'sep' => ', ',  | 
                                                        
| 40 | 40 | 'html' => false,  | 
                                                        
| 41 | 41 | );  | 
                                                        
| 42 | - $atts = wp_parse_args( $atts, $defaults );  | 
                                                        |
| 42 | + $atts = wp_parse_args( $atts, $defaults );  | 
                                                        |
| 43 | 43 | |
| 44 | 44 |  		if ( $atts['html'] ) { | 
                                                        
| 45 | 45 | $atts['sep'] = ' ';  | 
                                                        
@@ -61,9 +61,9 @@ discard block  | 
                                                    ||
| 61 | 61 | |
| 62 | 62 | // validate the url format  | 
                                                        
| 63 | 63 |  		if ( ! empty( $value ) && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) { | 
                                                        
| 64 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );  | 
                                                        |
| 64 | + $errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );  | 
                                                        |
| 65 | 65 |  		} elseif ( $this->field->required == '1' && empty( $value ) ) { | 
                                                        
| 66 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );  | 
                                                        |
| 66 | + $errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );  | 
                                                        |
| 67 | 67 | }  | 
                                                        
| 68 | 68 | |
| 69 | 69 | return $errors;  | 
                                                        
@@ -61,7 +61,7 @@ discard block  | 
                                                    ||
| 61 | 61 | }  | 
                                                        
| 62 | 62 | |
| 63 | 63 |  		foreach ( $args as $key => $value ) { | 
                                                        
| 64 | - $where .= empty( $where ) ? $base_where : $condition;  | 
                                                        |
| 64 | + $where .= empty( $where ) ? $base_where : $condition;  | 
                                                        |
| 65 | 65 | $array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );  | 
                                                        
| 66 | 66 |  			if ( is_numeric( $key ) || $array_inc_null ) { | 
                                                        
| 67 | 67 | $where .= ' ( ';  | 
                                                        
@@ -96,7 +96,7 @@ discard block  | 
                                                    ||
| 96 | 96 | |
| 97 | 97 |  		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) { | 
                                                        
| 98 | 98 | $k = explode( ' ', $key );  | 
                                                        
| 99 | -			$where    .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key ); | 
                                                        |
| 99 | +			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key ); | 
                                                        |
| 100 | 100 | $values[] = '%Y-%m-%d %H:%i:%s';  | 
                                                        
| 101 | 101 |  		} else { | 
                                                        
| 102 | 102 | $where .= ' ' . $key;  | 
                                                        
@@ -116,12 +116,12 @@ discard block  | 
                                                    ||
| 116 | 116 | $where .= ' OR ';  | 
                                                        
| 117 | 117 | }  | 
                                                        
| 118 | 118 | $start = false;  | 
                                                        
| 119 | - $where .= $key . ' %s';  | 
                                                        |
| 119 | + $where .= $key . ' %s';  | 
                                                        |
| 120 | 120 | $values[] = '%' . self::esc_like( $v ) . '%';  | 
                                                        
| 121 | 121 | }  | 
                                                        
| 122 | 122 | $where .= ')';  | 
                                                        
| 123 | 123 |  			} elseif ( ! empty( $value ) ) { | 
                                                        
| 124 | -				$where  .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')'; | 
                                                        |
| 124 | +				$where .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')'; | 
                                                        |
| 125 | 125 | $values = array_merge( $values, $value );  | 
                                                        
| 126 | 126 | }  | 
                                                        
| 127 | 127 |  		} elseif ( strpos( $lowercase_key, 'like' ) !== false ) { | 
                                                        
@@ -141,7 +141,7 @@ discard block  | 
                                                    ||
| 141 | 141 | $where .= 'like';  | 
                                                        
| 142 | 142 | }  | 
                                                        
| 143 | 143 | |
| 144 | - $where .= ' %s';  | 
                                                        |
| 144 | + $where .= ' %s';  | 
                                                        |
| 145 | 145 | $values[] = $start . self::esc_like( $value ) . $end;  | 
                                                        
| 146 | 146 | |
| 147 | 147 |  		} elseif ( $value === null ) { | 
                                                        
@@ -306,8 +306,8 @@ discard block  | 
                                                    ||
| 306 | 306 | );  | 
                                                        
| 307 | 307 | |
| 308 | 308 | $where_is = strtolower( $where_is );  | 
                                                        
| 309 | -		if ( isset( $switch_to[ $where_is ] ) ) { | 
                                                        |
| 310 | - return ' ' . $switch_to[ $where_is ];  | 
                                                        |
| 309 | +		if ( isset( $switch_to[$where_is] ) ) { | 
                                                        |
| 310 | + return ' ' . $switch_to[$where_is];  | 
                                                        |
| 311 | 311 | }  | 
                                                        
| 312 | 312 | |
| 313 | 313 | // > and < need a little more work since we don't want them switched to >= and <=  | 
                                                        
@@ -360,13 +360,13 @@ discard block  | 
                                                    ||
| 360 | 360 | $temp_args = $args;  | 
                                                        
| 361 | 361 |  		foreach ( $temp_args as $k => $v ) { | 
                                                        
| 362 | 362 |  			if ( $v == '' ) { | 
                                                        
| 363 | - unset( $args[ $k ] );  | 
                                                        |
| 363 | + unset( $args[$k] );  | 
                                                        |
| 364 | 364 | continue;  | 
                                                        
| 365 | 365 | }  | 
                                                        
| 366 | 366 | |
| 367 | 367 | $db_name = strtoupper( str_replace( '_', ' ', $k ) );  | 
                                                        
| 368 | 368 |  			if ( strpos( $v, $db_name ) === false ) { | 
                                                        
| 369 | - $args[ $k ] = $db_name . ' ' . $v;  | 
                                                        |
| 369 | + $args[$k] = $db_name . ' ' . $v;  | 
                                                        |
| 370 | 370 | }  | 
                                                        
| 371 | 371 | }  | 
                                                        
| 372 | 372 | |
@@ -440,13 +440,13 @@ discard block  | 
                                                    ||
| 440 | 440 |  	private static function esc_query_args( &$args ) { | 
                                                        
| 441 | 441 |  		foreach ( $args as $param => $value ) { | 
                                                        
| 442 | 442 |  			if ( $param == 'order_by' ) { | 
                                                        
| 443 | - $args[ $param ] = self::esc_order( $value );  | 
                                                        |
| 443 | + $args[$param] = self::esc_order( $value );  | 
                                                        |
| 444 | 444 |  			} elseif ( $param == 'limit' ) { | 
                                                        
| 445 | - $args[ $param ] = self::esc_limit( $value );  | 
                                                        |
| 445 | + $args[$param] = self::esc_limit( $value );  | 
                                                        |
| 446 | 446 | }  | 
                                                        
| 447 | 447 | |
| 448 | -			if ( $args[ $param ] == '' ) { | 
                                                        |
| 449 | - unset( $args[ $param ] );  | 
                                                        |
| 448 | +			if ( $args[$param] == '' ) { | 
                                                        |
| 449 | + unset( $args[$param] );  | 
                                                        |
| 450 | 450 | }  | 
                                                        
| 451 | 451 | }  | 
                                                        
| 452 | 452 | }  | 
                                                        
@@ -529,7 +529,7 @@ discard block  | 
                                                    ||
| 529 | 529 | $limit = explode( ',', trim( $limit ) );  | 
                                                        
| 530 | 530 |  		foreach ( $limit as $k => $l ) { | 
                                                        
| 531 | 531 |  			if ( is_numeric( $l ) ) { | 
                                                        
| 532 | - $limit[ $k ] = $l;  | 
                                                        |
| 532 | + $limit[$k] = $l;  | 
                                                        |
| 533 | 533 | }  | 
                                                        
| 534 | 534 | }  | 
                                                        
| 535 | 535 | |
@@ -665,7 +665,7 @@ discard block  | 
                                                    ||
| 665 | 665 | */  | 
                                                        
| 666 | 666 |  	public static function add_key_to_group_cache( $key, $group ) { | 
                                                        
| 667 | 667 | $cached = self::get_group_cached_keys( $group );  | 
                                                        
| 668 | - $cached[ $key ] = $key;  | 
                                                        |
| 668 | + $cached[$key] = $key;  | 
                                                        |
| 669 | 669 | wp_cache_set( 'cached_keys', $cached, $group, 300 );  | 
                                                        
| 670 | 670 | }  | 
                                                        
| 671 | 671 | |
@@ -41,7 +41,7 @@ discard block  | 
                                                    ||
| 41 | 41 | }  | 
                                                        
| 42 | 42 | |
| 43 | 43 |  	public function insert_installed_addon( $plugins ) { | 
                                                        
| 44 | - $plugins[ $this->plugin_slug ] = $this;  | 
                                                        |
| 44 | + $plugins[$this->plugin_slug] = $this;  | 
                                                        |
| 45 | 45 | |
| 46 | 46 | return $plugins;  | 
                                                        
| 47 | 47 | }  | 
                                                        
@@ -49,8 +49,8 @@ discard block  | 
                                                    ||
| 49 | 49 |  	public static function get_addon( $plugin_slug ) { | 
                                                        
| 50 | 50 | $plugins = apply_filters( 'frm_installed_addons', array() );  | 
                                                        
| 51 | 51 | $plugin = false;  | 
                                                        
| 52 | -		if ( isset( $plugins[ $plugin_slug ] ) ) { | 
                                                        |
| 53 | - $plugin = $plugins[ $plugin_slug ];  | 
                                                        |
| 52 | +		if ( isset( $plugins[$plugin_slug] ) ) { | 
                                                        |
| 53 | + $plugin = $plugins[$plugin_slug];  | 
                                                        |
| 54 | 54 | }  | 
                                                        
| 55 | 55 | |
| 56 | 56 | return $plugin;  | 
                                                        
@@ -109,7 +109,7 @@ discard block  | 
                                                    ||
| 109 | 109 |  		} else { | 
                                                        
| 110 | 110 | $api = new FrmFormApi( $this->license );  | 
                                                        
| 111 | 111 | $plugins = $api->get_api_info();  | 
                                                        
| 112 | - $_data = $plugins[ $item_id ];  | 
                                                        |
| 112 | + $_data = $plugins[$item_id];  | 
                                                        |
| 113 | 113 | }  | 
                                                        
| 114 | 114 | |
| 115 | 115 | $_data['sections'] = array(  | 
                                                        
@@ -301,19 +301,19 @@ discard block  | 
                                                    ||
| 301 | 301 | |
| 302 | 302 |  		if ( $this->is_current_version( $transient ) ) { | 
                                                        
| 303 | 303 | //make sure it doesn't show there is an update if plugin is up-to-date  | 
                                                        
| 304 | -			if ( isset( $transient->response[ $this->plugin_folder ] ) ) { | 
                                                        |
| 305 | - unset( $transient->response[ $this->plugin_folder ] );  | 
                                                        |
| 304 | +			if ( isset( $transient->response[$this->plugin_folder] ) ) { | 
                                                        |
| 305 | + unset( $transient->response[$this->plugin_folder] );  | 
                                                        |
| 306 | 306 | }  | 
                                                        
| 307 | -		} elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) { | 
                                                        |
| 308 | - $this->prepare_update_details( $transient->response[ $this->plugin_folder ] );  | 
                                                        |
| 307 | +		} elseif ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) { | 
                                                        |
| 308 | + $this->prepare_update_details( $transient->response[$this->plugin_folder] );  | 
                                                        |
| 309 | 309 | |
| 310 | 310 | // if the transient has expired, clear the update and trigger it again  | 
                                                        
| 311 | -			if ( $transient->response[ $this->plugin_folder ] === false ) { | 
                                                        |
| 311 | +			if ( $transient->response[$this->plugin_folder] === false ) { | 
                                                        |
| 312 | 312 |  				if ( ! $this->has_been_cleared() ) { | 
                                                        
| 313 | 313 | $this->cleared_plugins();  | 
                                                        
| 314 | 314 | $this->manually_queue_update();  | 
                                                        
| 315 | 315 | }  | 
                                                        
| 316 | - unset( $transient->response[ $this->plugin_folder ] );  | 
                                                        |
| 316 | + unset( $transient->response[$this->plugin_folder] );  | 
                                                        |
| 317 | 317 | }  | 
                                                        
| 318 | 318 | }  | 
                                                        
| 319 | 319 | |
@@ -401,7 +401,7 @@ discard block  | 
                                                    ||
| 401 | 401 | }  | 
                                                        
| 402 | 402 | |
| 403 | 403 |  	private function is_current_version( $transient ) { | 
                                                        
| 404 | -		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) { | 
                                                        |
| 404 | +		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) { | 
                                                        |
| 405 | 405 | return false;  | 
                                                        
| 406 | 406 | }  | 
                                                        
| 407 | 407 | |
@@ -410,7 +410,7 @@ discard block  | 
                                                    ||
| 410 | 410 | return true;  | 
                                                        
| 411 | 411 | }  | 
                                                        
| 412 | 412 | |
| 413 | - return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version;  | 
                                                        |
| 413 | + return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] === $transient->response[$this->plugin_folder]->new_version;  | 
                                                        |
| 414 | 414 | }  | 
                                                        
| 415 | 415 | |
| 416 | 416 |  	private function has_been_cleared() { | 
                                                        
@@ -491,8 +491,8 @@ discard block  | 
                                                    ||
| 491 | 491 | $response['message'] = $response['status'];  | 
                                                        
| 492 | 492 |  		} else { | 
                                                        
| 493 | 493 | $messages = $this->get_messages();  | 
                                                        
| 494 | -			if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) { | 
                                                        |
| 495 | - $response['message'] = $messages[ $response['status'] ];  | 
                                                        |
| 494 | +			if ( is_string( $response['status'] ) && isset( $messages[$response['status']] ) ) { | 
                                                        |
| 495 | + $response['message'] = $messages[$response['status']];  | 
                                                        |
| 496 | 496 |  			} else { | 
                                                        
| 497 | 497 | $response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) );  | 
                                                        
| 498 | 498 | }  | 
                                                        
@@ -367,7 +367,8 @@ discard block  | 
                                                    ||
| 367 | 367 | |
| 368 | 368 |  		if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) { | 
                                                        
| 369 | 369 | $this->clear_old_plugin_version( $version_info );  | 
                                                        
| 370 | -			if ( $version_info === false ) { // was cleared with timeout | 
                                                        |
| 370 | +			if ( $version_info === false ) { | 
                                                        |
| 371 | +// was cleared with timeout  | 
                                                        |
| 371 | 372 | $transient = false;  | 
                                                        
| 372 | 373 |  			} else { | 
                                                        
| 373 | 374 | $this->maybe_use_beta_url( $version_info );  | 
                                                        
@@ -455,7 +456,8 @@ discard block  | 
                                                    ||
| 455 | 456 | }  | 
                                                        
| 456 | 457 | |
| 457 | 458 |  	private function is_license_revoked() { | 
                                                        
| 458 | -		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing | 
                                                        |
| 459 | +		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { | 
                                                        |
| 460 | +// phpcs:ignore WordPress.Security.NonceVerification.Missing  | 
                                                        |
| 459 | 461 | return;  | 
                                                        
| 460 | 462 | }  | 
                                                        
| 461 | 463 | |
@@ -56,7 +56,8 @@ discard block  | 
                                                    ||
| 56 | 56 | }  | 
                                                        
| 57 | 57 | |
| 58 | 58 |  	private function translate_settings( $settings ) { | 
                                                        
| 59 | -		if ( $settings ) { //workaround for W3 total cache conflict | 
                                                        |
| 59 | +		if ( $settings ) { | 
                                                        |
| 60 | +//workaround for W3 total cache conflict  | 
                                                        |
| 60 | 61 | return unserialize( serialize( $settings ) );  | 
                                                        
| 61 | 62 | }  | 
                                                        
| 62 | 63 | |
@@ -68,7 +69,8 @@ discard block  | 
                                                    ||
| 68 | 69 | }  | 
                                                        
| 69 | 70 | |
| 70 | 71 | // If unserializing didn't work  | 
                                                        
| 71 | -		if ( $settings ) { //workaround for W3 total cache conflict | 
                                                        |
| 72 | +		if ( $settings ) { | 
                                                        |
| 73 | +//workaround for W3 total cache conflict  | 
                                                        |
| 72 | 74 | $settings = unserialize( serialize( $settings ) );  | 
                                                        
| 73 | 75 |  		} else { | 
                                                        
| 74 | 76 | $settings = $this;  | 
                                                        
@@ -179,8 +179,8 @@ discard block  | 
                                                    ||
| 179 | 179 | }  | 
                                                        
| 180 | 180 | |
| 181 | 181 |  		foreach ( $settings as $setting => $default ) { | 
                                                        
| 182 | -			if ( isset( $params[ 'frm_' . $setting ] ) ) { | 
                                                        |
| 183 | -				$this->{$setting} = $params[ 'frm_' . $setting ]; | 
                                                        |
| 182 | +			if ( isset( $params['frm_' . $setting] ) ) { | 
                                                        |
| 183 | +				$this->{$setting} = $params['frm_' . $setting]; | 
                                                        |
| 184 | 184 |  			} elseif ( ! isset( $this->{$setting} ) ) { | 
                                                        
| 185 | 185 |  				$this->{$setting} = $default; | 
                                                        
| 186 | 186 | }  | 
                                                        
@@ -329,7 +329,7 @@ discard block  | 
                                                    ||
| 329 | 329 | |
| 330 | 330 | $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar' );  | 
                                                        
| 331 | 331 |  		foreach ( $checkboxes as $set ) { | 
                                                        
| 332 | - $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;  | 
                                                        |
| 332 | + $this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;  | 
                                                        |
| 333 | 333 | }  | 
                                                        
| 334 | 334 | }  | 
                                                        
| 335 | 335 | |
@@ -339,7 +339,7 @@ discard block  | 
                                                    ||
| 339 | 339 | $frm_roles = FrmAppHelper::frm_capabilities();  | 
                                                        
| 340 | 340 | $roles = get_editable_roles();  | 
                                                        
| 341 | 341 |  		foreach ( $frm_roles as $frm_role => $frm_role_description ) { | 
                                                        
| 342 | - $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' );  | 
                                                        |
| 342 | + $this->$frm_role = (array) ( isset( $params[$frm_role] ) ? $params[$frm_role] : 'administrator' );  | 
                                                        |
| 343 | 343 | |
| 344 | 344 | // Make sure administrators always have permissions  | 
                                                        
| 345 | 345 |  			if ( ! in_array( 'administrator', $this->$frm_role ) ) { | 
                                                        
@@ -146,7 +146,7 @@  | 
                                                    ||
| 146 | 146 | |
| 147 | 147 | $next_dir = '';  | 
                                                        
| 148 | 148 |  		foreach ( $dir_names as $dir ) { | 
                                                        
| 149 | - $next_dir .= '/' . $dir;  | 
                                                        |
| 149 | + $next_dir .= '/' . $dir;  | 
                                                        |
| 150 | 150 | $needed_dirs[] = $this->uploads['basedir'] . $next_dir;  | 
                                                        
| 151 | 151 | }  | 
                                                        
| 152 | 152 | |