Strategy11 / formidable-forms

classes/helpers/FrmFormActionsHelper.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( ! defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
 

classes/views/frm-entries/_sidebar-shared-pub.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! isset( $entry) ) {
+if ( ! isset( $entry ) ) {
     $entry = $record;
 } ?>
 
@@ -18,4 +18,4 @@ 
 </div>
 <?php } ?>
 
-<?php do_action('frm_entry_shared_sidebar', $entry); ?>
+<?php do_action( 'frm_entry_shared_sidebar', $entry ); ?>

Indentation +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 if ( ! isset( $entry) ) {
-    $entry = $record;
+	$entry = $record;
 } ?>
 
 <div class="misc-pub-section curtime misc-pub-curtime">
     <span id="timestamp">
     <?php
-    $date_format = __( 'M j, Y @ G:i' );
+	$date_format = __( 'M j, Y @ G:i' );
 	printf( esc_html__( 'Published on: %1$s' ), '<b>' . FrmAppHelper::get_localized_date( $date_format, $entry->created_at ) . '</b>' );
 	?>
     </span>

classes/views/frm-entries/sidebar-shared.php

Indentation +7 added lines, -7 removed lines

@@ -66,18 +66,18 @@
         <?php } ?>
 
         <?php
-        foreach ( (array) $data as $k => $d ) {
+		foreach ( (array) $data as $k => $d ) {
 			if ( in_array( $k, array( 'browser', 'referrer' ) ) ) {
-                continue;
-            }
-        ?>
+				continue;
+			}
+		?>
         <div class="misc-pub-section">
 			<b><?php echo sanitize_text_field( ucfirst( str_replace( '-', ' ', $k ) ) ); ?></b>:
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
-        }
-        ?>
+			unset($k, $d);
+		}
+		?>
     </div>
 </div>

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 <div class="postbox frm_with_icons" >
     <h3 class="hndle">
 		<span><?php esc_html_e( 'Entry Details', 'formidable' ) ?></span>
-		<?php if ( FrmAppHelper::get_param('frm_action') != 'show' ) { ?>
+		<?php if ( FrmAppHelper::get_param( 'frm_action' ) != 'show' ) { ?>
 		<a href="?page=formidable-entries&amp;frm_action=show&amp;id=<?php echo absint( $entry->id ); ?>" class="alignright">
 			<?php esc_html_e( 'View Entry', 'formidable' ) ?>
 		</a>
@@ -15,7 +15,7 @@ 
         <div class="misc-pub-section frm_no_print">
             <span class="dashicons dashicons-admin-post wp-media-buttons-icon"></span>
             <?php esc_html_e( 'Post', 'formidable' ) ?>:
-            <b><?php echo get_the_title($entry->post_id) ?></b>
+            <b><?php echo get_the_title( $entry->post_id ) ?></b>
 			<span>
 				<a href="<?php echo esc_url( admin_url( 'post.php?post=' . $entry->post_id . '&action=edit' ) ) ?>">
 					<?php esc_html_e( 'Edit', 'formidable' ) ?>
@@ -75,7 +75,7 @@ 
         </div>
         <?php } ?>
 
-        <?php if ( isset($data['referrer']) ) { ?>
+        <?php if ( isset( $data['referrer'] ) ) { ?>
 		<div class="misc-pub-section frm_force_wrap">
 			<b><?php esc_html_e( 'Referrer', 'formidable' ) ?></b>:<br/>
 			<?php echo wp_kses_post( str_replace( "\r\n", '<br/>', $data['referrer'] ) ); ?>
@@ -93,7 +93,7 @@ 
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
+            unset( $k, $d );
         }
         ?>
     </div>

classes/views/frm-form-actions/default_actions.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class FrmDefPostAction extends FrmFormAction {
 	public function __construct() {
 		$action_ops = FrmFormAction::default_action_opts();
-	    $action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
+		$action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
 
 		parent::__construct( 'wppost', __( 'Create Post', 'formidable' ), $action_ops );
 	}

Spacing +6 added lines, -6 removed lines

@@ -12,7 +12,7 @@ 
 // add register action
 class FrmDefRegAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_register_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_register_icon' );
 		parent::__construct( 'register', __( 'Register User', 'formidable' ), $action_ops );
 	}
 }
@@ -20,7 +20,7 @@ 
 // add paypal action
 class FrmDefPayPalAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_paypal_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_paypal_icon' );
 		parent::__construct( 'paypal', __( 'Collect Payment', 'formidable' ), $action_ops );
 	}
 }
@@ -28,7 +28,7 @@ 
 // add aweber action
 class FrmDefAweberAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_aweber_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_aweber_icon' );
 		parent::__construct( 'aweber', __( 'Aweber', 'formidable' ), $action_ops );
 	}
 }
