gravityview / GravityView

future/includes/class-gv-context-template.php

Spacing +2 added lines, -2 removed lines

@@ -86,8 +86,8 @@
 		 */
 		$context->view = Utils::get( $template, 'view' );
 		$context->source = Utils::get( $template, 'source' );
-		$context->field = Utils::get( $template, 'field' ) ? : Utils::get( $data, 'field' );
-		$context->entry = Utils::get( $template, 'entry' ) ? : Utils::get( $data, 'entry' );
+		$context->field = Utils::get( $template, 'field' ) ?: Utils::get( $data, 'field' );
+		$context->entry = Utils::get( $template, 'entry' ) ?: Utils::get( $data, 'entry' );
 		$context->request = Utils::get( $template, 'request' );
 
 		$context->entries = Utils::get( $template, 'entries' ) ? $template->entries : null;

future/includes/class-gv-logger-wp-action.php

Spacing +5 added lines, -5 removed lines

@@ -27,12 +27,12 @@ 
 	 */
 	protected function log( $level, $message, $context ) {
 
-		$php_version = ( ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		$php_version = ( ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 
 		if ( version_compare( $php_version, '5.4', '>=' ) ) {
 			$backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 3 );
-			$location = $this->interpolate( "{class}{type}{function}", $backtrace[2] );
+			$location = $this->interpolate( "{class}{type}{function}", $backtrace[ 2 ] );
 			$message = $this->interpolate( "[$level, $location] $message", $context );
 		} else {
 			$message = "[$level] $message";
@@ -58,14 +58,14 @@ 
 			do_action(
 				sprintf( 'gravityview_log_%s_test', $action ),
 				$this->interpolate( $message, $context ),
-				empty( $context['data'] ) ? array() : $context['data']
+				empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
 			);
 		}
 		
 		do_action(
 			sprintf( 'gravityview_log_%s', $action ),
 			$this->interpolate( $message, $context ),
-			empty( $context['data'] ) ? array() : $context['data']
+			empty( $context[ 'data' ] ) ? array() : $context[ 'data' ]
 		);
 	}
 }

gravityview.php

Indentation +15 added lines, -15 removed lines

@@ -237,26 +237,26 @@
 
 	/** DEBUG */
 
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @param mixed $data Additional data to display
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @param mixed $data Additional data to display
 	 * @deprecated use gravityview()->log
-     * @return void
-     */
-    public static function log_debug( $message, $data = null ){
+	 * @return void
+	 */
+	public static function log_debug( $message, $data = null ){
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->debug( $message, $data );
-    }
+	}
 
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
 	 * @deprecated use gravityview()->log
-     * @return void
-     */
-    public static function log_error( $message, $data = null ){
+	 * @return void
+	 */
+	public static function log_error( $message, $data = null ){
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->error( $message, $data );
-    }
+	}
 } // end class GravityView_Plugin

Spacing +2 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
 	 * @deprecated use gravityview()->log
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->debug( $message, $data );
     }
@@ -255,7 +255,7 @@ 
 	 * @deprecated use gravityview()->log
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->error( $message, $data );
     }

Braces +2 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
 	 * @deprecated use gravityview()->log
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->debug( $message, $data );
     }
@@ -255,7 +255,7 @@ 
 	 * @deprecated use gravityview()->log
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 		gravityview()->log->notice( '\GravityView_Plugin is deprecated. Use \GV\Plugin instead.' );
 		gravityview()->log->error( $message, $data );
     }

includes/class-api.php

Indentation +33 added lines, -33 removed lines

