Strategy11 / formidable-forms

classes/views/frm-settings/form.php

Spacing +8 added lines, -8 removed lines

@@ -26,12 +26,12 @@ 
         </ul>
         </div>
 
-    <?php do_action('frm_before_settings'); ?>
+    <?php do_action( 'frm_before_settings' ); ?>
 
 	<form name="frm_settings_form" method="post" class="frm_settings_form" action="?page=formidable-settings<?php echo ( $a ? '&amp;t=' . $a : '' ); ?>">
         <input type="hidden" name="frm_action" value="process-form" />
         <input type="hidden" name="action" value="process-form" />
-        <?php wp_nonce_field('process_form_nonce', 'process_form'); ?>
+        <?php wp_nonce_field( 'process_form_nonce', 'process_form' ); ?>
 
         <div class="general_settings tabs-panel <?php echo esc_attr( $a === 'general_settings' ? 'frm_block' : 'frm_hidden' ); ?>">
             <p class="submit">
@@ -56,7 +56,7 @@ 
 
             <p>
 				<label for="frm_use_html">
-					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked($frm_settings->use_html, 1) ?>> <?php esc_html_e( 'Use HTML5 in forms', 'formidable' ) ?>
+					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked( $frm_settings->use_html, 1 ) ?>> <?php esc_html_e( 'Use HTML5 in forms', 'formidable' ) ?>
 				</label>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'We recommend using HTML 5 for your forms. It adds some nifty options like placeholders, patterns, and autocomplete.', 'formidable' ) ?>"></span>
             </p>
@@ -95,10 +95,10 @@ 
 			</p>
 
 			<p><label class="frm_left_label"><?php esc_html_e( 'Site Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr($frm_settings->pubkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr( $frm_settings->pubkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 			<p><label class="frm_left_label"><?php esc_html_e( 'Secret Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr($frm_settings->privkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr( $frm_settings->privkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 			<p><label class="frm_left_label"><?php esc_html_e( 'reCAPTCHA Type', 'formidable' ) ?></label>
 			<select name="frm_re_type" id="frm_re_type">
@@ -114,7 +114,7 @@ 
 			<select name="frm_re_lang" id="frm_re_lang">
 				<option value="" <?php selected( $frm_settings->re_lang, '' ) ?>><?php esc_html_e( 'Browser Default', 'formidable' ); ?></option>
 			    <?php foreach ( $captcha_lang as $lang => $lang_name ) { ?>
-				<option value="<?php echo esc_attr($lang) ?>" <?php selected($frm_settings->re_lang, $lang) ?>><?php echo esc_html( $lang_name ) ?></option>
+				<option value="<?php echo esc_attr( $lang ) ?>" <?php selected( $frm_settings->re_lang, $lang ) ?>><?php echo esc_html( $lang_name ) ?></option>
                 <?php } ?>
             </select></p>
 
@@ -167,7 +167,7 @@ 
 			<label class="frm_left_label"><?php esc_html_e( 'Success Message', 'formidable' ); ?>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'The default message seen after a form is submitted.', 'formidable' ) ?>" ></span>
 			</label>
-            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr($frm_settings->success_msg) ?>" />
+            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr( $frm_settings->success_msg ) ?>" />
 		</p>
 
 		<p>
@@ -175,7 +175,7 @@ 
 			<input type="text" value="<?php echo esc_attr( $frm_settings->submit_value ) ?>" id="frm_submit_value" name="frm_submit_value" class="frm_with_left_label" />
 		</p>
 
-        <?php do_action('frm_settings_form', $frm_settings); ?>
+        <?php do_action( 'frm_settings_form', $frm_settings ); ?>
 
         <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?>
 			<div class="clear"></div>

classes/views/styles/show.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 							</a>
 						    <?php } ?>
 						    <?php
-						    if ( $style->ID ) {
+							if ( $style->ID ) {
 								echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
 							}
 							?>

classes/models/fields/FrmFieldUserID.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 		$user_ID = get_current_user_id();
 		$user_ID = ( $user_ID ? $user_ID : '' );
-		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][ $this->field['id'] ] ) );
+		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][$this->field['id']] ) );
 		$updating = ( isset( $args['action'] ) && $args['action'] == 'update' );
 		$value = ( is_numeric( $this->field['value'] ) || $posted_value || $updating ) ? $this->field['value'] : $user_ID;
 

classes/models/fields/FrmFieldTextarea.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		$size_html = $size ? ' style="width:' . esc_attr( $size . ( is_numeric( $size ) ? 'px' : '' ) ) . '";' : '';
 
 		$max = FrmField::get_option( $this->field, 'max' );