@@ -36,7 +36,7 @@ 
 // add mailchimp action
 class FrmDefMlcmpAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_mailchimp_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_mailchimp_icon' );
 		parent::__construct( 'mailchimp', __( 'MailChimp', 'formidable' ), $action_ops );
 	}
 }
@@ -44,7 +44,7 @@ 
 // add twilio action
 class FrmDefTwilioAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_sms_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_sms_icon' );
 		parent::__construct( 'twilio', __( 'Twilio', 'formidable' ), $action_ops );
 	}
 }
@@ -52,7 +52,7 @@ 
 // add highrise action
 class FrmDefHrsAction extends FrmFormAction {
 	public function __construct() {
-		$action_ops = FrmFormAction::default_action_opts('frm_highrise_icon');
+		$action_ops = FrmFormAction::default_action_opts( 'frm_highrise_icon' );
 		parent::__construct( 'highrise', __( 'Highrise', 'formidable' ), $action_ops );
 	}
 }

classes/views/xml/forms_xml.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! $item_ids ) {
-    return;
+	return;
 }
 
 // fetch 20 posts at a time rather than loading the entire table into memory
@@ -45,6 +45,6 @@ 
 <?php	} ?>
 	</form>
 <?php
-    	unset( $fields );
+		unset( $fields );
 	}
 }

Spacing +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@ 
 ?>
 	<form>
 		<id><?php echo absint( $form->id ) ?></id>
-		<form_key><?php echo FrmXMLHelper::cdata($form->form_key) ?></form_key>
-		<name><?php echo FrmXMLHelper::cdata($form->name) ?></name>
-		<description><?php echo FrmXMLHelper::cdata($form->description) ?></description>
+		<form_key><?php echo FrmXMLHelper::cdata( $form->form_key ) ?></form_key>
+		<name><?php echo FrmXMLHelper::cdata( $form->name ) ?></name>
+		<description><?php echo FrmXMLHelper::cdata( $form->description ) ?></description>
 		<created_at><?php echo esc_html( $form->created_at ) ?></created_at>
 		<logged_in><?php echo esc_html( $form->logged_in ) ?></logged_in>
 		<is_template><?php echo esc_html( $form->is_template ) ?></is_template>
 		<default_template><?php echo esc_html( $form->default_template ) ?></default_template>
 		<editable><?php echo esc_html( $form->editable ) ?></editable>
-		<options><?php echo FrmXMLHelper::prepare_form_options_for_export($form->options) ?></options>
-		<status><?php echo FrmXMLHelper::cdata($form->status) ?></status>
+		<options><?php echo FrmXMLHelper::prepare_form_options_for_export( $form->options ) ?></options>
+		<status><?php echo FrmXMLHelper::cdata( $form->status ) ?></status>
         <parent_form_id><?php echo esc_html( $form->parent_form_id ) ?></parent_form_id>
 <?php
 
@@ -32,16 +32,16 @@ 
 		?>
 		<field>
 		    <id><?php echo absint( $field->id ) ?></id>
-            <field_key><?php echo FrmXMLHelper::cdata($field->field_key) ?></field_key>
-            <name><?php echo FrmXMLHelper::cdata($field->name) ?></name>
-            <description><?php echo FrmXMLHelper::cdata($field->description) ?></description>
-            <type><?php echo FrmXMLHelper::cdata($field->type) ?></type>
-            <default_value><?php echo FrmXMLHelper::cdata($field->default_value) ?></default_value>
+            <field_key><?php echo FrmXMLHelper::cdata( $field->field_key ) ?></field_key>
+            <name><?php echo FrmXMLHelper::cdata( $field->name ) ?></name>
+            <description><?php echo FrmXMLHelper::cdata( $field->description ) ?></description>
+            <type><?php echo FrmXMLHelper::cdata( $field->type ) ?></type>
+            <default_value><?php echo FrmXMLHelper::cdata( $field->default_value ) ?></default_value>
             <field_order><?php echo absint( $field->field_order ) ?></field_order>
             <form_id><?php echo absint( $field->form_id ) ?></form_id>
             <required><?php echo absint( $field->required ) ?></required>
-            <options><?php echo FrmXMLHelper::cdata($field->options) ?></options>
-            <field_options><?php echo FrmXMLHelper::cdata($field->field_options) ?></field_options>
+            <options><?php echo FrmXMLHelper::cdata( $field->options ) ?></options>
+            <field_options><?php echo FrmXMLHelper::cdata( $field->field_options ) ?></field_options>
 		</field>
 <?php	} ?>
 	</form>

classes/models/FrmPointers.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Get the singleton instance of this class
 	 *