@@ -161,20 +161,20 @@ 
 
 		if( !empty( $field['custom_class'] ) ) {
 
-            $custom_class = $field['custom_class'];
+			$custom_class = $field['custom_class'];
 
-            if( !empty( $entry ) ) {
+			if( !empty( $entry ) ) {
 
-                // We want the merge tag to be formatted as a class. The merge tag may be
-                // replaced by a multiple-word value that should be output as a single class.
-                // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+				// We want the merge tag to be formatted as a class. The merge tag may be
+				// replaced by a multiple-word value that should be output as a single class.
+				// "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
+				add_filter('gform_merge_tag_filter', 'sanitize_html_class');
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+				$custom_class = self::replace_variables( $custom_class, $form, $entry);
 
-                // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
-            }
+				// And then we want life to return to normal
+				remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+			}
 
 			// And now we want the spaces to be handled nicely.
 			$classes[] = gravityview_sanitize_html_class( $custom_class );
@@ -531,32 +531,32 @@ 
 		return sanitize_title( $slug );
 	}
 
-    /**
-     * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
-     *
-     * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
-     *
-     * @param $entry array Gravity Forms entry object
-     * @param $form array Gravity Forms form object
-     */
-    public static function entry_create_custom_slug( $entry, $form ) {
-        /**
-         * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
-         * @param boolean $custom Should we process the custom entry slug?
-         */
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
-            // create the gravityview_unique_id and save it
+	/**
+	 * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
+	 *
+	 * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+	 *
+	 * @param $entry array Gravity Forms entry object
+	 * @param $form array Gravity Forms form object
+	 */
+	public static function entry_create_custom_slug( $entry, $form ) {
+		/**
+		 * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
+		 * @param boolean $custom Should we process the custom entry slug?
+		 */
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
+		if( $custom ) {
+			// create the gravityview_unique_id and save it
 
-            // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+			// Get the entry hash
+			$hash = self::get_custom_entry_slug( $entry['id'], $entry );
 
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
+			gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
+			gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 
-        }
-    }
+		}
+	}
 
 
 
@@ -899,7 +899,7 @@ 
 
 			// If there was an error, continue to the next term.
 			if ( is_wp_error( $term_link ) ) {
-			    continue;
+				continue;
 			}
 
 			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );

Doc Comments +4 added lines, -1 removed lines

@@ -236,7 +236,6 @@ 
 	 *
 	 * @access public
 	 * @param array $entry
-	 * @param array $field
 	 * @return null|string
 	 */
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
@@ -741,6 +740,9 @@ 
 	return $value;
 }
 
+/**
+ * @param GV\Template_Context $context
+ */
 function gv_directory_link( $post = NULL, $add_pagination = true, $context = null ) {
 	return GravityView_API::directory_link( $post, $add_pagination, $context );
 }
@@ -1216,6 +1218,7 @@ 
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
  * @since  2.0
  * @param  \GV\Template_Context The template context.
+ * @param GV\Template_Context $context
  * @return string Field output. If empty value and hide empty is true, return empty.
  */
 function gravityview_field_output( $passed_args, $context = null ) {

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

@@ -526,7 +526,7 @@
 					$column = 'lead_id';
 				}
 
-				$results = $wpdb->get_results( $wpdb->prepare( "SELECT $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
+				$results = $wpdb->get_results( $wpdb->prepare( "select $column, meta_value FROM $table WHERE form_id = (SELECT form_id FROM $table WHERE $column = %d LIMIT 1) AND meta_key = 'gravityview_unique_id'", $id_or_string ) );
 
 				if ( $results ) {
 					$cache = array_replace( $cache, array_combine( wp_list_pluck( $results, $column ), wp_list_pluck( $results, 'meta_value' ) ) );

Braces +2 added lines, -2 removed lines

@@ -1380,7 +1380,7 @@ 
 	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '> ', '>', $placeholders['label_value'] ) ) ) );
 	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
 
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
+	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ) {
 		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
@@ -1419,7 +1419,7 @@ 
 	foreach ( $placeholders as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}
 

Spacing +112 added lines, -112 removed lines

@@ -31,7 +31,7 @@ 
 
 		$form = $gravityview_view->getForm();
 
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
 			/** Allow to fall through for back compatibility testing purposes. */
 		} else {
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@ 
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = $field['label'];
+			$label = $field[ 'label' ];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if ( class_exists( 'GF_Field' ) ) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
-				if( $field_object ) {
+				if ( $field_object ) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ( $input ) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
 
 					}
 
@@ -70,9 +70,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
 
 			}
 