-		$default_value = FrmAppHelper::esc_textarea( force_balance_tags( $this->get_field_column('default_value') ) );
+		$default_value = FrmAppHelper::esc_textarea( force_balance_tags( $this->get_field_column( 'default_value' ) ) );
 
 		echo '<textarea name="' . esc_attr( $this->html_name( $name ) ) . '" ' .
 			$size_html . ' rows="' . esc_attr( $max ) . '" ' .

classes/models/fields/FrmFieldCaptcha.php

Spacing +5 added lines, -5 removed lines

@@ -142,11 +142,11 @@ 
 			return $errors;
 		}
 
-		if ( ! isset( $_POST['g-recaptcha-response']) ) {
+		if ( ! isset( $_POST['g-recaptcha-response'] ) ) {
 			// If captcha is missing, check if it was already verified
 			if ( ! isset( $_POST['recaptcha_checked'] ) || ! wp_verify_nonce( $_POST['recaptcha_checked'], 'frm_ajax' ) ) {
 				// There was no captcha submitted
-				$errors[ 'field' . $args['id'] ] = __( 'The captcha is missing from this form', 'formidable' );
+				$errors['field' . $args['id']] = __( 'The captcha is missing from this form', 'formidable' );
 			}
 			return $errors;
 		}
@@ -159,11 +159,11 @@ 
 		if ( isset( $response['success'] ) && ! $response['success'] ) {
 			// What happens when the CAPTCHA was entered incorrectly
 			$invalid_message = FrmField::get_option( $this->field, 'invalid' );
-			$errors[ 'field' . $args['id'] ] = ( $invalid_message == '' ? $frm_settings->re_msg : $invalid_message );
+			$errors['field' . $args['id']] = ( $invalid_message == '' ? $frm_settings->re_msg : $invalid_message );
 		} elseif ( is_wp_error( $resp ) ) {
 			$error_string = $resp->get_error_message();
-			$errors[ 'field' . $args['id'] ] = __( 'There was a problem verifying your recaptcha', 'formidable' );
-			$errors[ 'field' . $args['id'] ] .= ' ' . $error_string;
+			$errors['field' . $args['id']] = __( 'There was a problem verifying your recaptcha', 'formidable' );
+			$errors['field' . $args['id']] .= ' ' . $error_string;
 		}
 
 		return $errors;

classes/models/FrmAddon.php

Spacing +13 added lines, -13 removed lines

@@ -39,15 +39,15 @@ 
 	}
 
 	public function insert_installed_addon( $plugins ) {
-		$plugins[ $this->plugin_slug ] = $this;
+		$plugins[$this->plugin_slug] = $this;
 		return $plugins;
 	}
 
 	public static function get_addon( $plugin_slug ) {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
 		$plugin = false;
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
-			$plugin = $plugins[ $plugin_slug ];
+		if ( isset( $plugins[$plugin_slug] ) ) {
+			$plugin = $plugins[$plugin_slug];
 		}
 		return $plugin;
 	}
@@ -155,7 +155,7 @@ 
 		echo '<tr class="plugin-update-tr active"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
 
 		/* translators: %1$s: Plugin name, %2$s: Start link HTML, %3$s: end link HTML */
-		printf( esc_html__( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), esc_html( $this->plugin_name ), '<a href="' . esc_url( admin_url('admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
+		printf( esc_html__( 'Your %1$s license key is missing. Please add it on the %2$slicenses page%3$s.', 'formidable' ), esc_html( $this->plugin_name ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-settings&t=licenses_settings' ) ) . '">', '</a>' );
 		$id = sanitize_title( $plugin['Name'] );
 		echo '<script type="text/javascript">var d = document.getElementById("' . esc_attr( $id ) . '");if ( d !== null ){ d.className = d.className + " update"; }</script>';
 		echo '</div></td></tr>';
@@ -168,10 +168,10 @@ 
 
 		if ( $this->is_current_version( $transient ) ) {
 			//make sure it doesn't show there is an update if plugin is up-to-date
-			if ( isset( $transient->response[ $this->plugin_folder ] ) ) {
-				unset( $transient->response[ $this->plugin_folder ] );
+			if ( isset( $transient->response[$this->plugin_folder] ) ) {
+				unset( $transient->response[$this->plugin_folder] );
 			}
-		} elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) {
+		} elseif ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) {
 			$cache_key = $this->version_cache_key();
 			$version_info = get_option( $cache_key );
 
@@ -183,7 +183,7 @@ 
 			}
 
 			if ( false !== $version_info && version_compare( $version_info->new_version, $this->version, '>' ) ) {
-				$transient->response[ $this->plugin_folder ] = $version_info;
+				$transient->response[$this->plugin_folder] = $version_info;
 			} else {
 				delete_option( $cache_key );
 				if ( ! $this->has_been_cleared() ) {
@@ -192,7 +192,7 @@ 
 					$this->manually_queue_update();
 				}
 
-				unset( $transient->response[ $this->plugin_folder ] );
+				unset( $transient->response[$this->plugin_folder] );
 			}
 		}
 
@@ -226,7 +226,7 @@ 
 	}
 
 	private function is_current_version( $transient ) {
-		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) {
+		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) {
 			return false;
 		}
 
@@ -235,7 +235,7 @@ 
 			return true;
 		}
 
-		return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version;
+		return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] === $transient->response[$this->plugin_folder]->new_version;
 	}
 
 	private function has_been_cleared() {
@@ -311,8 +311,8 @@ 
 			$response['message'] = $response['status'];
 		} else {
 			$messages = $this->get_messages();
-			if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) {
-				$response['message'] = $messages[ $response['status'] ];
+			if ( is_string( $response['status'] ) && isset( $messages[$response['status']] ) ) {
+				$response['message'] = $messages[$response['status']];
 			} else {
 				$response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) );
 			}