-	 * @return object
+	 * @return FrmPointers
 	 */
 	public static function get_instance() {
 		if ( ! ( self::$instance instanceof self ) ) {

Indentation +16 added lines, -16 removed lines

@@ -239,16 +239,16 @@ 
 
 		return array(
 			'content'   => '<h3>' . __( 'Forms', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'All your forms will be listed on this page. Create your first form by clicking on the "Add New" button.', 'formidable' ) . '</p>'
-			               . '<p><strong>' . __( 'Subscribe to our Newsletter', 'formidable' ) . '</strong><br/>'
-			               . sprintf( __( 'If you would like to hear about new features and updates for %1$s, subscribe to our newsletter:', 'formidable' ), 'Formidable' ) . '</p>'
-			               . '<form target="_blank" action="//formidablepro.us1.list-manage.com/subscribe/post?u=a4a913790ffb892daacc6f271&amp;id=7e7df15967" method="post" selector="newsletter-form" accept-charset="' . esc_attr( get_bloginfo( 'charset' ) ) . '">'
-			               . '<p>'
-			               . '<input style="margin: 5px; color:#666" name="EMAIL" value="' . esc_attr( $current_user->user_email ) . '" selector="newsletter-email" placeholder="' . esc_attr__( 'Email', 'formidable' ) . '"/>'
+						   . '<p>' . __( 'All your forms will be listed on this page. Create your first form by clicking on the "Add New" button.', 'formidable' ) . '</p>'
+						   . '<p><strong>' . __( 'Subscribe to our Newsletter', 'formidable' ) . '</strong><br/>'
+						   . sprintf( __( 'If you would like to hear about new features and updates for %1$s, subscribe to our newsletter:', 'formidable' ), 'Formidable' ) . '</p>'
+						   . '<form target="_blank" action="//formidablepro.us1.list-manage.com/subscribe/post?u=a4a913790ffb892daacc6f271&amp;id=7e7df15967" method="post" selector="newsletter-form" accept-charset="' . esc_attr( get_bloginfo( 'charset' ) ) . '">'
+						   . '<p>'
+						   . '<input style="margin: 5px; color:#666" name="EMAIL" value="' . esc_attr( $current_user->user_email ) . '" selector="newsletter-email" placeholder="' . esc_attr__( 'Email', 'formidable' ) . '"/>'
 						   . '<input type="hidden" name="group[4505]" value="4" />'
-			               . '<button type="submit" class="button-primary">' . esc_html__( 'Subscribe', 'formidable' ) . '</button>'
-			               . '</p>'
-			               . '</form>',
+						   . '<button type="submit" class="button-primary">' . esc_html__( 'Subscribe', 'formidable' ) . '</button>'
+						   . '</p>'
+						   . '</form>',
 			'next_page' => 'entries',
 		);
 	}
@@ -261,7 +261,7 @@ 
 	private function entries_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Entries', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Each time one of your forms is submitted, an entry is created. You will find every form submission listed here so you will always have a backup if an email fails.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Each time one of your forms is submitted, an entry is created. You will find every form submission listed here so you will always have a backup if an email fails.', 'formidable' ) . '</p>',
 			'prev_page' => '',
 			'next_page' => 'styles',
 			'selector'  => '.wp-list-table',
@@ -277,7 +277,7 @@ 
 	private function styles_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Styles', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Want to make changes to the way your forms look? Make all the changes you would like right here, and watch the sample form change before your eyes.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Want to make changes to the way your forms look? Make all the changes you would like right here, and watch the sample form change before your eyes.', 'formidable' ) . '</p>',
 			'prev_page' => 'entries',
 			'next_page' => 'import',
 			'selector'  => '.general-style',
@@ -293,7 +293,7 @@ 
 	private function import_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Import/Export', 'formidable' ) . '</h3>'
-			               . '<p>' . __( 'Import and export forms and styles when copying from one site to another or sharing with someone else. Your entries can be exported to a CSV as well. The Premium version also includes the option to import entries to your site from a CSV.', 'formidable' ) . '</p>',
+						   . '<p>' . __( 'Import and export forms and styles when copying from one site to another or sharing with someone else. Your entries can be exported to a CSV as well. The Premium version also includes the option to import entries to your site from a CSV.', 'formidable' ) . '</p>',
 			'prev_page' => 'styles',
 			'next_page' => 'settings',
 			'selector'  => '.inside.with_frm_style',
@@ -313,7 +313,7 @@ 
 				. __( 'Turn stylesheets and scripts off, set which user roles have access to change and create forms, setup your reCaptcha, and set default messages for new forms and fields.', 'formidable' )
 				. '<p><strong>' . __( 'Plugin Licenses', 'formidable' ) . '</strong><br/>'
 				. sprintf( __( 'Once you&#8217;ve purchased %1$s or any addons, you&#8217;ll have to enter a license key to get access to all of their powerful features. A Plugin Licenses tab will appear here for you to enter your license key.', 'formidable' ), 'Formidable Pro' )
-           	    . '</p>',
+		   		. '</p>',
 			'prev_page' => 'import',
 			'next_page' => 'addons',
 		);