@@ -134,11 +134,11 @@ 
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if ( ! empty( $field[ 'width' ] ) ) {
+			$width = absint( $field[ 'width' ] );
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ( '%d%%' === $format && $width > 100 ) {
 				$width = 100;
 			}
 
@@ -159,42 +159,42 @@ 
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
 
-            $custom_class = $field['custom_class'];
+            $custom_class = $field[ 'custom_class' ];
 
-            if( !empty( $entry ) ) {
+            if ( ! empty( $entry ) ) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
 
                 // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
-				$form_id = '-'.$form['id'];
+		if ( ! empty( $field[ 'id' ] ) ) {
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
 				$gravityview_view = GravityView_View::getInstance();
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
-		return esc_attr(implode(' ', $classes));
+		return esc_attr( implode( ' ', $classes ) );
 	}
 
 	/**
@@ -210,11 +210,11 @@ 
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
-		$id = $field['id'];
+		$id = $field[ 'id' ];
 
 		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@ 
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
 		return esc_attr( $id );
@@ -262,14 +262,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry, $base_id );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -306,7 +306,7 @@ 
 		} else {
 			$gravityview_view = GravityView_View::getInstance();
 
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
 				$is_search = true;
 			}
 		}
@@ -317,7 +317,7 @@ 
 
 			$output = esc_html__( 'This search returned no results.', 'gravityview' );
 
-			if( $context ) {
+			if ( $context ) {
 				$setting = $context->view->settings->get( 'no_search_results_text', $output );
 			}
 
@@ -325,7 +325,7 @@ 
 
 			$output = esc_html__( 'No entries match your request.', 'gravityview' );
 
-			if( $context ) {
+			if ( $context ) {
 				$setting = $context->view->settings->get( 'no_results_text', $output );
 			}
 		}
@@ -443,9 +443,9 @@ 
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
 
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
 			$link = home_url();
 		}
 
@@ -454,7 +454,7 @@ 
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
 		}
 
 		// Deal with returning to proper pagination for embedded views
@@ -462,13 +462,13 @@ 
 
 			$args = array();
 
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -505,7 +505,7 @@ 
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -516,7 +516,7 @@ 
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if ( empty( $slug ) ) {
 			$slug = $id;
 		}
 
@@ -610,15 +610,15 @@ 
          * @param boolean $custom Should we process the custom entry slug?
          */
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        if ( $custom ) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
 
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 
         }
     }
@@ -643,7 +643,7 @@ 
 
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			// @deprecated path
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
@@ -663,38 +663,38 @@ 
 
 		$query_arg_name = \GV\Entry::get_endpoint_name();
 