classes/models/FrmEntryValues.php

Spacing +5 added lines, -5 removed lines

@@ -136,12 +136,12 @@ 
 	 * @return array
 	 */
 	private function prepare_array_property( $index, $atts ) {
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
 
-			if ( is_array( $atts[ $index ] ) ) {
-				$property = $atts[ $index ];
+			if ( is_array( $atts[$index] ) ) {
+				$property = $atts[$index];
 			} else {
-				$property = explode( ',', $atts[ $index ] );
+				$property = explode( ',', $atts[$index] );
 			}
 		} else {
 			$property = array();
@@ -274,6 +274,6 @@ 
 	 * @param stdClass $field
 	 */
 	protected function add_field_values( $field ) {
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
 	}
 }

classes/models/FrmFieldValue.php

Spacing +3 added lines, -3 removed lines

@@ -59,8 +59,8 @@ 
 	protected function init_saved_value( $entry ) {
 		if ( $this->field->type === 'html' ) {
 			$this->saved_value = $this->field->description;
-		} else if ( isset( $entry->metas[ $this->field->id ] ) ) {
-			$this->saved_value = $entry->metas[ $this->field->id ];
+		} else if ( isset( $entry->metas[$this->field->id] ) ) {
+			$this->saved_value = $entry->metas[$this->field->id];
 		} else {
 			$this->saved_value = '';
 		}
@@ -176,7 +176,7 @@ 
 		// TODO: maybe change from 'source' to 'run_filters' = 'email'
 		if ( isset( $atts['source'] ) && $atts['source'] === 'entry_formatter' ) {
 			// Deprecated frm_email_value hook
-			$meta                  = array(
+			$meta = array(
 				'item_id'    => $entry->id,
 				'field_id'   => $this->field->id,
 				'meta_value' => $this->saved_value,

classes/models/FrmCreateFile.php

Spacing +8 added lines, -8 removed lines

@@ -21,8 +21,8 @@ 
 		$this->error_message = isset( $atts['error_message'] ) ? $atts['error_message'] : '';
 		$this->uploads = wp_upload_dir();
 		$this->set_new_file_path( $atts );
-		$this->chmod_dir = defined('FS_CHMOD_DIR') ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
-		$this->chmod_file = defined('FS_CHMOD_FILE') ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
+		$this->chmod_dir = defined( 'FS_CHMOD_DIR' ) ? FS_CHMOD_DIR : ( fileperms( ABSPATH ) & 0777 | 0755 );
+		$this->chmod_file = defined( 'FS_CHMOD_FILE' ) ? FS_CHMOD_FILE : ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 );
 
 		$this->check_permission();
 	}
@@ -154,7 +154,7 @@ 
 	}
 
 	private function get_creds() {
-		if ( ! function_exists('get_filesystem_method') ) {
+		if ( ! function_exists( 'get_filesystem_method' ) ) {
 			include_once( ABSPATH . 'wp-admin/includes/file.php' );
 		}
 
@@ -173,13 +173,13 @@ 
 			'username' => '',
 		) );
 
-		$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : $credentials['hostname'];
-		$credentials['username'] = defined('FTP_USER') ? FTP_USER : $credentials['username'];
-		$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : '';
+		$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : $credentials['hostname'];
+		$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : $credentials['username'];
+		$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : '';
 
 		// Check to see if we are setting the public/private keys for ssh
-		$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : '';
-		$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : '';
+		$credentials['public_key'] = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : '';
+		$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : '';
 
 		// Sanitize the hostname, Some people might pass in odd-data:
 		$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off