@@ -327,10 +327,10 @@ 
 	private function addons_pointer() {
 		return array(
 			'content'   => '<h3>' . __( 'Addons', 'formidable' ) . '</h3>'
-			               . '<p>' . sprintf( __( 'The powerful functions of %1$s can be extended with %2$spremium plugins%3$s. You can read all about the Formidable Premium Plugins %2$shere%3$s.', 'formidable' ), 'Formidable', '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/' ) ) . '">', '</a>' )
+						   . '<p>' . sprintf( __( 'The powerful functions of %1$s can be extended with %2$spremium plugins%3$s. You can read all about the Formidable Premium Plugins %2$shere%3$s.', 'formidable' ), 'Formidable', '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/' ) ) . '">', '</a>' )
 						   . '</p>'
-			               . '<p><strong>' . __( 'Like this plugin?', 'formidable' ) . '</strong><br/>' . sprintf( __( 'So, we&#8217;ve come to the end of the tour. If you like the plugin, please %1$srate it 5 stars on WordPress.org%2$s!', 'formidable' ), '<a target="_blank" href="https://wordpress.org/plugins/formidable/">', '</a>' ) . '</p>'
-			               . '<p>' . sprintf( __( 'Thank you for using our plugin and good luck with your forms!<br/><br/>Best,<br/>Team Formidable - %1$sformidableforms.com%2$s', 'formidable' ), '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/' ) ) . '">', '</a>' ) . '</p>',
+						   . '<p><strong>' . __( 'Like this plugin?', 'formidable' ) . '</strong><br/>' . sprintf( __( 'So, we&#8217;ve come to the end of the tour. If you like the plugin, please %1$srate it 5 stars on WordPress.org%2$s!', 'formidable' ), '<a target="_blank" href="https://wordpress.org/plugins/formidable/">', '</a>' ) . '</p>'
+						   . '<p>' . sprintf( __( 'Thank you for using our plugin and good luck with your forms!<br/><br/>Best,<br/>Team Formidable - %1$sformidableforms.com%2$s', 'formidable' ), '<a target="_blank" href="' . esc_url( FrmAppHelper::make_affiliate_url( 'https://formidableforms.com/' ) ) . '">', '</a>' ) . '</p>',
 			'prev_page' => 'settings',
 		);
 	}

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 	 * @param string $page Admin page key.
 	 */
 	private function do_page_pointer( $page ) {
-		$pointer = call_user_func( array( $this, $this->admin_pages[ $page ] ) );
+		$pointer = call_user_func( array( $this, $this->admin_pages[$page] ) );
 
 		$opt_arr = array(
 			'content'      => $pointer['content'],

classes/helpers/FrmTipsHelper.php

Spacing +2 added lines, -2 removed lines

@@ -181,13 +181,13 @@
 			),
 		);
 		$random = rand( 0, count( $tips ) - 1 );
-		$tip = $tips[ $random ];
+		$tip = $tips[$random];
 		$tip['num'] = $random;
 		return $tip;
 	}
 
 	public static function get_random_tip( $tips ) {
 		$random = rand( 0, count( $tips ) - 1 );
-		return $tips[ $random ];
+		return $tips[$random];
 	}
 }

classes/views/frm-form-actions/email_action.php

Indentation +17 added lines, -17 removed lines

@@ -4,12 +4,12 @@ 
 
 	public function __construct() {
 		$action_ops = array(
-		    'classes'   => 'frm_email_icon frm_icon_font',
-            'active'    => true,
+			'classes'   => 'frm_email_icon frm_icon_font',
+			'active'    => true,
 			'event'     => array( 'create' ),
-            'limit'     => 99,
-            'priority'  => 10,
-            'ajax_load' => false,
+			'limit'     => 99,
+			'priority'  => 10,
+			'ajax_load' => false,
 		);
 		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
 
@@ -17,23 +17,23 @@ 
 	}
 
 	public function form( $form_action, $args = array() ) {
-	    extract($args);
+		extract($args);
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_email_settings.php' );
 	}
 
 	public function get_defaults() {
-	    return array(
-            'email_to'      => '[admin_email]',
-            'cc'            => '',
-            'bcc'           => '',
-            'from'          => '[sitename] <[admin_email]>',
-            'reply_to'      => '',
-            'email_subject' => '',
-            'email_message' => '[default-message]',
-            'inc_user_info' => 0,
-            'plain_text'    => 0,
+		return array(
+			'email_to'      => '[admin_email]',
+			'cc'            => '',
+			'bcc'           => '',
+			'from'          => '[sitename] <[admin_email]>',
+			'reply_to'      => '',
+			'email_subject' => '',
+			'email_message' => '[default-message]',
+			'inc_user_info' => 0,
+			'plain_text'    => 0,
 			'event'         => array( 'create' ),
-	    );
+		);
 	}
 }