-		if ( ! empty( $entry['_multi'] ) ) {
+		if ( ! empty( $entry[ '_multi' ] ) ) {
 			$entry_slugs = array();
 
-			foreach ( $entry['_multi'] as $_multi ) {
+			foreach ( $entry[ '_multi' ] as $_multi ) {
 
-				if( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
-					$entry_slugs[] = $gv_multi->get_slug();
+				if ( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
+					$entry_slugs[ ] = $gv_multi->get_slug();
 				} else {
 					// TODO: This path isn't covered by unit tests
-					$entry_slugs[] = \GravityView_API::get_entry_slug( $_multi['id'], $_multi );
+					$entry_slugs[ ] = \GravityView_API::get_entry_slug( $_multi[ 'id' ], $_multi );
 				}
 
 				unset( $gv_multi );
 
-				$forms[] = $_multi['form_id'];
+				$forms[ ] = $_multi[ 'form_id' ];
 			}
 
 			$entry_slug = implode( ',', $entry_slugs );
 		} else {
 
 			// Fallback when
-			if( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
+			if ( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
 				$entry_slug = $gv_entry->get_slug();
 			} else {
 				// TODO: This path isn't covered by unit tests
-				$entry_slug = \GravityView_API::get_entry_slug( $entry['id'], $entry );
+				$entry_slug = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 			}
 
 			unset( $gv_entry );
 		}
 
-		if ( get_option('permalink_structure') && !is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			$args = array();
 
@@ -704,9 +704,9 @@ 
 			 */
 			$link_parts = explode( '?', $directory_link );
 
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
 
 		} else {
 
@@ -718,21 +718,21 @@ 
 		 */
 		if ( $add_directory_args ) {
 
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			/**
 			 * @since 1.7
 			 */
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 		}
 
-		if( $post_id ) {
+		if ( $post_id ) {
 			$passed_post = get_post( $post_id );
 			$views       = \GV\View_Collection::from_post( $passed_post );
 			$has_multiple_views = $views->count() > 1;
@@ -741,7 +741,7 @@ 
 		}
 
 		if ( $has_multiple_views ) {
-			$args['gvid'] = $view_id ? $view_id : gravityview_get_view_id();
+			$args[ 'gvid' ] = $view_id ? $view_id : gravityview_get_view_id();
 		}
 
 		return add_query_arg( $args, $directory_link );
@@ -762,7 +762,7 @@ 
 }
 
 function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+	return GravityView_API::field_class( $field, $form, $entry );
 }
 
 /**
@@ -785,7 +785,7 @@ 
 		$view_id = 0;
 		if ( $context->view ) {
 			$view_id = $context->view->ID;
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
 			}
 		}
@@ -817,7 +817,7 @@ 
 		$default_css_class .= ' ' . $context->view->settings->get( 'class', '' );
 	}
 
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
 
 	/**
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -844,7 +844,7 @@ 
 
 	$value = GravityView_API::field_value( $entry, $field );
 
-	if( $value === '' ) {
+	if ( $value === '' ) {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
@@ -957,7 +957,7 @@ 
  */
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -991,16 +991,16 @@ 
 		$terms = explode( ', ', $value );
 	}
 
-	foreach ($terms as $term_name ) {
+	foreach ( $terms as $term_name ) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ( $taxonomy === 'category' ) {
 
 			// Use rgexplode to prevent errors if : doesn't exist
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
+			if ( ! empty( $term_id ) ) {
 				$term = get_term_by( 'id', $term_id, $taxonomy );
 			} else {
 			// We have to fall back to the name
@@ -1013,7 +1013,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -1022,11 +1022,11 @@ 
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
 		}
 	}
 
-	return implode(', ', $output );
+	return implode( ', ', $output );
 }
 
 /**
@@ -1040,8 +1040,8 @@ 
 
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if ( empty( $link ) ) {
+		return strip_tags( $output );
 	}
 
 	return $output;
@@ -1060,7 +1060,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
 
@@ -1068,7 +1068,7 @@ 
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
 
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
 
@@ -1299,12 +1299,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if ( ! class_exists( 'GravityView_Field' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
 	}
 
 	if ( is_null( $context ) ) {
@@ -1407,21 +1407,21 @@ 
 	} else {
 		// @deprecated path
 		// Required fields.
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
 			return '';
 		}
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
 	} else {
 		// @deprecated path
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
-		$field = $args['field'];
-		$form = $args['form'];
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
+		$field = $args[ 'field' ];
+		$form = $args[ 'form' ];
 	}
 
 	/**
@@ -1441,43 +1441,43 @@ 
 	);
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
 	} else {
 		// @deprecated path
-		$placeholders['value'] = gv_value( $entry, $field );
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
 	}
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$placeholders['value'] = wpautop( $placeholders['value'] );
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$placeholders['width'] = GravityView_API::field_width( $field );
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$placeholders['class'] = gv_class( $field, $form, $entry );
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
 	} else {
 		// Default Label value
-		$placeholders['label_value'] = gv_label( $field, $entry );
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
 	}
 
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
 
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1488,7 +1488,7 @@ 
 	 * @since 2.0
 	 * @param \GV\Template_Context $context The context.
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1515,7 +1515,7 @@ 
 	foreach ( $placeholders as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-forms-signature.php

Spacing +6 added lines, -6 removed lines

@@ -53,7 +53,7 @@ 
 		$signature_fields = GFAPI::get_fields_by_type( $form, 'signature' );
 
 		foreach ( $signature_fields as $field ) {
-			unset( $_POST["input_{$field->id}"] );
+			unset( $_POST[ "input_{$field->id}" ] );
 		}
 	}
 
@@ -72,19 +72,19 @@ 
 	 */
 	function edit_entry_field_input( $field_content = '', $field, $value = '', $lead_id = 0, $form_id = 0 ) {
 
-		$context = function_exists('gravityview_get_context') ? gravityview_get_context() : '';
+		$context = function_exists( 'gravityview_get_context' ) ? gravityview_get_context() : '';
 
-		if( 'signature' !== $field->type || 'edit' !== $context ) {
+		if ( 'signature' !== $field->type || 'edit' !== $context ) {
 			return $field_content;
 		}
 
 		// We need to fetch a fresh version of the entry, since the saved entry hasn't refreshed in GV yet.
 		$entry = GravityView_View::getInstance()->getCurrentEntry();
-		$entry = GFAPI::get_entry( $entry['id'] );
+		$entry = GFAPI::get_entry( $entry[ 'id' ] );
 		$entry_value = \GV\Utils::get( $entry, $field->id );
 
-		$_POST["input_{$field->id}"] = $entry_value; // Used when Edit Entry form *is* submitted
-		$_POST["input_{$form_id}_{$field->id}_signature_filename"] = $entry_value; // Used when Edit Entry form *is not* submitted
+		$_POST[ "input_{$field->id}" ] = $entry_value; // Used when Edit Entry form *is* submitted
+		$_POST[ "input_{$form_id}_{$field->id}_signature_filename" ] = $entry_value; // Used when Edit Entry form *is not* submitted
 
 		return ''; // Return empty string to force using $_POST values instead
 	}

includes/class-gravityview-gfformsmodel.php

Indentation +127 added lines, -127 removed lines

@@ -48,132 +48,132 @@
 	}
 
 	/**
-     * Given information provided in an entry, get array of media IDs
-     *
-     * This is necessary because GF doesn't expect to need to update post images, only to create them.
-     *
-     * @see GFFormsModel::create_post()
-     *
-     * @since 1.17
-     *
-     * @param array $form Gravity Forms form array
-     * @param array $entry Gravity Forms entry array
-     *
-     * @return array Array of "Field ID" => "Media IDs"
-     */
-    public static function get_post_field_images( $form, $entry ) {
-
-        $post_data = self::get_post_fields( $form, $entry );
-
-        $media = get_attached_media( 'image', $entry['post_id'] );
-
-        $post_images = array();
-
-        foreach ( $media as $media_item ) {
-            foreach( (array) $post_data['images'] as $post_data_item ) {
-                if(
-                    \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
-                    \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
-                    \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
-                ) {
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
-                }
-            }
-        }
-
-        return $post_images;
-    }
-
-    /**
-     * Alias of GFFormsModel::get_post_fields(); just making it public
-     *
-     * @see GFFormsModel::get_post_fields()
-     *
-     * @since 1.17
-     *
-     * @param array $form Gravity Forms form array
-     * @param array $entry Gravity Forms entry array
-     *
-     * @return array
-     */
-    public static function get_post_fields( $form, $entry ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::get_post_fields( $form, $entry );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $form, $entry );
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
-     *
-     * @since 1.16.2
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
-     */
-    public static function copy_post_image( $url, $post_id ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::copy_post_image( $url, $post_id );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $url, $post_id );
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
-     *
-     * Note: The method became public in GF 1.9.17.7
-     *
-     * @see GFFormsModel::media_handle_upload
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
-     *
-     * @uses copy_post_image
-     * @uses wp_insert_attachment
-     * @uses wp_update_attachment_metadata
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
-     */
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::media_handle_upload( $url, $post_id, $post_data );
-        }
-
-        // It was private; let's make it public
-        $reflection->setAccessible( true );
-
-        return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
-    }
+	 * Given information provided in an entry, get array of media IDs
+	 *
+	 * This is necessary because GF doesn't expect to need to update post images, only to create them.
+	 *
+	 * @see GFFormsModel::create_post()
+	 *
+	 * @since 1.17
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param array $entry Gravity Forms entry array
+	 *
+	 * @return array Array of "Field ID" => "Media IDs"
+	 */
+	public static function get_post_field_images( $form, $entry ) {
+
+		$post_data = self::get_post_fields( $form, $entry );
+
+		$media = get_attached_media( 'image', $entry['post_id'] );
+
+		$post_images = array();
+
+		foreach ( $media as $media_item ) {
+			foreach( (array) $post_data['images'] as $post_data_item ) {
+				if(
+					\GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
+					\GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
+					\GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
+				) {
+					$post_images["{$post_data_item['field_id']}"] = $media_item->ID;
+				}
+			}
+		}
+
+		return $post_images;
+	}
+
+	/**
+	 * Alias of GFFormsModel::get_post_fields(); just making it public
+	 *
+	 * @see GFFormsModel::get_post_fields()
+	 *
+	 * @since 1.17
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param array $entry Gravity Forms entry array
+	 *
+	 * @return array
+	 */
+	public static function get_post_fields( $form, $entry ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'get_post_fields' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::get_post_fields( $form, $entry );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $form, $entry );
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
+	 *
+	 * @since 1.16.2
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
+	 */
+	public static function copy_post_image( $url, $post_id ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::copy_post_image( $url, $post_id );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $url, $post_id );
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
+	 *
+	 * Note: The method became public in GF 1.9.17.7
+	 *
+	 * @see GFFormsModel::media_handle_upload
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
+	 *
+	 * @uses copy_post_image
+	 * @uses wp_insert_attachment
+	 * @uses wp_update_attachment_metadata
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
+	 */
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::media_handle_upload( $url, $post_id, $post_data );
+		}
+
+		// It was private; let's make it public
+		$reflection->setAccessible( true );
+
+		return $reflection->invoke( new GFFormsModel, $url, $post_id, $post_data );
+	}
 
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -40,17 +40,17 @@ 
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
 
 		if ( in_array( $source_field, array( 'date_created', 'date_updated', 'payment_date' ), true ) ) {
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
 		}
 
 		if ( $source_field instanceof GF_Field && $source_field->type == 'date' ) {
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
 		}
 
 		if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), array( 'in', 'not_in' ) ) ) {
-			return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $_operation );
+			return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $_operation );
 		}
 
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
@@ -74,18 +74,18 @@ 
 
         $post_data = self::get_post_fields( $form, $entry );
 
