gravityview / GravityView

includes/admin/field-types/type_hidden.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 
 	function render_input( $override_input = null ) {
 
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+        $class = ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />

includes/admin/field-types/type_number.php

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,10 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
-        }
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
+		}
+		$class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

Spacing +4 added lines, -4 removed lines

@@ -3,13 +3,13 @@ 
  * number input type
  */
 
-if( !class_exists('GravityView_FieldType_text') ) {
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
 }
 class GravityView_FieldType_number extends GravityView_FieldType_text {
 
 	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -18,10 +18,10 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+        $class .= ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

includes/admin/metaboxes/class-gravityview-admin-metaboxes.php

Indentation +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 		if( !GravityView_Compatibility::is_valid() ) { return; }
 
-        self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
+		self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
 
 		include_once self::$metaboxes_dir . 'class-gravityview-metabox-tab.php';
 
@@ -228,13 +228,13 @@ 
 		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
 
 		if( isset( $form['id'] ) ) {
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
+			$form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
 
-		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
-		    $_GET['id'] = $form['id'];
+			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
+			$_GET['id'] = $form['id'];
 
 		} else {
-		    $form_script = 'var form = new Form();';
+			$form_script = 'var form = new Form();';
 		}
 
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';

Spacing +24 added lines, -24 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function __construct() {
 
-		if( !GravityView_Compatibility::is_valid() ) { return; }
+		if ( ! GravityView_Compatibility::is_valid() ) { return; }
 
         self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/';
 
@@ -35,9 +35,9 @@ 
 	 */
 	function initialize() {
 
-		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ));
+		add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ) );
 
-		add_action( 'add_meta_boxes_gravityview' , array( $this, 'update_priority' ) );
+		add_action( 'add_meta_boxes_gravityview', array( $this, 'update_priority' ) );
 
 		// information box
 		add_action( 'post_submitbox_misc_actions', array( $this, 'render_shortcode_hint' ) );