Spacing +3 added lines, -3 removed lines

@@ -11,13 +11,13 @@
             'priority'  => 10,
             'ajax_load' => false,
 		);
-		$action_ops = apply_filters('frm_email_control_settings', $action_ops);
+		$action_ops = apply_filters( 'frm_email_control_settings', $action_ops );
 
-		parent::__construct('email', __( 'Email Notification', 'formidable' ), $action_ops);
+		parent::__construct( 'email', __( 'Email Notification', 'formidable' ), $action_ops );
 	}
 
 	public function form( $form_action, $args = array() ) {
-	    extract($args);
+	    extract( $args );
 
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_email_settings.php' );
 	}

classes/models/FrmDb.php

Doc Comments +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
 	 *
 	 * @since 2.02.05
 	 * @param string $key
-	 * @param int|string $value
+	 * @param string $value
 	 * @param string $where
 	 */
     private static function add_query_placeholder( $key, $value, &$where ) {

Spacing +18 added lines, -18 removed lines

@@ -7,8 +7,8 @@ 
     public $entry_metas;
 
     public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
+        if ( ! defined( 'ABSPATH' ) ) {
+            die( 'You are not allowed to call this page directly.' );
         }
 
 		_deprecated_function( __METHOD__, '2.05.06', 'FrmMigrate' );
@@ -26,7 +26,7 @@ 
 	 * @param string $starts_with
      */
     public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+        if ( empty( $args ) ) {
 			// add an arg to prevent prepare from failing
 			$args = array(
 				'where' => $starts_with . '1=%d',
@@ -94,7 +94,7 @@ 
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
+            $k = explode( ' ', $key );
             $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
             $values[] = '%Y-%m-%d %H:%i:%s';
         } else {
@@ -107,7 +107,7 @@ 
         if ( is_array( $value ) ) {
             // translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
-				$where = preg_replace('/' . $key . '$/', '', $where);
+				$where = preg_replace( '/' . $key . '$/', '', $where );
 				$where .= '(';
 				$start = true;
 				foreach ( $value as $v ) {
@@ -292,8 +292,8 @@ 
 		);
 
 		$where_is = strtolower( $where_is );
-		if ( isset( $switch_to[ $where_is ] ) ) {
-			return ' ' . $switch_to[ $where_is ];
+		if ( isset( $switch_to[$where_is] ) ) {
+			return ' ' . $switch_to[$where_is];
 		}
 
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -315,8 +315,8 @@ 
     private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
+        $table_parts = explode( ' ', $table );
+        $group = reset( $table_parts );
         $group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
@@ -331,7 +331,7 @@ 
     }
 
     private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+        if ( ! is_array( $args ) ) {
 			$args = array( 'order_by' => $args );
         }
 
@@ -346,13 +346,13 @@ 
         $temp_args = $args;
         foreach ( $temp_args as $k => $v ) {
             if ( $v == '' ) {
-				unset( $args[ $k ] );
+				unset( $args[$k] );
                 continue;
             }
 
             $db_name = strtoupper( str_replace( '_', ' ', $k ) );
             if ( strpos( $v, $db_name ) === false ) {
-				$args[ $k ] = $db_name . ' ' . $v;
+				$args[$k] = $db_name . ' ' . $v;
             }
         }
 
@@ -423,13 +423,13 @@ 
 	private static function esc_query_args( &$args ) {
 		foreach ( $args as $param => $value ) {
 			if ( $param == 'order_by' ) {
-				$args[ $param ] = self::esc_order( $value );
+				$args[$param] = self::esc_order( $value );
 			} elseif ( $param == 'limit' ) {
-				$args[ $param ] = self::esc_limit( $value );
+				$args[$param] = self::esc_limit( $value );
 			}
 
-			if ( $args[ $param ] == '' ) {
-				unset( $args[ $param ] );
+			if ( $args[$param] == '' ) {
+				unset( $args[$param] );
 			}
 		}
 	}
@@ -514,7 +514,7 @@ 
 		$limit = explode( ',', trim( $limit ) );
 		foreach ( $limit as $k => $l ) {
 			if ( is_numeric( $l ) ) {
-				$limit[ $k ] = $l;
+				$limit[$k] = $l;
 			}
 		}
 
@@ -645,7 +645,7 @@ 
 	 */
 	public static function add_key_to_group_cache( $key, $group ) {
 		$cached = self::get_group_cached_keys( $group );
-		$cached[ $key ] = $key;
+		$cached[$key] = $key;
 		wp_cache_set( 'cached_keys', $cached, $group, 300 );
 	}
 

Indentation +162 added lines, -162 removed lines

@@ -1,39 +1,39 @@ 
 <?php
 
 class FrmDb {
-    public $fields;
-    public $forms;
-    public $entries;
-    public $entry_metas;
-
-    public function __construct() {
-        if ( ! defined('ABSPATH') ) {
-            die('You are not allowed to call this page directly.');
-        }
+	public $fields;
+	public $forms;
+	public $entries;
+	public $entry_metas;
+
+	public function __construct() {
+		if ( ! defined('ABSPATH') ) {
+			die('You are not allowed to call this page directly.');
+		}
 
 		_deprecated_function( __METHOD__, '2.05.06', 'FrmMigrate' );
-        global $wpdb;
-        $this->fields         = $wpdb->prefix . 'frm_fields';
-        $this->forms          = $wpdb->prefix . 'frm_forms';
-        $this->entries        = $wpdb->prefix . 'frm_items';
-        $this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
-    }
-
-    /**
-     * Change array into format $wpdb->prepare can use
+		global $wpdb;
+		$this->fields         = $wpdb->prefix . 'frm_fields';
+		$this->forms          = $wpdb->prefix . 'frm_forms';
+		$this->entries        = $wpdb->prefix . 'frm_items';
+		$this->entry_metas    = $wpdb->prefix . 'frm_item_metas';
+	}
+
+	/**
+	 * Change array into format $wpdb->prepare can use
 	 *
 	 * @param array $args
 	 * @param string $starts_with
-     */
-    public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
-        if ( empty($args) ) {
+	 */
+	public static function get_where_clause_and_values( &$args, $starts_with = ' WHERE ' ) {
+		if ( empty($args) ) {
 			// add an arg to prevent prepare from failing
 			$args = array(
 				'where' => $starts_with . '1=%d',
 				'values' => array( 1 ),
 			);
 			return;
-        }
+		}
 
 		$where = '';
 		$values = array();
@@ -44,20 +44,20 @@ 
 		}
 
 		$args = compact( 'where', 'values' );
-    }
+	}
 
-    /**
+	/**
 	 * @param array $args
-     * @param string $base_where
-     * @param string $where
+	 * @param string $base_where
+	 * @param string $where
 	 * @param array $values
-     */
-    public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
-        $condition = ' AND';
-        if ( isset( $args['or'] ) ) {
-            $condition = ' OR';
-            unset( $args['or'] );
-        }
+	 */
+	public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
+		$condition = ' AND';
+		if ( isset( $args['or'] ) ) {
+			$condition = ' OR';
+			unset( $args['or'] );
+		}
 
 		foreach ( $args as $key => $value ) {
 			$where .= empty( $where ) ? $base_where : $condition;
@@ -84,28 +84,28 @@ 
 		}
 	}
 
-    /**
-     * @param string $key
+	/**
+	 * @param string $key
 	 * @param string|array $value
-     * @param string $where
+	 * @param string $where
 	 * @param array $values
-     */
-    private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
+	 */
+	private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
 		$key = trim( $key );
 
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
-            $k = explode(' ', $key);
-            $where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
-            $values[] = '%Y-%m-%d %H:%i:%s';
-        } else {
+			$k = explode(' ', $key);
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
+			$values[] = '%Y-%m-%d %H:%i:%s';
+		} else {
 			$where .= ' ' . $key;
-        }
+		}
 
 		$lowercase_key = explode( ' ', strtolower( $key ) );
 		$lowercase_key = end( $lowercase_key );
 
-        if ( is_array( $value ) ) {
-            // translate array of values to "in"
+		if ( is_array( $value ) ) {
+			// translate array of values to "in"
 			if ( strpos( $lowercase_key, 'like' ) !== false ) {
 				$where = preg_replace('/' . $key . '$/', '', $where);
 				$where .= '(';
@@ -123,7 +123,7 @@ 
 				$where .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')';
 				$values = array_merge( $values, $value );
 			}
-        } else if ( strpos( $lowercase_key, 'like' ) !== false ) {
+		} else if ( strpos( $lowercase_key, 'like' ) !== false ) {
 			/**
 			 * Allow string to start or end with the value
 			 * If the key is like% then skip the first % for starts with
@@ -143,9 +143,9 @@ 
 			$where .= ' %s';
 			$values[] = $start . self::esc_like( $value ) . $end;
 
-        } else if ( $value === null ) {
-            $where .= ' IS NULL';
-        } else {
+		} else if ( $value === null ) {
+			$where .= ' IS NULL';
+		} else {
 			// allow a - to prevent = from being added
 			if ( substr( $key, -1 ) == '-' ) {
 				$where = rtrim( $where, '-' );
@@ -155,9 +155,9 @@ 
 
 			self::add_query_placeholder( $key, $value, $where );
 
-            $values[] = $value;
-        }
-    }
+			$values[] = $value;
+		}
+	}
 
 	/**
 	 * Add %d, or %s to query
@@ -167,7 +167,7 @@ 
 	 * @param int|string $value
 	 * @param string $where
 	 */
-    private static function add_query_placeholder( $key, $value, &$where ) {
+	private static function add_query_placeholder( $key, $value, &$where ) {
 		if ( is_numeric( $value ) && ( strpos( $key, 'meta_value' ) === false || strpos( $key, '+0' ) !== false ) ) {
 			$value = $value + 0; // switch string to number
 			$where .= is_float( $value ) ? '%f' : '%d';
@@ -176,16 +176,16 @@ 
 		}
 	}
 
-    /**
-     * @param string $table
+	/**
+	 * @param string $table
 	 * @param array $where
 	 * @param array $args
 	 * @return int
-     */
-    public static function get_count( $table, $where = array(), $args = array() ) {
-        $count = self::get_var( $table, $where, 'COUNT(*)', $args );
-        return $count;
-    }
+	 */
+	public static function get_count( $table, $where = array(), $args = array() ) {
+		$count = self::get_var( $table, $where, 'COUNT(*)', $args );
+		return $count;
+	}
 
 	/**
 	 * @param string $table
@@ -196,17 +196,17 @@ 
 	 * @param string $type
 	 * @return array|null|string|object
 	 */
-    public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
-        $group = '';
-        self::get_group_and_table_name( $table, $group );
+	public static function get_var( $table, $where = array(), $field = 'id', $args = array(), $limit = '', $type = 'var' ) {
+		$group = '';
+		self::get_group_and_table_name( $table, $group );
 		self::convert_options_to_array( $args, '', $limit );
 
 		$query = self::generate_query_string_from_pieces( $field, $table, $where, $args );
 
 		$cache_key = self::generate_cache_key( $where, $args, $field, $type );
 		$results = self::check_cache( $cache_key, $group, $query, 'get_' . $type );
-        return $results;
-    }
+		return $results;
+	}
 
 	/**
 	 * Generate a cache key from the where query, field, type, and other arguments
@@ -232,44 +232,44 @@ 
 		return $cache_key;
 	}
 
-    /**
-     * @param string $table
-     * @param array $where
+	/**
+	 * @param string $table
+	 * @param array $where
 	 * @param string $field
 	 * @param array $args
 	 * @param string $limit
 	 * @return mixed
-     */
-    public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
-        return self::get_var( $table, $where, $field, $args, $limit, 'col' );
-    }
-
-    /**
-     * @since 2.0
-     * @param string $table
+	 */
+	public static function get_col( $table, $where = array(), $field = 'id', $args = array(), $limit = '' ) {
+		return self::get_var( $table, $where, $field, $args, $limit, 'col' );
+	}
+
+	/**
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
-        $args['limit'] = 1;
-        return self::get_var( $table, $where, $fields, $args, '', 'row' );
-    }
-
-    /**
-     * Prepare a key/value array before DB call
+	 */
+	public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
+		$args['limit'] = 1;
+		return self::get_var( $table, $where, $fields, $args, '', 'row' );
+	}
+
+	/**
+	 * Prepare a key/value array before DB call
 	 *
-     * @since 2.0
-     * @param string $table
+	 * @since 2.0
+	 * @param string $table
 	 * @param array $where
 	 * @param string $fields
 	 * @param array $args
 	 * @return mixed
-     */
-    public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
-        return self::get_var( $table, $where, $fields, $args, '', 'results' );
-    }
+	 */
+	public static function get_results( $table, $where = array(), $fields = '*', $args = array() ) {
+		return self::get_var( $table, $where, $fields, $args, '', 'results' );
+	}
 
 	/**
 	 * Check for like, not like, in, not in, =, !=, >, <, <=, >=
@@ -306,56 +306,56 @@ 
 		return '';
 	}
 
-    /**
-     * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
-     * Also add the wpdb->prefix to the table if it's missing
-     *
-     * @param string $table
-     * @param string $group
-     */
-    private static function get_group_and_table_name( &$table, &$group ) {
+	/**
+	 * Get 'frm_forms' from wp_frm_forms or a longer table param that includes a join
+	 * Also add the wpdb->prefix to the table if it's missing
+	 *
+	 * @param string $table
+	 * @param string $group
+	 */
+	private static function get_group_and_table_name( &$table, &$group ) {
 		global $wpdb, $wpmuBaseTablePrefix;
 
-        $table_parts = explode(' ', $table);
-        $group = reset($table_parts);
-        $group = str_replace( $wpdb->prefix, '', $group );
+		$table_parts = explode(' ', $table);
+		$group = reset($table_parts);
+		$group = str_replace( $wpdb->prefix, '', $group );
 
 		$prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix : $wpdb->base_prefix;
 		$group = str_replace( $prefix, '', $group );
 
-        if ( $group == $table ) {
-            $table = $wpdb->prefix . $table;
-        }
+		if ( $group == $table ) {
+			$table = $wpdb->prefix . $table;
+		}
 
 		// switch to singular group name
 		$group = rtrim( $group, 's' );
-    }
+	}
 
-    private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
-        if ( ! is_array($args) ) {
+	private static function convert_options_to_array( &$args, $order_by = '', $limit = '' ) {
+		if ( ! is_array($args) ) {
 			$args = array( 'order_by' => $args );
-        }
+		}
 
-        if ( ! empty( $order_by ) ) {
-            $args['order_by'] = $order_by;
-        }
+		if ( ! empty( $order_by ) ) {
+			$args['order_by'] = $order_by;
+		}
 
-        if ( ! empty( $limit ) ) {
-            $args['limit'] = $limit;
-        }
+		if ( ! empty( $limit ) ) {
+			$args['limit'] = $limit;
+		}
 
-        $temp_args = $args;
-        foreach ( $temp_args as $k => $v ) {
-            if ( $v == '' ) {
+		$temp_args = $args;
+		foreach ( $temp_args as $k => $v ) {
+			if ( $v == '' ) {
 				unset( $args[ $k ] );
-                continue;
-            }
+				continue;
+			}
 
-            $db_name = strtoupper( str_replace( '_', ' ', $k ) );
-            if ( strpos( $v, $db_name ) === false ) {
+			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
+			if ( strpos( $v, $db_name ) === false ) {
 				$args[ $k ] = $db_name . ' ' . $v;
-            }
-        }
+			}
+		}
 
 		// Make sure LIMIT is the last argument
 		if ( isset( $args['order_by'] ) && isset( $args['limit'] ) ) {
@@ -363,7 +363,7 @@ 
 			unset( $args['limit'] );
 			$args['limit'] = $temp_limit;
 		}
-    }
+	}
 
 	/**
 	 * Get the associative array results for the given columns, table, and where query
@@ -435,25 +435,25 @@ 
 		}
 	}
 
-    /**
-     * Added for < WP 4.0 compatability
-     *
-     * @since 2.05.06
-     *
-     * @param string $term The value to escape
-     * @return string The escaped value
-     */
+	/**
+	 * Added for < WP 4.0 compatability
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $term The value to escape
+	 * @return string The escaped value
+	 */
 	public static function esc_like( $term ) {
-        global $wpdb;
-        if ( method_exists( $wpdb, 'esc_like' ) ) {
+		global $wpdb;
+		if ( method_exists( $wpdb, 'esc_like' ) ) {
 			// WP 4.0
-            $term = $wpdb->esc_like( $term );
-        } else {
-            $term = like_escape( $term );
-        }
+			$term = $wpdb->esc_like( $term );
+		} else {
+			$term = like_escape( $term );
+		}
 
-        return $term;
-    }
+		return $term;
+	}
 
 	/**
 	 * @since 2.05.06
@@ -523,10 +523,10 @@ 
 		return ' LIMIT ' . $limit;
 	}
 
-    /**
-     * Get an array of values ready to go through $wpdb->prepare
-     * @since 2.05.06
-     */
+	/**
+	 * Get an array of values ready to go through $wpdb->prepare
+	 * @since 2.05.06
+	 */
 	public static function prepare_array_values( $array, $type = '%s' ) {
 		$placeholders = array_fill( 0, count( $array ), $type );
 		return implode( ', ', $placeholders );
@@ -597,17 +597,17 @@ 
 		return $post;
 	}
 