-        $media = get_attached_media( 'image', $entry['post_id'] );
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
 
         $post_images = array();
 
         foreach ( $media as $media_item ) {
-            foreach( (array) $post_data['images'] as $post_data_item ) {
-                if(
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
+                if (
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
                 ) {
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
                 }
             }
         }
@@ -113,7 +113,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::get_post_fields( $form, $entry );
         }
 
@@ -140,7 +140,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::copy_post_image( $url, $post_id );
         }
 
@@ -175,7 +175,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 

includes/class-data.php

Spacing +20 added lines, -20 removed lines

@@ -20,7 +20,7 @@ 
 
 		if ( ! empty( $passed_post ) ) {
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
-			foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
+			foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
 				if ( \GV\View::exists( $view_id ) && ! $this->views->contains( $view_id ) ) {
 					$this->views->add( \GV\View::by_id( $view_id ) );
 				}
@@ -75,7 +75,7 @@ 
 				foreach ( $passed_post as &$post ) {
 					$views = \GV\View_Collection::from_post( $post );
 					foreach ( $views->all() as $view ) {
-						$ids []= $view->ID;
+						$ids [ ] = $view->ID;
 
 						/** And as a side-effect... add each view to the global scope. */
 						if ( ! $this->views->contains( $view->ID ) ) {
@@ -89,29 +89,29 @@ 
 				if ( is_string( $passed_post ) ) {
 					$shortcodes = \GV\Shortcode::parse( $passed_post );
 					foreach ( $shortcodes as $shortcode ) {
-						if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
-							$ids []= $shortcode->atts['id'];
+						if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
+							$ids [ ] = $shortcode->atts[ 'id' ];
 
 							/** And as a side-effect... add each view to the global scope. */
-							if ( ! $this->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
-								$this->views->add( $shortcode->atts['id'] );
+							if ( ! $this->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
+								$this->views->add( $shortcode->atts[ 'id' ] );
 							}
 						}
 					}
 				} else {
 					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$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;
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new GravityView_View_Data( $passed_post );
 		}
 
@@ -135,8 +135,8 @@ 
 			return array();
 		}
 		return array_combine(
-			array_map( function ( $view ) { return $view->ID; }, $this->views->all() ),
-			array_map( function ( $view ) { return $view->as_data(); }, $this->views->all() )
+			array_map( function( $view ) { return $view->ID; }, $this->views->all() ),
+			array_map( function( $view ) { return $view->as_data(); }, $this->views->all() )
 		);
 	}
 
@@ -245,22 +245,22 @@ 
 	public function parse_post_content( $content ) {
 		$ids = array();
 		foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
-			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
-				if ( \GV\View::exists( $shortcode->atts['id'] ) && ! $this->views->contains( $shortcode->atts['id'] ) ) {
-					$this->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
+			if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
+				if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! $this->views->contains( $shortcode->atts[ 'id' ] ) ) {
+					$this->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
 				}
 				/**
 				 * The original function outputs the ID even though it wasn't added by ::add_view()
 				 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
 				 * until better times.
 				 */
-				$ids []= $shortcode->atts['id'];
+				$ids [ ] = $shortcode->atts[ 'id' ];
 			}
 		}
 		if ( empty ( $ids ) ) {
 			return null;
 		}
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 		// Not invalid if not set!
 		if ( empty( $post_id ) || empty( $view_id ) ) {
 
-			if( $empty_is_valid ) {
+			if ( $empty_is_valid ) {
 				return true;
 			}
 
@@ -316,7 +316,7 @@ 
 			$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
+			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>' );
 			}
 		}
@@ -324,7 +324,7 @@ 
 		if ( ! $message ) {
 			// It's a View
 			if ( \GV\View::exists( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
 			}
 		}
 

Doc Comments +1 added lines

@@ -143,6 +143,7 @@
 	/**
 	 * @deprecated
 	 * @see \GV\View_Collection::get()
+	 * @param integer|null $view_id
 	 */
 	function get_view( $view_id, $atts = NULL ) {
 		if ( ! $view = $this->views->get( $view_id ) ) {

includes/class-gravityview-admin-notices.php

Spacing +23 added lines, -23 removed lines

@@ -60,21 +60,21 @@ 
 	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[] = $notice_id;
+		$dismissed_notices[ ] = $notice_id;
 
 		$dismissed_notices = array_unique( $dismissed_notices );
 
@@ -97,12 +97,12 @@ 
 	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;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if ( ! is_multisite() ) {
 			return true;
 		}
 
@@ -137,7 +137,7 @@ 
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if ( ! is_super_admin() ) {
 			return false;
 		}
 
@@ -160,48 +160,48 @@ 
 		 */
 		$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'] ) ) {
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $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']);
+				$dismiss = esc_attr( $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 );
@@ -233,14 +233,14 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if( !isset( $notice['message'] ) ) {
+		if ( ! isset( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices[] = $notice;
+		self::$admin_notices[ ] = $notice;
 	}
 }
 

includes/class-gravityview-entry-approval-status.php

Spacing +5 added lines, -5 removed lines

@@ -113,16 +113,16 @@ 
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -248,9 +248,9 @@ 
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
 
-				if( 'key' === $attr_key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return \GV\Utils::get( $choice, $attr_key, false );