@@ -51,13 +51,13 @@ 
 	function update_priority() {
 		global $wp_meta_boxes;
 
-		if( ! empty( $wp_meta_boxes['gravityview'] ) ) {
-			foreach( array( 'high', 'core', 'low' ) as $position ) {
-				if( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
-					foreach( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
-						if( ! preg_match( '/^gravityview_/ism', $key ) ) {
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
+			foreach ( array( 'high', 'core', 'low' ) as $position ) {
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
+						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
 						}
 					}
 				}
@@ -69,7 +69,7 @@ 
 		global $post;
 
 		// On Comment Edit, for example, $post isn't set.
-		if( empty( $post ) || !is_object( $post ) || !isset( $post->ID ) ) {
+		if ( empty( $post ) || ! is_object( $post ) || ! isset( $post->ID ) ) {
 			return;
 		}
 
@@ -152,9 +152,9 @@ 
 		 */
 		$metaboxes = apply_filters( 'gravityview/metaboxes/default', $metaboxes );
 
-		foreach( $metaboxes as $m ) {
+		foreach ( $metaboxes as $m ) {
 
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
 
 			GravityView_Metabox_Tabs::add( $tab );
 
@@ -180,8 +180,8 @@ 
 
 		$links = GravityView_Admin_Views::get_connected_form_links( $current_form, false );
 
-		if( !empty( $links ) ) {
-			$links = '<span class="alignright gv-form-links">'. $links .'</span>';
+		if ( ! empty( $links ) ) {
+			$links = '<span class="alignright gv-form-links">' . $links . '</span>';
 		}
 
 		return __( 'Data Source', 'gravityview' ) . $links;
@@ -220,28 +220,28 @@ 
 	 */
 	public static function render_merge_tags_scripts( $curr_form ) {
 
-		if( empty( $curr_form )) {
+		if ( empty( $curr_form ) ) {
 			return NULL;
 		}
 
 		$form = gravityview_get_form( $curr_form );
 
-		$get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL;
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : NULL;
 
-		if( isset( $form['id'] ) ) {
-		    $form_script = 'var form = ' . GFCommon::json_encode($form) . ';';
+		if ( isset( $form[ 'id' ] ) ) {
+		    $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
 
 		    // The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
-		    $_GET['id'] = $form['id'];
+		    $_GET[ 'id' ] = $form[ 'id' ];
 
 		} else {
 		    $form_script = 'var form = new Form();';
 		}
 
-		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>';
+		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
 
 		// Restore previous $_GET setting
-		$_GET['id'] = $get_id_backup;
+		$_GET[ 'id' ] = $get_id_backup;
 
 		return $output;
 	}
@@ -299,12 +299,12 @@ 
 		global $post;
 
 		// Only show this on GravityView post types.
-		if( false === gravityview()->request->is_admin( '', null ) ) {
+		if ( false === gravityview()->request->is_admin( '', null ) ) {
 			return;
 		}
 
 		// If the View hasn't been configured yet, don't show embed shortcode
-		if( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) {
+		if ( ! gravityview_get_directory_fields( $post->ID ) && ! gravityview_get_directory_widgets( $post->ID ) ) {
 			return;
 		}
 

includes/class-admin-welcome.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * GravityView_Welcome Class

Spacing +18 added lines, -18 removed lines

@@ -34,10 +34,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
+		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
 	}
 
 	/**
@@ -53,8 +53,8 @@ 
 		// Add help page to GravityView menu
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__('GravityView: Getting Started', 'gravityview'),
-			__('Getting Started', 'gravityview'),
+			__( 'GravityView: Getting Started', 'gravityview' ),
+			__( 'Getting Started', 'gravityview' ),
 			$this->minimum_capability,
 			'gv-getting-started',
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@ 
 	 *
 	 * @return boolean  $is_page   True: yep; false: nope
 	 */
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
 		global $plugin_page;
 
-		if($is_page) { return $is_page; }
+		if ( $is_page ) { return $is_page; }
 
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
 	}
@@ -108,7 +108,7 @@ 
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
 
-		if( !$this->is_dashboard_page() ) { return; }
+		if ( ! $this->is_dashboard_page() ) { return; }
 
 		?>
         <style type="text/css" media="screen" xmlns="http://www.w3.org/1999/html">
@@ -132,7 +132,7 @@ 
 		// Don't fetch -beta, etc.
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
 
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
 
 		echo gravityview_get_floaty( 132 );
 		?>
@@ -141,13 +141,13 @@ 
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
 
 		<h2 class="nav-tab-wrapper clear">
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "Getting Started", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "List of Changes", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( 'Credits', 'gravityview' ); ?>
 			</a>
 		</h2>
@@ -182,7 +182,7 @@ 
 					<h3>Create a View</h3>
 
                     <ol class="ol-decimal">
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -464,7 +464,7 @@ 
 					</ul>
 
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
 				</div>
 			</div>
 
@@ -507,7 +507,7 @@ 
 		global $plugin_page;
 
 		// Bail if we're just editing the plugin
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
 
 		// Bail if no activation redirect
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -518,7 +518,7 @@ 
 		$upgrade = get_option( 'gv_version_upgraded_from' );
 
 		// Don't do anything if they've already seen the new version info
-		if( $upgrade === GravityView_Plugin::version ) {
+		if ( $upgrade === GravityView_Plugin::version ) {
 			return;
 		}
 
@@ -526,10 +526,10 @@ 
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
 
 		// First time install
-		if( ! $upgrade ) {
+		if ( ! $upgrade ) {
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
 		}
 		// Update

includes/class-gravityview-image.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	var $style = NULL;
 
 	/**
- 	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
+	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
 	 * @var string
 	 */
 	var $size = NULL;

Spacing +19 added lines, -19 removed lines

@@ -65,11 +65,11 @@ 
 
 		$atts = wp_parse_args( $atts, $defaults );
 
-		foreach( $atts as $key => $val ) {
+		foreach ( $atts as $key => $val ) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,7 +85,7 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if ( ! $this->validate_src ) { return true; }
 
 		$info = pathinfo( $this->src );
 
@@ -93,9 +93,9 @@ 
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
 		 */
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
+		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) );
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts );
 	}
 
 	/**
@@ -111,16 +111,16 @@ 
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if ( empty( $string ) && ! empty( $this->getimagesize ) ) {
 
 				$image_size = @getimagesize( $this->src );
 
 				// If it didn't return a response, it may be a HTTPS/SSL error
-				if ( empty( $image_size[0] ) ) {
+				if ( empty( $image_size[ 0 ] ) ) {
 					$image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) );
 				}
 
-				if ( !empty( $image_size ) ) {
+				if ( ! empty( $image_size ) ) {
 					list( $width, $height ) = $image_size;
 				}
 
@@ -133,33 +133,33 @@ 
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
 				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
-					'tiny' => array('width' => 40, 'height' => 30),
-					'small' => array('width' => 100, 'height' => 75),
-					'medium' => array('width' => 250, 'height' => 188),
-					'large' => array('width' => 448, 'height' => 336),
+					'tiny' => array( 'width' => 40, 'height' => 30 ),
+					'small' => array( 'width' => 100, 'height' => 75 ),
+					'medium' => array( 'width' => 250, 'height' => 188 ),
+					'large' => array( 'width' => 448, 'height' => 336 ),
 				) );
 
-				switch( $this->size ) {
+				switch ( $this->size ) {
 					case 'tiny':
-						extract($image_sizes['tiny']);
+						extract( $image_sizes[ 'tiny' ] );
 						break;
 					case 'small':
 					case 's':
 					case 'thumb':
-						extract($image_sizes['small']);
+						extract( $image_sizes[ 'small' ] );
 						break;
 					case 'm':
 					case 'medium':
-						extract($image_sizes['medium']);
+						extract( $image_sizes[ 'medium' ] );
 						break;
 					case 'large':
 					case 'l':
-						extract($image_sizes['large']);
+						extract( $image_sizes[ 'large' ] );
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = ! empty( $width ) ? intval( $width ) : intval( $this->width );
+						$height = ! empty( $height ) ? intval( $height ) : intval( $this->height );
 				}
 
 			}

includes/class-gravityview-migrate.php

Indentation +2 added lines, -2 removed lines

@@ -180,8 +180,8 @@
 
 					// check widget settings:
 					//  [search_free] => 1
-			        //  [search_date] => 1
-			        $search_generic = array();
+					//  [search_date] => 1
+					$search_generic = array();
 					if( !empty( $widget['search_free'] ) ) {
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 			$table_name = GFFormsModel::get_lead_meta_table_name();
 		}
 
-		$sql = "UPDATE {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
+		$sql = "update {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
 
 		$approved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::APPROVED, 'Approved' ) );
 

Spacing +39 added lines, -39 removed lines

@@ -72,7 +72,7 @@ 
 
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
 
-		if( false === $approved_result || false === $disapproved_result ) {
+		if ( false === $approved_result || false === $disapproved_result ) {
 			gravityview()->log->error( 'There was an error processing the query. {error}', array( 'error' => $wpdb->last_error ) );
 		} else {
 			// All done: Meta values are migrated
@@ -105,11 +105,11 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if ( false === $redux_settings ) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
 		}
 
@@ -123,8 +123,8 @@ 
 		gravityview()->plugin->settings->update( $updated_settings );
 
 		// And now remove the previous option, so this is a one-time thing.
-		delete_option('gravityview_settings');
-		delete_option('gravityview_settings-transients');
+		delete_option( 'gravityview_settings' );
+		delete_option( 'gravityview_settings-transients' );
 	}
 
 	/**
@@ -147,9 +147,9 @@ 
 
 		$license_call = \GV\License_Handler::get()->license_call( $data );
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
-			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
 		}
 
 		return $redux_settings;
@@ -163,10 +163,10 @@ 
 	function get_redux_settings() {
 
 		// Previous settings set by Redux
-		$redux_option = get_option('gravityview_settings');
+		$redux_option = get_option( 'gravityview_settings' );
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if ( false === $redux_option ) {
 			return false;
 		}
 
@@ -178,19 +178,19 @@ 
 
 		if ( $license_array = \GV\Utils::get( $redux_option, 'license' ) ) {
 
-			$redux_settings['license_key'] = $license_key = \GV\Utils::get( $license_array, 'license' );
+			$redux_settings[ 'license_key' ] = $license_key = \GV\Utils::get( $license_array, 'license' );
 
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) {
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) {
 
 				$saved_license = \GV\Utils::get( $saved_values, 'license' );
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) {
-					$redux_settings['license_key_status'] = \GV\Utils::get( $saved_license, 'status' );
-					$redux_settings['license_key_response'] = \GV\Utils::get( $saved_license, 'response' );
+				if ( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) {
+					$redux_settings[ 'license_key_status' ] = \GV\Utils::get( $saved_license, 'status' );
+					$redux_settings[ 'license_key_response' ] = \GV\Utils::get( $saved_license, 'response' );
 				}
 			}
 		}
@@ -202,8 +202,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
 		}
 
 		// Loop through all the views
@@ -215,20 +215,20 @@ 
 
 		$views = get_posts( $query_args );
 
-		foreach( $views as $view ) {
+		foreach ( $views as $view ) {
 
 			$widgets = gravityview_get_directory_widgets( $view->ID );
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
 
 			gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Loading View ID: {view_id}', array( 'view_id' => $view->ID ) );
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ( $widgets as $area => $ws ) {
+				foreach ( $ws as $k => $widget ) {
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
 
-					if( is_null( $search_fields ) ) {
+					if ( is_null( $search_fields ) ) {
 						$search_fields = $this->get_search_fields( $view->ID );
 					}
 
@@ -236,24 +236,24 @@ 
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
 					}
 
 					$search_config = array_merge( $search_generic, $search_fields );
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if ( empty( $search_config ) ) {
 						$search_config = '';
 					} else {
 						$search_config = json_encode( $search_config );
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
 
 					gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Updated Widget: ', array( 'data' => $widgets[ $area ][ $k ] ) );
 				}
@@ -281,26 +281,26 @@ 
 		// check view fields' settings
 		$fields = gravityview_get_directory_fields( $view_id, false );
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ( $fields as $t => $fs ) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ( $fs as $k => $field ) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
 
-					if( empty( $form_field['type'] ) ) {
+					if ( empty( $form_field[ 'type' ] ) ) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
 
 				}
 			}

includes/helper-functions.php

Indentation +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
 		! isset( $value ) // If it's not set, it's empty!
 		|| false === $value
 		|| null === $value
-	    || '' === $value // Empty string
+		|| '' === $value // Empty string
 		|| array() === $value // Empty array
 		|| ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object
 	) {

Doc Comments +2 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
  *
  * We could do this in a cleaner fashion, but this prevents a lot of code duplication, checking for URL structure, etc.
  *
- * @param int|WP_Post $id        Optional. Post ID or post object. Default current post.
+ * @param integer $id        Optional. Post ID or post object. Default current post.
  *
  * @return array URL args, if exists. Empty array if not.
  */
@@ -135,7 +135,7 @@ 
  * @since 1.15 Added $object param
  *
  * @param string $file_path Full path to a file
- * @param mixed $object Pass pseudo-global to the included file
+ * @param GravityView_Edit_Entry_Render $object Pass pseudo-global to the included file
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
@@ -310,7 +310,6 @@ 
  * Do a _very_ basic match for second-level TLD domains, like `.co.uk`
  *
  * Ideally, we'd use https://github.com/jeremykendall/php-domain-parser to check for this, but it's too much work for such a basic functionality. Maybe if it's needed more in the future. So instead, we use [Basic matching regex](http://stackoverflow.com/a/12372310).
- * @param  string $domain Domain to check if it's a TLD or subdomain
  * @return string         Extracted domain if it has a subdomain
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {

Spacing +52 added lines, -52 removed lines

@@ -32,19 +32,19 @@ 
 	// If there's an overriding CSS file in the current template folder, use it.
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
 
-	if( file_exists( $template_css_path ) ) {
+	if ( file_exists( $template_css_path ) ) {
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
 	} else {
 		// Default: use GravityView CSS file
 
 		// If no path is provided, assume default plugin templates CSS folder
-		if( '' === $dir_path ) {
+		if ( '' === $dir_path ) {
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
 		}
 		
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
 	}
 
 	return $path;
@@ -82,9 +82,9 @@ 
 
 	$parsed_permalink = parse_url( get_permalink( $id ) );
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
 
-	if( empty( $permalink_args ) ) {
+	if ( empty( $permalink_args ) ) {
 		return array();
 	}
 
@@ -109,15 +109,15 @@ 
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
+	if ( is_array( $current ) ) {
+		if ( in_array( $value, $current ) ) {
 			$output = __checked_selected_helper( true, true, false, $type );
 		}
 	} else {
 		$output = __checked_selected_helper( $value, $current, false, $type );
 	}
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $output;
 	}
 
@@ -125,7 +125,7 @@ 
 }
 
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@ 
  */
 function gravityview_strip_whitespace( $string ) {
 	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
 }
 
 /**
@@ -185,7 +185,7 @@ 
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
+	if ( ! file_exists( $file_path ) ) {
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
 		return '';
 	}
@@ -209,15 +209,15 @@ 
 
 	$width = $height * 0.7586206897;
 
-	if( function_exists('is_rtl') && is_rtl() ) {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
 	} else {
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
 	}
 
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
 }
 
 /**
@@ -241,9 +241,9 @@ 
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ( '' === $decimals ) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@ 
 	$parts = parse_url( $value );
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if ( empty( $parts[ 'host' ] ) ) {
 		return $value;
 	}
 
@@ -289,16 +289,16 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
 
-		if( isset( $parts['scheme'] ) ) {
-			$return .= $parts['scheme'];
+		if ( isset( $parts[ 'scheme' ] ) ) {
+			$return .= $parts[ 'scheme' ];
 		}
 
 	}
 
 	// The domain, which may contain a subdomain
-	$domain = $parts['host'];
+	$domain = $parts[ 'host' ];
 
 	/**
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ( $strip_www ) {
+		$domain = str_replace( 'www.', '', $domain );
 	}
 
 	/**
@@ -319,11 +319,11 @@ 
 	 * If true: `http://demo.example.com => example.com` \n
 	 * If false: `http://demo.example.com => demo.example.com`
 	 */
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
 
-	if( $strip_subdomains ) {
+	if ( $strip_subdomains ) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
 
 	}
 
@@ -337,12 +337,12 @@ 
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
 	 */
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
 
-	if( empty( $root_only ) ) {
+	if ( empty( $root_only ) ) {
 
-		if( isset( $parts['path'] ) ) {
-			$return .= $parts['path'];
+		if ( isset( $parts[ 'path' ] ) ) {
+			$return .= $parts[ 'path' ];
 		}
 	}
 
@@ -352,12 +352,12 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
 
-	if( empty( $strip_query_string ) ) {
+	if ( empty( $strip_query_string ) ) {
 
-		if( isset( $parts['query'] ) ) {
-			$return .= '?'.$parts['query'];
+		if ( isset( $parts[ 'query' ] ) ) {
+			$return .= '?' . $parts[ 'query' ];
 		}
 
 	}
@@ -374,8 +374,8 @@ 
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
-		return $matches['domain'];
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+		return $matches[ 'domain' ];
 	} else {
 		return $string_maybe_has_subdomain;
 	}
@@ -444,7 +444,7 @@ 
 
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
 			$value = false;
 		}
 	}
@@ -473,7 +473,7 @@ 
  */
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
 
-	if( ! is_string( $value ) ) {
+	if ( ! is_string( $value ) ) {
 		return $value;
 	}
 
@@ -484,12 +484,12 @@ 
 	}
 
 	// There was a JSON error (PHP 5.3+)
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
 		return $value;
 	}
 
 	// It wasn't JSON (PHP < 5.3 fallback)
-	if( is_null( $decoded ) ) {
+	if ( is_null( $decoded ) ) {
 		return $value;
 	}
 
@@ -512,7 +512,7 @@ 
 
 	// Use the original function, if exists.
 	// Requires WP 4.4+
-	if( function_exists( 'map_deep') ) {
+	if ( function_exists( 'map_deep' ) ) {
 		return map_deep( $value, $callback );
 	}
 
@@ -577,7 +577,7 @@ 
 
 	$exploded = explode( '.', "{$field_id}" );
 
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
 }
 
 /**
@@ -618,13 +618,13 @@ 
 	 */
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
 
-	$terms = get_terms( $args['taxonomy'], $args );
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
 
 	$choices = array();
 
 	if ( is_array( $terms ) ) {
 		foreach ( $terms as $term_id => $term_name ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'text'  => $term_name,
 				'value' => $term_id
 			);
@@ -648,21 +648,21 @@ 
 function _gravityview_process_posted_fields() {
 	$fields = array();
 
-	if( !empty( $_POST['gv_fields'] ) ) {
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
 
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
 			$fields_holder = array();
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
 
-			if ( isset( $fields_holder['fields'] ) ) {
-				$fields = $fields_holder['fields'];
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
+				$fields = $fields_holder[ 'fields' ];
 			} else {
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
 			}
 
 		} else {
-			$fields = $_POST['gv_fields'];
+			$fields = $_POST[ 'gv_fields' ];
 		}
 	}
 

includes/wordpress-widgets/class-gravityview-recent-entries-widget.php

Indentation +2 added lines, -2 removed lines

@@ -184,8 +184,8 @@
 		// Get the settings for the View ID
 		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
 
-        // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+		// Set the context view ID to avoid conflicts with the Advanced Filter extension.
+		$criteria['context_view_id'] = $instance['view_id'];
 
 		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
 		$view_settings['id'] = $instance['view_id'];

Doc Comments +1 added lines

@@ -176,6 +176,7 @@
 	 * Get the entries that will be shown in the current widget
 	 *
 	 * @param  array $instance Settings for the current widget
+	 * @param false|string $form_id
 	 *
 	 * @return array $entries Multidimensional array of Gravity Forms entries
 	 */

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 	function __construct( ) {
 
-		$name = __('GravityView Recent Entries', 'gravityview');
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
 
 		$widget_options = array(
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@ 
 
 	private function initialize() {
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
 
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
 
@@ -38,21 +38,21 @@ 
 	 */
 	function ajax_get_view_merge_tag_data() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
 			exit( false );
 		}
 
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
 		$form = RGFormsModel::get_form_meta( $form_id );
 
 		$output = array(
 			'form' => array(
-				'id' => $form['id'],
-				'title' => $form['title'],
-				'fields' => $form['fields'],
+				'id' => $form[ 'id' ],
+				'title' => $form[ 'title' ],
+				'fields' => $form[ 'fields' ],
 			),
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
 		);
 
 		echo json_encode( $output );
@@ -68,17 +68,17 @@ 
 	function admin_enqueue_scripts() {
 		global $pagenow;
 
-		if( $pagenow === 'widgets.php' ) {
+		if ( $pagenow === 'widgets.php' ) {
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
 
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
 		}
 
 	}
@@ -93,19 +93,19 @@ 
 	function widget( $args, $instance ) {
 
 		// Don't have the Customizer render too soon.
-		if( empty( $instance['view_id'] ) ) {
+		if ( empty( $instance[ 'view_id' ] ) ) {
 			return;
 		}
 
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
 
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
 
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
-		if ( !empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ( ! empty( $title ) ) {
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		/**
@@ -125,7 +125,7 @@ 
 		 */
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	private function get_output( $instance ) {
 
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
 
 		$form = gravityview_get_form( $form_id );
 
@@ -149,13 +149,13 @@ 
 		 * @since 1.6.1
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
 		 */
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
 
 		/**
 		 * Generate list output
 		 * @since 1.7.2
 		 */
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget' );
 
 		$output = $List->get_output();
 
@@ -180,30 +180,30 @@ 
 	private function get_entries( $instance, $form_id ) {
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
+		$view_settings = gravityview_get_template_settings( $instance[ 'view_id' ] );
 
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+        $criteria[ 'context_view_id' ] = $instance[ 'view_id' ];
 
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
-		$view_settings['id'] = $instance['view_id'];
-		$view_settings['page_size'] = $instance['limit'];
+		$instance[ 'limit' ] = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
+		$view_settings[ 'id' ] = $instance[ 'view_id' ];
+		$view_settings[ 'page_size' ] = $instance[ 'limit' ];
 
 		// Prepare paging criteria
-		$criteria['paging'] = array(
+		$criteria[ 'paging' ] = array(
 			'offset' => 0,
-			'page_size' => $instance['limit']
+			'page_size' => $instance[ 'limit' ]
 		);
 
 		// Prepare Search Criteria
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
+		$criteria[ 'search_criteria' ] = array( 'field_filters' => array() );
+		$criteria[ 'search_criteria' ] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria[ 'search_criteria' ] );
+		$criteria[ 'search_criteria' ][ 'status' ] = apply_filters( 'gravityview_status', 'active', $view_settings );
 
 		/**
 		 * Modify the search parameters before the entries are fetched
 		 */
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
+		$criteria = apply_filters( 'gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
 
 		$results = GVCommon::get_entries( $form_id, $criteria );
 
@@ -224,23 +224,23 @@ 
 		$instance = $new_instance;
 
 		// Force positive number
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
 
-		$instance['view_id'] = intval( $instance['view_id'] );
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
 
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
 
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
 
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance[ 'updated' ] = 1;
 
 		/**
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -262,22 +262,22 @@ 
 
 		// Set up some default widget settings.
 		$defaults = array(
-			'title' 			=> __('Recent Entries', 'gravityview'),
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
 			'view_id'           => NULL,
 			'post_id'           => NULL,
 			'limit'            => 10,
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
 			'after_link'        => ''
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args( (array)$instance, $defaults );
 
 		?>
 
 		<!-- Title -->
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
 		</p>
 
 		<!-- Download -->
@@ -290,7 +290,7 @@ 
 		$views = get_posts( $args );
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
+		if ( empty( $views ) ) {
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 			return;
 		}
@@ -302,10 +302,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
 			?>
 			<div class="error inline hide-on-view-change">
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -313,14 +313,14 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
 				<?php
 
-				foreach( $views as $view ) {
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+				foreach ( $views as $view ) {
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
 				}
 
 				?>
@@ -332,10 +332,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
 			?>
 			<div class="error inline">
-				<p><?php echo $instance['error_post_id']; ?></p>
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -343,11 +343,11 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
 				?></span>
 		</p>
 
@@ -355,21 +355,21 @@ 
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
 			</label>
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
 			</label>
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
 		</p>
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
 			</label>
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
 		</p>
 
 		<?php
@@ -379,7 +379,7 @@ 
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
 		 * @param array $instance Current widget instance
 		 */
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
 
 		?>
 

includes/admin/class.field.type.php

Doc Comments +1 added lines

@@ -158,6 +158,7 @@
     /**
      * important! Override this class if needed
      * outputs the field setting html
+     * @param string $override_input
      */
     function render_setting( $override_input = NULL ) {
 

Spacing +14 added lines, -14 removed lines

@@ -33,14 +33,14 @@ 
         $defaults = self::get_field_defaults();
 
         // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
+        if ( ! empty( $field[ 'choices' ] ) ) {
+        	$field[ 'options' ] = $field[ 'choices' ];
+        	unset( $field[ 'choices' ] );
         }
 
-        $this->field =  wp_parse_args( $field, $defaults );
+        $this->field = wp_parse_args( $field, $defaults );
 
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
 
     }
 
@@ -78,11 +78,11 @@ 
 
 
     function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
+        if ( ! function_exists( 'gform_tooltip' ) ) {
             return NULL;
         }
 
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . gform_tooltip( $this->field[ 'tooltip' ], false, true ) : NULL;
     }
 
     /**
@@ -90,8 +90,8 @@ 
      * @return string
      */
     function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
+        if ( isset( $this->field[ 'id' ] ) ) {
+            return esc_attr( $this->field[ 'id' ] );
         }
         return esc_attr( sanitize_html_class( $this->name ) );
     }
@@ -101,7 +101,7 @@ 
      * @return string
      */
     function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
+        return esc_html( trim( $this->field[ 'label' ] ) );
     }
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return string
 	 */
 	function get_field_left_label() {
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
 	}
 
     /**
@@ -120,7 +120,7 @@ 
      * @return string
      */
     function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
     }
 
 
@@ -129,7 +129,7 @@ 
      * @return string
      */
     function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
     }
 
 
@@ -162,7 +162,7 @@ 
      */
     function render_setting( $override_input = NULL ) {
 
-        if( !empty( $this->field['full_width'] ) ) { ?>
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">

Indentation +141 added lines, -141 removed lines

@@ -10,160 +10,160 @@ 
 	 *
 	 * @var string
 	 */
-    protected $name;
+	protected $name;
 
 	/**
 	 * Field settings
 	 *
 	 * @var array
 	 */
-    protected $field;
+	protected $field;
 
 	/**
 	 * Field current value
 	 *
 	 * @var mixed
 	 */
-    protected $value;
-
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
-
-        $this->name = $name;
-
-        $defaults = self::get_field_defaults();
-
-        // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
-        }
-
-        $this->field =  wp_parse_args( $field, $defaults );
-
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
-
-    }
-
-    /**
-     * Returns the default details for a field option
-     *
-     * - default    // default option value, in case nothing is defined (@deprecated)
-     * - desc       // option description
-     * - value      // the option default value
-     * - label      // the option label
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
-     * - id         // the field id
-     * - type       // the option type ( text, checkbox, select, ... )
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
-     * - merge_tags // if the option supports merge tags feature
-     * - class      // (new) define extra classes for the field
-     * - tooltip    //
-     *
-     * @return array
-     */
-    public static function get_field_defaults() {
-        return array(
-            'desc' => '',
-            'value' => NULL,
-            'label' => '',
-            'left_label' => NULL,
-            'id' => NULL,
-            'type'  => 'text',
-            'options' => NULL,
-            'merge_tags' => true,
-            'class' => '',
-            'tooltip' => NULL,
-            'requires' => NULL
-        );
-    }
-
-
-    function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
-            return NULL;
-        }
-
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
-    }
-
-    /**
-     * Build input id based on the name
-     * @return string
-     */
-    function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
-        }
-        return esc_attr( sanitize_html_class( $this->name ) );
-    }
-
-    /**
-     * Retrieve field label
-     * @return string
-     */
-    function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
-    }
+	protected $value;
+
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
+
+		$this->name = $name;
+
+		$defaults = self::get_field_defaults();
+
+		// Backward compatibility
+		if( !empty( $field['choices'] ) ) {
+			$field['options'] = $field['choices'];
+			unset( $field['choices'] );
+		}
+
+		$this->field =  wp_parse_args( $field, $defaults );
+
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+
+	}
+
+	/**
+	 * Returns the default details for a field option
+	 *
+	 * - default    // default option value, in case nothing is defined (@deprecated)
+	 * - desc       // option description
+	 * - value      // the option default value
+	 * - label      // the option label
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
+	 * - id         // the field id
+	 * - type       // the option type ( text, checkbox, select, ... )
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
+	 * - merge_tags // if the option supports merge tags feature
+	 * - class      // (new) define extra classes for the field
+	 * - tooltip    //
+	 *
+	 * @return array
+	 */
+	public static function get_field_defaults() {
+		return array(
+			'desc' => '',
+			'value' => NULL,
+			'label' => '',
+			'left_label' => NULL,
+			'id' => NULL,
+			'type'  => 'text',
+			'options' => NULL,
+			'merge_tags' => true,
+			'class' => '',
+			'tooltip' => NULL,
+			'requires' => NULL
+		);
+	}
+
+
+	function get_tooltip() {
+		if( !function_exists('gform_tooltip') ) {
+			return NULL;
+		}
+
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+	}
+
+	/**
+	 * Build input id based on the name
+	 * @return string
+	 */
+	function get_field_id() {
+		if( isset( $this->field['id'] ) ) {
+			return esc_attr( $this->field['id'] );
+		}
+		return esc_attr( sanitize_html_class( $this->name ) );
+	}
+
+	/**
+	 * Retrieve field label
+	 * @return string
+	 */
+	function get_field_label() {
+		return esc_html( trim( $this->field['label'] ) );
+	}
 
 	/**
 	 * Retrieve field left label
-     *
-     * @since 1.7
-     *
+	 *
+	 * @since 1.7
+	 *
 	 * @return string
 	 */
 	function get_field_left_label() {
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
 	}
 
-    /**
-     * Retrieve field label class
-     * @return string
-     */
-    function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
-    }
-
-
-    /**
-     * Retrieve field description
-     * @return string
-     */
-    function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
-    }
-
-
-    /**
-     * Verify if field should have merge tags
-     * @return boolean
-     */
-    function show_merge_tags() {
-        // Show the merge tags if the field is a list view
-        $is_list = preg_match( '/_list-/ism', $this->name );
-        // Or is a single entry view
-        $is_single = preg_match( '/single_/ism', $this->name );
-
-        return ( $is_single || $is_list );
-    }
-
-
-
-    /**
-     * important! Override this class
-     * outputs the field option html
-     */
-    function render_option() {
-        // to replace on each field
-    }
-
-    /**
-     * important! Override this class if needed
-     * outputs the field setting html
-     */
-    function render_setting( $override_input = NULL ) {
-
-        if( !empty( $this->field['full_width'] ) ) { ?>
+	/**
+	 * Retrieve field label class
+	 * @return string
+	 */
+	function get_label_class() {
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+	}
+
+
+	/**
+	 * Retrieve field description
+	 * @return string
+	 */
+	function get_field_desc() {
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+	}
+
+
+	/**
+	 * Verify if field should have merge tags
+	 * @return boolean
+	 */
+	function show_merge_tags() {
+		// Show the merge tags if the field is a list view
+		$is_list = preg_match( '/_list-/ism', $this->name );
+		// Or is a single entry view
+		$is_single = preg_match( '/single_/ism', $this->name );
+
+		return ( $is_single || $is_list );
+	}
+
+
+
+	/**
+	 * important! Override this class
+	 * outputs the field option html
+	 */
+	function render_option() {
+		// to replace on each field
+	}
+
+	/**
+	 * important! Override this class if needed
+	 * outputs the field setting html
+	 */
+	function render_setting( $override_input = NULL ) {
+
+		if( !empty( $this->field['full_width'] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -183,14 +183,14 @@ 
             </td>
         <?php }
 
-    }
+	}
 
-    /**
-     * important! Override this class
-     * outputs the input html part
-     */
-    function render_input( $override_input ) {
-        echo '';
-    }
+	/**
+	 * important! Override this class
+	 * outputs the input html part
+	 */
+	function render_input( $override_input ) {
+		echo '';
+	}
 
 }