gravityview / GravityView

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 ) );

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 +113 added lines, -113 removed lines

@@ -30,7 +30,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 );
@@ -38,29 +38,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' ] );
 
 					}
 
@@ -69,9 +69,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 );
 
 			}
 
@@ -133,11 +133,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;
 			}
 
@@ -157,42 +157,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 ) );
 	}
 
 	/**
@@ -207,11 +207,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' );
@@ -219,7 +219,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 );
@@ -258,14 +258,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;
 		}
 
@@ -302,7 +302,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;
 			}
 		}
@@ -313,7 +313,7 @@ 
 
 			$output = esc_html__( 'This search returned no results.', 'gravityview' );
 
-			if( $context ) {
+			if ( $context ) {
 				$setting = $context->view->settings->get( 'no_search_results_text', $output );
 			}
 
@@ -321,7 +321,7 @@ 
 
 			$output = esc_html__( 'No entries match your request.', 'gravityview' );
 
-			if( $context ) {
+			if ( $context ) {
 				$setting = $context->view->settings->get( 'no_results_text', $output );
 			}
 		}
@@ -439,9 +439,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();
 		}
 
@@ -450,7 +450,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
@@ -458,13 +458,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 );
@@ -501,7 +501,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}`
@@ -512,7 +512,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;
 		}
 
@@ -606,15 +606,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' ) );
 
         }
     }
@@ -640,7 +640,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();
 		}
@@ -660,32 +660,32 @@ 
 
 		$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 );
@@ -704,7 +704,7 @@ 
 			$args = gv_get_query_args();
 		}
 
-		if ( get_option('permalink_structure') && ! is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			/**
 			 * Make sure the $directory_link doesn't contain any query otherwise it will break when adding the entry slug.
@@ -712,13 +712,13 @@ 
 			 */
 			$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 {
 
-			$args[] = array( $query_arg_name => $entry_slug );
+			$args[ ] = array( $query_arg_name => $entry_slug );
 		}
 
 		/**
@@ -726,21 +726,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;
@@ -749,7 +749,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 );
@@ -819,7 +819,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 );
 }
 
 /**
@@ -842,7 +842,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() );
 			}
 		}
@@ -874,7 +874,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
@@ -901,7 +901,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)
@@ -1014,7 +1014,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;
@@ -1048,16 +1048,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
@@ -1070,7 +1070,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -1079,11 +1079,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 );
 }
 
 /**
@@ -1097,8 +1097,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;
@@ -1117,7 +1117,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.' );
 
@@ -1125,7 +1125,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() ) );
 
@@ -1356,12 +1356,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 ) ) {
@@ -1464,21 +1464,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' ];
 	}
 
 	/**
@@ -1498,43 +1498,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>';
 	}
 
 	/**
@@ -1545,7 +1545,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
@@ -1572,7 +1572,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/class-gravityview-admin-duplicate-view.php

Spacing +18 added lines, -18 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;
 		}
 
@@ -60,10 +60,10 @@ 
 		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>';
 			}
 
 		}
@@ -123,7 +123,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,
@@ -146,11 +146,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 ) {
-			$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' ]     = $new_post_date = $post->post_date;
+			$new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date );
 		}
 
 		/**
@@ -159,7 +159,7 @@ 
 		 * @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 );
@@ -241,13 +241,13 @@ 
 			$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' );
 
-			$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;
@@ -271,7 +271,7 @@ 
 		}
 
 		// Verify the View exists
-		if ( !$view = get_post( $id ) ) {
+		if ( ! $view = get_post( $id ) ) {
 			return '';
 		}
 
@@ -286,7 +286,7 @@ 
 		$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 ) {
+		if ( ! $post_type_object ) {
 			gravityview()->log->error( 'No gravityview post type exists when trying to clone the View.', array( 'data' => $view ) );
 			return '';
 		}
@@ -298,7 +298,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;
 	}
@@ -325,14 +325,14 @@ 
 	 */
 	public function save_as_new_view( $status = '' ) {
 
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
+		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 ) ) {
+		if ( ! $this->current_user_can_copy( $id ) ) {
 			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
 		}
 

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

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
 
 		$return = $input_type;
 
-		if( 'survey' === $field_type ) {
+		if ( 'survey' === $field_type ) {
 			$return = 'select';
 		}
 
@@ -65,8 +65,8 @@ 
 	public function fix_survey_fields( $fields ) {
 
 		/** @var GF_Field $field */
-		foreach( $fields as &$field ) {
-			if( 'survey' === $field->type ) {
+		foreach ( $fields as &$field ) {
+			if ( 'survey' === $field->type ) {
 				$field->allowsPrepopulate = true;
 			}
 		}
@@ -82,7 +82,7 @@ 
 	 * @return void
 	 */
 	function add_render_hooks() {
-		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 );
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 );
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @return void
 	 */
 	function remove_render_hooks() {
-		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 );
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 );
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 */
 	public function fix_survey_field_value( $value, $field, $name ) {
 
-		if( 'survey' === $field->type ) {
+		if ( 'survey' === $field->type ) {
 
-			$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
+			$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
 
 			// We need to run through each survey row until we find a match for expected values
 			foreach ( $entry as $field_id => $field_value ) {
@@ -128,7 +128,7 @@ 
 					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
 
 					// If the $name matches the $row_val, we are processing the correct row
-					if( $row_val === $name ) {
+					if ( $row_val === $name ) {
 						$value = $field_value;
 						break;
 					}

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-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 );

includes/widgets/class-gravityview-widget-page-links.php

Spacing +16 added lines, -16 removed lines

@@ -11,35 +11,35 @@ 
 
 	function __construct() {
 
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
 
 		$default_values = array( 'header' => 1, 'footer' => 1 );
 		$settings = array( 'show_all' => array(
 			'type' => 'checkbox',
 			'label' => __( 'Show each page number', 'gravityview' ),
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
 			'value' => false
-		));
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
+		) );
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
 
 	}
 
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		$atts = shortcode_atts( array(
 			'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
 			'total' => $gravityview_view->total_entries,
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
-			'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
+			'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
 		), $widget_args, 'gravityview_widget_page_links' );
 		
 		$page_link_args = array(
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
 			'format' => '&pagenum=%#%',
 			'add_args' => array(), //
 			'prev_text' => '«',
@@ -47,9 +47,9 @@ 
 			'type' => 'list',
 			'end_size' => 1,
 			'mid_size' => 2,
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
-			'current' => $atts['current'],
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
+			'current' => $atts[ 'current' ],
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
 		);
 
 		/**
@@ -57,14 +57,14 @@ 
 		 * @since 1.1.4
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
 		 */
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
 
 		$page_links = paginate_links( $page_link_args );
 
-		if( !empty( $page_links )) {
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		if ( ! empty( $page_links ) ) {
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
 		} else {
 			gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
 		}

includes/widgets/search-widget/templates/search-field-link.php

Indentation +12 added lines, -12 removed lines

@@ -41,22 +41,22 @@
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+		$search_value = \GV\Utils::_GET( $search_field['name'] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+		foreach ( $search_field['choices'] as $k => $choice ) {
 
-            if ( 0 != $k ) {
-                echo esc_html( $links_sep );
-            }
+			if ( 0 != $k ) {
+				echo esc_html( $links_sep );
+			}
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
 
-            if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
-            } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
-            }
-            ?>
+			if ( $active ) {
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+			} else {
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+			}
+			?>
 
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
 

Spacing +8 added lines, -8 removed lines

@@ -13,12 +13,12 @@ 
 $base_url = GravityView_Widget_Search::get_search_form_action();
 
 // Make sure that there are choices to display
-if ( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
 	return;
 }
 
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
 
 /**
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@ 
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
 
             if ( 0 != $k ) {
                 echo esc_html( $links_sep );
             }
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
 
             if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
             } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
             }
             ?>
 
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
 
 		<?php } ?>
 	</p>

includes/widgets/search-widget/templates/search-field-checkbox.php

Spacing +7 added lines, -7 removed lines

@@ -10,22 +10,22 @@
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-checkbox">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>