gravityview / GravityView

includes/class-admin.php

Spacing +102 added lines, -102 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if (!is_admin()) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if (false === GravityView_Compatibility::is_valid()) {
 			return;
 		}
 
@@ -22,22 +22,22 @@ 
 	private function include_required_files() {
 
 		// Migrate Class
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-migrate.php');
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
-			require_once( GFCommon::get_base_path() . '/tooltips.php' );
+		if (class_exists('GFCommon') && class_exists('GFForms') && !GFForms::is_gravity_page()) {
+			require_once(GFCommon::get_base_path().'/tooltips.php');
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/entry-list.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php');
+		require_once(GRAVITYVIEW_DIR.'includes/admin/entry-list.php');
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-change-entry-creator.php');
 
 		/** @since 1.15 **/
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-support-port.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/class-gravityview-support-port.php');
 
 		/** @since 1.6 */
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-duplicate-view.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-duplicate-view.php');
 	}
 
 	/**
@@ -47,21 +47,21 @@ 
 	private function add_hooks() {
 
 		// Filter Admin messages
-		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
-		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
+		add_filter('post_updated_messages', array($this, 'post_updated_messages'));
+		add_filter('bulk_post_updated_messages', array($this, 'post_updated_messages'));
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter('plugin_action_links_'.plugin_basename(GRAVITYVIEW_FILE), array($this, 'plugin_action_links'));
 
-		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
+		add_action('plugins_loaded', array($this, 'backend_actions'), 100);
 
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action('wp_print_scripts', array($this, 'no_conflict_scripts'), 1000);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_scripts'), 9);
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action('wp_print_styles', array($this, 'no_conflict_styles'), 1000);
+		add_action('admin_print_styles', array($this, 'no_conflict_styles'), 11);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_styles'), 1);
+		add_action('admin_footer', array($this, 'no_conflict_styles'), 1);
 
 	}
 
@@ -74,13 +74,13 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.field.type.php');
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.render.settings.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-label.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-welcome.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-add-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-approve-entries.php');
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
@@ -99,19 +99,19 @@ 
 	 * @param array $links Array of action links under GravityView on the plugin page
 	 * @return array Action links with Settings and Support included, if the user has the appropriate caps
 	 */
-	public static function plugin_action_links( $links ) {
+	public static function plugin_action_links($links) {
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if (GVCommon::has_cap('gravityview_view_settings')) {
+			$actions[] = sprintf('<a href="%s">%s</a>', admin_url('edit.php?post_type=gravityview&page=gravityview_settings'), esc_html__('Settings', 'gravityview'));
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if (GVCommon::has_cap('gravityview_support_port')) {
+			$actions[] = '<a href="http://docs.gravityview.co">'.esc_html__('Support', 'gravityview').'</a>';
 		}
 
-		return array_merge( $actions, $links );
+		return array_merge($actions, $links);
 	}
 
 	/**
@@ -128,70 +128,70 @@ 
 	 * @param  array      $messages Existing messages
 	 * @return array                Messages with GravityView views!
 	 */
-	function post_updated_messages( $messages, $bulk_counts = NULL ) {
+	function post_updated_messages($messages, $bulk_counts = NULL) {
 		global $post;
 
-		$post_id = isset($_GET['post']) ? intval($_GET['post']) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
+		$post_id = isset($_GET['post']) ? intval($_GET['post']) : (is_object($post) && isset($post->ID) ? $post->ID : NULL);
 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null($bulk_counts) ? array('updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1) : $bulk_counts;
 
 
 		// If we're starting fresh, a new form was created.
 		// We should let the user know this is the case.
-		$start_fresh = get_post_meta( $post_id, '_gravityview_start_fresh', true );
+		$start_fresh = get_post_meta($post_id, '_gravityview_start_fresh', true);
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if (!empty($start_fresh)) {
 
 			// Get the form that was created
-			$connected_form = gravityview_get_form_id( $post_id );
+			$connected_form = gravityview_get_form_id($post_id);
 
-			if( !empty( $connected_form ) ) {
-				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+			if (!empty($connected_form)) {
+				$form = gravityview_get_form($connected_form);
+				$form_name = esc_attr($form['title']);
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>'.$image.sprintf(__('A new form was created for this View: "%s"', 'gravityview'), $form_name).'</h3>';
+				$new_form_text .= sprintf(__('%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
-				$new_form_text = wpautop( $new_form_text );
+					', 'gravityview'), '<strong>', '</strong>', '<a href="'.site_url('?gf_page=preview&amp;id='.$connected_form).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;id='.$connected_form).'">', '</a>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form).'">', '</a>');
+				$new_form_text = wpautop($new_form_text);
 
-				delete_post_meta( $post_id, '_gravityview_start_fresh' );
+				delete_post_meta($post_id, '_gravityview_start_fresh');
 			}
 		}
 
 		$messages['gravityview'] = array(
 			0  => '', // Unused. Messages start at index 1.
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			3  => __( 'View deleted.', 'gravityview' ),
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			2  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			3  => __('View deleted.', 'gravityview'),
+			4  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			8  => __( 'View submitted.', 'gravityview' ),
+			5  => isset($_GET['revision']) ? sprintf(__('View restored to revision from %s', 'gravityview'), wp_post_revision_title((int)$_GET['revision'], false)) : false,
+			6  => sprintf(__('View published. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			7  => sprintf(__('View saved. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			8  => __('View submitted.', 'gravityview'),
 			9  => sprintf(
-				__( 'View scheduled for: %1$s.', 'gravityview' ),
+				__('View scheduled for: %1$s.', 'gravityview'),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
-			) . $new_form_text,
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+				date_i18n(__('M j, Y @ G:i', 'gravityview'), strtotime((isset($post->post_date) ? $post->post_date : NULL)))
+			).$new_form_text,
+			10  => sprintf(__('View draft updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n('%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview'),
+			'locked'    => _n('%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview'),
+			'deleted'   => _n('%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview'),
+			'trashed'   => _n('%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview'),
+			'untrashed' => _n('%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview'),
 		);
 
 		return $messages;
@@ -204,13 +204,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -250,7 +250,7 @@ 
             'jquery-ui-accordion',
 		);
 
-		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
+		$this->remove_conflicts($wp_scripts, $wp_allowed_scripts, 'scripts');
 	}
 
 	/**
@@ -260,16 +260,16 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
+		if (!empty($wp_styles->registered)) {
 			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
-					wp_dequeue_style( $key );
+				if (preg_match('/^(?:wp\-)?jquery/ism', $key)) {
+					wp_dequeue_style($key);
 				}
 			}
 		}
@@ -277,7 +277,7 @@ 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -299,7 +299,7 @@ 
 	        'jquery-qtip.js',
 	    );
 
-		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
+		$this->remove_conflicts($wp_styles, $wp_allowed_styles, 'styles');
 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
@@ -315,31 +315,31 @@ 
 	 * @param  string $type              Either 'styles' or 'scripts'
 	 * @return void
 	 */
-	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
+	private function remove_conflicts(&$wp_objects, $required_objects, $type = 'scripts') {
 
         /**
          * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
          * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
          * @param array $required_objects
          */
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
+        $required_objects = apply_filters("gravityview_noconflict_{$type}", $required_objects);
 
         //reset queue
         $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
+        foreach ($wp_objects->queue as $object) {
+	        if (in_array($object, $required_objects) || preg_match('/gravityview|gf_|gravityforms/ism', $object)) {
                 $queue[] = $object;
             }
         }
         $wp_objects->queue = $queue;
 
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
+        $required_objects = $this->add_script_dependencies($wp_objects->registered, $required_objects);
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
-                $registered[ $handle ] = $script_registration;
+        foreach ($wp_objects->registered as $handle => $script_registration) {
+            if (in_array($handle, $required_objects)) {
+                $registered[$handle] = $script_registration;
             }
         }
         $wp_objects->registered = $registered;
@@ -356,16 +356,16 @@ 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
 			$dependents = array();
-			foreach ( $scripts as $script ) {
-				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
-				foreach ( $deps as $dep ) {
-					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
+			foreach ($scripts as $script) {
+				$deps = isset($registered[$script]) && is_array($registered[$script]->deps) ? $registered[$script]->deps : array();
+				foreach ($deps as $dep) {
+					if (!in_array($dep, $scripts) && !in_array($dep, $dependents)) {
 						$dependents[] = $dep;
 					}
 				}
 			}
-			$scripts = array_merge( $scripts, $dependents );
-		} while ( ! empty( $dependents ) );
+			$scripts = array_merge($scripts, $dependents);
+		} while (!empty($dependents));
 
 		return $scripts;
 	}
@@ -385,8 +385,8 @@ 
 	 * @deprecated since 1.12
 	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
 	 */
-	public static function add_notice( $notice = array() ) {
-		GravityView_Admin_Notices::add_notice( $notice );
+	public static function add_notice($notice = array()) {
+		GravityView_Admin_Notices::add_notice($notice);
 	}
 
 	/**
@@ -408,8 +408,8 @@ 
 
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
-	static function get_plugin_status( $location = '' ) {
-		return GravityView_Compatibility::get_plugin_status( $location );
+	static function get_plugin_status($location = '') {
+		return GravityView_Compatibility::get_plugin_status($location);
 	}
 
 	/**
@@ -421,10 +421,10 @@ 
 	 *
 	 * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
 	 */
-	static function is_admin_page( $hook = '', $page = NULL ) {
+	static function is_admin_page($hook = '', $page = NULL) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if (!is_admin()) { return false; }
 
 		$is_page = false;
 
@@ -432,21 +432,21 @@ 
 
 		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset($_GET['page']) && $_GET['page'] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
+		if (empty($post) && $pagenow === 'post.php' && !empty($_GET['post'])) {
+			$gv_post = get_post(intval($_GET['post']));
 			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
 		} else {
 			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ($is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if (in_array($pagenow, array('post.php', 'post-new.php'))) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if (in_array($plugin_page, array('gravityview_settings', 'gravityview_page_gravityview_settings')) || (!empty($_GET['page']) && $_GET['page'] === 'gravityview_settings')) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -458,10 +458,10 @@ 
 		 * @param[in,out] string|bool $is_page If false, no. If string, the name of the page (`single`, `settings`, or `views`)
 		 * @param[in] string $hook The name of the page to check against. Is passed to the method.
 		 */
-		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
+		$is_page = apply_filters('gravityview_is_admin_page', $is_page, $hook);
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if (!empty($page)) {
 			return $is_page === $page;
 		}
 
@@ -473,5 +473,5 @@ 
 new GravityView_Admin;
 
 function gravityview_is_admin_page($hook = '', $page = NULL) {
-	return GravityView_Admin::is_admin_page( $hook, $page );
+	return GravityView_Admin::is_admin_page($hook, $page);
 }

includes/class-ajax.php

Spacing +110 added lines, -110 removed lines

@@ -5,21 +5,21 @@ 
 	function __construct() {
 
 		//get field options
-		add_action( 'wp_ajax_gv_field_options', array( $this, 'get_field_options' ) );
+		add_action('wp_ajax_gv_field_options', array($this, 'get_field_options'));
 
 		// get available fields
-		add_action( 'wp_ajax_gv_available_fields', array( $this, 'get_available_fields_html' ) );
+		add_action('wp_ajax_gv_available_fields', array($this, 'get_available_fields_html'));
 
 		// get active areas
-		add_action( 'wp_ajax_gv_get_active_areas', array( $this, 'get_active_areas' ) );
+		add_action('wp_ajax_gv_get_active_areas', array($this, 'get_active_areas'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_get_preset_fields', array( $this, 'get_preset_fields_config' ) );
+		add_action('wp_ajax_gv_get_preset_fields', array($this, 'get_preset_fields_config'));
 
 		// get preset fields
-		add_action( 'wp_ajax_gv_set_preset_form', array( $this, 'create_preset_form' ) );
+		add_action('wp_ajax_gv_set_preset_form', array($this, 'create_preset_form'));
 
-		add_action( 'wp_ajax_gv_sortable_fields_form', array( $this, 'get_sortable_fields' ) );
+		add_action('wp_ajax_gv_sortable_fields_form', array($this, 'get_sortable_fields'));
 	}
 
 	/**
@@ -30,17 +30,17 @@ 
 	 *
 	 * @return bool
 	 */
-	private function _exit( $mixed = NULL ) {
+	private function _exit($mixed = NULL) {
 
 		/**
 		 * Don't exit if we're running test suite.
 		 * @since 1.15
 		 */
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
+		if (defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS) {
 			return $mixed;
 		}
 
-		exit( $mixed );
+		exit($mixed);
 	}
 
 	/** -------- AJAX ---------- */
@@ -50,8 +50,8 @@ 
 	 * @return void
 	 */
 	function check_ajax_nonce() {
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
-			$this->_exit( false );
+		if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxviews')) {
+			$this->_exit(false);
 		}
 	}
 
@@ -67,20 +67,20 @@ 
 		//check nonce
 		$this->check_ajax_nonce();
 
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
+		$context = isset($_POST['context']) ? esc_attr($_POST['context']) : 'directory';
 
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
-		if( !empty( $_POST['form_id'] ) ) {
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
+		if (!empty($_POST['form_id'])) {
+			do_action('gravityview_render_available_fields', (int)$_POST['form_id'], $context);
 			$this->_exit();
-		} elseif( !empty( $_POST['template_id'] ) ) {
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
-			do_action( 'gravityview_render_available_fields', $form, $context );
+		} elseif (!empty($_POST['template_id'])) {
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
+			do_action('gravityview_render_available_fields', $form, $context);
 			$this->_exit();
 		}
 
 		//if everything fails..
-		$this->_exit( false );
+		$this->_exit(false);
 	}
 
 
@@ -94,21 +94,21 @@ 
 	function get_active_areas() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
+		do_action('gravityview_render_directory_active_areas', $_POST['template_id'], 'single', '', true);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -119,49 +119,49 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			$this->_exit(false);
 		}
 
 		// get the fields xml config file for this specific preset
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
+		$preset_fields_path = apply_filters('gravityview_template_fieldsxml', array(), $_POST['template_id']);
 		// import fields
-		if( !empty( $preset_fields_path ) ) {
-			$presets = $this->import_fields( $preset_fields_path );
+		if (!empty($preset_fields_path)) {
+			$presets = $this->import_fields($preset_fields_path);
 		} else {
-			$presets = array( 'widgets' => array(), 'fields' => array() );
+			$presets = array('widgets' => array(), 'fields' => array());
 		}
 
-		$template_id = esc_attr( $_POST['template_id'] );
+		$template_id = esc_attr($_POST['template_id']);
 
 		// template areas
-		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
+		$template_areas_directory = apply_filters('gravityview_template_active_areas', array(), $template_id, 'directory');
+        $template_areas_single = apply_filters('gravityview_template_active_areas', array(), $template_id, 'single');
 
 		// widget areas
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets']);
 		$response['header'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
+		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets']);
 		$response['footer'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields']);
 		$response['directory'] = ob_get_clean();
 
 		ob_start();
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
+		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields']);
 		$response['single'] = ob_get_clean();
 
-		$response = array_map( 'gravityview_strip_whitespace', $response );
+		$response = array_map('gravityview_strip_whitespace', $response);
 
-		do_action( 'gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response );
+		do_action('gravityview_log_debug', '[get_preset_fields_config] AJAX Response', $response);
 
-		$this->_exit( json_encode( $response ) );
+		$this->_exit(json_encode($response));
 	}
 
 	/**
@@ -173,26 +173,26 @@ 
 
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template_id'] ) ) {
-			do_action( 'gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.' );
-			$this->_exit( false );
+		if (empty($_POST['template_id'])) {
+			do_action('gravityview_log_error', '[create_preset_form] Cannot create preset form; the template_id is empty.');
+			$this->_exit(false);
 		}
 
 		// get the xml for this specific template_id
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
+		$preset_form_xml_path = apply_filters('gravityview_template_formxml', '', $_POST['template_id']);
 
 		// import form
-		$form = $this->import_form( $preset_form_xml_path );
+		$form = $this->import_form($preset_form_xml_path);
 
 		// get the form ID
-		if( false === $form ) {
+		if (false === $form) {
 			// send error to user
-			do_action( 'gravityview_log_error', '[create_preset_form] Error importing form for template id: ' . (int) $_POST['template_id'] );
+			do_action('gravityview_log_error', '[create_preset_form] Error importing form for template id: '.(int)$_POST['template_id']);
 
-			$this->_exit( false );
+			$this->_exit(false);
 		}
 
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
+		$this->_exit('<option value="'.esc_attr($form['id']).'" selected="selected">'.esc_html($form['title']).'</option>');
 
 	}
 
@@ -202,24 +202,24 @@ 
 	 * @param  string $xml_or_json_path Path to form XML or JSON file
 	 * @return int|bool       Imported form ID or false
 	 */
-	function import_form( $xml_or_json_path = '' ) {
+	function import_form($xml_or_json_path = '') {
 
-		do_action( 'gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path );
+		do_action('gravityview_log_debug', '[import_form] Import Preset Form. (File)', $xml_or_json_path);
 
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path );
+		if (empty($xml_or_json_path) || !class_exists('GFExport') || !file_exists($xml_or_json_path)) {
+			do_action('gravityview_log_error', '[import_form] Class GFExport or file not found. file: ', $xml_or_json_path);
 			return false;
 		}
 
 		// import form
 		$forms = '';
-		$count = GFExport::import_file( $xml_or_json_path, $forms );
+		$count = GFExport::import_file($xml_or_json_path, $forms);
 
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Result)', $count );
-		do_action( 'gravityview_log_debug', '[import_form] Importing form (Form) ', $forms );
+		do_action('gravityview_log_debug', '[import_form] Importing form (Result)', $count);
+		do_action('gravityview_log_debug', '[import_form] Importing form (Form) ', $forms);
 
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
-			do_action( 'gravityview_log_error', '[import_form] Form Import Failed!' );
+		if ($count != 1 || empty($forms[0]['id'])) {
+			do_action('gravityview_log_error', '[import_form] Form Import Failed!');
 			return false;
 		}
 
@@ -238,26 +238,26 @@ 
 	function get_field_options() {
 		$this->check_ajax_nonce();
 
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
-			do_action( 'gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ' );
-			$this->_exit( false );
+		if (empty($_POST['template']) || empty($_POST['area']) || empty($_POST['field_id']) || empty($_POST['field_type'])) {
+			do_action('gravityview_log_error', '[get_field_options] Required fields were not set in the $_POST request. ');
+			$this->_exit(false);
 		}
 
 		// Fix apostrophes added by JSON response
-		$_post = array_map( 'stripslashes_deep', $_POST );
+		$_post = array_map('stripslashes_deep', $_POST);
 
 		// Sanitize
-		$_post = array_map( 'esc_attr', $_post );
+		$_post = array_map('esc_attr', $_post);
 
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
+		$input_type = isset($_post['input_type']) ? esc_attr($_post['input_type']) : NULL;
+		$context = isset($_post['context']) ? esc_attr($_post['context']) : NULL;
 
-		$response = GravityView_Render_Settings::render_field_options( $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
+		$response = GravityView_Render_Settings::render_field_options($_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -274,23 +274,23 @@ 
 		$form = '';
 
 		// if form id is set, use it, else, get form from preset
-		if( !empty( $_POST['form_id'] ) ) {
+		if (!empty($_POST['form_id'])) {
 
-			$form = (int) $_POST['form_id'];
+			$form = (int)$_POST['form_id'];
 
 		}
 		// get form from preset
-		elseif( !empty( $_POST['template_id'] ) ) {
+		elseif (!empty($_POST['template_id'])) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
 
 		}
 
-		$response = gravityview_get_sortable_fields( $form );
+		$response = gravityview_get_sortable_fields($form);
 
-		$response = gravityview_strip_whitespace( $response );
+		$response = gravityview_strip_whitespace($response);
 
-		$this->_exit( $response );
+		$this->_exit($response);
 	}
 
 	/**
@@ -298,35 +298,35 @@ 
 	 * @param  string $template_id Preset template
 	 *
 	 */
-	static function pre_get_form_fields( $template_id = '') {
+	static function pre_get_form_fields($template_id = '') {
 
-		if( empty( $template_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Template ID not set.' );
+		if (empty($template_id)) {
+			do_action('gravityview_log_error', __METHOD__.' - Template ID not set.');
 			return false;
 		} else {
-			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
-			if( !file_exists( $form_file )  ) {
-				do_action( 'gravityview_log_error', __METHOD__ . ' - Importing Form Fields for preset ['. $template_id .']. File not found. file: ' . $form_file );
+			$form_file = apply_filters('gravityview_template_formxml', '', $template_id);
+			if (!file_exists($form_file)) {
+				do_action('gravityview_log_error', __METHOD__.' - Importing Form Fields for preset ['.$template_id.']. File not found. file: '.$form_file);
 				return false;
 			}
 		}
 
 		// Load xml parser (from GravityForms)
-		if( class_exists( 'GFCommon' ) ) {
-			$xml_parser = GFCommon::get_base_path() . '/xml.php';
+		if (class_exists('GFCommon')) {
+			$xml_parser = GFCommon::get_base_path().'/xml.php';
 		} else {
-			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
+			$xml_parser = trailingslashit(WP_PLUGIN_DIR).'gravityforms/xml.php';
 		}
 
-		if( file_exists( $xml_parser ) ) {
-			require_once( $xml_parser );
+		if (file_exists($xml_parser)) {
+			require_once($xml_parser);
 		} else {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Gravity Forms XML Parser not found.', $xml_parser );
+			do_action('gravityview_log_debug', __METHOD__.' - Gravity Forms XML Parser not found.', $xml_parser);
 			return false;
 		}
 
 		// load file
-		$xmlstr = file_get_contents( $form_file );
+		$xmlstr = file_get_contents($form_file);
 
         $options = array(
             "page" => array("unserialize_as_array" => true),
@@ -345,21 +345,21 @@ 
 		$xml = new RGXML($options);
         $forms = $xml->unserialize($xmlstr);
 
-        if( !$forms ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. Error importing file. (File)', $form_file );
+        if (!$forms) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. Error importing file. (File)', $form_file);
         	return false;
         }
 
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
+        if (!empty($forms[0]) && is_array($forms[0])) {
         	$form = $forms[0];
         }
 
-        if( empty( $form ) ) {
-        	do_action( 'gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms );
+        if (empty($form)) {
+        	do_action('gravityview_log_error', '[pre_get_available_fields] $form not set.', $forms);
         	return false;
         }
 
-        do_action( 'gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['. $template_id .']. (Form)', $form );
+        do_action('gravityview_log_debug', '[pre_get_available_fields] Importing Form Fields for preset ['.$template_id.']. (Form)', $form);
 
         return $form;
 
@@ -371,46 +371,46 @@ 
 	 * @param  string $file path to file
 	 * @return array       Fields config array (unserialized)
 	 */
-	function import_fields( $file ) {
+	function import_fields($file) {
 
-		if( empty( $file ) || !file_exists(  $file ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file );
+		if (empty($file) || !file_exists($file)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields. File not found. (File)', $file);
 			return false;
 		}
 
-		if( !class_exists('WXR_Parser') ) {
-			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
+		if (!class_exists('WXR_Parser')) {
+			include_once GRAVITYVIEW_DIR.'includes/lib/xml-parsers/parsers.php';
 		}
 
 		$parser = new WXR_Parser();
-		$presets = $parser->parse( $file );
+		$presets = $parser->parse($file);
 
-		if(is_wp_error( $presets )) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets );
+		if (is_wp_error($presets)) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Threw WP_Error.', $presets);
 			return false;
 		}
 
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
-			do_action( 'gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file );
+		if (empty($presets['posts'][0]['postmeta']) && !is_array($presets['posts'][0]['postmeta'])) {
+			do_action('gravityview_log_error', '[import_fields] Importing Preset Fields failed. Meta not found in file.', $file);
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta'] );
+		do_action('gravityview_log_debug', '[import_fields] postmeta', $presets['posts'][0]['postmeta']);
 
 		$fields = $widgets = array();
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
+		foreach ($presets['posts'][0]['postmeta'] as $meta) {
 			switch ($meta['key']) {
 				case '_gravityview_directory_fields':
-					$fields = maybe_unserialize( $meta['value'] );
+					$fields = maybe_unserialize($meta['value']);
 					break;
 				case '_gravityview_directory_widgets':
-					$widgets = maybe_unserialize( $meta['value'] );
+					$widgets = maybe_unserialize($meta['value']);
 					break;
 			}
 		}
 
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields );
-		do_action( 'gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets );
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Fields)', $fields);
+		do_action('gravityview_log_debug', '[import_fields] Imported Preset (Widgets)', $widgets);
 
 		return array(
 			'fields' => $fields,

includes/class-cache.php

Spacing +101 added lines, -101 removed lines

@@ -32,18 +32,18 @@ 
 	 * @since 1.13.1
 	 * @var array Columns in the database for leads
 	 */
-	private $lead_db_columns = array( 'id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status' );
+	private $lead_db_columns = array('id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status');
 
 	/**
 	 *
 	 * @param array|int $form_ids Form ID or array of form IDs used in a request
 	 * @param array $args Extra request parameters used to generate the query. This is used to generate the unique transient key.
 	 */
-	function __construct( $form_ids = NULL, $args = array() ) {
+	function __construct($form_ids = NULL, $args = array()) {
 
 		$this->add_hooks();
 
-		if ( ! is_null( $form_ids ) ) {
+		if (!is_null($form_ids)) {
 
 			$this->form_ids = $form_ids;
 
@@ -59,31 +59,31 @@ 
 	function add_hooks() {
 
 		// Schedule cleanup of expired transients
-		add_action( 'wp', array( $this, 'schedule_transient_cleanup' ) );
+		add_action('wp', array($this, 'schedule_transient_cleanup'));
 
 		// Hook in to the scheduled cleanup, if scheduled
-		add_action( 'gravityview-expired-transients', array( $this, 'delete_expired_transients' ) );
+		add_action('gravityview-expired-transients', array($this, 'delete_expired_transients'));
 
 		// Trigger this when you need to prevent any results from being cached with forms that have been modified
-		add_action( 'gravityview_clear_form_cache', array( $this, 'blacklist_add' ) );
+		add_action('gravityview_clear_form_cache', array($this, 'blacklist_add'));
 
 		/**
 		 * @since 1.14
 		 */
-		add_action( 'gravityview_clear_entry_cache', array( $this, 'entry_status_changed' ) );
+		add_action('gravityview_clear_entry_cache', array($this, 'entry_status_changed'));
 
-		add_action( 'gform_after_update_entry', array( $this, 'entry_updated' ), 10, 2 );
+		add_action('gform_after_update_entry', array($this, 'entry_updated'), 10, 2);
 
-		add_action( 'gform_entry_created', array( $this, 'entry_created' ), 10, 2 );
+		add_action('gform_entry_created', array($this, 'entry_created'), 10, 2);
 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
-			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
+		foreach ($this->lead_db_columns as $column) {
+			add_action('gform_update_'.$column, array($this, 'entry_status_changed'), 10, 3);
 		}
 
-		add_action( 'gform_delete_lead', array( $this, 'entry_status_changed' ), 10 );
+		add_action('gform_delete_lead', array($this, 'entry_status_changed'), 10);
 	}
 
 	/**
@@ -99,22 +99,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_status_changed( $lead_id, $property_value = '', $previous_value = '' ) {
+	public function entry_status_changed($lead_id, $property_value = '', $previous_value = '') {
 
 		/** @var array $entry */
-		$entry = GFAPI::get_entry( $lead_id );
+		$entry = GFAPI::get_entry($lead_id);
 
-		if ( is_wp_error( $entry ) ) {
+		if (is_wp_error($entry)) {
 
 			/** @var WP_Error $entry */
-			do_action( 'gravityview_log_error', __METHOD__ . ' Could not retrieve entry ' . $lead_id . ' to delete it: ' . $entry->get_error_message() );
+			do_action('gravityview_log_error', __METHOD__.' Could not retrieve entry '.$lead_id.' to delete it: '.$entry->get_error_message());
 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action('gravityview_log_debug', __METHOD__.' adding form '.$entry['form_id'].' to blacklist because entry #'.$lead_id.' was deleted', array('value' => $property_value, 'previous' => $previous_value));
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add($entry['form_id']);
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_updated( $form, $lead_id ) {
+	public function entry_updated($form, $lead_id) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form '.$form['id'].' to blacklist because entry #'.$lead_id.' was updated');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -142,11 +142,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_created( $entry, $form ) {
+	public function entry_created($entry, $form) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_created] adding form '.$form['id'].' to blacklist because entry #'.$entry['id'].' was created');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -156,20 +156,20 @@ 
 	 *
 	 * @return string           Prefix for the cache string used in set_key()
 	 */
-	protected function get_cache_key_prefix( $form_ids = NULL ) {
+	protected function get_cache_key_prefix($form_ids = NULL) {
 
-		if ( is_null( $form_ids ) ) {
+		if (is_null($form_ids)) {
 			$form_ids = $this->form_ids;
 		}
 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:'.implode('&f:', (array)$form_ids);
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
-		return 'gv-cache-' . $forms . '-';
+		return 'gv-cache-'.$forms.'-';
 
 	}
 
@@ -179,17 +179,17 @@ 
 	protected function set_key() {
 
 		// Don't set key if no forms have been set.
-		if ( empty( $this->form_ids ) ) {
+		if (empty($this->form_ids)) {
 			return;
 		}
 
-		$key = $this->get_cache_key_prefix() . sha1( serialize( $this->args ) );
+		$key = $this->get_cache_key_prefix().sha1(serialize($this->args));
 
 		// The transient name column can handle up to 64 characters.
 		// The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
 		// 64 - 19 = 45
 		// We make sure the key isn't too long or else WP doesn't store data.
-		$this->key = substr( $key, 0, 45 );
+		$this->key = substr($key, 0, 45);
 	}
 
 	/**
@@ -210,24 +210,24 @@ 
 	 *
 	 * @return boolean           False if value was not updated and true if value was updated.
 	 */
-	public function blacklist_add( $form_ids ) {
+	public function blacklist_add($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
+		$form_ids = is_array($form_ids) ? $form_ids : array($form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
 			'$form_ids'  => $form_ids,
 			'$blacklist' => $blacklist
-		) );
+		));
 
 		// Add the passed form IDs
-		$blacklist = array_merge( $blacklist, $form_ids );
+		$blacklist = array_merge($blacklist, $form_ids);
 
 		// Don't duplicate
-		$blacklist = array_unique( $blacklist );
+		$blacklist = array_unique($blacklist);
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $blacklist );
+		return update_option(self::BLACKLIST_OPTION_NAME, $blacklist);
 
 	}
 
@@ -238,19 +238,19 @@ 
 	 *
 	 * @return boolean           Whether the removal was successful
 	 */
-	public function blacklist_remove( $form_ids ) {
+	public function blacklist_remove($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff($blacklist, (array)$form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
 			'$blacklist'    => $blacklist,
 			'$updated_list' => $updated_list
-		) );
+		));
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $updated_list );
+		return update_option(self::BLACKLIST_OPTION_NAME, $updated_list);
 	}
 
 
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	function in_blacklist( $form_ids = NULL ) {
+	function in_blacklist($form_ids = NULL) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
+		if (empty($form_ids)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids );
+			do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids);
 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			if ( in_array( $form_id, $blacklist ) ) {
+			if (in_array($form_id, $blacklist)) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #' . esc_attr( $form_id ) . ' is in the cache blacklist' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #'.esc_attr($form_id).' is in the cache blacklist');
 
 				return true;
 			}
@@ -296,35 +296,35 @@ 
 	 *
 	 * @return mixed      False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
 	 */
-	public function get( $key = NULL ) {
+	public function get($key = NULL) {
 
-		$key = is_null( $key ) ? $this->key : $key;
+		$key = is_null($key) ? $this->key : $key;
 
-		if ( ! $this->use_cache() ) {
+		if (!$this->use_cache()) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results');
 
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key '.$key);
 
-		$result = get_transient( $key );
+		$result = get_transient($key);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result);
 
 			return false;
 
-		} elseif ( $result ) {
+		} elseif ($result) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key ' . $key );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key '.$key);
 
 			return $result;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key '.$key);
 
 		return NULL;
 
@@ -338,24 +338,24 @@ 
 	 * @param [type] $content     [description]
 	 * @param [type] $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
 	 */
-	public function set( $content, $filter_name = '' ) {
+	public function set($content, $filter_name = '') {
 
 		// Don't cache empty results
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 
 			/**
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key '.$this->key.' for '.$cache_time.' seconds');
 
-			return set_transient( $this->key, $content, $cache_time );
+			return set_transient($this->key, $content, $cache_time);
 
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty');
 
 		return false;
 
@@ -371,39 +371,39 @@ 
 	 *
 	 * @return [type]           [description]
 	 */
-	public function delete( $form_ids = NULL ) {
+	public function delete($form_ids = NULL) {
 		global $wpdb;
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs' );
+		if (empty($form_ids)) {
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs');
 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			$key = $this->get_cache_key_prefix( $form_id );
+			$key = $this->get_cache_key_prefix($form_id);
 
 			// WordPress 4.0+
-			if ( is_callable( array( $wpdb, 'esc_like' ) ) ) {
-				$key = $wpdb->esc_like( $key );
+			if (is_callable(array($wpdb, 'esc_like'))) {
+				$key = $wpdb->esc_like($key);
 			} else {
-				$key = like_escape( $key );
+				$key = like_escape($key);
 			}
 
-			$key = "%" . $key . "%";
+			$key = "%".$key."%";
 
-			$sql = $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
+			$sql = $wpdb->prepare("DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
 
-			$result = $wpdb->query( $sql );
+			$result = $wpdb->query($sql);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #' . $form_id, array(
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #'.$form_id, array(
 				$sql,
-				sprintf( 'Deleted results: %d', $result )
-			) );
+				sprintf('Deleted results: %d', $result)
+			));
 		}
 
 	}
@@ -421,14 +421,14 @@ 
 		 * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
 		 * @param boolean $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
 		 */
-		$cleanup = apply_filters( 'gravityview_cleanup_transients', true );
+		$cleanup = apply_filters('gravityview_cleanup_transients', true);
 
-		if ( ! $cleanup ) {
+		if (!$cleanup) {
 			return;
 		}
 
-		if ( ! wp_next_scheduled( 'gravityview-expired-transients' ) ) {
-			wp_schedule_event( time(), 'daily', 'gravityview-expired-transients' );
+		if (!wp_next_scheduled('gravityview-expired-transients')) {
+			wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
 		}
 	}
 
@@ -453,7 +453,7 @@ 
 		$threshold = time() - 60;
 
 		// get table name for options on specified blog
-		$table = $wpdb->get_blog_prefix( $blog_id ) . 'options';
+		$table = $wpdb->get_blog_prefix($blog_id).'options';
 
 		// delete expired transients, using the paired timeout record to find them
 		$sql = "
@@ -464,7 +464,7 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-		$num_results = $wpdb->query( $sql );
+		$num_results = $wpdb->query($sql);
 
 		// delete orphaned transient expirations
 		// also delete NextGEN Gallery 2.x display cache timeout aliases
@@ -479,9 +479,9 @@ 
 			and option_value < '$threshold'
 		";
 
-		$num_results += $wpdb->query( $sql );
+		$num_results += $wpdb->query($sql);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted ' . $num_results . ' expired transient records from the database' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted '.$num_results.' expired transient records from the database');
 	}
 
 	/**
@@ -495,11 +495,11 @@ 
 
 		$use_cache = true;
 
-		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if (isset($_GET['cache']) || isset($_GET['nocache'])) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL');
 
 				$use_cache = false;
 			}
@@ -507,13 +507,13 @@ 
 		}
 
 		// Has the form been flagged as having changed items in it?
-		if ( $this->in_blacklist() ) {
+		if ($this->in_blacklist()) {
 
 			// Delete caches for all items with form IDs XYZ
-			$this->delete( $this->form_ids );
+			$this->delete($this->form_ids);
 
 			// Remove the form from
-			$this->blacklist_remove( $this->form_ids );
+			$this->blacklist_remove($this->form_ids);
 
 		}
 
@@ -524,9 +524,9 @@ 
 		 * @param[out,in]  boolean $use_cache Previous setting
 		 * @param[out] GravityView_Cache $this The GravityView_Cache object
 		 */
-		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
+		$use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/class-data.php

Spacing +164 added lines, -164 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -15,14 +15,14 @@ 
 	 *
 	 * @param null $passed_post
 	 */
-	private function __construct( $passed_post = NULL ) {
+	private function __construct($passed_post = NULL) {
 
-		if( !empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
+			$id_or_id_array = $this->maybe_get_view_id($passed_post);
 
-			if( !empty( $id_or_id_array ) ) {
-				$this->add_view( $id_or_id_array );
+			if (!empty($id_or_id_array)) {
+				$this->add_view($id_or_id_array);
 			}
 		}
 
@@ -34,7 +34,7 @@ 
 	public function has_multiple_views() {
 
 		//multiple views
-		return count( $this->get_views() ) > 1 ? true : false;
+		return count($this->get_views()) > 1 ? true : false;
 	}
 
 
@@ -52,37 +52,37 @@ 
 	 *
 	 * @return int|null|array ID of the View. If there are multiple views in the content, array of IDs parsed.
 	 */
-	public function maybe_get_view_id( $passed_post ) {
+	public function maybe_get_view_id($passed_post) {
 
 		$ids = array();
 
-		if( ! empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			if( is_numeric( $passed_post ) ) {
-				$passed_post = get_post( $passed_post );
+			if (is_numeric($passed_post)) {
+				$passed_post = get_post($passed_post);
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
-				$passed_post = array( $passed_post );
+			if ($passed_post instanceof WP_Post) {
+				$passed_post = array($passed_post);
 			}
 
-			if( is_array( $passed_post ) ) {
+			if (is_array($passed_post)) {
 
-				foreach ( $passed_post as &$post) {
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
+				foreach ($passed_post as &$post) {
+					if ((get_post_type($post) === 'gravityview')) {
 						$ids[] = $post->ID;
-					} else{
+					} else {
 						// Parse the Post Content
-						$id = $this->parse_post_content( $post->post_content );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_content($post->post_content);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 
 						// Parse the Post Meta
-						$id = $this->parse_post_meta( $post->ID );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_meta($post->ID);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 					}
 
@@ -90,33 +90,33 @@ 
 
 			} else {
 
-				if ( is_string( $passed_post ) ) {
+				if (is_string($passed_post)) {
 
-					$id = $this->parse_post_content( $passed_post );
-					if( $id ) {
-						$ids = array_merge( $ids, (array) $id );
+					$id = $this->parse_post_content($passed_post);
+					if ($id) {
+						$ids = array_merge($ids, (array)$id);
 					}
 
 				} else {
-					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$id = $this->get_id_from_atts($passed_post);
+					$ids[] = intval($id);
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 	}
 
-	public static function getInstance( $passed_post = NULL ) {
+	public static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new GravityView_View_Data( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new GravityView_View_Data($passed_post);
 		}
 
 		return self::$instance;
@@ -126,25 +126,25 @@ 
 		return $this->views;
 	}
 
-	function get_view( $view_id, $atts = NULL ) {
+	function get_view($view_id, $atts = NULL) {
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if (!is_numeric($view_id)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id));
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
-		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
-			return $this->add_view( $view_id, $atts );
+		if (!isset($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id));
+			return $this->add_view($view_id, $atts);
 		}
 
-		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+		if (empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id));
 			return false;
 		}
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	 * @return   bool          True if the post exists; otherwise, false.
 	 * @since    1.0.0
 	 */
-	function view_exists( $view_id ) {
-		return is_string( get_post_status( $view_id ) );
+	function view_exists($view_id) {
+		return is_string(get_post_status($view_id));
 	}
 
 	/**
@@ -168,56 +168,56 @@ 
 	 * @param array|string $atts Combine other attributes (eg. from shortcode) with the view settings (optional)
 	 * @return type
 	 */
-	function add_view( $view_id, $atts = NULL ) {
+	function add_view($view_id, $atts = NULL) {
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if (is_array($view_id)) {
+			foreach ($view_id as $id) {
 
-				$this->add_view( $id, $atts );
+				$this->add_view($id, $atts);
 			}
 
 			return $this->views;
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
-			return $this->views[ $view_id ];
+		if (!empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id));
+			return $this->views[$view_id];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if (!$this->view_exists($view_id)) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id));
 			return false;
 		}
 
-		$form_id = gravityview_get_form_id( $view_id );
+		$form_id = gravityview_get_form_id($view_id);
 
-		if( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id));
 
 			return false;
 		}
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $view_id );
+		$view_settings = gravityview_get_template_settings($view_id);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings);
 
 		// Merge the view settings with the defaults
-		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
+		$view_defaults = wp_parse_args($view_settings, self::get_default_args());
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults);
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if (!empty($atts) && is_array($atts)) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts);
 
 			// Get the settings from the shortcode and merge them with defaults.
-			$atts = shortcode_atts( $view_defaults, $atts );
+			$atts = shortcode_atts($view_defaults, $atts);
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts);
 
 		} else {
 
@@ -226,24 +226,24 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset($atts['id'], $view_defaults, $view_settings);
 
 		$data = array(
 			'id' => $view_id,
 			'view_id' => $view_id,
 			'form_id' => $form_id,
-			'template_id' => gravityview_get_template_id( $view_id ),
+			'template_id' => gravityview_get_template_id($view_id),
 			'atts' => $atts,
-			'fields' => $this->get_fields( $view_id ),
-			'widgets' => get_post_meta( $view_id, '_gravityview_directory_widgets', true ),
-			'form' => gravityview_get_form( $form_id ),
+			'fields' => $this->get_fields($view_id),
+			'widgets' => get_post_meta($view_id, '_gravityview_directory_widgets', true),
+			'form' => gravityview_get_form($form_id),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data);
 
-		$this->views[ $view_id ] = $data;
+		$this->views[$view_id] = $data;
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -253,14 +253,14 @@ 
 	 * @param  int $view_id View ID
 	 * @return array          Array of fields as passed by `gravityview_get_directory_fields()`
 	 */
-	function get_fields( $view_id ) {
+	function get_fields($view_id) {
 
-		$dir_fields = gravityview_get_directory_fields( $view_id );
-		do_action( 'gravityview_log_debug', '[render_view] Fields: ', $dir_fields );
+		$dir_fields = gravityview_get_directory_fields($view_id);
+		do_action('gravityview_log_debug', '[render_view] Fields: ', $dir_fields);
 
 		// remove fields according to visitor visibility permissions (if logged-in)
-		$dir_fields = $this->filter_fields( $dir_fields );
-		do_action( 'gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields );
+		$dir_fields = $this->filter_fields($dir_fields);
+		do_action('gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields);
 
 		return $dir_fields;
 	}
@@ -272,18 +272,18 @@ 
 	 * @param array $dir_fields
 	 * @return array
 	 */
-	private function filter_fields( $dir_fields ) {
+	private function filter_fields($dir_fields) {
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if (empty($dir_fields) || !is_array($dir_fields)) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ($dir_fields as $area => $fields) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ((array)$fields as $uniqid => $properties) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
-					unset( $dir_fields[ $area ][ $uniqid ] );
+				if ($this->hide_field_check_conditions($properties)) {
+					unset($dir_fields[$area][$uniqid]);
 				}
 
 			}
@@ -301,31 +301,31 @@ 
 	 * @param array $properties
 	 * @return void|boolean (field should be hidden) or false (field should be presented)
 	 */
-	private function hide_field_check_conditions( $properties ) {
+	private function hide_field_check_conditions($properties) {
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if (!empty($properties['only_loggedin']) && !GVCommon::has_cap($properties['only_loggedin_cap'])) {
 			return true;
 		}
 
 		return false;
 	}
 
-	function get_id_from_atts( $atts ) {
+	function get_id_from_atts($atts) {
 
-		$atts = is_array( $atts ) ? $atts : shortcode_parse_atts( $atts );
+		$atts = is_array($atts) ? $atts : shortcode_parse_atts($atts);
 
 		// Get the settings from the shortcode and merge them with defaults.
-		$atts = wp_parse_args( $atts, self::get_default_args() );
+		$atts = wp_parse_args($atts, self::get_default_args());
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = !empty($atts['view_id']) ? (int)$atts['view_id'] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
+		if (empty($view_id) && !empty($atts['id'])) {
 			$view_id = (int)$atts['id'];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if (empty($view_id)) {
+			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts);
 			return;
 		}
 
@@ -341,50 +341,50 @@ 
 	 * @param  string $content $post->post_content content
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, NULL
 	 */
-	function parse_post_content( $content ) {
+	function parse_post_content($content) {
 
 		/**
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if (!shortcode_exists('gravityview') && class_exists('GravityView_Shortcode')) {
 			new GravityView_Shortcode;
 		}
 
-		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
+		$shortcodes = gravityview_has_shortcode_r($content, 'gravityview');
 
-		if( empty( $shortcodes ) ) {
+		if (empty($shortcodes)) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes);
 
 		$ids = array();
 
 		foreach ($shortcodes as $key => $shortcode) {
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts($shortcode[3]);
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
+			if (empty($args['id'])) {
+				do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID), $shortcode);
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args);
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view($args['id'], $args);
 
 			$ids[] = $args['id'];
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 
 	}
 
@@ -395,7 +395,7 @@ 
 	 * @param int $post_id WP_Post ID
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, or meta not parsed, NULL
 	 */
-	private function parse_post_meta( $post_id ) {
+	private function parse_post_meta($post_id) {
 
 		/**
 		 * @filter `gravityview/data/parse/meta_keys` Define meta keys to parse to check for GravityView shortcode content
@@ -403,32 +403,32 @@ 
 		 * @param[in,out] array $meta_keys Array of key values to check. If empty, do not check. Default: empty array
 		 * @param[in] int $post_id ID of the post being checked
 		 */
-		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
+		$meta_keys = (array)apply_filters('gravityview/data/parse/meta_keys', array(), $post_id);
 
-		if( empty( $meta_keys ) ) {
+		if (empty($meta_keys)) {
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys);
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ($meta_keys as $key) {
+			$meta = get_post_meta($post_id, $key, true);
+			if (!is_string($meta)) {
 				continue;
 			}
-			$meta_content .= $meta . ' ';
+			$meta_content .= $meta.' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if (empty($meta_content)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id), $meta_keys);
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content);
 
-		return $this->parse_post_content( $meta_content );
+		return $this->parse_post_content($meta_content);
 
 	}
 
@@ -444,61 +444,61 @@ 
 	 *
 	 * @return bool|WP_Error If valid, returns true. If invalid, returns WP_Error containing error message.
 	 */
-	public static function is_valid_embed_id( $post_id = '', $view_id = '', $empty_is_valid = true ) {
+	public static function is_valid_embed_id($post_id = '', $view_id = '', $empty_is_valid = true) {
 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if (empty($post_id) || empty($view_id)) {
 
-			if( $empty_is_valid ) {
+			if ($empty_is_valid) {
 				return true;
 			}
 
-			$message = esc_html__( 'The ID is required.', 'gravityview' );
+			$message = esc_html__('The ID is required.', 'gravityview');
 		}
 
-		if( ! $message ) {
-			$status = get_post_status( $post_id );
+		if (!$message) {
+			$status = get_post_status($post_id);
 
 			// Nothing exists with that post ID.
-			if ( ! is_numeric( $post_id ) ) {
-				$message = esc_html__( 'You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview' );
+			if (!is_numeric($post_id)) {
+				$message = esc_html__('You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview');
 
 				// @todo Convert to generic article about Embed IDs
-				$message .= ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				$message .= ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// Nothing exists with that post ID.
-			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
-				$message = esc_html__( 'There is no post or page with that ID.', 'gravityview' );
+			if (empty($status) || in_array($status, array('revision', 'attachment'))) {
+				$message = esc_html__('There is no post or page with that ID.', 'gravityview');
 			}
 
 		}
 
-		if( ! $message ) {
-			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+		if (!$message) {
+			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
-				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
+			if (false === in_array($view_id, (array)$view_ids_in_post)) {
+				$message = sprintf(esc_html__('The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview'), '<br /><code>[gravityview id="'.intval($view_id).'"]</code>');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// It's a View
-			if( 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+			if ('gravityview' === get_post_type($post_id)) {
+				$message = esc_html__('The ID is already a View.', 'gravityview'); ;
 			}
 
 		}
 
-		if( $message ) {
-			return new WP_Error( 'invalid_embed_id', $message );
+		if ($message) {
+			return new WP_Error('invalid_embed_id', $message);
 		}
 
 		return true;
@@ -510,13 +510,13 @@ 
 	 * @param  boolean $with_details Include details
 	 * @return mixed|array                If using $with_details, return array. Otherwise, mixed.
 	 */
-	public static function get_default_arg( $key, $with_details = false ) {
+	public static function get_default_arg($key, $with_details = false) {
 
-		$args = self::get_default_args( $with_details );
+		$args = self::get_default_args($with_details);
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if (!isset($args[$key])) { return NULL; }
 
-		return $args[ $key ];
+		return $args[$key];
 	}
 
 	/**
@@ -535,13 +535,13 @@ 
 	 *      @param[out] array  $options Array of values to use when generating select, multiselect, radio, or checkboxes fields
 	 *      @param[out] boolean $full_width True: Display the input and label together when rendering. False: Display label and input in separate columns when rendering.
 	 */
-	public static function get_default_args( $with_details = false, $group = NULL ) {
+	public static function get_default_args($with_details = false, $group = NULL) {
 
 		/**
 		 * @filter `gravityview_default_args` Modify the default settings for new Views
 		 * @param[in,out] array $default_args Array of default args.
 		 */
-		$default_settings = apply_filters( 'gravityview_default_args', array(
+		$default_settings = apply_filters('gravityview_default_args', array(
 			'id' => array(
 				'label' => __('View ID', 'gravityview'),
 				'type' => 'number',
@@ -559,7 +559,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'lightbox' => array(
-				'label' => __( 'Enable lightbox for images', 'gravityview' ),
+				'label' => __('Enable lightbox for images', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 1,
@@ -567,29 +567,29 @@ 
 				'show_in_shortcode' => true,
 			),
 			'show_only_approved' => array(
-				'label' => __( 'Show only approved entries', 'gravityview' ),
+				'label' => __('Show only approved entries', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_until_searched' => array(
-				'label' => __( 'Hide View data until search is performed', 'gravityview' ),
+				'label' => __('Hide View data until search is performed', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
-				'tooltip' => __( 'When enabled it will only show any View entries after a search is performed.', 'gravityview' ),
+				'tooltip' => __('When enabled it will only show any View entries after a search is performed.', 'gravityview'),
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_empty' => array(
-				'label' 	=> __( 'Hide empty fields', 'gravityview' ),
+				'label' 	=> __('Hide empty fields', 'gravityview'),
 				'group'	=> 'default',
 				'type'	=> 'checkbox',
 				'value' => 1,
 				'show_in_shortcode' => false,
 			),
 			'user_edit' => array(
-				'label'	=> __( 'Allow User Edit', 'gravityview' ),
+				'label'	=> __('Allow User Edit', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -598,7 +598,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
-				'label'	=> __( 'Allow User Delete', 'gravityview' ),
+				'label'	=> __('Allow User Delete', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -612,8 +612,8 @@ 
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __('Default', 'gravityview'),
+					'date_created' => __('Date Created', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -630,19 +630,19 @@ 
 				'show_in_shortcode' => true,
 			),
 			'sort_columns' => array(
-				'label' 	=> __( 'Enable sorting by column', 'gravityview' ),
-				'left_label' => __( 'Column Sorting', 'gravityview' ),
+				'label' 	=> __('Enable sorting by column', 'gravityview'),
+				'left_label' => __('Column Sorting', 'gravityview'),
 				'type' => 'checkbox',
 				'value' => false,
 				'group'	=> 'sort',
 				'tooltip' => NULL,
 				'show_in_shortcode' => true,
-				'show_in_template' => array( 'default_table' ),
+				'show_in_template' => array('default_table'),
 			),
 			'start_date' => array(
 				'label' 	=> __('Filter by Start Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -651,7 +651,7 @@ 
 			'end_date' => array(
 				'label' 	=> __('Filter by End Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -711,12 +711,12 @@ 
 		));
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if (empty($with_details)) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ($default_settings as $key => $value) {
+				$defaults[$key] = $value['value'];
 			}
 
 			return $defaults;
@@ -729,9 +729,9 @@ 
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
-						unset( $default_settings[ $key ] );
+				if (!empty($group) && is_string($group)) {
+					if (empty($value['group']) || $value['group'] !== $group) {
+						unset($default_settings[$key]);
 					}
 				}
 

includes/class-gravityview-admin-bar.php

Spacing +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 	 * @since 1.13
 	 */
 	private function add_hooks() {
-		add_action( 'add_admin_bar_menus', array( $this, 'remove_links' ), 80 );
-		add_action( 'admin_bar_menu', array( $this, 'add_links' ), 85 );
+		add_action('add_admin_bar_menus', array($this, 'remove_links'), 80);
+		add_action('admin_bar_menu', array($this, 'add_links'), 85);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 
 		$entry_id = $this->gravityview_view->getSingleEntry();
 
-		if ( $entry_id && GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ), $entry_id ) ) {
+		if ($entry_id && GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'), $entry_id)) {
 
 			$entry = $this->gravityview_view->getEntry();
 
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit-entry',
-				'title' => __( 'Edit Entry', 'gravityview' ),
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
-			) );
+				'title' => __('Edit Entry', 'gravityview'),
+				'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id']))),
+			));
 
 		}
 	}
@@ -78,7 +78,7 @@ 
 		/** @var WP_Admin_Bar $wp_admin_bar */
 		global $wp_admin_bar;
 
-		if( GVCommon::has_cap('edit_gravityviews') ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
 			$view_data = GravityView_View_Data::getInstance();
 
@@ -86,15 +86,15 @@ 
 
 			// If there is a View embed, shor Edit View link.
 			// todo: Support multiple View embeds with a drop-down menu
-			if ( ! $this->gravityview_view->isGravityviewPostType() && ! empty( $views ) && ! $view_data->has_multiple_views() ) {
-				$view = reset( $views );
+			if (!$this->gravityview_view->isGravityviewPostType() && !empty($views) && !$view_data->has_multiple_views()) {
+				$view = reset($views);
 
-				if( GVCommon::has_cap( 'edit_gravityview', $view['id'] ) ) {
-					$wp_admin_bar->add_menu( array(
+				if (GVCommon::has_cap('edit_gravityview', $view['id'])) {
+					$wp_admin_bar->add_menu(array(
 						'id'    => 'edit-view',
-						'title' => __( 'Edit View', 'gravityview' ),
-						'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view['id'] ) ) ),
-					) );
+						'title' => __('Edit View', 'gravityview'),
+						'href'  => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view['id']))),
+					));
 				}
 			}
 		}
@@ -108,8 +108,8 @@ 
 	function remove_links() {
 
 		// If we're on the single entry page, we don't want to cause confusion.
-		if ( is_admin() || ( $this->gravityview_view->getSingleEntry() && ! $this->gravityview_view->isGravityviewPostType() ) ) {
-			remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		if (is_admin() || ($this->gravityview_view->getSingleEntry() && !$this->gravityview_view->isGravityviewPostType())) {
+			remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 		}
 	}
 }

includes/class-gravityview-admin-duplicate-view.php

Spacing +71 added lines, -71 removed lines

@@ -15,12 +15,12 @@ 
 	function __construct() {
 
 		// Only run on Admin
-		if ( !is_admin() ) {
+		if (!is_admin()) {
 			return;
 		}
 
 		// If the Duplicate Post plugin is active, don't run.
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
+		if (defined('DUPLICATE_POST_CURRENT_VERSION')) {
 			return;
 		}
 
@@ -33,18 +33,18 @@ 
 	 * @return void
 	 */
 	private function add_hooks() {
-		add_filter( 'post_row_actions', array( $this, 'make_duplicate_link_row' ), 10, 2 );
+		add_filter('post_row_actions', array($this, 'make_duplicate_link_row'), 10, 2);
 
 		/**
 		 * Connect actions to functions
 		 */
-		add_action( 'admin_action_duplicate_view', array( $this, 'save_as_new_view' ) );
-		add_action( 'admin_action_duplicate_view_as_draft', array( $this, 'save_as_new_view_draft' ) );
+		add_action('admin_action_duplicate_view', array($this, 'save_as_new_view'));
+		add_action('admin_action_duplicate_view_as_draft', array($this, 'save_as_new_view_draft'));
 
 		// Using our action hooks to copy meta fields
-		add_action( 'gv_duplicate_view', array( $this, 'copy_view_meta_info' ), 10, 2 );
+		add_action('gv_duplicate_view', array($this, 'copy_view_meta_info'), 10, 2);
 
-		add_filter( 'gravityview_connected_form_links', array( $this, 'connected_form_links' ), 10, 2 );
+		add_filter('gravityview_connected_form_links', array($this, 'connected_form_links'), 10, 2);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 	 *
 	 * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
 	 */
-	function connected_form_links( $links = array(), $form = array() ) {
+	function connected_form_links($links = array(), $form = array()) {
 		/** @global WP_Post $post */
 		global $post;
 
 		// We only want to add Clone links to the Edit View metabox
-		if( !$this->is_all_views_page() ) {
+		if (!$this->is_all_views_page()) {
 
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
+			if ($duplicate_links = $this->make_duplicate_link_row(array(), $post)) {
+				$links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
 			}
 
 		}
@@ -88,12 +88,12 @@ 
 	 *
 	 * @since 1.6
 	 */
-	private function current_user_can_copy( $post ) {
+	private function current_user_can_copy($post) {
 
-		$id = is_object( $post ) ? $post->ID : $post;
+		$id = is_object($post) ? $post->ID : $post;
 
 		// Can't edit this current View
-		return GVCommon::has_cap( 'copy_gravityviews', $id );
+		return GVCommon::has_cap('copy_gravityviews', $id);
 
 	}
 
@@ -104,10 +104,10 @@ 
 	 * @param string $status The post status
 	 * @since 1.6
 	 */
-	private function create_duplicate( $post, $status = '' ) {
+	private function create_duplicate($post, $status = '') {
 
 		// We only want to clone Views
-		if ( $post->post_type !== 'gravityview' ) {
+		if ($post->post_type !== 'gravityview') {
 			return;
 		}
 
@@ -119,7 +119,7 @@ 
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
+		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post);
 
 		$new_view = array(
 			'menu_order'     => $post->menu_order,
@@ -131,7 +131,7 @@ 
 			'post_mime_type' => $post->post_mime_type,
 			'post_parent'    => $post->post_parent,
 			'post_password'  => $post->post_password,
-			'post_status'    => ( empty( $new_view_status ) ) ? $post->post_status : $new_view_status,
+			'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
 			'post_title'     => $post->post_title,
 			'post_type'      => $post->post_type,
 		);
@@ -142,11 +142,11 @@ 
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
 		 * @param WP_Post $post View being cloned
 		 */
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
+		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post);
 
-		if ( $copy_date ) {
+		if ($copy_date) {
 			$new_view['post_date']     = $new_post_date = $post->post_date;
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
+			$new_view['post_date_gmt'] = get_gmt_from_date($new_post_date);
 		}
 
 		/**
@@ -155,15 +155,15 @@ 
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
+		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post);
 
 		// Magic happens here.
-		$new_view_id = wp_insert_post( $new_view );
+		$new_view_id = wp_insert_post($new_view);
 
 		// If the copy is published or scheduled, we have to set a proper slug.
-		if ( $new_view_status == 'publish' || $new_view_status == 'future' ) {
+		if ($new_view_status == 'publish' || $new_view_status == 'future') {
 
-			$view_name = wp_unique_post_slug( $post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent );
+			$view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
 
 			$new_view_name_array = array(
 				'ID' => $new_view_id,
@@ -171,7 +171,7 @@ 
 			);
 
 			// Update the post into the database
-			wp_update_post( $new_view_name_array );
+			wp_update_post($new_view_name_array);
 		}
 
 		/**
@@ -181,11 +181,11 @@ 
 		 * @param int $new_view_id The ID of the newly created View
 		 * @param WP_Post The View that was just cloned
 		 */
-		do_action( 'gv_duplicate_view', $new_view_id, $post );
+		do_action('gv_duplicate_view', $new_view_id, $post);
 
-		delete_post_meta( $new_view_id, '_dp_original' );
+		delete_post_meta($new_view_id, '_dp_original');
 
-		add_post_meta( $new_view_id, '_dp_original', $post->ID, false );
+		add_post_meta($new_view_id, '_dp_original', $post->ID, false);
 
 		return $new_view_id;
 	}
@@ -200,23 +200,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function copy_view_meta_info( $new_id, $post ) {
+	public function copy_view_meta_info($new_id, $post) {
 
-		$post_meta_keys = get_post_custom_keys( $post->ID );
+		$post_meta_keys = get_post_custom_keys($post->ID);
 
-		if ( empty( $post_meta_keys ) ) {
+		if (empty($post_meta_keys)) {
 			return;
 		}
 
-		foreach ( $post_meta_keys as $meta_key ) {
+		foreach ($post_meta_keys as $meta_key) {
 
-			$meta_values = get_post_custom_values( $meta_key, $post->ID );
+			$meta_values = get_post_custom_values($meta_key, $post->ID);
 
-			foreach ( $meta_values as $meta_value ) {
+			foreach ($meta_values as $meta_value) {
 
-				$meta_value = maybe_unserialize( $meta_value );
+				$meta_value = maybe_unserialize($meta_value);
 
-				add_post_meta( $new_id, $meta_key, $meta_value );
+				add_post_meta($new_id, $meta_key, $meta_value);
 			}
 		}
 	}
@@ -228,22 +228,22 @@ 
 	 * @param array $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
 	 * @param WP_Post $post
 	 */
-	public function make_duplicate_link_row( $actions, $post ) {
+	public function make_duplicate_link_row($actions, $post) {
 
 		// Only process on GravityView Views
-		if ( get_post_type( $post ) === 'gravityview' && $this->current_user_can_copy( $post ) ) {
+		if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
 
-			$clone_link = $this->get_clone_view_link( $post->ID, 'display', false );
-			$clone_text = __( 'Clone', 'gravityview' );
-			$clone_title = __( 'Clone this View', 'gravityview' );
+			$clone_link = $this->get_clone_view_link($post->ID, 'display', false);
+			$clone_text = __('Clone', 'gravityview');
+			$clone_title = __('Clone this View', 'gravityview');
 
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
+			$actions['clone'] = gravityview_get_link($clone_link, $clone_text, 'title='.$clone_title);
 
-			$clone_draft_link = $this->get_clone_view_link( $post->ID );
-			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
-			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
+			$clone_draft_link = $this->get_clone_view_link($post->ID);
+			$clone_draft_text = $this->is_all_views_page() ? __('New Draft', 'gravityview') : __('Clone View', 'gravityview');
+			$clone_draft_title = __('Copy as a new draft View', 'gravityview');
 
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
+			$actions['edit_as_new_draft'] = gravityview_get_link($clone_draft_link, esc_html($clone_draft_text), 'title='.$clone_draft_title);
 		}
 
 		return $actions;
@@ -259,31 +259,31 @@ 
 	 * @param string $draft Optional, default to true
 	 * @return string
 	 */
-	private function get_clone_view_link( $id = 0, $context = 'display', $draft = true ) {
+	private function get_clone_view_link($id = 0, $context = 'display', $draft = true) {
 
 		// Make sure they have permission
-		if ( false === $this->current_user_can_copy( $id ) ) {
+		if (false === $this->current_user_can_copy($id)) {
 			return '';
 		}
 
 		// Verify the View exists
-		if ( !$view = get_post( $id ) ) {
+		if (!$view = get_post($id)) {
 			return '';
 		}
 
 		$action_name = $draft ? "duplicate_view_as_draft" : "duplicate_view";
 
-		$action = '?action=' . $action_name . '&post=' . $view->ID;
+		$action = '?action='.$action_name.'&post='.$view->ID;
 
-		if ( 'display' == $context ) {
-			$action = esc_html( $action );
+		if ('display' == $context) {
+			$action = esc_html($action);
 		}
 
-		$post_type_object = get_post_type_object( $view->post_type );
+		$post_type_object = get_post_type_object($view->post_type);
 
 		/** If there's no gravityview post type for some reason, abort! */
-		if ( !$post_type_object ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' No gravityview post type exists when trying to clone the View.', $view );
+		if (!$post_type_object) {
+			do_action('gravityview_log_error', __METHOD__.' No gravityview post type exists when trying to clone the View.', $view);
 			return '';
 		}
 
@@ -294,7 +294,7 @@ 
 		 * @param int $view_id View ID
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
 		 */
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
+		$clone_view_link = apply_filters('gravityview/duplicate-view/get_clone_view_link', admin_url("admin.php".$action), $view->ID, $context);
 
 		return $clone_view_link;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return void
 	 */
 	public function save_as_new_view_draft() {
-		$this->save_as_new_view( 'draft' );
+		$this->save_as_new_view('draft');
 	}
 
 	/**
@@ -319,38 +319,38 @@ 
 	 * @param string $status The status to set for the new View
 	 * @return void
 	 */
-	public function save_as_new_view( $status = '' ) {
+	public function save_as_new_view($status = '') {
 
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
-			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
+		if (!(isset($_GET['post']) || isset($_POST['post']))) {
+			wp_die(__('No post to duplicate has been supplied!', 'gravityview'));
 		}
 
 		// Get the original post
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
+		$id = (isset($_GET['post']) ? $_GET['post'] : $_POST['post']);
 
-		if( ! $this->current_user_can_copy( $id ) ) {
-			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
+		if (!$this->current_user_can_copy($id)) {
+			wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
 		}
 
-		$post = get_post( $id );
+		$post = get_post($id);
 
 		// Copy the post and insert it
-		if ( isset( $post ) && $post != NULL ) {
+		if (isset($post) && $post != NULL) {
 
-			$new_id = $this->create_duplicate( $post, $status );
+			$new_id = $this->create_duplicate($post, $status);
 
-			if ( $status == '' ) {
+			if ($status == '') {
 				// Redirect to the post list screen
-				wp_redirect( admin_url( 'edit.php?post_type=' . $post->post_type ) );
+				wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
 			} else {
 				// Redirect to the edit screen for the new draft post
-				wp_redirect( admin_url( 'post.php?action=edit&post=' . $new_id ) );
+				wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
 			}
 			exit;
 
 		} else {
 
-			wp_die( sprintf( esc_attr__( 'Copy creation failed, could not find original View with ID #%d', 'gravityview' ), $id ) );
+			wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
 
 		}
 	}

includes/class-gravityview-admin-notices.php

Spacing +39 added lines, -39 removed lines

@@ -15,7 +15,7 @@ 
  * When the plugin is activated, flush dismissed notices
  * @since 1.15.1
  */
-register_activation_hook( GRAVITYVIEW_FILE, array( 'GravityView_Admin_Notices', 'flush_dismissed_notices' ) );
+register_activation_hook(GRAVITYVIEW_FILE, array('GravityView_Admin_Notices', 'flush_dismissed_notices'));
 
 /**
  * Handle displaying and storing of admin notices for GravityView
@@ -33,10 +33,10 @@ 
 	}
 
 	function add_hooks() {
-		add_action( 'network_admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'admin_notice' ), 100 );
-		add_action( 'network_admin_notices', array( $this, 'admin_notice' ), 100 );
+		add_action('network_admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'admin_notice'), 100);
+		add_action('network_admin_notices', array($this, 'admin_notice'), 100);
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 * @return void
 	 */
 	static public function flush_dismissed_notices() {
-		delete_transient( 'gravityview_dismissed_notices' );
+		delete_transient('gravityview_dismissed_notices');
 	}
 
 	/**
@@ -57,26 +57,26 @@ 
 	public function dismiss_notice() {
 
 		// No dismiss sent
-		if( empty( $_GET['gv-dismiss'] ) ) {
+		if (empty($_GET['gv-dismiss'])) {
 			return;
 		}
 
 		// Invalid nonce
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
+		if (!wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
 			return;
 		}
 
-		$notice_id = esc_attr( $_GET['notice'] );
+		$notice_id = esc_attr($_GET['notice']);
 
 		//don't display a message if use has dismissed the message for this version
-		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
+		$dismissed_notices = (array)get_transient('gravityview_dismissed_notices');
 
 		$dismissed_notices[] = $notice_id;
 
-		$dismissed_notices = array_unique( $dismissed_notices );
+		$dismissed_notices = array_unique($dismissed_notices);
 
 		// Remind users every 16 weeks
-		set_transient( 'gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16 );
+		set_transient('gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16);
 
 	}
 
@@ -91,15 +91,15 @@ 
 	 * @param  string $notice            Notice array, set using `add_notice()`.
 	 * @return boolean                   True: show notice; False: hide notice
 	 */
-	private function is_notice_dismissed( $notice ) {
+	private function is_notice_dismissed($notice) {
 
 		// There are no dismissed notices.
-		if( empty( self::$dismissed_notices ) ) {
+		if (empty(self::$dismissed_notices)) {
 			return false;
 		}
 
 		// Has the
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
+		$is_dismissed = !empty($notice['dismiss']) && in_array($notice['dismiss'], self::$dismissed_notices);
 
 		return $is_dismissed ? true : false;
 	}
@@ -124,17 +124,17 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if (!is_multisite()) {
 			return true;
 		}
 
 		// It's network activated but the user can't manage network plugins; they can't do anything about it.
-		if( GravityView_Plugin::is_network_activated() && ! is_main_site() ) {
+		if (GravityView_Plugin::is_network_activated() && !is_main_site()) {
 			return false;
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if (!is_super_admin()) {
 			return false;
 		}
 
@@ -155,53 +155,53 @@ 
 		 * @filter `gravityview/admin/notices` Modify the notices displayed in the admin
 		 * @since 1.12
 		 */
-		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
+		$notices = apply_filters('gravityview/admin/notices', self::$admin_notices);
 
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
+		if (empty($notices) || !$this->check_show_multisite_notices()) {
 			return;
 		}
 
 		//don't display a message if use has dismissed the message for this version
 		// TODO: Use get_user_meta instead of get_transient
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
+		self::$dismissed_notices = isset($_GET['show-dismissed-notices']) ? array() : (array)get_transient('gravityview_dismissed_notices');
 
 		$output = '';
 
-		foreach( $notices as $notice ) {
+		foreach ($notices as $notice) {
 
 			// If the user doesn't have the capability to see the warning
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice );
+			if (isset($notice['cap']) && false === GVCommon::has_cap($notice['cap'])) {
+				do_action('gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice);
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice );
+			if (true === $this->is_notice_dismissed($notice)) {
+				do_action('gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice);
 				continue;
 			}
 
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
+			$output .= '<div id="message" style="position:relative" class="notice '.gravityview_sanitize_html_class($notice['class']).'">';
 
 			// Too cute to leave out.
 			$output .= gravityview_get_floaty();
 
-			if( !empty( $notice['title'] ) ) {
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
+			if (!empty($notice['title'])) {
+				$output .= '<h3>'.esc_html($notice['title']).'</h3>';
 			}
 
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
+			$message = isset($notice['message']) ? $notice['message'] : '';
 
-			if( !empty( $notice['dismiss'] ) ) {
+			if (!empty($notice['dismiss'])) {
 
 				$dismiss = esc_attr($notice['dismiss']);
 
-				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
+				$url = esc_url(add_query_arg(array('gv-dismiss' => wp_create_nonce('dismiss'), 'notice' => $dismiss)));
 
 				$align = is_rtl() ? 'alignleft' : 'alignright';
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
+				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="'.$align.' button button-link">'.esc_html__('Dismiss', 'gravityview').'</a></p>';
 			}
 
-			$output .= wpautop( $message );
+			$output .= wpautop($message);
 
 			$output .= '<div class="clear"></div>';
 			$output .= '</div>';
@@ -210,7 +210,7 @@ 
 
 		echo $output;
 
-		unset( $output, $align, $message, $notices );
+		unset($output, $align, $message, $notices);
 
 		//reset the notices handler
 		self::$admin_notices = array();
@@ -223,14 +223,14 @@ 
 	 * @param array $notice Array with `class`, `message`, `dismiss` and `cap` keys. The message is not escaped.
 	 * @return void
 	 */
-	public static function add_notice( $notice = array() ) {
+	public static function add_notice($notice = array()) {
 
-		if( !isset( $notice['message'] ) ) {
-			do_action( 'gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice );
+		if (!isset($notice['message'])) {
+			do_action('gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice);
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
 
 		self::$admin_notices[] = $notice;
 	}

includes/class-gravityview-change-entry-creator.php

Spacing +42 added lines, -42 removed lines

@@ -10,17 +10,17 @@ 
     	/**
     	 * @since  1.5.1
     	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+    	add_action('gform_user_registered', array($this, 'assign_new_user_to_lead'), 10, 4);
 
     	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
+    	if (!is_admin()) { return; }
 
 	    /**
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
 	     * @since 1.7.4
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
 	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+	    if (apply_filters('gravityview_disable_change_entry_creator', false)) {
 		    return;
 	    }
 
@@ -28,9 +28,9 @@ 
          * Use `init` to fix bbPress warning
          * @see https://bbpress.trac.wordpress.org/ticket/2309
          */
-    	add_action('init', array( $this, 'load'), 100 );
+    	add_action('init', array($this, 'load'), 100);
 
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+    	add_action('plugins_loaded', array($this, 'prevent_conflicts'));
 
     }
 
@@ -45,7 +45,7 @@ 
      * @param  string $password User password
      * @return void
      */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+    function assign_new_user_to_lead($user_id, $config, $entry = array(), $password = '') {
 
     	/**
     	 * Disable assigning the new user to the entry by returning false.
@@ -53,27 +53,27 @@ 
 	     * @param  array $config   User registration feed configuration
 	     * @param  array  $entry     GF Entry array
     	 */
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
+    	$assign_to_lead = apply_filters('gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry);
 
     	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
+    	if (empty($assign_to_lead)) {
     		return;
     	}
 
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
+    	$result = RGFormsModel::update_lead_property($entry['id'], 'created_by', $user_id, false, true);
 
-    	if( empty( $result ) ) {
+    	if (empty($result)) {
     		$status = __('Error', 'gravityview');
     	} else {
     		$status = __('Success', 'gravityview');
     	}
 
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+    	$note = sprintf(_x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id);
 
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
+    	do_action('gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note);
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+        GravityView_Entry_Notes::add_note($entry['id'], -1, 'GravityView', $note, 'gravityview');
 
     }
 
@@ -89,16 +89,16 @@ 
     	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
 
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
+    	if (class_exists('KWS_GF_Change_Lead_Creator')) {
 
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
     		// Now, no validation is required in the methods; let's hook in.
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
+    		remove_action('admin_init', array($Old_Lead_Creator, 'set_screen_mode'));
 
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
+    		remove_action("gform_entry_info", array($Old_Lead_Creator, 'add_select'), 10, 2);
 
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
+    		remove_action("gform_after_update_entry", array($Old_Lead_Creator, 'update_entry_creator'), 10, 2);
     	}
 
     }
@@ -110,26 +110,26 @@ 
     function load() {
 
     	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
+        if (!class_exists('GFCommon')) {
             return;
         }
 
         // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+        if (!GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'))) {
             return;
         }
 
         // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
+        if (empty($_REQUEST['screen_mode'])) {
             return;
         }
 
         // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+        add_action('admin_init', array(&$this, 'set_screen_mode'));
 
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+        add_action("gform_entry_info", array(&$this, 'add_select'), 10, 2);
 
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+        add_action("gform_after_update_entry", array(&$this, 'update_entry_creator'), 10, 2);
 
     }
 
@@ -140,7 +140,7 @@ 
     function set_screen_mode() {
 
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
+        if (rgget('screen_mode') === 'edit') {
             $_POST["screen_mode"] = 'edit';
         }
 
@@ -156,38 +156,38 @@ 
             global $current_user;
 
         // Update the entry
-        $created_by = absint( rgpost('created_by') );
+        $created_by = absint(rgpost('created_by'));
 
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
+        RGFormsModel::update_lead_property($entry_id, 'created_by', $created_by);
 
         // If the creator has changed, let's add a note about who it used to be.
         $originally_created_by = rgpost('originally_created_by');
 
         // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
+        if (empty($originally_created_by) && empty($created_by)) {
             return;
         }
 
         // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+        if (absint($originally_created_by) !== absint($created_by)) {
 
             $user_data = get_userdata($current_user->ID);
 
             $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+            $original_name = $created_by_name = esc_attr_x('No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
 
-            if( !empty( $originally_created_by ) ) {
+            if (!empty($originally_created_by)) {
                 $originally_created_by_user_data = get_userdata($originally_created_by);
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
+                $original_name = sprintf($user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID);
             }
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
+            if (!empty($created_by)) {
+                $created_by_user_data = get_userdata($created_by);
+                $created_by_name = sprintf($user_format, $created_by_user_data->display_name, $created_by_user_data->ID);
             }
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+            GravityView_Entry_Notes::add_note($entry_id, $current_user->ID, $user_data->display_name, sprintf(__('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name), 'note');
         }
 
     }
@@ -198,24 +198,24 @@ 
      * @param array $entry    GF entry array
      * @return void
      */
-    function add_select($form_id, $entry ) {
+    function add_select($form_id, $entry) {
 
-        if( rgpost('screen_mode') !== 'edit' ) {
+        if (rgpost('screen_mode') !== 'edit') {
             return;
         }
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+        $users = GVCommon::get_users('change_entry_creator');
 
         $output = '<label for="change_created_by">';
         $output .= esc_html__('Change Entry Creator:', 'gravityview');
         $output .= '</label>
         <select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+        $output .= '<option value=""> &mdash; '.esc_attr_x('No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
+        foreach ($users as $user) {
+            $output .= '<option value="'.$user->ID.'"'.selected($entry['created_by'], $user->ID, false).'>'.esc_attr($user->display_name.' ('.$user->user_nicename.')').'</option>';
         }
         $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+        $output .= '<input name="originally_created_by" value="'.esc_attr($entry['created_by']).'" type="hidden" />';
         echo $output;
 
     }

includes/class-gravityview-compatibility.php

Spacing +39 added lines, -39 removed lines

@@ -57,7 +57,7 @@ 
 
 	function add_hooks() {
 
-		add_filter( 'gravityview/admin/notices', array( $this, 'insert_admin_notices' ) );
+		add_filter('gravityview/admin/notices', array($this, 'insert_admin_notices'));
 
 		$this->add_fallback_shortcode();
 	}
@@ -68,15 +68,15 @@ 
 	 *
 	 * @return array
 	 */
-	function insert_admin_notices( $notices = array() ) {
-		return array_merge( $notices, self::$notices );
+	function insert_admin_notices($notices = array()) {
+		return array_merge($notices, self::$notices);
 	}
 
 	/**
 	 * @return GravityView_Compatibility
 	 */
 	public static function getInstance() {
-		if( self::$instance ) {
+		if (self::$instance) {
 			return self::$instance;
 		}
 		return new self;
@@ -87,7 +87,7 @@ 
 	 * @return bool
 	 */
 	public static function is_valid() {
-		return ( self::is_valid_gravity_forms() && self::is_valid_wordpress() && self::is_valid_php() );
+		return (self::is_valid_gravity_forms() && self::is_valid_wordpress() && self::is_valid_php());
 	}
 
 	/**
@@ -123,10 +123,10 @@ 
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
 		// show the notice, but not load any post types or process shortcodes.
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
-		if( ! self::is_valid() ) {
+		if (!self::is_valid()) {
 
 			// If the plugin's not loaded, might as well hide the shortcode for people.
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
+			add_shortcode('gravityview', array($this, '_shortcode_gf_notice'));
 
 		}
 	}
@@ -150,17 +150,17 @@ 
 	 *
 	 * @return null|string NULL returned if user can't activate plugins. Notice shown with a warning that GF isn't supported.
 	 */
-	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
+	public function _shortcode_gf_notice($atts = array(), $content = null, $shortcode = 'gravityview') {
 
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
+		if (!GVCommon::has_cap('activate_plugins')) {
 			return null;
 		}
 
 		$notices = self::get_notices();
 
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
-		foreach( (array)$notices as $notice ) {
-			$message .= wpautop( $notice['message'] );
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>'.esc_html__('You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview').'</em></p>';
+		foreach ((array)$notices as $notice) {
+			$message .= wpautop($notice['message']);
 		}
 		$message .= '</div>';
 
@@ -175,11 +175,11 @@ 
 	 * @return boolean
 	 */
 	public static function check_php() {
-		if( false === version_compare( phpversion(), GV_MIN_PHP_VERSION , '>=' ) ) {
+		if (false === version_compare(phpversion(), GV_MIN_PHP_VERSION, '>=')) {
 
 			self::$notices['php_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
+				'message' => sprintf(__("%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview'), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>'),
 				'cap' => 'manage_options',
 				'dismiss' => 'php_version',
 			);
@@ -199,11 +199,11 @@ 
 	public static function check_wordpress() {
 		global $wp_version;
 
-		if( version_compare( $wp_version, GV_MIN_WP_VERSION ) <= 0 ) {
+		if (version_compare($wp_version, GV_MIN_WP_VERSION) <= 0) {
 
 			self::$notices['wp_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
+				'message' => sprintf(__("%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview'), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>'),
 			    'cap' => 'update_core',
 				'dismiss' => 'wp_version',
 			);
@@ -226,17 +226,17 @@ 
 	public static function check_gravityforms() {
 
 		// Bypass other checks: if the class exists
-		if( class_exists( 'GFCommon' ) ) {
+		if (class_exists('GFCommon')) {
 
 			// and the version's right, we're good.
-			if( true === version_compare( GFCommon::$version, GV_MIN_GF_VERSION, ">=" ) ) {
+			if (true === version_compare(GFCommon::$version, GV_MIN_GF_VERSION, ">=")) {
 				return true;
 			}
 
 			// Or the version's wrong
 			self::$notices['gf_version'] = array(
 				'class' => 'error',
-				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+				'message' => sprintf(__("%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview'), '<h3>', GV_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>'),
 				'cap' => 'update_plugins',
 				'dismiss' => 'gf_version',
 			);
@@ -244,40 +244,40 @@ 
 			return false;
 		}
 
-		$gf_status = self::get_plugin_status( 'gravityforms/gravityforms.php' );
+		$gf_status = self::get_plugin_status('gravityforms/gravityforms.php');
 
 		/**
 		 * The plugin is activated and yet somehow GFCommon didn't get picked up...
 		 * OR
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
 		 */
-		if( true === $gf_status || is_network_admin() ) {
+		if (true === $gf_status || is_network_admin()) {
 			return true;
 		}
 
 		// If GFCommon doesn't exist, assume GF not active
 		$return = false;
 
-		switch( $gf_status ) {
+		switch ($gf_status) {
 			case 'inactive':
 
 				// Required for multisite
-				if( ! function_exists('wp_create_nonce') ) {
-					require_once ABSPATH . WPINC . '/pluggable.php';
+				if (!function_exists('wp_create_nonce')) {
+					require_once ABSPATH.WPINC.'/pluggable.php';
 				}
 
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
-				if( is_multisite() ) {
+				if (is_multisite()) {
 					wp_cookie_constants();
 				}
 
 				$return = false;
 
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
+				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'.wp_nonce_url(admin_url('plugins.php?action=activate&plugin=gravityforms/gravityforms.php'), 'activate-plugin_gravityforms/gravityforms.php').'" class="button button-large">';
 
 				self::$notices['gf_inactive'] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
+					'message' => sprintf(__('%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview'), '<h3>', "</h3>\n\n".$button, '</a></strong>'),
 					'cap' => 'activate_plugins',
 					'dismiss' => 'gf_inactive',
 				);
@@ -286,7 +286,7 @@ 
 			default:
 				self::$notices['gf_installed'] = array(
 					'class' => 'error',
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
+					'message' => sprintf(__('%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview'), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>'),
 					'cap' => 'install_plugins',
 					'dismiss' => 'gf_installed',
 				);
@@ -303,11 +303,11 @@ 
 	 */
 	private static function check_gf_directory() {
 
-		if( class_exists( 'GFDirectory' ) ) {
+		if (class_exists('GFDirectory')) {
 			self::$notices['gf_directory'] = array(
 				'class' => 'error is-dismissible',
-				'title' => __('Potential Conflict', 'gravityview' ),
-				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
+				'title' => __('Potential Conflict', 'gravityview'),
+				'message' => __('GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview'),
 				'dismiss' => 'gf_directory',
 				'cap' => 'activate_plugins',
 			);
@@ -323,23 +323,23 @@ 
 	 * @param string $location (default: '')
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
-	public static function get_plugin_status( $location = '' ) {
+	public static function get_plugin_status($location = '') {
 
-		if( ! function_exists('is_plugin_active') ) {
-			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+		if (!function_exists('is_plugin_active')) {
+			include_once(ABSPATH.'/wp-admin/includes/plugin.php');
 		}
 
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
+		if (is_network_admin() && is_plugin_active_for_network($location)) {
 			return true;
 		}
 
-		if( !is_network_admin() && is_plugin_active( $location ) ) {
+		if (!is_network_admin() && is_plugin_active($location)) {
 			return true;
 		}
 
-		if(
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
+		if (
+			!file_exists(trailingslashit(WP_PLUGIN_DIR).$location) &&
+			!file_exists(trailingslashit(WPMU_PLUGIN_DIR).$location)
 		) {
 			return false;
 		}