-    /**
-     * Check cache before fetching values and saving to cache
-     *
-     * @since 2.05.06
-     *
-     * @param string $cache_key The unique name for this cache
-     * @param string $group The name of the cache group
-     * @param string $query If blank, don't run a db call
-     * @param string $type The wpdb function to use with this query
-     * @return mixed $results The cache or query results
-     */
+	/**
+	 * Check cache before fetching values and saving to cache
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $cache_key The unique name for this cache
+	 * @param string $group The name of the cache group
+	 * @param string $query If blank, don't run a db call
+	 * @param string $type The wpdb function to use with this query
+	 * @return mixed $results The cache or query results
+	 */
 	public static function check_cache( $cache_key, $group = '', $query = '', $type = 'get_var', $time = 300 ) {
 		$results = wp_cache_get( $cache_key, $group );
 		if ( ! FrmAppHelper::is_empty_value( $results, false ) || empty( $query ) ) {
@@ -671,13 +671,13 @@ 
 		wp_cache_delete( $cache_key, $group );
 	}
 
-    /**
-     * Delete all caching in a single group
-     *
-     * @since 2.05.06
-     *
-     * @param string $group The name of the cache group
-     */
+	/**
+	 * Delete all caching in a single group
+	 *
+	 * @since 2.05.06
+	 *
+	 * @param string $group The name of the cache group
+	 */
 	public static function cache_delete_group( $group ) {
 		$cached_keys = self::get_group_cached_keys( $group );