gravityview / GravityView

includes/class-gravityview-gfformsmodel.php

Indentation +180 added lines, -180 removed lines

@@ -6,184 +6,184 @@
  */
 class GravityView_GFFormsModel extends GFFormsModel
 {
-    /**
-     * Make sure the method exists, regardless of GF version.
-     *
-     * @since 1.22.2
-     *
-     * @return string|false False if not set, version string otherwise
-     */
-    public static function get_database_version()
-    {
-        if (is_callable('parent::get_database_version')) {
-            return parent::get_database_version();
-        }
-
-        return get_option('gf_db_version');
-    }
-
-    /**
-     * Determines if the field value matches the conditional logic rule value.
-     *
-     * @since 1.22.3
-     *
-     * @param mixed                $field_value  The field value to be checked.
-     * @param mixed                $target_value The conditional logic rule value.
-     * @param string               $operation    The conditional logic rule operator.
-     * @param null|GF_Field|string $source_field The field the rule is based on, or the entry meta
-     * @param null|array           $rule         The conditional logic rule properties.
-     * @param null|array           $form         The current form.
-     *
-     * @return bool
-     */
-    public static function is_value_match($field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null)
-    {
-        if (in_array($source_field, ['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);
-        }
-
-        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);
-        }
-
-        if (in_array($_operation = str_replace(' ', '_', trim($operation)), ['in', 'not_in'])) {
-            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);
-    }
-
-    /**
-     * 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 = [];
-
-        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 = [])
-    {
-        $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);
-    }
+	/**
+	 * Make sure the method exists, regardless of GF version.
+	 *
+	 * @since 1.22.2
+	 *
+	 * @return string|false False if not set, version string otherwise
+	 */
+	public static function get_database_version()
+	{
+		if (is_callable('parent::get_database_version')) {
+			return parent::get_database_version();
+		}
+
+		return get_option('gf_db_version');
+	}
+
+	/**
+	 * Determines if the field value matches the conditional logic rule value.
+	 *
+	 * @since 1.22.3
+	 *
+	 * @param mixed                $field_value  The field value to be checked.
+	 * @param mixed                $target_value The conditional logic rule value.
+	 * @param string               $operation    The conditional logic rule operator.
+	 * @param null|GF_Field|string $source_field The field the rule is based on, or the entry meta
+	 * @param null|array           $rule         The conditional logic rule properties.
+	 * @param null|array           $form         The current form.
+	 *
+	 * @return bool
+	 */
+	public static function is_value_match($field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null)
+	{
+		if (in_array($source_field, ['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);
+		}
+
+		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);
+		}
+
+		if (in_array($_operation = str_replace(' ', '_', trim($operation)), ['in', 'not_in'])) {
+			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);
+	}
+
+	/**
+	 * 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 = [];
+
+		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 = [])
+	{
+		$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);
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -15,11 +15,11 @@ 
      */
     public static function get_database_version()
     {
-        if (is_callable('parent::get_database_version')) {
+        if ( is_callable( 'parent::get_database_version' ) ) {
             return parent::get_database_version();
         }
 
-        return get_option('gf_db_version');
+        return get_option( 'gf_db_version' );
     }
 
     /**
@@ -36,23 +36,23 @@ 
      *
      * @return bool
      */
-    public static function is_value_match($field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null)
+    public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null )
     {
-        if (in_array($source_field, ['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);
+        if ( in_array( $source_field, [ '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 );
         }
 
-        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);
+        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 );
         }
 
-        if (in_array($_operation = str_replace(' ', '_', trim($operation)), ['in', 'not_in'])) {
-            return GVCommon::matches_operation((array) $field_value, (array) $target_value, $_operation);
+        if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), [ 'in', 'not_in' ] ) ) {
+            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);
+        return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
     }
 
     /**
@@ -68,22 +68,22 @@ 
      *
      * @return array Array of "Field ID" => "Media IDs"
      */
-    public static function get_post_field_images($form, $entry)
+    public static function get_post_field_images( $form, $entry )
     {
-        $post_data = self::get_post_fields($form, $entry);
+        $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 = [];
+        $post_images = [ ];
 
-        foreach ($media as $media_item) {
-            foreach ((array) $post_data['images'] as $post_data_item) {
+        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
+                    \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;
                 }
             }
         }
@@ -102,23 +102,23 @@ 
      *
      * @return array
      */
-    public static function get_post_fields($form, $entry)
+    public static function get_post_fields( $form, $entry )
     {
-        $reflection = new ReflectionMethod('GFFormsModel', 'get_post_fields');
+        $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);
+        if ( $reflection->isPublic() ) {
+            return parent::get_post_fields( $form, $entry );
         }
 
         // It was private; let's make it public
-        $reflection->setAccessible(true);
+        $reflection->setAccessible( true );
 
-        return $reflection->invoke(new GFFormsModel(), $form, $entry);
+        return $reflection->invoke( new GFFormsModel(), $form, $entry );
     }
 
     /**
@@ -131,23 +131,23 @@ 
      *
      * @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)
+    public static function copy_post_image( $url, $post_id )
     {
-        $reflection = new ReflectionMethod('GFFormsModel', 'copy_post_image');
+        $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);
+        if ( $reflection->isPublic() ) {
+            return parent::copy_post_image( $url, $post_id );
         }
 
         // It was private; let's make it public
-        $reflection->setAccessible(true);
+        $reflection->setAccessible( true );
 
-        return $reflection->invoke(new GFFormsModel(), $url, $post_id);
+        return $reflection->invoke( new GFFormsModel(), $url, $post_id );
     }
 
     /**
@@ -168,22 +168,22 @@ 
      *
      * @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 = [])
+    public static function media_handle_upload( $url, $post_id, $post_data = [ ] )
     {
-        $reflection = new ReflectionMethod('GFFormsModel', 'media_handle_upload');
+        $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);
+        if ( $reflection->isPublic() ) {
+            return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 
         // It was private; let's make it public
-        $reflection->setAccessible(true);
+        $reflection->setAccessible( true );
 
-        return $reflection->invoke(new GFFormsModel(), $url, $post_id, $post_data);
+        return $reflection->invoke( new GFFormsModel(), $url, $post_id, $post_data );
     }
 }

Braces +7 added lines, -14 removed lines

@@ -4,8 +4,7 @@ 
  *
  * @since 1.16.2
  */
-class GravityView_GFFormsModel extends GFFormsModel
-{
+class GravityView_GFFormsModel extends GFFormsModel {
     /**
      * Make sure the method exists, regardless of GF version.
      *
@@ -13,8 +12,7 @@ 
      *
      * @return string|false False if not set, version string otherwise
      */
-    public static function get_database_version()
-    {
+    public static function get_database_version() {
         if (is_callable('parent::get_database_version')) {
             return parent::get_database_version();
         }
@@ -36,8 +34,7 @@ 
      *
      * @return bool
      */
-    public static function is_value_match($field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null)
-    {
+    public static function is_value_match($field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null) {
         if (in_array($source_field, ['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);
@@ -68,8 +65,7 @@ 
      *
      * @return array Array of "Field ID" => "Media IDs"
      */
-    public static function get_post_field_images($form, $entry)
-    {
+    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']);
@@ -102,8 +98,7 @@ 
      *
      * @return array
      */
-    public static function get_post_fields($form, $entry)
-    {
+    public static function get_post_fields($form, $entry) {
         $reflection = new ReflectionMethod('GFFormsModel', 'get_post_fields');
 
         /**
@@ -131,8 +126,7 @@ 
      *
      * @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)
-    {
+    public static function copy_post_image($url, $post_id) {
         $reflection = new ReflectionMethod('GFFormsModel', 'copy_post_image');
 
         /**
@@ -168,8 +162,7 @@ 
      *
      * @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 = [])
-    {
+    public static function media_handle_upload($url, $post_id, $post_data = []) {
         $reflection = new ReflectionMethod('GFFormsModel', 'media_handle_upload');
 
         /**

includes/class-admin-add-shortcode.php

Indentation +144 added lines, -144 removed lines

@@ -14,81 +14,81 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('ABSPATH')) {
-    exit;
+	exit;
 }
 
 class GravityView_Admin_Add_Shortcode
 {
-    public function __construct()
-    {
-        add_action('media_buttons', [$this, 'add_shortcode_button'], 30);
-
-        add_action('admin_footer', [$this, 'add_shortcode_popup']);
-
-        // adding styles and scripts
-        add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
-
-        // ajax - populate sort fields based on the selected view
-        add_action('wp_ajax_gv_sortable_fields', [$this, 'get_sortable_fields']);
-    }
-
-    /**
-     * check if screen post editor and is not related with post type 'gravityview'.
-     *
-     * @return bool
-     */
-    public function is_post_editor_screen()
-    {
-        global $current_screen, $pagenow;
-
-        return !empty($current_screen->post_type) && 'gravityview' != $current_screen->post_type && in_array($pagenow, ['post.php', 'post-new.php']);
-    }
-
-    /**
-     * Add shortcode button to the Add Media right.
-     *
-     * @return void
-     */
-    public function add_shortcode_button()
-    {
-
-        /**
-         * @since 1.15.3
-         */
-        if (!GVCommon::has_cap(['publish_gravityviews'])) {
-            return;
-        }
-
-        if (!$this->is_post_editor_screen()) {
-            return;
-        } ?>
+	public function __construct()
+	{
+		add_action('media_buttons', [$this, 'add_shortcode_button'], 30);
+
+		add_action('admin_footer', [$this, 'add_shortcode_popup']);
+
+		// adding styles and scripts
+		add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
+
+		// ajax - populate sort fields based on the selected view
+		add_action('wp_ajax_gv_sortable_fields', [$this, 'get_sortable_fields']);
+	}
+
+	/**
+	 * check if screen post editor and is not related with post type 'gravityview'.
+	 *
+	 * @return bool
+	 */
+	public function is_post_editor_screen()
+	{
+		global $current_screen, $pagenow;
+
+		return !empty($current_screen->post_type) && 'gravityview' != $current_screen->post_type && in_array($pagenow, ['post.php', 'post-new.php']);
+	}
+
+	/**
+	 * Add shortcode button to the Add Media right.
+	 *
+	 * @return void
+	 */
+	public function add_shortcode_button()
+	{
+
+		/**
+		 * @since 1.15.3
+		 */
+		if (!GVCommon::has_cap(['publish_gravityviews'])) {
+			return;
+		}
+
+		if (!$this->is_post_editor_screen()) {
+			return;
+		} ?>
 		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e('Insert View', 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e('Add View', 'gravityview'); ?></a>
 		<?php
-    }
+	}
 
-    /**
-     * Add shortcode popup div.
-     *
-     * @return void
-     */
-    public function add_shortcode_popup()
-    {
-        global $post;
+	/**
+	 * Add shortcode popup div.
+	 *
+	 * @return void
+	 */
+	public function add_shortcode_popup()
+	{
+		global $post;
 
-        if (!$this->is_post_editor_screen()) {
-            return;
-        }
+		if (!$this->is_post_editor_screen()) {
+			return;
+		}
 
-        $post_type = get_post_type_object($post->post_type);
+		$post_type = get_post_type_object($post->post_type);
 
-        $views = get_posts(['post_type' => 'gravityview', 'posts_per_page' => -1]);
+		$views = get_posts(['post_type' => 'gravityview', 'posts_per_page' => -1]);
 
-        // If there are no views set up yet, we get outta here.
-        if (empty($views)) {
-            echo '<div id="select_gravityview_view"><div class="wrap">'.GravityView_Admin::no_views_text().'</div></div>';
+		// If there are no views set up yet, we get outta here.
+		if (empty($views)) {
+			echo '<div id="select_gravityview_view"><div class="wrap">'.GravityView_Admin::no_views_text().'</div></div>';
 
-            return;
-        } ?>
+			return;
+		} ?>
 		<div id="select_gravityview_view">
 			<form action="#" method="get" id="select_gravityview_view_form">
 				<div class="wrap">
@@ -102,10 +102,10 @@ 
 						<select name="gravityview_id" id="gravityview_id">
 							<option value=""><?php esc_html_e('&mdash; Select a View to Insert &mdash;', 'gravityview'); ?></option>
 							<?php
-                            foreach ($views as $view) {
-                                $title = empty($view->post_title) ? __('(no title)', 'gravityview') : $view->post_title;
-                                echo '<option value="'.$view->ID.'">'.esc_html(sprintf('%s #%d', $title, $view->ID)).'</option>';
-                            } ?>
+							foreach ($views as $view) {
+								$title = empty($view->post_title) ? __('(no title)', 'gravityview') : $view->post_title;
+								echo '<option value="'.$view->ID.'">'.esc_html(sprintf('%s #%d', $title, $view->ID)).'</option>';
+							} ?>
 						</select>
 					</div>
 
@@ -115,15 +115,15 @@ 
 
 						<?php
 
-                        $settings = \GV\View_Settings::defaults(true);
+						$settings = \GV\View_Settings::defaults(true);
 
-        foreach ($settings as $key => $setting) {
-            if (empty($setting['show_in_shortcode'])) {
-                continue;
-            }
+		foreach ($settings as $key => $setting) {
+			if (empty($setting['show_in_shortcode'])) {
+				continue;
+			}
 
-            GravityView_Render_Settings::render_setting_row($key, [], null, 'gravityview_%s', 'gravityview_%s');
-        } ?>
+			GravityView_Render_Settings::render_setting_row($key, [], null, 'gravityview_%s', 'gravityview_%s');
+		} ?>
 
 					</table>
 
@@ -136,76 +136,76 @@ 
 			</form>
 		</div>
 		<?php
-    }
-
-    /**
-     * Enqueue scripts and styles.
-     *
-     * @return void
-     */
-    public function add_scripts_and_styles()
-    {
-        if (!$this->is_post_editor_screen()) {
-            return;
-        }
-
-        wp_enqueue_style('dashicons');
-
-        // date picker
-        wp_enqueue_script('jquery-ui-datepicker');
-
-        $protocol = is_ssl() ? 'https://' : 'http://';
-
-        wp_enqueue_style('jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', [], GravityView_Plugin::version);
-
-        //enqueue styles
-        wp_register_style('gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_style('gravityview_postedit_styles');
-
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
-
-        // custom js
-        wp_register_script('gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery', 'jquery-ui-datepicker'], GravityView_Plugin::version);
-        wp_enqueue_script('gravityview_postedit_scripts');
-        wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', [
-            'nonce'        => wp_create_nonce('gravityview_ajaxaddshortcode'),
-            'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
-            'alert_1'      => esc_html__('Please select a View', 'gravityview'),
-        ]);
-    }
-
-    /**
-     * Ajax
-     * Given a View id, calculates the assigned form, and returns the form fields (only the sortable ones ).
-     *
-     * @return void
-     */
-    public function get_sortable_fields()
-    {
-
-        // Not properly formatted request
-        if (empty($_POST['viewid']) || !is_numeric($_POST['viewid'])) {
-            exit(false);
-        }
-
-        // Not valid request
-        if (empty($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxaddshortcode')) {
-            exit(false);
-        }
-
-        $viewid = (int) $_POST['viewid'];
-
-        // fetch form id assigned to the view
-        $formid = gravityview_get_form_id($viewid);
-
-        // Get the default sort field for the view
-        $sort_field = gravityview_get_template_setting($viewid, 'sort_field');
-
-        // Generate the output `<option>`s
-        $response = gravityview_get_sortable_fields($formid, $sort_field);
-
-        exit($response);
-    }
+	}
+
+	/**
+	 * Enqueue scripts and styles.
+	 *
+	 * @return void
+	 */
+	public function add_scripts_and_styles()
+	{
+		if (!$this->is_post_editor_screen()) {
+			return;
+		}
+
+		wp_enqueue_style('dashicons');
+
+		// date picker
+		wp_enqueue_script('jquery-ui-datepicker');
+
+		$protocol = is_ssl() ? 'https://' : 'http://';
+
+		wp_enqueue_style('jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', [], GravityView_Plugin::version);
+
+		//enqueue styles
+		wp_register_style('gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+		wp_enqueue_style('gravityview_postedit_styles');
+
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+
+		// custom js
+		wp_register_script('gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery', 'jquery-ui-datepicker'], GravityView_Plugin::version);
+		wp_enqueue_script('gravityview_postedit_scripts');
+		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', [
+			'nonce'        => wp_create_nonce('gravityview_ajaxaddshortcode'),
+			'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
+			'alert_1'      => esc_html__('Please select a View', 'gravityview'),
+		]);
+	}
+
+	/**
+	 * Ajax
+	 * Given a View id, calculates the assigned form, and returns the form fields (only the sortable ones ).
+	 *
+	 * @return void
+	 */
+	public function get_sortable_fields()
+	{
+
+		// Not properly formatted request
+		if (empty($_POST['viewid']) || !is_numeric($_POST['viewid'])) {
+			exit(false);
+		}
+
+		// Not valid request
+		if (empty($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxaddshortcode')) {
+			exit(false);
+		}
+
+		$viewid = (int) $_POST['viewid'];
+
+		// fetch form id assigned to the view
+		$formid = gravityview_get_form_id($viewid);
+
+		// Get the default sort field for the view
+		$sort_field = gravityview_get_template_setting($viewid, 'sort_field');
+
+		// Generate the output `<option>`s
+		$response = gravityview_get_sortable_fields($formid, $sort_field);
+
+		exit($response);
+	}
 }
 
 new GravityView_Admin_Add_Shortcode();

Spacing +51 added lines, -51 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if (!defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
@@ -21,15 +21,15 @@ 
 {
     public function __construct()
     {
-        add_action('media_buttons', [$this, 'add_shortcode_button'], 30);
+        add_action( 'media_buttons', [ $this, 'add_shortcode_button' ], 30 );
 
-        add_action('admin_footer', [$this, 'add_shortcode_popup']);
+        add_action( 'admin_footer', [ $this, 'add_shortcode_popup' ] );
 
         // adding styles and scripts
-        add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
+        add_action( 'admin_enqueue_scripts', [ $this, 'add_scripts_and_styles' ] );
 
         // ajax - populate sort fields based on the selected view
-        add_action('wp_ajax_gv_sortable_fields', [$this, 'get_sortable_fields']);
+        add_action( 'wp_ajax_gv_sortable_fields', [ $this, 'get_sortable_fields' ] );
     }
 
     /**
@@ -41,7 +41,7 @@ 
     {
         global $current_screen, $pagenow;
 
-        return !empty($current_screen->post_type) && 'gravityview' != $current_screen->post_type && in_array($pagenow, ['post.php', 'post-new.php']);
+        return ! empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow, [ 'post.php', 'post-new.php' ] );
     }
 
     /**
@@ -55,14 +55,14 @@ 
         /**
          * @since 1.15.3
          */
-        if (!GVCommon::has_cap(['publish_gravityviews'])) {
+        if ( ! GVCommon::has_cap( [ 'publish_gravityviews' ] ) ) {
             return;
         }
 
-        if (!$this->is_post_editor_screen()) {
+        if ( ! $this->is_post_editor_screen() ) {
             return;
         } ?>
-		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e('Insert View', 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e('Add View', 'gravityview'); ?></a>
+		<a href="#TB_inline?width=600&amp;height=800&amp;inlineId=select_gravityview_view" class="thickbox hide-if-no-js button gform_media_link" id="add_gravityview" title="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
 		<?php
     }
 
@@ -75,17 +75,17 @@ 
     {
         global $post;
 
-        if (!$this->is_post_editor_screen()) {
+        if ( ! $this->is_post_editor_screen() ) {
             return;
         }
 
-        $post_type = get_post_type_object($post->post_type);
+        $post_type = get_post_type_object( $post->post_type );
 
-        $views = get_posts(['post_type' => 'gravityview', 'posts_per_page' => -1]);
+        $views = get_posts( [ 'post_type' => 'gravityview', 'posts_per_page' => -1 ] );
 
         // If there are no views set up yet, we get outta here.
-        if (empty($views)) {
-            echo '<div id="select_gravityview_view"><div class="wrap">'.GravityView_Admin::no_views_text().'</div></div>';
+        if ( empty( $views ) ) {
+            echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
 
             return;
         } ?>
@@ -93,43 +93,43 @@ 
 			<form action="#" method="get" id="select_gravityview_view_form">
 				<div class="wrap">
 
-					<h2 class=""><?php esc_html_e('Embed a View', 'gravityview'); ?></h2>
-					<p class="subtitle"><?php printf(esc_attr(__('Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview')), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>'); ?></p>
+					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
+					<p class="subtitle"><?php printf( esc_attr( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview' ) ), $post_type->labels->singular_name, '<a href="https://docs.gravityview.co/article/73-using-the-shortcode" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
 
 					<div>
-						<h3><label for="gravityview_id"><?php esc_html_e('Select a View', 'gravityview'); ?></label></h3>
+						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
 
 						<select name="gravityview_id" id="gravityview_id">
-							<option value=""><?php esc_html_e('&mdash; Select a View to Insert &mdash;', 'gravityview'); ?></option>
+							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
 							<?php
-                            foreach ($views as $view) {
-                                $title = empty($view->post_title) ? __('(no title)', 'gravityview') : $view->post_title;
-                                echo '<option value="'.$view->ID.'">'.esc_html(sprintf('%s #%d', $title, $view->ID)).'</option>';
+                            foreach ( $views as $view ) {
+                                $title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
+                                echo '<option value="' . $view->ID . '">' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
                             } ?>
 						</select>
 					</div>
 
 					<table class="form-table hide-if-js">
 
-						<caption><?php esc_html_e('View Settings', 'gravityview'); ?></caption>
+						<caption><?php esc_html_e( 'View Settings', 'gravityview' ); ?></caption>
 
 						<?php
 
-                        $settings = \GV\View_Settings::defaults(true);
+                        $settings = \GV\View_Settings::defaults( true );
 
-        foreach ($settings as $key => $setting) {
-            if (empty($setting['show_in_shortcode'])) {
+        foreach ( $settings as $key => $setting ) {
+            if ( empty( $setting[ 'show_in_shortcode' ] ) ) {
                 continue;
             }
 
-            GravityView_Render_Settings::render_setting_row($key, [], null, 'gravityview_%s', 'gravityview_%s');
+            GravityView_Render_Settings::render_setting_row( $key, [ ], null, 'gravityview_%s', 'gravityview_%s' );
         } ?>
 
 					</table>
 
 					<div class="submit">
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview'); ?>" id="insert_gravityview_view" />
-						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e('Cancel', 'gravityview'); ?>" />
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e( 'Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
+						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e( 'Cancel', 'gravityview' ); ?>" />
 					</div>
 
 				</div>
@@ -145,33 +145,33 @@ 
      */
     public function add_scripts_and_styles()
     {
-        if (!$this->is_post_editor_screen()) {
+        if ( ! $this->is_post_editor_screen() ) {
             return;
         }
 
-        wp_enqueue_style('dashicons');
+        wp_enqueue_style( 'dashicons' );
 
         // date picker
-        wp_enqueue_script('jquery-ui-datepicker');
+        wp_enqueue_script( 'jquery-ui-datepicker' );
 
         $protocol = is_ssl() ? 'https://' : 'http://';
 
-        wp_enqueue_style('jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', [], GravityView_Plugin::version);
+        wp_enqueue_style( 'jquery-ui-datepicker', $protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', [ ], GravityView_Plugin::version );
 
         //enqueue styles
-        wp_register_style('gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_style('gravityview_postedit_styles');
+        wp_register_style( 'gravityview_postedit_styles', plugins_url( 'assets/css/admin-post-edit.css', GRAVITYVIEW_FILE ), [ ], GravityView_Plugin::version );
+        wp_enqueue_style( 'gravityview_postedit_styles' );
 
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
         // custom js
-        wp_register_script('gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery', 'jquery-ui-datepicker'], GravityView_Plugin::version);
-        wp_enqueue_script('gravityview_postedit_scripts');
-        wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', [
-            'nonce'        => wp_create_nonce('gravityview_ajaxaddshortcode'),
-            'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
-            'alert_1'      => esc_html__('Please select a View', 'gravityview'),
-        ]);
+        wp_register_script( 'gravityview_postedit_scripts', plugins_url( 'assets/js/admin-post-edit' . $script_debug . '.js', GRAVITYVIEW_FILE ), [ 'jquery', 'jquery-ui-datepicker' ], GravityView_Plugin::version );
+        wp_enqueue_script( 'gravityview_postedit_scripts' );
+        wp_localize_script( 'gravityview_postedit_scripts', 'gvGlobals', [
+            'nonce'        => wp_create_nonce( 'gravityview_ajaxaddshortcode' ),
+            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
+            'alert_1'      => esc_html__( 'Please select a View', 'gravityview' ),
+        ] );
     }
 
     /**
@@ -184,27 +184,27 @@ 
     {
 
         // Not properly formatted request
-        if (empty($_POST['viewid']) || !is_numeric($_POST['viewid'])) {
-            exit(false);
+        if ( empty( $_POST[ 'viewid' ] ) || ! is_numeric( $_POST[ 'viewid' ] ) ) {
+            exit( false );
         }
 
         // Not valid request
-        if (empty($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxaddshortcode')) {
-            exit(false);
+        if ( empty( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxaddshortcode' ) ) {
+            exit( false );
         }
 
-        $viewid = (int) $_POST['viewid'];
+        $viewid = (int)$_POST[ 'viewid' ];
 
         // fetch form id assigned to the view
-        $formid = gravityview_get_form_id($viewid);
+        $formid = gravityview_get_form_id( $viewid );
 
         // Get the default sort field for the view
-        $sort_field = gravityview_get_template_setting($viewid, 'sort_field');
+        $sort_field = gravityview_get_template_setting( $viewid, 'sort_field' );
 
         // Generate the output `<option>`s
-        $response = gravityview_get_sortable_fields($formid, $sort_field);
+        $response = gravityview_get_sortable_fields( $formid, $sort_field );
 
-        exit($response);
+        exit( $response );
     }
 }
 

Braces +7 added lines, -14 removed lines

@@ -17,10 +17,8 @@ 
     exit;
 }
 
-class GravityView_Admin_Add_Shortcode
-{
-    public function __construct()
-    {
+class GravityView_Admin_Add_Shortcode {
+    public function __construct() {
         add_action('media_buttons', [$this, 'add_shortcode_button'], 30);
 
         add_action('admin_footer', [$this, 'add_shortcode_popup']);
@@ -37,8 +35,7 @@ 
      *
      * @return bool
      */
-    public function is_post_editor_screen()
-    {
+    public function is_post_editor_screen() {
         global $current_screen, $pagenow;
 
         return !empty($current_screen->post_type) && 'gravityview' != $current_screen->post_type && in_array($pagenow, ['post.php', 'post-new.php']);
@@ -49,8 +46,7 @@ 
      *
      * @return void
      */
-    public function add_shortcode_button()
-    {
+    public function add_shortcode_button() {
 
         /**
          * @since 1.15.3
@@ -71,8 +67,7 @@ 
      *
      * @return void
      */
-    public function add_shortcode_popup()
-    {
+    public function add_shortcode_popup() {
         global $post;
 
         if (!$this->is_post_editor_screen()) {
@@ -143,8 +138,7 @@ 
      *
      * @return void
      */
-    public function add_scripts_and_styles()
-    {
+    public function add_scripts_and_styles() {
         if (!$this->is_post_editor_screen()) {
             return;
         }
@@ -180,8 +174,7 @@ 
      *
      * @return void
      */
-    public function get_sortable_fields()
-    {
+    public function get_sortable_fields() {
 
         // Not properly formatted request
         if (empty($_POST['viewid']) || !is_numeric($_POST['viewid'])) {

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

Indentation +360 added lines, -360 removed lines

@@ -10,366 +10,366 @@
  */
 class GravityView_Admin_Duplicate_View
 {
-    public function __construct()
-    {
-
-        // Only run on Admin
-        if (!is_admin()) {
-            return;
-        }
-
-        // If the Duplicate Post plugin is active, don't run.
-        if (defined('DUPLICATE_POST_CURRENT_VERSION')) {
-            return;
-        }
-
-        $this->add_hooks();
-    }
-
-    /**
-     * Add actions & filters.
-     *
-     * @since 1.15
-     *
-     * @return void
-     */
-    private function add_hooks()
-    {
-        add_filter('post_row_actions', [$this, 'make_duplicate_link_row'], 10, 2);
-
-        /**
-         * Connect actions to functions.
-         */
-        add_action('admin_action_duplicate_view', [$this, 'save_as_new_view']);
-        add_action('admin_action_duplicate_view_as_draft', [$this, 'save_as_new_view_draft']);
-
-        // Using our action hooks to copy meta fields
-        add_action('gv_duplicate_view', [$this, 'copy_view_meta_info'], 10, 2);
-
-        add_filter('gravityview_connected_form_links', [$this, 'connected_form_links'], 10, 2);
-    }
-
-    /**
-     * Add Duplicate View link to the Data Source metabox.
-     *
-     * @param array $links Array of link HTML to display in the Data Source metabox
-     * @param array $form  Gravity Forms form array
-     *
-     * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
-     */
-    public function connected_form_links($links = [], $form = [])
-    {
-        /** @global WP_Post $post */
-        global $post;
-
-        // We only want to add Clone links to the Edit View metabox
-        if (!$this->is_all_views_page()) {
-            if ($duplicate_links = $this->make_duplicate_link_row([], $post)) {
-                $links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
-            }
-        }
-
-        return $links;
-    }
-
-    /**
-     * Is the current screen the All Views screen?
-     *
-     * @return bool
-     */
-    private function is_all_views_page()
-    {
-        global $pagenow;
-
-        return $pagenow === 'edit.php';
-    }
-
-    /**
-     * Test if the user is allowed to copy Views.
-     *
-     * @since 1.6
-     *
-     * @param WP_Post|int Post ID or Post object
-     *
-     * @return bool True: user can copy the View; false: nope.
-     */
-    private function current_user_can_copy($post)
-    {
-        $id = is_object($post) ? $post->ID : $post;
-
-        // Can't edit this current View
-        return GVCommon::has_cap('copy_gravityviews', $id);
-    }
-
-    /**
-     * Create a duplicate from a View $post.
-     *
-     * @param WP_Post $post
-     * @param string  $status The post status
-     *
-     * @since 1.6
-     */
-    private function create_duplicate($post, $status = '')
-    {
-
-        // We only want to clone Views
-        if ($post->post_type !== 'gravityview') {
-            return;
-        }
-
-        $new_view_author = wp_get_current_user();
-
-        /**
-         * @filter `gravityview/duplicate-view/status` Modify the default status for a new View. Return empty for the new View to inherit existing View status
-         *
-         * @since 1.6
-         *
-         * @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 = [
-            'menu_order'     => $post->menu_order,
-            'comment_status' => $post->comment_status,
-            'ping_status'    => $post->ping_status,
-            'post_author'    => $new_view_author->ID,
-            'post_content'   => $post->post_content,
-            'post_excerpt'   => $post->post_excerpt,
-            'post_mime_type' => $post->post_mime_type,
-            'post_parent'    => $post->post_parent,
-            'post_password'  => $post->post_password,
-            'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
-            'post_title'     => $post->post_title,
-            'post_type'      => $post->post_type,
-        ];
-
-        /**
-         * @filter `gravityview/duplicate-view/copy-date` When copying a View, should the date also be copied?
-         *
-         * @since 1.6
-         *
-         * @param bool    $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);
-
-        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);
-        }
-
-        /**
-         * @filter `gravityview/duplicate-view/new-view` Modify View configuration before creating the duplicated View.
-         *
-         * @since 1.6
-         *
-         * @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);
-
-        // Magic happens here.
-        $new_view_id = wp_insert_post($new_view);
-
-        // If the copy is published or scheduled, we have to set a proper slug.
-        if ($new_view_status == 'publish' || $new_view_status == 'future') {
-            $view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
-
-            $new_view_name_array = [
-                'ID'        => $new_view_id,
-                'post_name' => $view_name,
-            ];
-
-            // Update the post into the database
-            wp_update_post($new_view_name_array);
-        }
-
-        /**
-         * @action `gv_duplicate_view` After a View is duplicated, perform an action
-         *
-         * @since 1.6
-         * @see GravityView_Admin_Duplicate_View::copy_view_meta_info
-         *
-         * @param int     $new_view_id The ID of the newly created View
-         * @param WP_Post $post        The View that was just cloned
-         */
-        do_action('gv_duplicate_view', $new_view_id, $post);
-
-        delete_post_meta($new_view_id, '_dp_original');
-
-        add_post_meta($new_view_id, '_dp_original', $post->ID, false);
-
-        return $new_view_id;
-    }
-
-    /**
-     * Copy the meta information of a post to another View.
-     *
-     * @since 1.6
-     *
-     * @param int     $new_view_id The ID of the newly created View
-     * @param WP_Post $post        The View that was just cloned
-     *
-     * @return void
-     */
-    public function copy_view_meta_info($new_id, $post)
-    {
-        $post_meta_keys = get_post_custom_keys($post->ID);
-
-        if (empty($post_meta_keys)) {
-            return;
-        }
-
-        foreach ($post_meta_keys as $meta_key) {
-            $meta_values = get_post_custom_values($meta_key, $post->ID);
-
-            foreach ($meta_values as $meta_value) {
-                $meta_value = maybe_unserialize($meta_value);
-
-                add_post_meta($new_id, $meta_key, $meta_value);
-            }
-        }
-    }
-
-    /**
-     * Add the link to action list for post_row_actions.
-     *
-     * @since 1.6
-     *
-     * @param array   $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
-     * @param WP_Post $post
-     */
-    public function make_duplicate_link_row($actions, $post)
-    {
-
-        // Only process on GravityView Views
-        if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
-            $clone_link = $this->get_clone_view_link($post->ID, 'display', false);
-            $clone_text = __('Clone', 'gravityview');
-            $clone_title = __('Clone this View', 'gravityview');
-
-            $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);
-        }
-
-        return $actions;
-    }
-
-    /**
-     * Retrieve duplicate post link for post.
-     *
-     * @since 1.6
-     *
-     * @param int    $id      Optional. Post ID.
-     * @param string $context Optional, default to display. How to write the '&', defaults to '&amp;'.
-     * @param string $draft   Optional, default to true
-     *
-     * @return string
-     */
-    private function get_clone_view_link($id = 0, $context = 'display', $draft = true)
-    {
-
-        // Make sure they have permission
-        if (false === $this->current_user_can_copy($id)) {
-            return '';
-        }
-
-        // Verify the View exists
-        if (!$view = get_post($id)) {
-            return '';
-        }
-
-        $action_name = $draft ? 'duplicate_view_as_draft' : 'duplicate_view';
-
-        $action = '?action='.$action_name.'&post='.$view->ID;
-
-        if ('display' == $context) {
-            $action = esc_html($action);
-        }
-
-        $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) {
-            gravityview()->log->error('No gravityview post type exists when trying to clone the View.', ['data' => $view]);
-
-            return '';
-        }
-
-        /**
-         * @filter `gravityview/duplicate-view/get_clone_view_link` Modify the Clone View URL that is generated
-         *
-         * @since 1.6
-         *
-         * @param string $clone_view_link Link with `admin_url("admin.php")`, plus the action query string
-         * @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);
-
-        return $clone_view_link;
-    }
-
-    /**
-     * This function calls the creation of a new copy of the selected post (as a draft)
-     * then redirects to the edit post screen.
-     *
-     * @since 1.6
-     *
-     * @return void
-     */
-    public function save_as_new_view_draft()
-    {
-        $this->save_as_new_view('draft');
-    }
-
-    /**
-     * This function calls the creation of a new copy of the selected post (by default preserving the original publish status)
-     * then redirects to the post list.
-     *
-     * @since 1.6
-     *
-     * @param string $status The status to set for the new View
-     *
-     * @return void
-     */
-    public function save_as_new_view($status = '')
-    {
-        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']);
-
-        if (!$this->current_user_can_copy($id)) {
-            wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
-        }
-
-        $post = get_post($id);
-
-        // Copy the post and insert it
-        if (isset($post) && $post != null) {
-            $new_id = $this->create_duplicate($post, $status);
-
-            if ($status == '') {
-                // Redirect to the post list screen
-                wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
-            } else {
-                // Redirect to the edit screen for the new draft post
-                wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
-            }
-            exit;
-        } else {
-            wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
-        }
-    }
+	public function __construct()
+	{
+
+		// Only run on Admin
+		if (!is_admin()) {
+			return;
+		}
+
+		// If the Duplicate Post plugin is active, don't run.
+		if (defined('DUPLICATE_POST_CURRENT_VERSION')) {
+			return;
+		}
+
+		$this->add_hooks();
+	}
+
+	/**
+	 * Add actions & filters.
+	 *
+	 * @since 1.15
+	 *
+	 * @return void
+	 */
+	private function add_hooks()
+	{
+		add_filter('post_row_actions', [$this, 'make_duplicate_link_row'], 10, 2);
+
+		/**
+		 * Connect actions to functions.
+		 */
+		add_action('admin_action_duplicate_view', [$this, 'save_as_new_view']);
+		add_action('admin_action_duplicate_view_as_draft', [$this, 'save_as_new_view_draft']);
+
+		// Using our action hooks to copy meta fields
+		add_action('gv_duplicate_view', [$this, 'copy_view_meta_info'], 10, 2);
+
+		add_filter('gravityview_connected_form_links', [$this, 'connected_form_links'], 10, 2);
+	}
+
+	/**
+	 * Add Duplicate View link to the Data Source metabox.
+	 *
+	 * @param array $links Array of link HTML to display in the Data Source metabox
+	 * @param array $form  Gravity Forms form array
+	 *
+	 * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
+	 */
+	public function connected_form_links($links = [], $form = [])
+	{
+		/** @global WP_Post $post */
+		global $post;
+
+		// We only want to add Clone links to the Edit View metabox
+		if (!$this->is_all_views_page()) {
+			if ($duplicate_links = $this->make_duplicate_link_row([], $post)) {
+				$links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
+			}
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Is the current screen the All Views screen?
+	 *
+	 * @return bool
+	 */
+	private function is_all_views_page()
+	{
+		global $pagenow;
+
+		return $pagenow === 'edit.php';
+	}
+
+	/**
+	 * Test if the user is allowed to copy Views.
+	 *
+	 * @since 1.6
+	 *
+	 * @param WP_Post|int Post ID or Post object
+	 *
+	 * @return bool True: user can copy the View; false: nope.
+	 */
+	private function current_user_can_copy($post)
+	{
+		$id = is_object($post) ? $post->ID : $post;
+
+		// Can't edit this current View
+		return GVCommon::has_cap('copy_gravityviews', $id);
+	}
+
+	/**
+	 * Create a duplicate from a View $post.
+	 *
+	 * @param WP_Post $post
+	 * @param string  $status The post status
+	 *
+	 * @since 1.6
+	 */
+	private function create_duplicate($post, $status = '')
+	{
+
+		// We only want to clone Views
+		if ($post->post_type !== 'gravityview') {
+			return;
+		}
+
+		$new_view_author = wp_get_current_user();
+
+		/**
+		 * @filter `gravityview/duplicate-view/status` Modify the default status for a new View. Return empty for the new View to inherit existing View status
+		 *
+		 * @since 1.6
+		 *
+		 * @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 = [
+			'menu_order'     => $post->menu_order,
+			'comment_status' => $post->comment_status,
+			'ping_status'    => $post->ping_status,
+			'post_author'    => $new_view_author->ID,
+			'post_content'   => $post->post_content,
+			'post_excerpt'   => $post->post_excerpt,
+			'post_mime_type' => $post->post_mime_type,
+			'post_parent'    => $post->post_parent,
+			'post_password'  => $post->post_password,
+			'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
+			'post_title'     => $post->post_title,
+			'post_type'      => $post->post_type,
+		];
+
+		/**
+		 * @filter `gravityview/duplicate-view/copy-date` When copying a View, should the date also be copied?
+		 *
+		 * @since 1.6
+		 *
+		 * @param bool    $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);
+
+		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);
+		}
+
+		/**
+		 * @filter `gravityview/duplicate-view/new-view` Modify View configuration before creating the duplicated View.
+		 *
+		 * @since 1.6
+		 *
+		 * @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);
+
+		// Magic happens here.
+		$new_view_id = wp_insert_post($new_view);
+
+		// If the copy is published or scheduled, we have to set a proper slug.
+		if ($new_view_status == 'publish' || $new_view_status == 'future') {
+			$view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
+
+			$new_view_name_array = [
+				'ID'        => $new_view_id,
+				'post_name' => $view_name,
+			];
+
+			// Update the post into the database
+			wp_update_post($new_view_name_array);
+		}
+
+		/**
+		 * @action `gv_duplicate_view` After a View is duplicated, perform an action
+		 *
+		 * @since 1.6
+		 * @see GravityView_Admin_Duplicate_View::copy_view_meta_info
+		 *
+		 * @param int     $new_view_id The ID of the newly created View
+		 * @param WP_Post $post        The View that was just cloned
+		 */
+		do_action('gv_duplicate_view', $new_view_id, $post);
+
+		delete_post_meta($new_view_id, '_dp_original');
+
+		add_post_meta($new_view_id, '_dp_original', $post->ID, false);
+
+		return $new_view_id;
+	}
+
+	/**
+	 * Copy the meta information of a post to another View.
+	 *
+	 * @since 1.6
+	 *
+	 * @param int     $new_view_id The ID of the newly created View
+	 * @param WP_Post $post        The View that was just cloned
+	 *
+	 * @return void
+	 */
+	public function copy_view_meta_info($new_id, $post)
+	{
+		$post_meta_keys = get_post_custom_keys($post->ID);
+
+		if (empty($post_meta_keys)) {
+			return;
+		}
+
+		foreach ($post_meta_keys as $meta_key) {
+			$meta_values = get_post_custom_values($meta_key, $post->ID);
+
+			foreach ($meta_values as $meta_value) {
+				$meta_value = maybe_unserialize($meta_value);
+
+				add_post_meta($new_id, $meta_key, $meta_value);
+			}
+		}
+	}
+
+	/**
+	 * Add the link to action list for post_row_actions.
+	 *
+	 * @since 1.6
+	 *
+	 * @param array   $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
+	 * @param WP_Post $post
+	 */
+	public function make_duplicate_link_row($actions, $post)
+	{
+
+		// Only process on GravityView Views
+		if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
+			$clone_link = $this->get_clone_view_link($post->ID, 'display', false);
+			$clone_text = __('Clone', 'gravityview');
+			$clone_title = __('Clone this View', 'gravityview');
+
+			$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);
+		}
+
+		return $actions;
+	}
+
+	/**
+	 * Retrieve duplicate post link for post.
+	 *
+	 * @since 1.6
+	 *
+	 * @param int    $id      Optional. Post ID.
+	 * @param string $context Optional, default to display. How to write the '&', defaults to '&amp;'.
+	 * @param string $draft   Optional, default to true
+	 *
+	 * @return string
+	 */
+	private function get_clone_view_link($id = 0, $context = 'display', $draft = true)
+	{
+
+		// Make sure they have permission
+		if (false === $this->current_user_can_copy($id)) {
+			return '';
+		}
+
+		// Verify the View exists
+		if (!$view = get_post($id)) {
+			return '';
+		}
+
+		$action_name = $draft ? 'duplicate_view_as_draft' : 'duplicate_view';
+
+		$action = '?action='.$action_name.'&post='.$view->ID;
+
+		if ('display' == $context) {
+			$action = esc_html($action);
+		}
+
+		$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) {
+			gravityview()->log->error('No gravityview post type exists when trying to clone the View.', ['data' => $view]);
+
+			return '';
+		}
+
+		/**
+		 * @filter `gravityview/duplicate-view/get_clone_view_link` Modify the Clone View URL that is generated
+		 *
+		 * @since 1.6
+		 *
+		 * @param string $clone_view_link Link with `admin_url("admin.php")`, plus the action query string
+		 * @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);
+
+		return $clone_view_link;
+	}
+
+	/**
+	 * This function calls the creation of a new copy of the selected post (as a draft)
+	 * then redirects to the edit post screen.
+	 *
+	 * @since 1.6
+	 *
+	 * @return void
+	 */
+	public function save_as_new_view_draft()
+	{
+		$this->save_as_new_view('draft');
+	}
+
+	/**
+	 * This function calls the creation of a new copy of the selected post (by default preserving the original publish status)
+	 * then redirects to the post list.
+	 *
+	 * @since 1.6
+	 *
+	 * @param string $status The status to set for the new View
+	 *
+	 * @return void
+	 */
+	public function save_as_new_view($status = '')
+	{
+		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']);
+
+		if (!$this->current_user_can_copy($id)) {
+			wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
+		}
+
+		$post = get_post($id);
+
+		// Copy the post and insert it
+		if (isset($post) && $post != null) {
+			$new_id = $this->create_duplicate($post, $status);
+
+			if ($status == '') {
+				// Redirect to the post list screen
+				wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
+			} else {
+				// Redirect to the edit screen for the new draft post
+				wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
+			}
+			exit;
+		} else {
+			wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
+		}
+	}
 }
 
 new GravityView_Admin_Duplicate_View();

Spacing +72 added lines, -72 removed lines

@@ -14,12 +14,12 @@ 
     {
 
         // 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;
         }
 
@@ -35,18 +35,18 @@ 
      */
     private function add_hooks()
     {
-        add_filter('post_row_actions', [$this, 'make_duplicate_link_row'], 10, 2);
+        add_filter( 'post_row_actions', [ $this, 'make_duplicate_link_row' ], 10, 2 );
 
         /**
          * Connect actions to functions.
          */
-        add_action('admin_action_duplicate_view', [$this, 'save_as_new_view']);
-        add_action('admin_action_duplicate_view_as_draft', [$this, 'save_as_new_view_draft']);
+        add_action( 'admin_action_duplicate_view', [ $this, 'save_as_new_view' ] );
+        add_action( 'admin_action_duplicate_view_as_draft', [ $this, 'save_as_new_view_draft' ] );
 
         // Using our action hooks to copy meta fields
-        add_action('gv_duplicate_view', [$this, 'copy_view_meta_info'], 10, 2);
+        add_action( 'gv_duplicate_view', [ $this, 'copy_view_meta_info' ], 10, 2 );
 
-        add_filter('gravityview_connected_form_links', [$this, 'connected_form_links'], 10, 2);
+        add_filter( 'gravityview_connected_form_links', [ $this, 'connected_form_links' ], 10, 2 );
     }
 
     /**
@@ -57,15 +57,15 @@ 
      *
      * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
      */
-    public function connected_form_links($links = [], $form = [])
+    public function connected_form_links( $links = [ ], $form = [ ] )
     {
         /** @global WP_Post $post */
         global $post;
 
         // We only want to add Clone links to the Edit View metabox
-        if (!$this->is_all_views_page()) {
-            if ($duplicate_links = $this->make_duplicate_link_row([], $post)) {
-                $links[] = '<span>'.$duplicate_links['edit_as_new_draft'].'</span>';
+        if ( ! $this->is_all_views_page() ) {
+            if ( $duplicate_links = $this->make_duplicate_link_row( [ ], $post ) ) {
+                $links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>';
             }
         }
 
@@ -93,12 +93,12 @@ 
      *
      * @return bool True: user can copy the View; false: nope.
      */
-    private function current_user_can_copy($post)
+    private function current_user_can_copy( $post )
     {
-        $id = is_object($post) ? $post->ID : $post;
+        $id = is_object( $post ) ? $post->ID : $post;
 
         // Can't edit this current View
-        return GVCommon::has_cap('copy_gravityviews', $id);
+        return GVCommon::has_cap( 'copy_gravityviews', $id );
     }
 
     /**
@@ -109,11 +109,11 @@ 
      *
      * @since 1.6
      */
-    private function create_duplicate($post, $status = '')
+    private function create_duplicate( $post, $status = '' )
     {
 
         // We only want to clone Views
-        if ($post->post_type !== 'gravityview') {
+        if ( $post->post_type !== 'gravityview' ) {
             return;
         }
 
@@ -127,7 +127,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 = [
             'menu_order'     => $post->menu_order,
@@ -139,7 +139,7 @@ 
             'post_mime_type' => $post->post_mime_type,
             'post_parent'    => $post->post_parent,
             'post_password'  => $post->post_password,
-            'post_status'    => (empty($new_view_status)) ? $post->post_status : $new_view_status,
+            'post_status'    => ( empty( $new_view_status ) ) ? $post->post_status : $new_view_status,
             'post_title'     => $post->post_title,
             'post_type'      => $post->post_type,
         ];
@@ -152,11 +152,11 @@ 
          * @param bool    $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);
+        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 );
         }
 
         /**
@@ -167,14 +167,14 @@ 
          * @param array   $new_view Array of settings to be passed to wp_insert_post()
          * @param WP_Post $post     View being cloned
          */
-        $new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post);
+        $new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post );
 
         // Magic happens here.
-        $new_view_id = wp_insert_post($new_view);
+        $new_view_id = wp_insert_post( $new_view );
 
         // If the copy is published or scheduled, we have to set a proper slug.
-        if ($new_view_status == 'publish' || $new_view_status == 'future') {
-            $view_name = wp_unique_post_slug($post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent);
+        if ( $new_view_status == 'publish' || $new_view_status == 'future' ) {
+            $view_name = wp_unique_post_slug( $post->post_name, $new_view_id, $new_view_status, $post->post_type, $post->post_parent );
 
             $new_view_name_array = [
                 'ID'        => $new_view_id,
@@ -182,7 +182,7 @@ 
             ];
 
             // Update the post into the database
-            wp_update_post($new_view_name_array);
+            wp_update_post( $new_view_name_array );
         }
 
         /**
@@ -194,11 +194,11 @@ 
          * @param int     $new_view_id The ID of the newly created View
          * @param WP_Post $post        The View that was just cloned
          */
-        do_action('gv_duplicate_view', $new_view_id, $post);
+        do_action( 'gv_duplicate_view', $new_view_id, $post );
 
-        delete_post_meta($new_view_id, '_dp_original');
+        delete_post_meta( $new_view_id, '_dp_original' );
 
-        add_post_meta($new_view_id, '_dp_original', $post->ID, false);
+        add_post_meta( $new_view_id, '_dp_original', $post->ID, false );
 
         return $new_view_id;
     }
@@ -213,21 +213,21 @@ 
      *
      * @return void
      */
-    public function copy_view_meta_info($new_id, $post)
+    public function copy_view_meta_info( $new_id, $post )
     {
-        $post_meta_keys = get_post_custom_keys($post->ID);
+        $post_meta_keys = get_post_custom_keys( $post->ID );
 
-        if (empty($post_meta_keys)) {
+        if ( empty( $post_meta_keys ) ) {
             return;
         }
 
-        foreach ($post_meta_keys as $meta_key) {
-            $meta_values = get_post_custom_values($meta_key, $post->ID);
+        foreach ( $post_meta_keys as $meta_key ) {
+            $meta_values = get_post_custom_values( $meta_key, $post->ID );
 
-            foreach ($meta_values as $meta_value) {
-                $meta_value = maybe_unserialize($meta_value);
+            foreach ( $meta_values as $meta_value ) {
+                $meta_value = maybe_unserialize( $meta_value );
 
-                add_post_meta($new_id, $meta_key, $meta_value);
+                add_post_meta( $new_id, $meta_key, $meta_value );
             }
         }
     }
@@ -240,22 +240,22 @@ 
      * @param array   $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
      * @param WP_Post $post
      */
-    public function make_duplicate_link_row($actions, $post)
+    public function make_duplicate_link_row( $actions, $post )
     {
 
         // Only process on GravityView Views
-        if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
-            $clone_link = $this->get_clone_view_link($post->ID, 'display', false);
-            $clone_text = __('Clone', 'gravityview');
-            $clone_title = __('Clone this View', 'gravityview');
+        if ( get_post_type( $post ) === 'gravityview' && $this->current_user_can_copy( $post ) ) {
+            $clone_link = $this->get_clone_view_link( $post->ID, 'display', false );
+            $clone_text = __( 'Clone', 'gravityview' );
+            $clone_title = __( 'Clone this View', 'gravityview' );
 
-            $actions['clone'] = gravityview_get_link($clone_link, $clone_text, 'title='.$clone_title);
+            $actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title );
 
-            $clone_draft_link = $this->get_clone_view_link($post->ID);
-            $clone_draft_text = $this->is_all_views_page() ? __('New Draft', 'gravityview') : __('Clone View', 'gravityview');
-            $clone_draft_title = __('Copy as a new draft View', 'gravityview');
+            $clone_draft_link = $this->get_clone_view_link( $post->ID );
+            $clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
+            $clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
 
-            $actions['edit_as_new_draft'] = gravityview_get_link($clone_draft_link, esc_html($clone_draft_text), 'title='.$clone_draft_title);
+            $actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title );
         }
 
         return $actions;
@@ -272,32 +272,32 @@ 
      *
      * @return string
      */
-    private function get_clone_view_link($id = 0, $context = 'display', $draft = true)
+    private function get_clone_view_link( $id = 0, $context = 'display', $draft = true )
     {
 
         // Make sure they have permission
-        if (false === $this->current_user_can_copy($id)) {
+        if ( false === $this->current_user_can_copy( $id ) ) {
             return '';
         }
 
         // Verify the View exists
-        if (!$view = get_post($id)) {
+        if ( ! $view = get_post( $id ) ) {
             return '';
         }
 
         $action_name = $draft ? 'duplicate_view_as_draft' : 'duplicate_view';
 
-        $action = '?action='.$action_name.'&post='.$view->ID;
+        $action = '?action=' . $action_name . '&post=' . $view->ID;
 
-        if ('display' == $context) {
-            $action = esc_html($action);
+        if ( 'display' == $context ) {
+            $action = esc_html( $action );
         }
 
-        $post_type_object = get_post_type_object($view->post_type);
+        $post_type_object = get_post_type_object( $view->post_type );
 
         /** If there's no gravityview post type for some reason, abort! */
-        if (!$post_type_object) {
-            gravityview()->log->error('No gravityview post type exists when trying to clone the View.', ['data' => $view]);
+        if ( ! $post_type_object ) {
+            gravityview()->log->error( 'No gravityview post type exists when trying to clone the View.', [ 'data' => $view ] );
 
             return '';
         }
@@ -311,7 +311,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;
     }
@@ -326,7 +326,7 @@ 
      */
     public function save_as_new_view_draft()
     {
-        $this->save_as_new_view('draft');
+        $this->save_as_new_view( 'draft' );
     }
 
     /**
@@ -339,35 +339,35 @@ 
      *
      * @return void
      */
-    public function save_as_new_view($status = '')
+    public function save_as_new_view( $status = '' )
     {
-        if (!(isset($_GET['post']) || isset($_POST['post']))) {
-            wp_die(__('No post to duplicate has been supplied!', 'gravityview'));
+        if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) {
+            wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
         }
 
         // Get the original post
-        $id = (isset($_GET['post']) ? $_GET['post'] : $_POST['post']);
+        $id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] );
 
-        if (!$this->current_user_can_copy($id)) {
-            wp_die(__('You don\'t have permission to copy this View.', 'gravityview'));
+        if ( ! $this->current_user_can_copy( $id ) ) {
+            wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
         }
 
-        $post = get_post($id);
+        $post = get_post( $id );
 
         // Copy the post and insert it
-        if (isset($post) && $post != null) {
-            $new_id = $this->create_duplicate($post, $status);
+        if ( isset( $post ) && $post != null ) {
+            $new_id = $this->create_duplicate( $post, $status );
 
-            if ($status == '') {
+            if ( $status == '' ) {
                 // Redirect to the post list screen
-                wp_redirect(admin_url('edit.php?post_type='.$post->post_type));
+                wp_redirect( admin_url( 'edit.php?post_type=' . $post->post_type ) );
             } else {
                 // Redirect to the edit screen for the new draft post
-                wp_redirect(admin_url('post.php?action=edit&post='.$new_id));
+                wp_redirect( admin_url( 'post.php?action=edit&post=' . $new_id ) );
             }
             exit;
         } else {
-            wp_die(sprintf(esc_attr__('Copy creation failed, could not find original View with ID #%d', 'gravityview'), $id));
+            wp_die( sprintf( esc_attr__( 'Copy creation failed, could not find original View with ID #%d', 'gravityview' ), $id ) );
         }
     }
 }

Braces +12 added lines, -24 removed lines

@@ -8,10 +8,8 @@ 
  *
  * @since 1.6
  */
-class GravityView_Admin_Duplicate_View
-{
-    public function __construct()
-    {
+class GravityView_Admin_Duplicate_View {
+    public function __construct() {
 
         // Only run on Admin
         if (!is_admin()) {
@@ -33,8 +31,7 @@ 
      *
      * @return void
      */
-    private function add_hooks()
-    {
+    private function add_hooks() {
         add_filter('post_row_actions', [$this, 'make_duplicate_link_row'], 10, 2);
 
         /**
@@ -57,8 +54,7 @@ 
      *
      * @return array If it's the All Views page, return unedited. Otherwise, add a link to create cloned draft of View
      */
-    public function connected_form_links($links = [], $form = [])
-    {
+    public function connected_form_links($links = [], $form = []) {
         /** @global WP_Post $post */
         global $post;
 
@@ -77,8 +73,7 @@ 
      *
      * @return bool
      */
-    private function is_all_views_page()
-    {
+    private function is_all_views_page() {
         global $pagenow;
 
         return $pagenow === 'edit.php';
@@ -93,8 +88,7 @@ 
      *
      * @return bool True: user can copy the View; false: nope.
      */
-    private function current_user_can_copy($post)
-    {
+    private function current_user_can_copy($post) {
         $id = is_object($post) ? $post->ID : $post;
 
         // Can't edit this current View
@@ -109,8 +103,7 @@ 
      *
      * @since 1.6
      */
-    private function create_duplicate($post, $status = '')
-    {
+    private function create_duplicate($post, $status = '') {
 
         // We only want to clone Views
         if ($post->post_type !== 'gravityview') {
@@ -213,8 +206,7 @@ 
      *
      * @return void
      */
-    public function copy_view_meta_info($new_id, $post)
-    {
+    public function copy_view_meta_info($new_id, $post) {
         $post_meta_keys = get_post_custom_keys($post->ID);
 
         if (empty($post_meta_keys)) {
@@ -240,8 +232,7 @@ 
      * @param array   $actions Row action links. Defaults are 'Edit', 'Quick Edit', 'Restore, 'Trash', 'Delete Permanently', 'Preview', and 'View'
      * @param WP_Post $post
      */
-    public function make_duplicate_link_row($actions, $post)
-    {
+    public function make_duplicate_link_row($actions, $post) {
 
         // Only process on GravityView Views
         if (get_post_type($post) === 'gravityview' && $this->current_user_can_copy($post)) {
@@ -272,8 +263,7 @@ 
      *
      * @return string
      */
-    private function get_clone_view_link($id = 0, $context = 'display', $draft = true)
-    {
+    private function get_clone_view_link($id = 0, $context = 'display', $draft = true) {
 
         // Make sure they have permission
         if (false === $this->current_user_can_copy($id)) {
@@ -324,8 +314,7 @@ 
      *
      * @return void
      */
-    public function save_as_new_view_draft()
-    {
+    public function save_as_new_view_draft() {
         $this->save_as_new_view('draft');
     }
 
@@ -339,8 +328,7 @@ 
      *
      * @return void
      */
-    public function save_as_new_view($status = '')
-    {
+    public function save_as_new_view($status = '') {
         if (!(isset($_GET['post']) || isset($_POST['post']))) {
             wp_die(__('No post to duplicate has been supplied!', 'gravityview'));
         }

includes/import-functions.php

Indentation +51 added lines, -51 removed lines

@@ -49,49 +49,49 @@ 
  */
 function gravityview_import_helper_fix_line_breaks($postmeta = [], $post_id = 0, $post = [])
 {
-    if (empty($post['postmeta'])) {
-        return $postmeta;
-    }
+	if (empty($post['postmeta'])) {
+		return $postmeta;
+	}
 
-    if ('gravityview' !== $post['post_type']) {
-        return $postmeta;
-    }
+	if ('gravityview' !== $post['post_type']) {
+		return $postmeta;
+	}
 
-    $keys_to_fix = [
-        '_gravityview_directory_fields',
-        '_gravityview_directory_widgets',
-    ];
+	$keys_to_fix = [
+		'_gravityview_directory_fields',
+		'_gravityview_directory_widgets',
+	];
 
-    $performed_fix = false;
+	$performed_fix = false;
 
-    foreach ($postmeta as &$meta) {
-        $key = $meta['key'];
+	foreach ($postmeta as &$meta) {
+		$key = $meta['key'];
 
-        if (!in_array($key, $keys_to_fix, true)) {
-            continue;
-        }
+		if (!in_array($key, $keys_to_fix, true)) {
+			continue;
+		}
 
-        $is_valid_serialized_data = maybe_unserialize($meta['value']);
+		$is_valid_serialized_data = maybe_unserialize($meta['value']);
 
-        // The values are not corrupted serialized data. No need to fix.
-        if (false !== $is_valid_serialized_data) {
-            continue;
-        }
+		// The values are not corrupted serialized data. No need to fix.
+		if (false !== $is_valid_serialized_data) {
+			continue;
+		}
 
-        $meta['value'] = str_replace("\n", "\n\n", $meta['value']);
+		$meta['value'] = str_replace("\n", "\n\n", $meta['value']);
 
-        $performed_fix = true;
-    }
+		$performed_fix = true;
+	}
 
-    // Leave a note that this modification has been done. We'll use it later.
-    if ($performed_fix) {
-        $postmeta[] = [
-            'key'   => '_gravityview_fixed_import_serialization',
-            'value' => 1,
-        ];
-    }
+	// Leave a note that this modification has been done. We'll use it later.
+	if ($performed_fix) {
+		$postmeta[] = [
+			'key'   => '_gravityview_fixed_import_serialization',
+			'value' => 1,
+		];
+	}
 
-    return $postmeta;
+	return $postmeta;
 }
 
 add_action('import_post_meta', 'gravityview_import_helper_restore_line_breaks', 10, 3);
@@ -108,29 +108,29 @@ 
  */
 function gravityview_import_helper_restore_line_breaks($post_id, $key, $value)
 {
-    $keys_to_fix = [
-        '_gravityview_directory_fields',
-        '_gravityview_directory_widgets',
-    ];
+	$keys_to_fix = [
+		'_gravityview_directory_fields',
+		'_gravityview_directory_widgets',
+	];
 
-    if (!in_array($key, $keys_to_fix, true)) {
-        return;
-    }
+	if (!in_array($key, $keys_to_fix, true)) {
+		return;
+	}
 
-    if (false === get_post_meta($post_id, '_gravityview_fixed_import_serialization')) {
-        return;
-    }
+	if (false === get_post_meta($post_id, '_gravityview_fixed_import_serialization')) {
+		return;
+	}
 
-    if (empty($value) || !is_string($value)) {
-        return;
-    }
+	if (empty($value) || !is_string($value)) {
+		return;
+	}
 
-    if (false === strpos($value, "\n\n")) {
-        return;
-    }
+	if (false === strpos($value, "\n\n")) {
+		return;
+	}
 
-    // Restore the single new line.
-    $updated_value = str_replace("\n\n", "\n", $value);
+	// Restore the single new line.
+	$updated_value = str_replace("\n\n", "\n", $value);
 
-    update_post_meta($updated_value, $key, $updated_value);
+	update_post_meta($updated_value, $key, $updated_value);
 }

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
  *
  * @copyright Copyright 2021, Katz Web Services, Inc.
  */
-add_action('wp_import_post_meta', 'gravityview_import_helper_fix_line_breaks', 10, 3);
+add_action( 'wp_import_post_meta', 'gravityview_import_helper_fix_line_breaks', 10, 3 );
 
 /**
  * Fixes broken serialization character counts when new line characters are in the exported XML.
@@ -47,13 +47,13 @@ 
  *
  * @return array Modified array, if GravityView
  */
-function gravityview_import_helper_fix_line_breaks($postmeta = [], $post_id = 0, $post = [])
+function gravityview_import_helper_fix_line_breaks( $postmeta = [ ], $post_id = 0, $post = [ ] )
 {
-    if (empty($post['postmeta'])) {
+    if ( empty( $post[ 'postmeta' ] ) ) {
         return $postmeta;
     }
 
-    if ('gravityview' !== $post['post_type']) {
+    if ( 'gravityview' !== $post[ 'post_type' ] ) {
         return $postmeta;
     }
 
@@ -64,28 +64,28 @@ 
 
     $performed_fix = false;
 
-    foreach ($postmeta as &$meta) {
-        $key = $meta['key'];
+    foreach ( $postmeta as &$meta ) {
+        $key = $meta[ 'key' ];
 
-        if (!in_array($key, $keys_to_fix, true)) {
+        if ( ! in_array( $key, $keys_to_fix, true ) ) {
             continue;
         }
 
-        $is_valid_serialized_data = maybe_unserialize($meta['value']);
+        $is_valid_serialized_data = maybe_unserialize( $meta[ 'value' ] );
 
         // The values are not corrupted serialized data. No need to fix.
-        if (false !== $is_valid_serialized_data) {
+        if ( false !== $is_valid_serialized_data ) {
             continue;
         }
 
-        $meta['value'] = str_replace("\n", "\n\n", $meta['value']);
+        $meta[ 'value' ] = str_replace( "\n", "\n\n", $meta[ 'value' ] );
 
         $performed_fix = true;
     }
 
     // Leave a note that this modification has been done. We'll use it later.
-    if ($performed_fix) {
-        $postmeta[] = [
+    if ( $performed_fix ) {
+        $postmeta[ ] = [
             'key'   => '_gravityview_fixed_import_serialization',
             'value' => 1,
         ];
@@ -94,7 +94,7 @@ 
     return $postmeta;
 }
 
-add_action('import_post_meta', 'gravityview_import_helper_restore_line_breaks', 10, 3);
+add_action( 'import_post_meta', 'gravityview_import_helper_restore_line_breaks', 10, 3 );
 
 /**
  * Restores the single new line for imported Views that have been modified.
@@ -106,31 +106,31 @@ 
  * @param string $key
  * @param mixed  $value
  */
-function gravityview_import_helper_restore_line_breaks($post_id, $key, $value)
+function gravityview_import_helper_restore_line_breaks( $post_id, $key, $value )
 {
     $keys_to_fix = [
         '_gravityview_directory_fields',
         '_gravityview_directory_widgets',
     ];
 
-    if (!in_array($key, $keys_to_fix, true)) {
+    if ( ! in_array( $key, $keys_to_fix, true ) ) {
         return;
     }
 
-    if (false === get_post_meta($post_id, '_gravityview_fixed_import_serialization')) {
+    if ( false === get_post_meta( $post_id, '_gravityview_fixed_import_serialization' ) ) {
         return;
     }
 
-    if (empty($value) || !is_string($value)) {
+    if ( empty( $value ) || ! is_string( $value ) ) {
         return;
     }
 
-    if (false === strpos($value, "\n\n")) {
+    if ( false === strpos( $value, "\n\n" ) ) {
         return;
     }
 
     // Restore the single new line.
-    $updated_value = str_replace("\n\n", "\n", $value);
+    $updated_value = str_replace( "\n\n", "\n", $value );
 
-    update_post_meta($updated_value, $key, $updated_value);
+    update_post_meta( $updated_value, $key, $updated_value );
 }

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
  *
  * @return array Modified array, if GravityView
  */
-function gravityview_import_helper_fix_line_breaks($postmeta = [], $post_id = 0, $post = [])
-{
+function gravityview_import_helper_fix_line_breaks($postmeta = [], $post_id = 0, $post = []) {
     if (empty($post['postmeta'])) {
         return $postmeta;
     }
@@ -106,8 +105,7 @@ 
  * @param string $key
  * @param mixed  $value
  */
-function gravityview_import_helper_restore_line_breaks($post_id, $key, $value)
-{
+function gravityview_import_helper_restore_line_breaks($post_id, $key, $value) {
     $keys_to_fix = [
         '_gravityview_directory_fields',
         '_gravityview_directory_widgets',

includes/class-cache.php

Indentation +560 added lines, -560 removed lines

@@ -5,523 +5,523 @@ 
  */
 class GravityView_Cache
 {
-    /** @deprecated 2.14 - use BLOCKLIST_OPTION_NAME instead! */
-    const BLACKLIST_OPTION_NAME = 'gravityview_cache_blocklist';
-
-    const BLOCKLIST_OPTION_NAME = 'gravityview_cache_blocklist';
-
-    /**
-     * Form ID, or array of Form IDs.
-     *
-     * @var mixed
-     */
-    protected $form_ids;
-
-    /**
-     * Extra request parameters used to generate the query. This is used to generate the unique transient key.
-     *
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * The transient key used to store the cached item. 45 characters long.
-     *
-     * @var string
-     */
-    private $key = '';
-
-    /**
-     * @since 1.13.1
-     *
-     * @var array Columns in the database for leads
-     */
-    private $lead_db_columns = ['id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status'];
-
-    /**
-     * @param array|int $form_ids Form ID or array of form IDs used in a request
-     * @param array     $args     Extra request parameters used to generate the query. This is used to generate the unique transient key.
-     */
-    public function __construct($form_ids = null, $args = [])
-    {
-        $this->add_hooks();
-
-        if (!is_null($form_ids)) {
-            $this->form_ids = $form_ids;
-
-            $this->args = $args;
-
-            $this->set_key();
-        }
-    }
-
-    /**
-     * Add actions for clearing out caches when entries are updated.
-     */
-    public function add_hooks()
-    {
-
-        // Schedule cleanup of expired transients
-        add_action('wp', [$this, 'schedule_transient_cleanup']);
-
-        // Hook in to the scheduled cleanup, if scheduled
-        add_action('gravityview-expired-transients', [$this, 'delete_expired_transients']);
-
-        // Trigger this when you need to prevent any results from being cached with forms that have been modified
-        add_action('gravityview_clear_form_cache', [$this, 'blocklist_add']);
-
-        /**
-         * @since 1.14
-         */
-        add_action('gravityview_clear_entry_cache', [$this, 'entry_status_changed']);
-
-        add_action('gform_after_update_entry', [$this, 'entry_updated'], 10, 2);
-
-        add_action('gform_entry_created', [$this, 'entry_created'], 10, 2);
-
-        add_action('gform_post_add_entry', [$this, 'entry_added'], 10, 2);
-
-        /**
-         * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
-         */
-        foreach ($this->lead_db_columns as $column) {
-            add_action('gform_update_'.$column, [$this, 'entry_status_changed'], 10, 3);
-        }
-
-        add_action('gform_delete_lead', [$this, 'entry_status_changed'], 10);
-    }
-
-    /**
-     * Force refreshing a cache when an entry is deleted.
-     *
-     * The `gform_delete_lead` action is called before the lead is deleted; we fetch the entry to find out the form ID so it can be added to the blocklist.
-     *
-     * @since  1.5.1
-     *
-     * @param int    $lead_id        Entry ID
-     * @param string $property_value Previous value of the lead status passed by gform_update_status hook
-     * @param string $previous_value Previous value of the lead status passed by gform_update_status hook
-     *
-     * @return void
-     */
-    public function entry_status_changed($lead_id, $property_value = '', $previous_value = '')
-    {
-        $entry = GFAPI::get_entry($lead_id);
-
-        if (is_wp_error($entry)) {
-            gravityview()->log->error('Could not retrieve entry {entry_id} to delete it: {error}', ['entry_id' => $lead_id, 'error' => $entry->get_error_message()]);
-
-            return;
-        }
-
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{lead_id} was deleted', ['form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => ['value' => $property_value, 'previous' => $previous_value]]);
-
-        $this->blocklist_add($entry['form_id']);
-    }
-
-    /**
-     * When an entry is updated, add the entry's form to the cache blocklist.
-     *
-     * @param array $form    GF form array
-     * @param int   $lead_id Entry ID
-     *
-     * @return void
-     */
-    public function entry_updated($form, $lead_id)
-    {
-        gravityview()->log->debug(' adding form {form_id} to blocklist because entry #{entry_id} was updated', ['form_id' => $form['id'], 'entry_id' => $lead_id]);
-
-        $this->blocklist_add($form['id']);
-    }
-
-    /**
-     * When an entry is created, add the entry's form to the cache blocklist.
-     *
-     * We don't want old caches; when an entry is added, we want to clear the cache.
-     *
-     * @param array $entry GF entry array
-     * @param array $form  GF form array
-     *
-     * @return void
-     */
-    public function entry_created($entry, $form)
-    {
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was created', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
-
-        $this->blocklist_add($form['id']);
-    }
-
-    /**
-     * Clear the cache when entries are added via GFAPI::add_entry().
-     *
-     * @param array $entry The GF Entry array
-     * @param array $form  The GF Form array
-     *
-     * @return void
-     */
-    public function entry_added($entry, $form)
-    {
-        if (is_wp_error($entry)) {
-            return;
-        }
-
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was added', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
-
-        $this->blocklist_add($form['id']);
-    }
-
-    /**
-     * Calculate the prefix based on the Form IDs.
-     *
-     * @param int|array $form_ids Form IDs to generate prefix for
-     *
-     * @return string Prefix for the cache string used in set_key()
-     */
-    protected function get_cache_key_prefix($form_ids = null)
-    {
-        if (is_null($form_ids)) {
-            $form_ids = $this->form_ids;
-        }
-
-        // Normally just one form, but supports multiple forms
-        //
-        // Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
-        $forms = 'f:'.implode('-f:', (array) $form_ids);
-
-        // Prefix for transient keys
-        // Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
-        return 'gv-cache-'.$forms.'-';
-    }
-
-    /**
-     * Set the transient key based on the form IDs and the arguments passed to the class.
-     */
-    protected function set_key()
-    {
-
-        // Don't set key if no forms have been set.
-        if (empty($this->form_ids)) {
-            return;
-        }
-
-        $key = $this->get_cache_key_prefix().sha1(serialize($this->args));
-
-        // The transient name column can handle up to 64 characters.
-        // The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
-        // 64 - 19 = 45
-        // We make sure the key isn't too long or else WP doesn't store data.
-        $this->key = substr($key, 0, 45);
-    }
-
-    /**
-     * Allow public access to get transient key.
-     *
-     * @return string Transient key
-     */
-    public function get_key()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Add form IDs to a "blocklist" to force the cache to be refreshed.
-     *
-     * @param int|array $form_ids Form IDs to force to be updated
-     *
-     * @return bool False if value was not updated and true if value was updated.
-     */
-    public function blocklist_add($form_ids)
-    {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
-
-        $form_ids = is_array($form_ids) ? $form_ids : [$form_ids];
-
-        // Add the passed form IDs
-        $blocklist = array_merge((array) $blocklist, $form_ids);
-
-        // Don't duplicate
-        $blocklist = array_unique($blocklist);
-
-        // Remove empty items from blocklist
-        $blocklist = array_filter($blocklist);
-
-        $updated = update_option(self::BLOCKLIST_OPTION_NAME, $blocklist);
-
-        if (false !== $updated) {
-            gravityview()->log->debug('Added form IDs to cache blocklist', ['data' => [
-                '$form_ids'  => $form_ids,
-                '$blocklist' => $blocklist,
-            ]]);
-        }
-
-        return $updated;
-    }
-
-    /**
-     * @deprecated 2.14 {@see GravityView_Cache::blocklist_add()}
-     *
-     * @param int|array $form_ids Form IDs to force to be updated
-     *
-     * @return bool Whether the removal was successful
-     */
-    public function blacklist_add($form_ids)
-    {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_add()');
-
-        return $this->blocklist_remove($form_ids);
-    }
-
-    /**
-     * Remove Form IDs from blocklist.
-     *
-     * @param int|array $form_ids Form IDs to remove
-     *
-     * @return bool Whether the removal was successful
-     */
-    public function blocklist_remove($form_ids)
-    {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
-
-        $updated_list = array_diff($blocklist, (array) $form_ids);
-
-        gravityview()->log->debug('Removing form IDs from cache blocklist', ['data' => [
-            '$form_ids'     => $form_ids,
-            '$blocklist'    => $blocklist,
-            '$updated_list' => $updated_list,
-        ]]);
-
-        return update_option(self::BLOCKLIST_OPTION_NAME, $updated_list);
-    }
-
-    /**
-     * @deprecated 2.14 {@see GravityView_Cache::blocklist_remove()}
-     *
-     * @param int|array $form_ids Form IDs to add
-     *
-     * @return bool Whether the removal was successful
-     */
-    public function blacklist_remove($form_ids)
-    {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_remove()');
-
-        return $this->blocklist_remove($form_ids);
-    }
-
-    /**
-     * Is a form ID in the cache blocklist?
-     *
-     * @param int|array $form_ids Form IDs to check if in blocklist
-     *
-     * @deprecated 2.14 Use {@see GravityView_Cache::in_blocklist()}
-     *
-     * @return bool
-     */
-    public function in_blacklist($form_ids = null)
-    {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::in_blocklist()');
-
-        return $this->in_blocklist($form_ids);
-    }
-
-    /**
-     * Is a form ID in the cache blocklist.
-     *
-     * @param int|array $form_ids Form IDs to check if in blocklist
-     *
-     * @return bool
-     */
-    public function in_blocklist($form_ids = null)
-    {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
-
-        // Use object var if exists
-        $form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
-
-        if (empty($form_ids)) {
-            gravityview()->log->debug('Did not add form to blocklist; empty form ID', ['data' => $form_ids]);
-
-            return false;
-        }
-
-        foreach ((array) $form_ids as $form_id) {
-            if (in_array($form_id, $blocklist)) {
-                gravityview()->log->debug('Form #{form_id} is in the cache blocklist', ['form_id' => $form_id]);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get transient result.
-     *
-     * @param string $key Transient key to fetch
-     *
-     * @return mixed False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
-     */
-    public function get($key = null)
-    {
-        $key = is_null($key) ? $this->key : $key;
-
-        if (!$this->use_cache()) {
-            gravityview()->log->debug('Not using cached results because of GravityView_Cache->use_cache() results');
-
-            return false;
-        }
-
-        gravityview()->log->debug('Fetching request with transient key {key}', ['key' => $key]);
-
-        $result = get_transient($key);
-
-        if (is_wp_error($result)) {
-            gravityview()->log->debug('Fetching request resulted in error:', ['data' => $result]);
-
-            return false;
-        } elseif ($result) {
-            gravityview()->log->debug('Cached results found for  transient key {key}', ['key' => $key]);
-
-            return $result;
-        }
-
-        gravityview()->log->debug('No cached results found for  transient key {key}', ['key' => $key]);
-
-        return null;
-    }
-
-    /**
-     * Cache content as a transient.
-     *
-     * Cache time defaults to 1 week
-     *
-     * @param mixed  $content     [description]
-     * @param string $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
-     *
-     * @return bool If $content is not set, false. Otherwise, returns true if transient was set and false if not.
-     */
-    public function set($content, $filter_name = '')
-    {
-
-        // Don't cache empty results
-        if (!empty($content)) {
-
-            /**
-             * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
-             *
-             * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
-             */
-            $cache_time = (int) apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
-
-            gravityview()->log->debug('Setting cache with transient key {key} for {cache_time} seconds', ['key' => $this->key, 'cache_time' => $cache_time]);
-
-            return set_transient($this->key, $content, $cache_time);
-        }
-
-        gravityview()->log->debug('Cache not set; content is empty');
-
-        return false;
-    }
-
-    /**
-     * Delete cached transients based on form IDs.
-     *
-     * @todo Use REGEX to match forms when array of form IDs is passed, instead of using a simple LIKE
-     * @todo  Rate limit deleting to prevent abuse
-     *
-     * @param int|array $form_ids Form IDs to delete
-     *
-     * @return void
-     */
-    public function delete($form_ids = null)
-    {
-        global $wpdb;
-
-        // Use object var if exists
-        $form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
-
-        if (empty($form_ids)) {
-            gravityview()->log->debug('Did not delete cache; empty form IDs');
-
-            return;
-        }
-
-        foreach ((array) $form_ids as $form_id) {
-            $key = '_transient_gv-cache-';
-
-            $key = $wpdb->esc_like($key);
-
-            $form_id = intval($form_id);
-
-            // Find the transients containing this form
-            $key = "$key%f:$form_id-%"; // \_transient\_gv-cache-%f:1-% for example
-            $sql = $wpdb->prepare("SELECT option_name FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
-
-            foreach (($transients = $wpdb->get_col($sql)) as $transient) {
-                // We have to delete it via the API to make sure the object cache is updated appropriately
-                delete_transient(preg_replace('#^_transient_#', '', $transient));
-            }
-
-            gravityview()->log->debug('Deleting cache for form #{form_id}', ['form_id' => $form_id, 'data' => [
-                $sql,
-                sprintf('Deleted results: %d', count($transients)),
-            ]]);
-        }
-    }
-
-    /**
-     * Schedule expired transient cleanup twice a day.
-     *
-     * Can be overruled by the `gravityview_cleanup_transients` filter (returns boolean)
-     *
-     * @return void
-     */
-    public function schedule_transient_cleanup()
-    {
-
-        /**
-         * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
-         *
-         * @param bool $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
-         */
-        $cleanup = apply_filters('gravityview_cleanup_transients', true);
-
-        if (!$cleanup) {
-            return;
-        }
-
-        if (!wp_next_scheduled('gravityview-expired-transients')) {
-            wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
-        }
-    }
-
-    /**
-     * Delete expired transients.
-     *
-     * The code is copied from the Delete Expired Transients, with slight modifications to track # of results and to get the blog ID dynamically
-     *
-     * @see https://wordpress.org/plugins/delete-expired-transients/ Plugin where the code was taken from
-     * @see  DelxtransCleaners::clearBlogExpired()
-     *
-     * @return void
-     */
-    public function delete_expired_transients()
-    {
-        global $wpdb;
-
-        // Added this line, which isn't in the plugin
-        $blog_id = get_current_blog_id();
-
-        $num_results = 0;
-
-        // get current PHP time, offset by a minute to avoid clashes with other tasks
-        $threshold = time() - 60;
-
-        // get table name for options on specified blog
-        $table = $wpdb->get_blog_prefix($blog_id).'options';
-
-        // delete expired transients, using the paired timeout record to find them
-        $sql = "
+	/** @deprecated 2.14 - use BLOCKLIST_OPTION_NAME instead! */
+	const BLACKLIST_OPTION_NAME = 'gravityview_cache_blocklist';
+
+	const BLOCKLIST_OPTION_NAME = 'gravityview_cache_blocklist';
+
+	/**
+	 * Form ID, or array of Form IDs.
+	 *
+	 * @var mixed
+	 */
+	protected $form_ids;
+
+	/**
+	 * Extra request parameters used to generate the query. This is used to generate the unique transient key.
+	 *
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * The transient key used to store the cached item. 45 characters long.
+	 *
+	 * @var string
+	 */
+	private $key = '';
+
+	/**
+	 * @since 1.13.1
+	 *
+	 * @var array Columns in the database for leads
+	 */
+	private $lead_db_columns = ['id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status'];
+
+	/**
+	 * @param array|int $form_ids Form ID or array of form IDs used in a request
+	 * @param array     $args     Extra request parameters used to generate the query. This is used to generate the unique transient key.
+	 */
+	public function __construct($form_ids = null, $args = [])
+	{
+		$this->add_hooks();
+
+		if (!is_null($form_ids)) {
+			$this->form_ids = $form_ids;
+
+			$this->args = $args;
+
+			$this->set_key();
+		}
+	}
+
+	/**
+	 * Add actions for clearing out caches when entries are updated.
+	 */
+	public function add_hooks()
+	{
+
+		// Schedule cleanup of expired transients
+		add_action('wp', [$this, 'schedule_transient_cleanup']);
+
+		// Hook in to the scheduled cleanup, if scheduled
+		add_action('gravityview-expired-transients', [$this, 'delete_expired_transients']);
+
+		// Trigger this when you need to prevent any results from being cached with forms that have been modified
+		add_action('gravityview_clear_form_cache', [$this, 'blocklist_add']);
+
+		/**
+		 * @since 1.14
+		 */
+		add_action('gravityview_clear_entry_cache', [$this, 'entry_status_changed']);
+
+		add_action('gform_after_update_entry', [$this, 'entry_updated'], 10, 2);
+
+		add_action('gform_entry_created', [$this, 'entry_created'], 10, 2);
+
+		add_action('gform_post_add_entry', [$this, 'entry_added'], 10, 2);
+
+		/**
+		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
+		 */
+		foreach ($this->lead_db_columns as $column) {
+			add_action('gform_update_'.$column, [$this, 'entry_status_changed'], 10, 3);
+		}
+
+		add_action('gform_delete_lead', [$this, 'entry_status_changed'], 10);
+	}
+
+	/**
+	 * Force refreshing a cache when an entry is deleted.
+	 *
+	 * The `gform_delete_lead` action is called before the lead is deleted; we fetch the entry to find out the form ID so it can be added to the blocklist.
+	 *
+	 * @since  1.5.1
+	 *
+	 * @param int    $lead_id        Entry ID
+	 * @param string $property_value Previous value of the lead status passed by gform_update_status hook
+	 * @param string $previous_value Previous value of the lead status passed by gform_update_status hook
+	 *
+	 * @return void
+	 */
+	public function entry_status_changed($lead_id, $property_value = '', $previous_value = '')
+	{
+		$entry = GFAPI::get_entry($lead_id);
+
+		if (is_wp_error($entry)) {
+			gravityview()->log->error('Could not retrieve entry {entry_id} to delete it: {error}', ['entry_id' => $lead_id, 'error' => $entry->get_error_message()]);
+
+			return;
+		}
+
+		gravityview()->log->debug('adding form {form_id} to blocklist because entry #{lead_id} was deleted', ['form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => ['value' => $property_value, 'previous' => $previous_value]]);
+
+		$this->blocklist_add($entry['form_id']);
+	}
+
+	/**
+	 * When an entry is updated, add the entry's form to the cache blocklist.
+	 *
+	 * @param array $form    GF form array
+	 * @param int   $lead_id Entry ID
+	 *
+	 * @return void
+	 */
+	public function entry_updated($form, $lead_id)
+	{
+		gravityview()->log->debug(' adding form {form_id} to blocklist because entry #{entry_id} was updated', ['form_id' => $form['id'], 'entry_id' => $lead_id]);
+
+		$this->blocklist_add($form['id']);
+	}
+
+	/**
+	 * When an entry is created, add the entry's form to the cache blocklist.
+	 *
+	 * We don't want old caches; when an entry is added, we want to clear the cache.
+	 *
+	 * @param array $entry GF entry array
+	 * @param array $form  GF form array
+	 *
+	 * @return void
+	 */
+	public function entry_created($entry, $form)
+	{
+		gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was created', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
+
+		$this->blocklist_add($form['id']);
+	}
+
+	/**
+	 * Clear the cache when entries are added via GFAPI::add_entry().
+	 *
+	 * @param array $entry The GF Entry array
+	 * @param array $form  The GF Form array
+	 *
+	 * @return void
+	 */
+	public function entry_added($entry, $form)
+	{
+		if (is_wp_error($entry)) {
+			return;
+		}
+
+		gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was added', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
+
+		$this->blocklist_add($form['id']);
+	}
+
+	/**
+	 * Calculate the prefix based on the Form IDs.
+	 *
+	 * @param int|array $form_ids Form IDs to generate prefix for
+	 *
+	 * @return string Prefix for the cache string used in set_key()
+	 */
+	protected function get_cache_key_prefix($form_ids = null)
+	{
+		if (is_null($form_ids)) {
+			$form_ids = $this->form_ids;
+		}
+
+		// Normally just one form, but supports multiple forms
+		//
+		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
+		$forms = 'f:'.implode('-f:', (array) $form_ids);
+
+		// Prefix for transient keys
+		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
+		return 'gv-cache-'.$forms.'-';
+	}
+
+	/**
+	 * Set the transient key based on the form IDs and the arguments passed to the class.
+	 */
+	protected function set_key()
+	{
+
+		// Don't set key if no forms have been set.
+		if (empty($this->form_ids)) {
+			return;
+		}
+
+		$key = $this->get_cache_key_prefix().sha1(serialize($this->args));
+
+		// The transient name column can handle up to 64 characters.
+		// The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
+		// 64 - 19 = 45
+		// We make sure the key isn't too long or else WP doesn't store data.
+		$this->key = substr($key, 0, 45);
+	}
+
+	/**
+	 * Allow public access to get transient key.
+	 *
+	 * @return string Transient key
+	 */
+	public function get_key()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * Add form IDs to a "blocklist" to force the cache to be refreshed.
+	 *
+	 * @param int|array $form_ids Form IDs to force to be updated
+	 *
+	 * @return bool False if value was not updated and true if value was updated.
+	 */
+	public function blocklist_add($form_ids)
+	{
+		$blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+
+		$form_ids = is_array($form_ids) ? $form_ids : [$form_ids];
+
+		// Add the passed form IDs
+		$blocklist = array_merge((array) $blocklist, $form_ids);
+
+		// Don't duplicate
+		$blocklist = array_unique($blocklist);
+
+		// Remove empty items from blocklist
+		$blocklist = array_filter($blocklist);
+
+		$updated = update_option(self::BLOCKLIST_OPTION_NAME, $blocklist);
+
+		if (false !== $updated) {
+			gravityview()->log->debug('Added form IDs to cache blocklist', ['data' => [
+				'$form_ids'  => $form_ids,
+				'$blocklist' => $blocklist,
+			]]);
+		}
+
+		return $updated;
+	}
+
+	/**
+	 * @deprecated 2.14 {@see GravityView_Cache::blocklist_add()}
+	 *
+	 * @param int|array $form_ids Form IDs to force to be updated
+	 *
+	 * @return bool Whether the removal was successful
+	 */
+	public function blacklist_add($form_ids)
+	{
+		_deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_add()');
+
+		return $this->blocklist_remove($form_ids);
+	}
+
+	/**
+	 * Remove Form IDs from blocklist.
+	 *
+	 * @param int|array $form_ids Form IDs to remove
+	 *
+	 * @return bool Whether the removal was successful
+	 */
+	public function blocklist_remove($form_ids)
+	{
+		$blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+
+		$updated_list = array_diff($blocklist, (array) $form_ids);
+
+		gravityview()->log->debug('Removing form IDs from cache blocklist', ['data' => [
+			'$form_ids'     => $form_ids,
+			'$blocklist'    => $blocklist,
+			'$updated_list' => $updated_list,
+		]]);
+
+		return update_option(self::BLOCKLIST_OPTION_NAME, $updated_list);
+	}
+
+	/**
+	 * @deprecated 2.14 {@see GravityView_Cache::blocklist_remove()}
+	 *
+	 * @param int|array $form_ids Form IDs to add
+	 *
+	 * @return bool Whether the removal was successful
+	 */
+	public function blacklist_remove($form_ids)
+	{
+		_deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_remove()');
+
+		return $this->blocklist_remove($form_ids);
+	}
+
+	/**
+	 * Is a form ID in the cache blocklist?
+	 *
+	 * @param int|array $form_ids Form IDs to check if in blocklist
+	 *
+	 * @deprecated 2.14 Use {@see GravityView_Cache::in_blocklist()}
+	 *
+	 * @return bool
+	 */
+	public function in_blacklist($form_ids = null)
+	{
+		_deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::in_blocklist()');
+
+		return $this->in_blocklist($form_ids);
+	}
+
+	/**
+	 * Is a form ID in the cache blocklist.
+	 *
+	 * @param int|array $form_ids Form IDs to check if in blocklist
+	 *
+	 * @return bool
+	 */
+	public function in_blocklist($form_ids = null)
+	{
+		$blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+
+		// Use object var if exists
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
+
+		if (empty($form_ids)) {
+			gravityview()->log->debug('Did not add form to blocklist; empty form ID', ['data' => $form_ids]);
+
+			return false;
+		}
+
+		foreach ((array) $form_ids as $form_id) {
+			if (in_array($form_id, $blocklist)) {
+				gravityview()->log->debug('Form #{form_id} is in the cache blocklist', ['form_id' => $form_id]);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get transient result.
+	 *
+	 * @param string $key Transient key to fetch
+	 *
+	 * @return mixed False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
+	 */
+	public function get($key = null)
+	{
+		$key = is_null($key) ? $this->key : $key;
+
+		if (!$this->use_cache()) {
+			gravityview()->log->debug('Not using cached results because of GravityView_Cache->use_cache() results');
+
+			return false;
+		}
+
+		gravityview()->log->debug('Fetching request with transient key {key}', ['key' => $key]);
+
+		$result = get_transient($key);
+
+		if (is_wp_error($result)) {
+			gravityview()->log->debug('Fetching request resulted in error:', ['data' => $result]);
+
+			return false;
+		} elseif ($result) {
+			gravityview()->log->debug('Cached results found for  transient key {key}', ['key' => $key]);
+
+			return $result;
+		}
+
+		gravityview()->log->debug('No cached results found for  transient key {key}', ['key' => $key]);
+
+		return null;
+	}
+
+	/**
+	 * Cache content as a transient.
+	 *
+	 * Cache time defaults to 1 week
+	 *
+	 * @param mixed  $content     [description]
+	 * @param string $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
+	 *
+	 * @return bool If $content is not set, false. Otherwise, returns true if transient was set and false if not.
+	 */
+	public function set($content, $filter_name = '')
+	{
+
+		// Don't cache empty results
+		if (!empty($content)) {
+
+			/**
+			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
+			 *
+			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
+			 */
+			$cache_time = (int) apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
+
+			gravityview()->log->debug('Setting cache with transient key {key} for {cache_time} seconds', ['key' => $this->key, 'cache_time' => $cache_time]);
+
+			return set_transient($this->key, $content, $cache_time);
+		}
+
+		gravityview()->log->debug('Cache not set; content is empty');
+
+		return false;
+	}
+
+	/**
+	 * Delete cached transients based on form IDs.
+	 *
+	 * @todo Use REGEX to match forms when array of form IDs is passed, instead of using a simple LIKE
+	 * @todo  Rate limit deleting to prevent abuse
+	 *
+	 * @param int|array $form_ids Form IDs to delete
+	 *
+	 * @return void
+	 */
+	public function delete($form_ids = null)
+	{
+		global $wpdb;
+
+		// Use object var if exists
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
+
+		if (empty($form_ids)) {
+			gravityview()->log->debug('Did not delete cache; empty form IDs');
+
+			return;
+		}
+
+		foreach ((array) $form_ids as $form_id) {
+			$key = '_transient_gv-cache-';
+
+			$key = $wpdb->esc_like($key);
+
+			$form_id = intval($form_id);
+
+			// Find the transients containing this form
+			$key = "$key%f:$form_id-%"; // \_transient\_gv-cache-%f:1-% for example
+			$sql = $wpdb->prepare("SELECT option_name FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
+
+			foreach (($transients = $wpdb->get_col($sql)) as $transient) {
+				// We have to delete it via the API to make sure the object cache is updated appropriately
+				delete_transient(preg_replace('#^_transient_#', '', $transient));
+			}
+
+			gravityview()->log->debug('Deleting cache for form #{form_id}', ['form_id' => $form_id, 'data' => [
+				$sql,
+				sprintf('Deleted results: %d', count($transients)),
+			]]);
+		}
+	}
+
+	/**
+	 * Schedule expired transient cleanup twice a day.
+	 *
+	 * Can be overruled by the `gravityview_cleanup_transients` filter (returns boolean)
+	 *
+	 * @return void
+	 */
+	public function schedule_transient_cleanup()
+	{
+
+		/**
+		 * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
+		 *
+		 * @param bool $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
+		 */
+		$cleanup = apply_filters('gravityview_cleanup_transients', true);
+
+		if (!$cleanup) {
+			return;
+		}
+
+		if (!wp_next_scheduled('gravityview-expired-transients')) {
+			wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
+		}
+	}
+
+	/**
+	 * Delete expired transients.
+	 *
+	 * The code is copied from the Delete Expired Transients, with slight modifications to track # of results and to get the blog ID dynamically
+	 *
+	 * @see https://wordpress.org/plugins/delete-expired-transients/ Plugin where the code was taken from
+	 * @see  DelxtransCleaners::clearBlogExpired()
+	 *
+	 * @return void
+	 */
+	public function delete_expired_transients()
+	{
+		global $wpdb;
+
+		// Added this line, which isn't in the plugin
+		$blog_id = get_current_blog_id();
+
+		$num_results = 0;
+
+		// get current PHP time, offset by a minute to avoid clashes with other tasks
+		$threshold = time() - 60;
+
+		// get table name for options on specified blog
+		$table = $wpdb->get_blog_prefix($blog_id).'options';
+
+		// delete expired transients, using the paired timeout record to find them
+		$sql = "
 			delete from t1, t2
 			using $table t1
 			join $table t2 on t2.option_name = replace(t1.option_name, '_timeout', '')
@@ -529,11 +529,11 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-        $num_results = $wpdb->query($sql);
+		$num_results = $wpdb->query($sql);
 
-        // delete orphaned transient expirations
-        // also delete NextGEN Gallery 2.x display cache timeout aliases
-        $sql = "
+		// delete orphaned transient expirations
+		// also delete NextGEN Gallery 2.x display cache timeout aliases
+		$sql = "
 			delete from $table
 			where (
 				   option_name like '\_transient\_timeout\_%'
@@ -544,56 +544,56 @@ 
 			and option_value < '$threshold'
 		";
 
-        $num_results += $wpdb->query($sql);
+		$num_results += $wpdb->query($sql);
 
-        gravityview()->log->debug('Deleted {count} expired transient records from the database', ['count' => $num_results]);
-    }
+		gravityview()->log->debug('Deleted {count} expired transient records from the database', ['count' => $num_results]);
+	}
 
-    /**
-     * Check whether to use cached results, if available.
-     *
-     * If the user can edit posts, they are able to override whether to cache results by adding `cache` or `nocache` to the URL requested.
-     *
-     * @return bool True: use cache; False: don't use cache
-     */
-    public function use_cache()
-    {
+	/**
+	 * Check whether to use cached results, if available.
+	 *
+	 * If the user can edit posts, they are able to override whether to cache results by adding `cache` or `nocache` to the URL requested.
+	 *
+	 * @return bool True: use cache; False: don't use cache
+	 */
+	public function use_cache()
+	{
 
-        // Exit early if debugging (unless running PHPUnit)
-        if (defined('WP_DEBUG') && WP_DEBUG && !(defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS)) {
-            return apply_filters('gravityview_use_cache', false, $this);
-        }
+		// Exit early if debugging (unless running PHPUnit)
+		if (defined('WP_DEBUG') && WP_DEBUG && !(defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS)) {
+			return apply_filters('gravityview_use_cache', false, $this);
+		}
 
-        $use_cache = true;
+		$use_cache = true;
 
-        if (GVCommon::has_cap('edit_gravityviews')) {
-            if (isset($_GET['cache']) || isset($_GET['nocache'])) {
-                gravityview()->log->debug('Not using cache: ?cache or ?nocache is in the URL');
+		if (GVCommon::has_cap('edit_gravityviews')) {
+			if (isset($_GET['cache']) || isset($_GET['nocache'])) {
+				gravityview()->log->debug('Not using cache: ?cache or ?nocache is in the URL');
 
-                $use_cache = false;
-            }
-        }
+				$use_cache = false;
+			}
+		}
 
-        // Has the form been flagged as having changed items in it?
-        if ($this->in_blocklist() || !$use_cache) {
+		// Has the form been flagged as having changed items in it?
+		if ($this->in_blocklist() || !$use_cache) {
 
-            // Delete caches for all items with form IDs XYZ
-            $this->delete($this->form_ids);
+			// Delete caches for all items with form IDs XYZ
+			$this->delete($this->form_ids);
 
-            // Remove the form from
-            $this->blocklist_remove($this->form_ids);
-        }
+			// Remove the form from
+			$this->blocklist_remove($this->form_ids);
+		}
 
-        /**
-         * @filter `gravityview_use_cache` Modify whether to use the cache or not
-         *
-         * @param bool              $use_cache Previous setting
-         * @param GravityView_Cache $this      The GravityView_Cache object
-         */
-        $use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
+		/**
+		 * @filter `gravityview_use_cache` Modify whether to use the cache or not
+		 *
+		 * @param bool              $use_cache Previous setting
+		 * @param GravityView_Cache $this      The GravityView_Cache object
+		 */
+		$use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
 
-        return (bool) $use_cache;
-    }
+		return (bool) $use_cache;
+	}
 }
 
 new GravityView_Cache();

Spacing +117 added lines, -117 removed lines

@@ -36,17 +36,17 @@ 
      *
      * @var array Columns in the database for leads
      */
-    private $lead_db_columns = ['id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status'];
+    private $lead_db_columns = [ 'id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status' ];
 
     /**
      * @param array|int $form_ids Form ID or array of form IDs used in a request
      * @param array     $args     Extra request parameters used to generate the query. This is used to generate the unique transient key.
      */
-    public function __construct($form_ids = null, $args = [])
+    public function __construct( $form_ids = null, $args = [ ] )
     {
         $this->add_hooks();
 
-        if (!is_null($form_ids)) {
+        if ( ! is_null( $form_ids ) ) {
             $this->form_ids = $form_ids;
 
             $this->args = $args;
@@ -62,33 +62,33 @@ 
     {
 
         // Schedule cleanup of expired transients
-        add_action('wp', [$this, 'schedule_transient_cleanup']);
+        add_action( 'wp', [ $this, 'schedule_transient_cleanup' ] );
 
         // Hook in to the scheduled cleanup, if scheduled
-        add_action('gravityview-expired-transients', [$this, 'delete_expired_transients']);
+        add_action( 'gravityview-expired-transients', [ $this, 'delete_expired_transients' ] );
 
         // Trigger this when you need to prevent any results from being cached with forms that have been modified
-        add_action('gravityview_clear_form_cache', [$this, 'blocklist_add']);
+        add_action( 'gravityview_clear_form_cache', [ $this, 'blocklist_add' ] );
 
         /**
          * @since 1.14
          */
-        add_action('gravityview_clear_entry_cache', [$this, 'entry_status_changed']);
+        add_action( 'gravityview_clear_entry_cache', [ $this, 'entry_status_changed' ] );
 
-        add_action('gform_after_update_entry', [$this, 'entry_updated'], 10, 2);
+        add_action( 'gform_after_update_entry', [ $this, 'entry_updated' ], 10, 2 );
 
-        add_action('gform_entry_created', [$this, 'entry_created'], 10, 2);
+        add_action( 'gform_entry_created', [ $this, 'entry_created' ], 10, 2 );
 
-        add_action('gform_post_add_entry', [$this, 'entry_added'], 10, 2);
+        add_action( 'gform_post_add_entry', [ $this, 'entry_added' ], 10, 2 );
 
         /**
          * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
          */
-        foreach ($this->lead_db_columns as $column) {
-            add_action('gform_update_'.$column, [$this, 'entry_status_changed'], 10, 3);
+        foreach ( $this->lead_db_columns as $column ) {
+            add_action( 'gform_update_' . $column, [ $this, 'entry_status_changed' ], 10, 3 );
         }
 
-        add_action('gform_delete_lead', [$this, 'entry_status_changed'], 10);
+        add_action( 'gform_delete_lead', [ $this, 'entry_status_changed' ], 10 );
     }
 
     /**
@@ -104,19 +104,19 @@ 
      *
      * @return void
      */
-    public function entry_status_changed($lead_id, $property_value = '', $previous_value = '')
+    public function entry_status_changed( $lead_id, $property_value = '', $previous_value = '' )
     {
-        $entry = GFAPI::get_entry($lead_id);
+        $entry = GFAPI::get_entry( $lead_id );
 
-        if (is_wp_error($entry)) {
-            gravityview()->log->error('Could not retrieve entry {entry_id} to delete it: {error}', ['entry_id' => $lead_id, 'error' => $entry->get_error_message()]);
+        if ( is_wp_error( $entry ) ) {
+            gravityview()->log->error( 'Could not retrieve entry {entry_id} to delete it: {error}', [ 'entry_id' => $lead_id, 'error' => $entry->get_error_message() ] );
 
             return;
         }
 
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{lead_id} was deleted', ['form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => ['value' => $property_value, 'previous' => $previous_value]]);
+        gravityview()->log->debug( 'adding form {form_id} to blocklist because entry #{lead_id} was deleted', [ 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => [ 'value' => $property_value, 'previous' => $previous_value ] ] );
 
-        $this->blocklist_add($entry['form_id']);
+        $this->blocklist_add( $entry[ 'form_id' ] );
     }
 
     /**
@@ -127,11 +127,11 @@ 
      *
      * @return void
      */
-    public function entry_updated($form, $lead_id)
+    public function entry_updated( $form, $lead_id )
     {
-        gravityview()->log->debug(' adding form {form_id} to blocklist because entry #{entry_id} was updated', ['form_id' => $form['id'], 'entry_id' => $lead_id]);
+        gravityview()->log->debug( ' adding form {form_id} to blocklist because entry #{entry_id} was updated', [ 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ] );
 
-        $this->blocklist_add($form['id']);
+        $this->blocklist_add( $form[ 'id' ] );
     }
 
     /**
@@ -144,11 +144,11 @@ 
      *
      * @return void
      */
-    public function entry_created($entry, $form)
+    public function entry_created( $entry, $form )
     {
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was created', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
+        gravityview()->log->debug( 'adding form {form_id} to blocklist because entry #{entry_id} was created', [ 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ] );
 
-        $this->blocklist_add($form['id']);
+        $this->blocklist_add( $form[ 'id' ] );
     }
 
     /**
@@ -159,15 +159,15 @@ 
      *
      * @return void
      */
-    public function entry_added($entry, $form)
+    public function entry_added( $entry, $form )
     {
-        if (is_wp_error($entry)) {
+        if ( is_wp_error( $entry ) ) {
             return;
         }
 
-        gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was added', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
+        gravityview()->log->debug( 'adding form {form_id} to blocklist because entry #{entry_id} was added', [ 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ] );
 
-        $this->blocklist_add($form['id']);
+        $this->blocklist_add( $form[ 'id' ] );
     }
 
     /**
@@ -177,20 +177,20 @@ 
      *
      * @return string Prefix for the cache string used in set_key()
      */
-    protected function get_cache_key_prefix($form_ids = null)
+    protected function get_cache_key_prefix( $form_ids = null )
     {
-        if (is_null($form_ids)) {
+        if ( is_null( $form_ids ) ) {
             $form_ids = $this->form_ids;
         }
 
         // Normally just one form, but supports multiple forms
         //
         // Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
-        $forms = 'f:'.implode('-f:', (array) $form_ids);
+        $forms = 'f:' . implode( '-f:', (array)$form_ids );
 
         // Prefix for transient keys
         // Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
-        return 'gv-cache-'.$forms.'-';
+        return 'gv-cache-' . $forms . '-';
     }
 
     /**
@@ -200,17 +200,17 @@ 
     {
 
         // Don't set key if no forms have been set.
-        if (empty($this->form_ids)) {
+        if ( empty( $this->form_ids ) ) {
             return;
         }
 
-        $key = $this->get_cache_key_prefix().sha1(serialize($this->args));
+        $key = $this->get_cache_key_prefix() . sha1( serialize( $this->args ) );
 
         // The transient name column can handle up to 64 characters.
         // The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
         // 64 - 19 = 45
         // We make sure the key isn't too long or else WP doesn't store data.
-        $this->key = substr($key, 0, 45);
+        $this->key = substr( $key, 0, 45 );
     }
 
     /**
@@ -230,28 +230,28 @@ 
      *
      * @return bool False if value was not updated and true if value was updated.
      */
-    public function blocklist_add($form_ids)
+    public function blocklist_add( $form_ids )
     {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+        $blocklist = get_option( self::BLOCKLIST_OPTION_NAME, [ ] );
 
-        $form_ids = is_array($form_ids) ? $form_ids : [$form_ids];
+        $form_ids = is_array( $form_ids ) ? $form_ids : [ $form_ids ];
 
         // Add the passed form IDs
-        $blocklist = array_merge((array) $blocklist, $form_ids);
+        $blocklist = array_merge( (array)$blocklist, $form_ids );
 
         // Don't duplicate
-        $blocklist = array_unique($blocklist);
+        $blocklist = array_unique( $blocklist );
 
         // Remove empty items from blocklist
-        $blocklist = array_filter($blocklist);
+        $blocklist = array_filter( $blocklist );
 
-        $updated = update_option(self::BLOCKLIST_OPTION_NAME, $blocklist);
+        $updated = update_option( self::BLOCKLIST_OPTION_NAME, $blocklist );
 
-        if (false !== $updated) {
-            gravityview()->log->debug('Added form IDs to cache blocklist', ['data' => [
+        if ( false !== $updated ) {
+            gravityview()->log->debug( 'Added form IDs to cache blocklist', [ 'data' => [
                 '$form_ids'  => $form_ids,
                 '$blocklist' => $blocklist,
-            ]]);
+            ] ] );
         }
 
         return $updated;
@@ -264,11 +264,11 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blacklist_add($form_ids)
+    public function blacklist_add( $form_ids )
     {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_add()');
+        _deprecated_function( __METHOD__, '2.14', 'GravityView_Cache::blocklist_add()' );
 
-        return $this->blocklist_remove($form_ids);
+        return $this->blocklist_remove( $form_ids );
     }
 
     /**
@@ -278,19 +278,19 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blocklist_remove($form_ids)
+    public function blocklist_remove( $form_ids )
     {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+        $blocklist = get_option( self::BLOCKLIST_OPTION_NAME, [ ] );
 
-        $updated_list = array_diff($blocklist, (array) $form_ids);
+        $updated_list = array_diff( $blocklist, (array)$form_ids );
 
-        gravityview()->log->debug('Removing form IDs from cache blocklist', ['data' => [
+        gravityview()->log->debug( 'Removing form IDs from cache blocklist', [ 'data' => [
             '$form_ids'     => $form_ids,
             '$blocklist'    => $blocklist,
             '$updated_list' => $updated_list,
-        ]]);
+        ] ] );
 
-        return update_option(self::BLOCKLIST_OPTION_NAME, $updated_list);
+        return update_option( self::BLOCKLIST_OPTION_NAME, $updated_list );
     }
 
     /**
@@ -300,11 +300,11 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blacklist_remove($form_ids)
+    public function blacklist_remove( $form_ids )
     {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_remove()');
+        _deprecated_function( __METHOD__, '2.14', 'GravityView_Cache::blocklist_remove()' );
 
-        return $this->blocklist_remove($form_ids);
+        return $this->blocklist_remove( $form_ids );
     }
 
     /**
@@ -316,11 +316,11 @@ 
      *
      * @return bool
      */
-    public function in_blacklist($form_ids = null)
+    public function in_blacklist( $form_ids = null )
     {
-        _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::in_blocklist()');
+        _deprecated_function( __METHOD__, '2.14', 'GravityView_Cache::in_blocklist()' );
 
-        return $this->in_blocklist($form_ids);
+        return $this->in_blocklist( $form_ids );
     }
 
     /**
@@ -330,22 +330,22 @@ 
      *
      * @return bool
      */
-    public function in_blocklist($form_ids = null)
+    public function in_blocklist( $form_ids = null )
     {
-        $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
+        $blocklist = get_option( self::BLOCKLIST_OPTION_NAME, [ ] );
 
         // Use object var if exists
-        $form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
+        $form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
 
-        if (empty($form_ids)) {
-            gravityview()->log->debug('Did not add form to blocklist; empty form ID', ['data' => $form_ids]);
+        if ( empty( $form_ids ) ) {
+            gravityview()->log->debug( 'Did not add form to blocklist; empty form ID', [ 'data' => $form_ids ] );
 
             return false;
         }
 
-        foreach ((array) $form_ids as $form_id) {
-            if (in_array($form_id, $blocklist)) {
-                gravityview()->log->debug('Form #{form_id} is in the cache blocklist', ['form_id' => $form_id]);
+        foreach ( (array)$form_ids as $form_id ) {
+            if ( in_array( $form_id, $blocklist ) ) {
+                gravityview()->log->debug( 'Form #{form_id} is in the cache blocklist', [ 'form_id' => $form_id ] );
 
                 return true;
             }
@@ -361,31 +361,31 @@ 
      *
      * @return mixed False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
      */
-    public function get($key = null)
+    public function get( $key = null )
     {
-        $key = is_null($key) ? $this->key : $key;
+        $key = is_null( $key ) ? $this->key : $key;
 
-        if (!$this->use_cache()) {
-            gravityview()->log->debug('Not using cached results because of GravityView_Cache->use_cache() results');
+        if ( ! $this->use_cache() ) {
+            gravityview()->log->debug( 'Not using cached results because of GravityView_Cache->use_cache() results' );
 
             return false;
         }
 
-        gravityview()->log->debug('Fetching request with transient key {key}', ['key' => $key]);
+        gravityview()->log->debug( 'Fetching request with transient key {key}', [ 'key' => $key ] );
 
-        $result = get_transient($key);
+        $result = get_transient( $key );
 
-        if (is_wp_error($result)) {
-            gravityview()->log->debug('Fetching request resulted in error:', ['data' => $result]);
+        if ( is_wp_error( $result ) ) {
+            gravityview()->log->debug( 'Fetching request resulted in error:', [ 'data' => $result ] );
 
             return false;
-        } elseif ($result) {
-            gravityview()->log->debug('Cached results found for  transient key {key}', ['key' => $key]);
+        } elseif ( $result ) {
+            gravityview()->log->debug( 'Cached results found for  transient key {key}', [ 'key' => $key ] );
 
             return $result;
         }
 
-        gravityview()->log->debug('No cached results found for  transient key {key}', ['key' => $key]);
+        gravityview()->log->debug( 'No cached results found for  transient key {key}', [ 'key' => $key ] );
 
         return null;
     }
@@ -400,25 +400,25 @@ 
      *
      * @return bool If $content is not set, false. Otherwise, returns true if transient was set and false if not.
      */
-    public function set($content, $filter_name = '')
+    public function set( $content, $filter_name = '' )
     {
 
         // Don't cache empty results
-        if (!empty($content)) {
+        if ( ! empty( $content ) ) {
 
             /**
              * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
              *
              * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
              */
-            $cache_time = (int) apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
+            $cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
-            gravityview()->log->debug('Setting cache with transient key {key} for {cache_time} seconds', ['key' => $this->key, 'cache_time' => $cache_time]);
+            gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', [ 'key' => $this->key, 'cache_time' => $cache_time ] );
 
-            return set_transient($this->key, $content, $cache_time);
+            return set_transient( $this->key, $content, $cache_time );
         }
 
-        gravityview()->log->debug('Cache not set; content is empty');
+        gravityview()->log->debug( 'Cache not set; content is empty' );
 
         return false;
     }
@@ -433,39 +433,39 @@ 
      *
      * @return void
      */
-    public function delete($form_ids = null)
+    public function delete( $form_ids = null )
     {
         global $wpdb;
 
         // Use object var if exists
-        $form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
+        $form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
 
-        if (empty($form_ids)) {
-            gravityview()->log->debug('Did not delete cache; empty form IDs');
+        if ( empty( $form_ids ) ) {
+            gravityview()->log->debug( 'Did not delete cache; empty form IDs' );
 
             return;
         }
 
-        foreach ((array) $form_ids as $form_id) {
+        foreach ( (array)$form_ids as $form_id ) {
             $key = '_transient_gv-cache-';
 
-            $key = $wpdb->esc_like($key);
+            $key = $wpdb->esc_like( $key );
 
-            $form_id = intval($form_id);
+            $form_id = intval( $form_id );
 
             // Find the transients containing this form
             $key = "$key%f:$form_id-%"; // \_transient\_gv-cache-%f:1-% for example
-            $sql = $wpdb->prepare("SELECT option_name FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
+            $sql = $wpdb->prepare( "SELECT option_name FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
 
-            foreach (($transients = $wpdb->get_col($sql)) as $transient) {
+            foreach ( ( $transients = $wpdb->get_col( $sql ) ) as $transient ) {
                 // We have to delete it via the API to make sure the object cache is updated appropriately
-                delete_transient(preg_replace('#^_transient_#', '', $transient));
+                delete_transient( preg_replace( '#^_transient_#', '', $transient ) );
             }
 
-            gravityview()->log->debug('Deleting cache for form #{form_id}', ['form_id' => $form_id, 'data' => [
+            gravityview()->log->debug( 'Deleting cache for form #{form_id}', [ 'form_id' => $form_id, 'data' => [
                 $sql,
-                sprintf('Deleted results: %d', count($transients)),
-            ]]);
+                sprintf( 'Deleted results: %d', count( $transients ) ),
+            ] ] );
         }
     }
 
@@ -484,14 +484,14 @@ 
          *
          * @param bool $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
          */
-        $cleanup = apply_filters('gravityview_cleanup_transients', true);
+        $cleanup = apply_filters( 'gravityview_cleanup_transients', true );
 
-        if (!$cleanup) {
+        if ( ! $cleanup ) {
             return;
         }
 
-        if (!wp_next_scheduled('gravityview-expired-transients')) {
-            wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
+        if ( ! wp_next_scheduled( 'gravityview-expired-transients' ) ) {
+            wp_schedule_event( time(), 'daily', 'gravityview-expired-transients' );
         }
     }
 
@@ -518,7 +518,7 @@ 
         $threshold = time() - 60;
 
         // get table name for options on specified blog
-        $table = $wpdb->get_blog_prefix($blog_id).'options';
+        $table = $wpdb->get_blog_prefix( $blog_id ) . 'options';
 
         // delete expired transients, using the paired timeout record to find them
         $sql = "
@@ -529,7 +529,7 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-        $num_results = $wpdb->query($sql);
+        $num_results = $wpdb->query( $sql );
 
         // delete orphaned transient expirations
         // also delete NextGEN Gallery 2.x display cache timeout aliases
@@ -544,9 +544,9 @@ 
 			and option_value < '$threshold'
 		";
 
-        $num_results += $wpdb->query($sql);
+        $num_results += $wpdb->query( $sql );
 
-        gravityview()->log->debug('Deleted {count} expired transient records from the database', ['count' => $num_results]);
+        gravityview()->log->debug( 'Deleted {count} expired transient records from the database', [ 'count' => $num_results ] );
     }
 
     /**
@@ -560,28 +560,28 @@ 
     {
 
         // Exit early if debugging (unless running PHPUnit)
-        if (defined('WP_DEBUG') && WP_DEBUG && !(defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS)) {
-            return apply_filters('gravityview_use_cache', false, $this);
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) {
+            return apply_filters( 'gravityview_use_cache', false, $this );
         }
 
         $use_cache = true;
 
-        if (GVCommon::has_cap('edit_gravityviews')) {
-            if (isset($_GET['cache']) || isset($_GET['nocache'])) {
-                gravityview()->log->debug('Not using cache: ?cache or ?nocache is in the URL');
+        if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
+            if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
+                gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' );
 
                 $use_cache = false;
             }
         }
 
         // Has the form been flagged as having changed items in it?
-        if ($this->in_blocklist() || !$use_cache) {
+        if ( $this->in_blocklist() || ! $use_cache ) {
 
             // Delete caches for all items with form IDs XYZ
-            $this->delete($this->form_ids);
+            $this->delete( $this->form_ids );
 
             // Remove the form from
-            $this->blocklist_remove($this->form_ids);
+            $this->blocklist_remove( $this->form_ids );
         }
 
         /**
@@ -590,9 +590,9 @@ 
          * @param bool              $use_cache Previous setting
          * @param GravityView_Cache $this      The GravityView_Cache object
          */
-        $use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
+        $use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-        return (bool) $use_cache;
+        return (bool)$use_cache;
     }
 }
 

Braces +22 added lines, -44 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Handle caching using transients for GravityView.
  */
-class GravityView_Cache
-{
+class GravityView_Cache {
     /** @deprecated 2.14 - use BLOCKLIST_OPTION_NAME instead! */
     const BLACKLIST_OPTION_NAME = 'gravityview_cache_blocklist';
 
@@ -42,8 +41,7 @@ 
      * @param array|int $form_ids Form ID or array of form IDs used in a request
      * @param array     $args     Extra request parameters used to generate the query. This is used to generate the unique transient key.
      */
-    public function __construct($form_ids = null, $args = [])
-    {
+    public function __construct($form_ids = null, $args = []) {
         $this->add_hooks();
 
         if (!is_null($form_ids)) {
@@ -58,8 +56,7 @@ 
     /**
      * Add actions for clearing out caches when entries are updated.
      */
-    public function add_hooks()
-    {
+    public function add_hooks() {
 
         // Schedule cleanup of expired transients
         add_action('wp', [$this, 'schedule_transient_cleanup']);
@@ -104,8 +101,7 @@ 
      *
      * @return void
      */
-    public function entry_status_changed($lead_id, $property_value = '', $previous_value = '')
-    {
+    public function entry_status_changed($lead_id, $property_value = '', $previous_value = '') {
         $entry = GFAPI::get_entry($lead_id);
 
         if (is_wp_error($entry)) {
@@ -127,8 +123,7 @@ 
      *
      * @return void
      */
-    public function entry_updated($form, $lead_id)
-    {
+    public function entry_updated($form, $lead_id) {
         gravityview()->log->debug(' adding form {form_id} to blocklist because entry #{entry_id} was updated', ['form_id' => $form['id'], 'entry_id' => $lead_id]);
 
         $this->blocklist_add($form['id']);
@@ -144,8 +139,7 @@ 
      *
      * @return void
      */
-    public function entry_created($entry, $form)
-    {
+    public function entry_created($entry, $form) {
         gravityview()->log->debug('adding form {form_id} to blocklist because entry #{entry_id} was created', ['form_id' => $form['id'], 'entry_id' => $entry['id']]);
 
         $this->blocklist_add($form['id']);
@@ -159,8 +153,7 @@ 
      *
      * @return void
      */
-    public function entry_added($entry, $form)
-    {
+    public function entry_added($entry, $form) {
         if (is_wp_error($entry)) {
             return;
         }
@@ -177,8 +170,7 @@ 
      *
      * @return string Prefix for the cache string used in set_key()
      */
-    protected function get_cache_key_prefix($form_ids = null)
-    {
+    protected function get_cache_key_prefix($form_ids = null) {
         if (is_null($form_ids)) {
             $form_ids = $this->form_ids;
         }
@@ -196,8 +188,7 @@ 
     /**
      * Set the transient key based on the form IDs and the arguments passed to the class.
      */
-    protected function set_key()
-    {
+    protected function set_key() {
 
         // Don't set key if no forms have been set.
         if (empty($this->form_ids)) {
@@ -218,8 +209,7 @@ 
      *
      * @return string Transient key
      */
-    public function get_key()
-    {
+    public function get_key() {
         return $this->key;
     }
 
@@ -230,8 +220,7 @@ 
      *
      * @return bool False if value was not updated and true if value was updated.
      */
-    public function blocklist_add($form_ids)
-    {
+    public function blocklist_add($form_ids) {
         $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
 
         $form_ids = is_array($form_ids) ? $form_ids : [$form_ids];
@@ -264,8 +253,7 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blacklist_add($form_ids)
-    {
+    public function blacklist_add($form_ids) {
         _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_add()');
 
         return $this->blocklist_remove($form_ids);
@@ -278,8 +266,7 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blocklist_remove($form_ids)
-    {
+    public function blocklist_remove($form_ids) {
         $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
 
         $updated_list = array_diff($blocklist, (array) $form_ids);
@@ -300,8 +287,7 @@ 
      *
      * @return bool Whether the removal was successful
      */
-    public function blacklist_remove($form_ids)
-    {
+    public function blacklist_remove($form_ids) {
         _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::blocklist_remove()');
 
         return $this->blocklist_remove($form_ids);
@@ -316,8 +302,7 @@ 
      *
      * @return bool
      */
-    public function in_blacklist($form_ids = null)
-    {
+    public function in_blacklist($form_ids = null) {
         _deprecated_function(__METHOD__, '2.14', 'GravityView_Cache::in_blocklist()');
 
         return $this->in_blocklist($form_ids);
@@ -330,8 +315,7 @@ 
      *
      * @return bool
      */
-    public function in_blocklist($form_ids = null)
-    {
+    public function in_blocklist($form_ids = null) {
         $blocklist = get_option(self::BLOCKLIST_OPTION_NAME, []);
 
         // Use object var if exists
@@ -361,8 +345,7 @@ 
      *
      * @return mixed False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
      */
-    public function get($key = null)
-    {
+    public function get($key = null) {
         $key = is_null($key) ? $this->key : $key;
 
         if (!$this->use_cache()) {
@@ -400,8 +383,7 @@ 
      *
      * @return bool If $content is not set, false. Otherwise, returns true if transient was set and false if not.
      */
-    public function set($content, $filter_name = '')
-    {
+    public function set($content, $filter_name = '') {
 
         // Don't cache empty results
         if (!empty($content)) {
@@ -433,8 +415,7 @@ 
      *
      * @return void
      */
-    public function delete($form_ids = null)
-    {
+    public function delete($form_ids = null) {
         global $wpdb;
 
         // Use object var if exists
@@ -476,8 +457,7 @@ 
      *
      * @return void
      */
-    public function schedule_transient_cleanup()
-    {
+    public function schedule_transient_cleanup() {
 
         /**
          * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
@@ -505,8 +485,7 @@ 
      *
      * @return void
      */
-    public function delete_expired_transients()
-    {
+    public function delete_expired_transients() {
         global $wpdb;
 
         // Added this line, which isn't in the plugin
@@ -556,8 +535,7 @@ 
      *
      * @return bool True: use cache; False: don't use cache
      */
-    public function use_cache()
-    {
+    public function use_cache() {
 
         // Exit early if debugging (unless running PHPUnit)
         if (defined('WP_DEBUG') && WP_DEBUG && !(defined('DOING_GRAVITYVIEW_TESTS') && DOING_GRAVITYVIEW_TESTS)) {

includes/class-admin-approve-entries.php

Indentation +428 added lines, -428 removed lines

@@ -13,194 +13,194 @@ 
  */
 class GravityView_Admin_ApproveEntries
 {
-    // hold notification messages
-    public $bulk_update_message = '';
-
-    /**
-     * @var array Set the prefixes here instead of spread across the class
-     *
-     * @since 1.17
-     */
-    private $bulk_action_prefixes = [
-        'approve'    => 'gvapprove',
-        'disapprove' => 'gvdisapprove',
-        'unapprove'  => 'gvunapprove',
-    ];
-
-    public function __construct()
-    {
-        $this->add_hooks();
-    }
-
-    private function add_hooks()
-    {
-        /** Edit Gravity Form page */
-
-        // Add button to left menu
-        add_filter('gform_add_field_buttons', [$this, 'add_field_buttons']);
-        // Set defaults
-        add_action('gform_editor_js_set_default_values', [$this, 'set_defaults']);
-
-        /** gf_entries page - entries table screen */
-
-        // add hidden field with approve status
-        add_action('gform_entries_first_column_actions', [$this, 'add_entry_approved_hidden_input'], 1, 5);
-
-        add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
-
-        // adding styles and scripts
-        add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
-        // bypass Gravity Forms no-conflict mode
-        add_filter('gform_noconflict_scripts', [$this, 'register_gform_noconflict_script']);
-        add_filter('gform_noconflict_styles', [$this, 'register_gform_noconflict_style']);
-
-        add_filter('gform_filter_links_entry_list', [$this, 'filter_links_entry_list'], 10, 3);
-    }
-
-    /**
-     * Add filter links to the Entries page.
-     *
-     * Can be disabled by returning false on the `gravityview/approve_entries/show_filter_links_entry_list` filter
-     *
-     * @since 1.17.1
-     *
-     * @param array $filter_links   Array of links to include in the subsubsub filter list. Includes `id`, `field_filters`, `count`, and `label` keys
-     * @param array $form           GF Form object of current form
-     * @param bool  $include_counts Whether to include counts in the output
-     *
-     * @return array Filter links, with GravityView approved/disapproved links added
-     */
-    public function filter_links_entry_list($filter_links = [], $form = [], $include_counts = true)
-    {
-
-        /**
-         * @filter `gravityview/approve_entries/show_filter_links_entry_list` Disable filter links
-         *
-         * @since 1.17.1
-         *
-         * @param bool  $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
-         * @param array $form              GF Form object of current form
-         */
-        if (false === apply_filters('gravityview/approve_entries/show_filter_links_entry_list', true, $form)) {
-            return $filter_links;
-        }
-
-        $field_filters_approved = [
-            [
-                'key'   => GravityView_Entry_Approval::meta_key,
-                'value' => GravityView_Entry_Approval_Status::APPROVED,
-            ],
-        ];
-
-        $field_filters_disapproved = [
-            [
-                'key'      => GravityView_Entry_Approval::meta_key,
-                'value'    => GravityView_Entry_Approval_Status::DISAPPROVED,
-            ],
-        ];
-
-        $field_filters_unapproved = [
-            [
-                'key'      => GravityView_Entry_Approval::meta_key,
-                'value'    => GravityView_Entry_Approval_Status::UNAPPROVED,
-            ],
-        ];
-
-        $approved_count = $disapproved_count = $unapproved_count = 0;
-
-        // Only count if necessary
-        if ($include_counts) {
-            $approved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_approved]));
-            $disapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_disapproved]));
-            $unapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_unapproved]));
-        }
-
-        $filter_links[] = [
-            'id'            => 'gv_approved',
-            'field_filters' => $field_filters_approved,
-            'count'         => $approved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::APPROVED),
-        ];
-
-        $filter_links[] = [
-            'id'            => 'gv_disapproved',
-            'field_filters' => $field_filters_disapproved,
-            'count'         => $disapproved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::DISAPPROVED),
-        ];
-
-        $filter_links[] = [
-            'id'            => 'gv_unapproved',
-            'field_filters' => $field_filters_unapproved,
-            'count'         => $unapproved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::UNAPPROVED),
-        ];
-
-        return $filter_links;
-    }
-
-    /**
-     * Add the GravityView Fields group tooltip.
-     *
-     * @param $tooltips
-     *
-     * @return array Tooltips array with GravityView fields tooltip
-     */
-    public function tooltips($tooltips)
-    {
-        $tooltips['form_gravityview_fields'] = [
-            'title' => __('GravityView Fields', 'gravityview'),
-            'value' => __('Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
-        ];
-
-        return $tooltips;
-    }
-
-    /**
-     * Inject new add field buttons in the gravity form editor page.
-     *
-     * @param mixed $field_groups
-     *
-     * @return array Array of fields
-     */
-    public function add_field_buttons($field_groups)
-    {
-        $gravityview_fields = [
-            'name'   => 'gravityview_fields',
-            'label'  => 'GravityView',
-            'fields' => [
-                [
-                    'class'     => 'button',
-                    'value'     => __('Approve/Reject', 'gravityview'),
-                    'onclick'   => "StartAddField('gravityviewapproved_admin');",
-                    'data-type' => 'gravityviewapproved_admin',
-                    'data-icon' => 'dashicons-yes-alt',
-                ],
-                [
-                    'class'     => 'button',
-                    'value'     => __('User Opt-In', 'gravityview'),
-                    'onclick'   => "StartAddField('gravityviewapproved');",
-                    'data-type' => 'gravityviewapproved',
-                    'data-icon' => 'dashicons-media-text',
-                ],
-            ],
-        ];
-
-        array_push($field_groups, $gravityview_fields);
-
-        return $field_groups;
-    }
-
-    /**
-     * At edit form page, set the field Approve defaults.
-     *
-     * @todo Convert to a partial include file
-     *
-     * @return void
-     */
-    public function set_defaults()
-    {
-        ?>
+	// hold notification messages
+	public $bulk_update_message = '';
+
+	/**
+	 * @var array Set the prefixes here instead of spread across the class
+	 *
+	 * @since 1.17
+	 */
+	private $bulk_action_prefixes = [
+		'approve'    => 'gvapprove',
+		'disapprove' => 'gvdisapprove',
+		'unapprove'  => 'gvunapprove',
+	];
+
+	public function __construct()
+	{
+		$this->add_hooks();
+	}
+
+	private function add_hooks()
+	{
+		/** Edit Gravity Form page */
+
+		// Add button to left menu
+		add_filter('gform_add_field_buttons', [$this, 'add_field_buttons']);
+		// Set defaults
+		add_action('gform_editor_js_set_default_values', [$this, 'set_defaults']);
+
+		/** gf_entries page - entries table screen */
+
+		// add hidden field with approve status
+		add_action('gform_entries_first_column_actions', [$this, 'add_entry_approved_hidden_input'], 1, 5);
+
+		add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
+
+		// adding styles and scripts
+		add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
+		// bypass Gravity Forms no-conflict mode
+		add_filter('gform_noconflict_scripts', [$this, 'register_gform_noconflict_script']);
+		add_filter('gform_noconflict_styles', [$this, 'register_gform_noconflict_style']);
+
+		add_filter('gform_filter_links_entry_list', [$this, 'filter_links_entry_list'], 10, 3);
+	}
+
+	/**
+	 * Add filter links to the Entries page.
+	 *
+	 * Can be disabled by returning false on the `gravityview/approve_entries/show_filter_links_entry_list` filter
+	 *
+	 * @since 1.17.1
+	 *
+	 * @param array $filter_links   Array of links to include in the subsubsub filter list. Includes `id`, `field_filters`, `count`, and `label` keys
+	 * @param array $form           GF Form object of current form
+	 * @param bool  $include_counts Whether to include counts in the output
+	 *
+	 * @return array Filter links, with GravityView approved/disapproved links added
+	 */
+	public function filter_links_entry_list($filter_links = [], $form = [], $include_counts = true)
+	{
+
+		/**
+		 * @filter `gravityview/approve_entries/show_filter_links_entry_list` Disable filter links
+		 *
+		 * @since 1.17.1
+		 *
+		 * @param bool  $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
+		 * @param array $form              GF Form object of current form
+		 */
+		if (false === apply_filters('gravityview/approve_entries/show_filter_links_entry_list', true, $form)) {
+			return $filter_links;
+		}
+
+		$field_filters_approved = [
+			[
+				'key'   => GravityView_Entry_Approval::meta_key,
+				'value' => GravityView_Entry_Approval_Status::APPROVED,
+			],
+		];
+
+		$field_filters_disapproved = [
+			[
+				'key'      => GravityView_Entry_Approval::meta_key,
+				'value'    => GravityView_Entry_Approval_Status::DISAPPROVED,
+			],
+		];
+
+		$field_filters_unapproved = [
+			[
+				'key'      => GravityView_Entry_Approval::meta_key,
+				'value'    => GravityView_Entry_Approval_Status::UNAPPROVED,
+			],
+		];
+
+		$approved_count = $disapproved_count = $unapproved_count = 0;
+
+		// Only count if necessary
+		if ($include_counts) {
+			$approved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_approved]));
+			$disapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_disapproved]));
+			$unapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_unapproved]));
+		}
+
+		$filter_links[] = [
+			'id'            => 'gv_approved',
+			'field_filters' => $field_filters_approved,
+			'count'         => $approved_count,
+			'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::APPROVED),
+		];
+
+		$filter_links[] = [
+			'id'            => 'gv_disapproved',
+			'field_filters' => $field_filters_disapproved,
+			'count'         => $disapproved_count,
+			'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::DISAPPROVED),
+		];
+
+		$filter_links[] = [
+			'id'            => 'gv_unapproved',
+			'field_filters' => $field_filters_unapproved,
+			'count'         => $unapproved_count,
+			'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::UNAPPROVED),
+		];
+
+		return $filter_links;
+	}
+
+	/**
+	 * Add the GravityView Fields group tooltip.
+	 *
+	 * @param $tooltips
+	 *
+	 * @return array Tooltips array with GravityView fields tooltip
+	 */
+	public function tooltips($tooltips)
+	{
+		$tooltips['form_gravityview_fields'] = [
+			'title' => __('GravityView Fields', 'gravityview'),
+			'value' => __('Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+		];
+
+		return $tooltips;
+	}
+
+	/**
+	 * Inject new add field buttons in the gravity form editor page.
+	 *
+	 * @param mixed $field_groups
+	 *
+	 * @return array Array of fields
+	 */
+	public function add_field_buttons($field_groups)
+	{
+		$gravityview_fields = [
+			'name'   => 'gravityview_fields',
+			'label'  => 'GravityView',
+			'fields' => [
+				[
+					'class'     => 'button',
+					'value'     => __('Approve/Reject', 'gravityview'),
+					'onclick'   => "StartAddField('gravityviewapproved_admin');",
+					'data-type' => 'gravityviewapproved_admin',
+					'data-icon' => 'dashicons-yes-alt',
+				],
+				[
+					'class'     => 'button',
+					'value'     => __('User Opt-In', 'gravityview'),
+					'onclick'   => "StartAddField('gravityviewapproved');",
+					'data-type' => 'gravityviewapproved',
+					'data-icon' => 'dashicons-media-text',
+				],
+			],
+		];
+
+		array_push($field_groups, $gravityview_fields);
+
+		return $field_groups;
+	}
+
+	/**
+	 * At edit form page, set the field Approve defaults.
+	 *
+	 * @todo Convert to a partial include file
+	 *
+	 * @return void
+	 */
+	public function set_defaults()
+	{
+		?>
 		case 'gravityviewapproved_admin':
 			field.label = "<?php echo esc_js(__('Approved? (Admin-only)', 'gravityview')); ?>";
 
@@ -248,246 +248,246 @@ 
 
 			break;
 		<?php
-    }
-
-    /**
-     * update_approved function.
-     *
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
-     * @see GravityView_Entry_Approval::update_approved
-     *
-     * @param int $entry_id       (default: 0)
-     * @param int $approved       (default: 0)
-     * @param int $form_id        (default: 0)
-     * @param int $approvedcolumn (default: 0)
-     *
-     * @return bool True: It worked; False: it failed
-     */
-    public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0)
-    {
-        return GravityView_Entry_Approval::update_approved($entry_id, $approved, $form_id, $approvedcolumn);
-    }
-
-    /**
-     * Calculate the approve field.input id.
-     *
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
-     * @see GravityView_Entry_Approval::get_approved_column
-     *
-     * @param mixed $form GF Form or Form ID
-     *
-     * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
-     */
-    public static function get_approved_column($form)
-    {
-        return GravityView_Entry_Approval::get_approved_column($form);
-    }
-
-    /**
-     * Add a hidden input that is used in the Javascript to show approved/disapproved entries checkbox.
-     *
-     * See the /assets/js/admin-entries-list.js setInitialApprovedEntries method
-     *
-     * @param $form_id
-     * @param $field_id
-     * @param $value
-     * @param $entry
-     * @param $query_string
-     *
-     * @return void
-     */
-    public static function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string)
-    {
-        if (!GVCommon::has_cap('gravityview_moderate_entries', $entry['id'])) {
-            return;
-        }
-
-        if (empty($entry['id'])) {
-            return;
-        }
-
-        $status_value = GravityView_Entry_Approval::get_entry_status($entry, 'value');
-
-        if ($status_value) {
-            echo '<input type="hidden" class="entry_approval" id="entry_approved_'.$entry['id'].'" value="'.esc_attr($status_value).'" />';
-        }
-    }
-
-    /**
-     * Get the form ID of the form currently being displayed.
-     *
-     * @since 1.17.1
-     *
-     * @return int ID of the current form being displayed. `0` is returned if no forms are found.
-     */
-    private function get_form_id()
-    {
-        $form_id = GFForms::get('id');
-
-        // If there are no forms identified, use the first form. That's how GF does it.
-        if (empty($form_id) && class_exists('RGFormsModel')) {
-            $form_id = $this->get_first_form_id();
-        }
-
-        return absint($form_id);
-    }
-
-    /**
-     * Get the first form ID from Gravity Forms, sorted in the same order as in the All Forms page.
-     *
-     * @see GFEntryList::all_entries_page() This method is based on the form-selecting code here
-     * @since 1.17.2
-     *
-     * @return int ID of the first form, sorted by title. `0` if no forms were found.
-     */
-    private function get_first_form_id()
-    {
-        $forms = RGFormsModel::get_forms(null, 'title');
-
-        if (!isset($forms[0])) {
-            gravityview()->log->error('No forms were found');
-
-            return 0;
-        }
-
-        $first_form = $forms[0];
-
-        $form_id = is_object($forms[0]) ? $first_form->id : $first_form['id'];
-
-        return intval($form_id);
-    }
-
-    public function add_scripts_and_styles($hook)
-    {
-        if (!class_exists('GFForms')) {
-            gravityview()->log->error('GFForms does not exist.');
-
-            return;
-        }
-
-        // enqueue styles & scripts gf_entries
-        // But only if we're on the main Entries page, not on reports pages
-        if (GFForms::get_page() !== 'entry_list') {
-            return;
-        }
-
-        $form_id = $this->get_form_id();
-
-        // Things are broken; no forms were found
-        if (empty($form_id)) {
-            return;
-        }
-
-        wp_enqueue_style('gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
-
-        wp_enqueue_script('gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery'], GravityView_Plugin::version);
-
-        wp_enqueue_script('gravityview_entries_list-popper', plugins_url('assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_script('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_style('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-
-        wp_localize_script('gravityview_gf_entries_scripts', 'gvGlobals', [
-            'nonce'                    => wp_create_nonce('gravityview_entry_approval'),
-            'admin_nonce'              => wp_create_nonce('gravityview_admin_entry_approval'),
-            'form_id'                  => $form_id,
-            'show_column'              => (int) $this->show_approve_entry_column($form_id),
-            'add_bulk_action'          => (int) GVCommon::has_cap('gravityview_moderate_entries'),
-            'status_approved'          => GravityView_Entry_Approval_Status::APPROVED,
-            'status_disapproved'       => GravityView_Entry_Approval_Status::DISAPPROVED,
-            'status_unapproved'        => GravityView_Entry_Approval_Status::UNAPPROVED,
-            'bulk_actions'             => GravityView_Bulk_Actions::get_bulk_actions($form_id),
-            'bulk_message'             => $this->bulk_update_message,
-            'unapprove_title'          => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title'            => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
-            'disapprove_title'         => GravityView_Entry_Approval_Status::get_title_attr('approved'),
-            'column_title'             => __('Show entry in directory view?', 'gravityview'),
-            'column_link'              => esc_url($this->get_sort_link()),
-            'status_popover_template'  => GravityView_Entry_Approval::get_popover_template(),
-            'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
-        ]);
-    }
-
-    /**
-     * Generate a link to sort by approval status.
-     *
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
-     * numeric, but it does group the approved entries together.
-     *
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
-     *
-     * @param int $form_id [NO LONGER USED]
-     *
-     * @return string Sorting link
-     */
-    private function get_sort_link($form_id = 0)
-    {
-        $args = [
-            'orderby' => 'is_approved',
-            'order'   => ('desc' === \GV\Utils::_GET('order')) ? 'asc' : 'desc',
-        ];
-
-        return add_query_arg($args);
-    }
-
-    /**
-     * Should the Approve/Reject Entry column be shown in the GF Entries page?
-     *
-     * @since 1.7.2
-     *
-     * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
-     *
-     * @return bool True: Show column; False: hide column
-     */
-    private function show_approve_entry_column($form_id)
-    {
-        $show_approve_column = GVCommon::has_cap('gravityview_moderate_entries');
-
-        /**
-         * @filter `gravityview/approve_entries/hide-if-no-connections` Return true to hide reject/approve if there are no connected Views
-         *
-         * @since 1.7.2
-         *
-         * @param bool $hide_if_no_connections
-         */
-        $hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false);
-
-        if ($hide_if_no_connections) {
-            $connected_views = gravityview_get_connected_views($form_id);
-
-            if (empty($connected_views)) {
-                $show_approve_column = false;
-            }
-        }
-
-        /**
-         * @filter `gravityview/approve_entries/show-column` Override whether the column is shown
-         *
-         * @param bool $show_approve_column Whether the column will be shown
-         * @param int  $form_id             The ID of the Gravity Forms form for which entries are being shown
-         */
-        $show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id);
-
-        return $show_approve_column;
-    }
-
-    public function register_gform_noconflict_script($scripts)
-    {
-        $scripts[] = 'gravityview_gf_entries_scripts';
-        $scripts[] = 'gravityview_entries_list-popper';
-        $scripts[] = 'gravityview_entries_list-tippy';
-
-        return $scripts;
-    }
-
-    public function register_gform_noconflict_style($styles)
-    {
-        $styles[] = 'gravityview_entries_list';
-        $styles[] = 'gravityview_entries_list-tippy';
-
-        return $styles;
-    }
+	}
+
+	/**
+	 * update_approved function.
+	 *
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
+	 * @see GravityView_Entry_Approval::update_approved
+	 *
+	 * @param int $entry_id       (default: 0)
+	 * @param int $approved       (default: 0)
+	 * @param int $form_id        (default: 0)
+	 * @param int $approvedcolumn (default: 0)
+	 *
+	 * @return bool True: It worked; False: it failed
+	 */
+	public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0)
+	{
+		return GravityView_Entry_Approval::update_approved($entry_id, $approved, $form_id, $approvedcolumn);
+	}
+
+	/**
+	 * Calculate the approve field.input id.
+	 *
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
+	 * @see GravityView_Entry_Approval::get_approved_column
+	 *
+	 * @param mixed $form GF Form or Form ID
+	 *
+	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
+	 */
+	public static function get_approved_column($form)
+	{
+		return GravityView_Entry_Approval::get_approved_column($form);
+	}
+
+	/**
+	 * Add a hidden input that is used in the Javascript to show approved/disapproved entries checkbox.
+	 *
+	 * See the /assets/js/admin-entries-list.js setInitialApprovedEntries method
+	 *
+	 * @param $form_id
+	 * @param $field_id
+	 * @param $value
+	 * @param $entry
+	 * @param $query_string
+	 *
+	 * @return void
+	 */
+	public static function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string)
+	{
+		if (!GVCommon::has_cap('gravityview_moderate_entries', $entry['id'])) {
+			return;
+		}
+
+		if (empty($entry['id'])) {
+			return;
+		}
+
+		$status_value = GravityView_Entry_Approval::get_entry_status($entry, 'value');
+
+		if ($status_value) {
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_'.$entry['id'].'" value="'.esc_attr($status_value).'" />';
+		}
+	}
+
+	/**
+	 * Get the form ID of the form currently being displayed.
+	 *
+	 * @since 1.17.1
+	 *
+	 * @return int ID of the current form being displayed. `0` is returned if no forms are found.
+	 */
+	private function get_form_id()
+	{
+		$form_id = GFForms::get('id');
+
+		// If there are no forms identified, use the first form. That's how GF does it.
+		if (empty($form_id) && class_exists('RGFormsModel')) {
+			$form_id = $this->get_first_form_id();
+		}
+
+		return absint($form_id);
+	}
+
+	/**
+	 * Get the first form ID from Gravity Forms, sorted in the same order as in the All Forms page.
+	 *
+	 * @see GFEntryList::all_entries_page() This method is based on the form-selecting code here
+	 * @since 1.17.2
+	 *
+	 * @return int ID of the first form, sorted by title. `0` if no forms were found.
+	 */
+	private function get_first_form_id()
+	{
+		$forms = RGFormsModel::get_forms(null, 'title');
+
+		if (!isset($forms[0])) {
+			gravityview()->log->error('No forms were found');
+
+			return 0;
+		}
+
+		$first_form = $forms[0];
+
+		$form_id = is_object($forms[0]) ? $first_form->id : $first_form['id'];
+
+		return intval($form_id);
+	}
+
+	public function add_scripts_and_styles($hook)
+	{
+		if (!class_exists('GFForms')) {
+			gravityview()->log->error('GFForms does not exist.');
+
+			return;
+		}
+
+		// enqueue styles & scripts gf_entries
+		// But only if we're on the main Entries page, not on reports pages
+		if (GFForms::get_page() !== 'entry_list') {
+			return;
+		}
+
+		$form_id = $this->get_form_id();
+
+		// Things are broken; no forms were found
+		if (empty($form_id)) {
+			return;
+		}
+
+		wp_enqueue_style('gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+
+		wp_enqueue_script('gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery'], GravityView_Plugin::version);
+
+		wp_enqueue_script('gravityview_entries_list-popper', plugins_url('assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+		wp_enqueue_script('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+		wp_enqueue_style('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+
+		wp_localize_script('gravityview_gf_entries_scripts', 'gvGlobals', [
+			'nonce'                    => wp_create_nonce('gravityview_entry_approval'),
+			'admin_nonce'              => wp_create_nonce('gravityview_admin_entry_approval'),
+			'form_id'                  => $form_id,
+			'show_column'              => (int) $this->show_approve_entry_column($form_id),
+			'add_bulk_action'          => (int) GVCommon::has_cap('gravityview_moderate_entries'),
+			'status_approved'          => GravityView_Entry_Approval_Status::APPROVED,
+			'status_disapproved'       => GravityView_Entry_Approval_Status::DISAPPROVED,
+			'status_unapproved'        => GravityView_Entry_Approval_Status::UNAPPROVED,
+			'bulk_actions'             => GravityView_Bulk_Actions::get_bulk_actions($form_id),
+			'bulk_message'             => $this->bulk_update_message,
+			'unapprove_title'          => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
+			'approve_title'            => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
+			'disapprove_title'         => GravityView_Entry_Approval_Status::get_title_attr('approved'),
+			'column_title'             => __('Show entry in directory view?', 'gravityview'),
+			'column_link'              => esc_url($this->get_sort_link()),
+			'status_popover_template'  => GravityView_Entry_Approval::get_popover_template(),
+			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
+		]);
+	}
+
+	/**
+	 * Generate a link to sort by approval status.
+	 *
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
+	 * numeric, but it does group the approved entries together.
+	 *
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
+	 *
+	 * @param int $form_id [NO LONGER USED]
+	 *
+	 * @return string Sorting link
+	 */
+	private function get_sort_link($form_id = 0)
+	{
+		$args = [
+			'orderby' => 'is_approved',
+			'order'   => ('desc' === \GV\Utils::_GET('order')) ? 'asc' : 'desc',
+		];
+
+		return add_query_arg($args);
+	}
+
+	/**
+	 * Should the Approve/Reject Entry column be shown in the GF Entries page?
+	 *
+	 * @since 1.7.2
+	 *
+	 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
+	 *
+	 * @return bool True: Show column; False: hide column
+	 */
+	private function show_approve_entry_column($form_id)
+	{
+		$show_approve_column = GVCommon::has_cap('gravityview_moderate_entries');
+
+		/**
+		 * @filter `gravityview/approve_entries/hide-if-no-connections` Return true to hide reject/approve if there are no connected Views
+		 *
+		 * @since 1.7.2
+		 *
+		 * @param bool $hide_if_no_connections
+		 */
+		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false);
+
+		if ($hide_if_no_connections) {
+			$connected_views = gravityview_get_connected_views($form_id);
+
+			if (empty($connected_views)) {
+				$show_approve_column = false;
+			}
+		}
+
+		/**
+		 * @filter `gravityview/approve_entries/show-column` Override whether the column is shown
+		 *
+		 * @param bool $show_approve_column Whether the column will be shown
+		 * @param int  $form_id             The ID of the Gravity Forms form for which entries are being shown
+		 */
+		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id);
+
+		return $show_approve_column;
+	}
+
+	public function register_gform_noconflict_script($scripts)
+	{
+		$scripts[] = 'gravityview_gf_entries_scripts';
+		$scripts[] = 'gravityview_entries_list-popper';
+		$scripts[] = 'gravityview_entries_list-tippy';
+
+		return $scripts;
+	}
+
+	public function register_gform_noconflict_style($styles)
+	{
+		$styles[] = 'gravityview_entries_list';
+		$styles[] = 'gravityview_entries_list-tippy';
+
+		return $styles;
+	}
 }
 
 new GravityView_Admin_ApproveEntries();

Spacing +93 added lines, -93 removed lines

@@ -37,24 +37,24 @@ 
         /** Edit Gravity Form page */
 
         // Add button to left menu
-        add_filter('gform_add_field_buttons', [$this, 'add_field_buttons']);
+        add_filter( 'gform_add_field_buttons', [ $this, 'add_field_buttons' ] );
         // Set defaults
-        add_action('gform_editor_js_set_default_values', [$this, 'set_defaults']);
+        add_action( 'gform_editor_js_set_default_values', [ $this, 'set_defaults' ] );
 
         /** gf_entries page - entries table screen */
 
         // add hidden field with approve status
-        add_action('gform_entries_first_column_actions', [$this, 'add_entry_approved_hidden_input'], 1, 5);
+        add_action( 'gform_entries_first_column_actions', [ $this, 'add_entry_approved_hidden_input' ], 1, 5 );
 
-        add_filter('gravityview/metaboxes/tooltips', [$this, 'tooltips']);
+        add_filter( 'gravityview/metaboxes/tooltips', [ $this, 'tooltips' ] );
 
         // adding styles and scripts
-        add_action('admin_enqueue_scripts', [$this, 'add_scripts_and_styles']);
+        add_action( 'admin_enqueue_scripts', [ $this, 'add_scripts_and_styles' ] );
         // bypass Gravity Forms no-conflict mode
-        add_filter('gform_noconflict_scripts', [$this, 'register_gform_noconflict_script']);
-        add_filter('gform_noconflict_styles', [$this, 'register_gform_noconflict_style']);
+        add_filter( 'gform_noconflict_scripts', [ $this, 'register_gform_noconflict_script' ] );
+        add_filter( 'gform_noconflict_styles', [ $this, 'register_gform_noconflict_style' ] );
 
-        add_filter('gform_filter_links_entry_list', [$this, 'filter_links_entry_list'], 10, 3);
+        add_filter( 'gform_filter_links_entry_list', [ $this, 'filter_links_entry_list' ], 10, 3 );
     }
 
     /**
@@ -70,7 +70,7 @@ 
      *
      * @return array Filter links, with GravityView approved/disapproved links added
      */
-    public function filter_links_entry_list($filter_links = [], $form = [], $include_counts = true)
+    public function filter_links_entry_list( $filter_links = [ ], $form = [ ], $include_counts = true )
     {
 
         /**
@@ -81,7 +81,7 @@ 
          * @param bool  $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
          * @param array $form              GF Form object of current form
          */
-        if (false === apply_filters('gravityview/approve_entries/show_filter_links_entry_list', true, $form)) {
+        if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
             return $filter_links;
         }
 
@@ -109,31 +109,31 @@ 
         $approved_count = $disapproved_count = $unapproved_count = 0;
 
         // Only count if necessary
-        if ($include_counts) {
-            $approved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_approved]));
-            $disapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_disapproved]));
-            $unapproved_count = count(gravityview_get_entry_ids($form['id'], ['status' => 'active', 'field_filters' => $field_filters_unapproved]));
+        if ( $include_counts ) {
+            $approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], [ 'status' => 'active', 'field_filters' => $field_filters_approved ] ) );
+            $disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], [ 'status' => 'active', 'field_filters' => $field_filters_disapproved ] ) );
+            $unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], [ 'status' => 'active', 'field_filters' => $field_filters_unapproved ] ) );
         }
 
-        $filter_links[] = [
+        $filter_links[ ] = [
             'id'            => 'gv_approved',
             'field_filters' => $field_filters_approved,
             'count'         => $approved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::APPROVED),
+            'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
         ];
 
-        $filter_links[] = [
+        $filter_links[ ] = [
             'id'            => 'gv_disapproved',
             'field_filters' => $field_filters_disapproved,
             'count'         => $disapproved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::DISAPPROVED),
+            'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
         ];
 
-        $filter_links[] = [
+        $filter_links[ ] = [
             'id'            => 'gv_unapproved',
             'field_filters' => $field_filters_unapproved,
             'count'         => $unapproved_count,
-            'label'         => GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::UNAPPROVED),
+            'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::UNAPPROVED ),
         ];
 
         return $filter_links;
@@ -146,11 +146,11 @@ 
      *
      * @return array Tooltips array with GravityView fields tooltip
      */
-    public function tooltips($tooltips)
+    public function tooltips( $tooltips )
     {
-        $tooltips['form_gravityview_fields'] = [
-            'title' => __('GravityView Fields', 'gravityview'),
-            'value' => __('Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+        $tooltips[ 'form_gravityview_fields' ] = [
+            'title' => __( 'GravityView Fields', 'gravityview' ),
+            'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
         ];
 
         return $tooltips;
@@ -163,7 +163,7 @@ 
      *
      * @return array Array of fields
      */
-    public function add_field_buttons($field_groups)
+    public function add_field_buttons( $field_groups )
     {
         $gravityview_fields = [
             'name'   => 'gravityview_fields',
@@ -171,14 +171,14 @@ 
             'fields' => [
                 [
                     'class'     => 'button',
-                    'value'     => __('Approve/Reject', 'gravityview'),
+                    'value'     => __( 'Approve/Reject', 'gravityview' ),
                     'onclick'   => "StartAddField('gravityviewapproved_admin');",
                     'data-type' => 'gravityviewapproved_admin',
                     'data-icon' => 'dashicons-yes-alt',
                 ],
                 [
                     'class'     => 'button',
-                    'value'     => __('User Opt-In', 'gravityview'),
+                    'value'     => __( 'User Opt-In', 'gravityview' ),
                     'onclick'   => "StartAddField('gravityviewapproved');",
                     'data-type' => 'gravityviewapproved',
                     'data-icon' => 'dashicons-media-text',
@@ -186,7 +186,7 @@ 
             ],
         ];
 
-        array_push($field_groups, $gravityview_fields);
+        array_push( $field_groups, $gravityview_fields );
 
         return $field_groups;
     }
@@ -202,16 +202,16 @@ 
     {
         ?>
 		case 'gravityviewapproved_admin':
-			field.label = "<?php echo esc_js(__('Approved? (Admin-only)', 'gravityview')); ?>";
+			field.label = "<?php echo esc_js( __( 'Approved? (Admin-only)', 'gravityview' ) ); ?>";
 
-			field.adminLabel = "<?php echo esc_js(__('Approved?', 'gravityview')); ?>";
+			field.adminLabel = "<?php echo esc_js( __( 'Approved?', 'gravityview' ) ); ?>";
 			field.adminOnly = true;
 
 			field.choices = null;
 			field.inputs = null;
 
 			if( !field.choices ) {
-				field.choices = new Array( new Choice("<?php echo esc_js(GravityView_Entry_Approval_Status::get_label(GravityView_Entry_Approval_Status::APPROVED)); ?>") );
+				field.choices = new Array( new Choice("<?php echo esc_js( GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ) ); ?>") );
 			}
 
 			field.inputs = new Array();
@@ -224,9 +224,9 @@ 
 
 			break;
 		case 'gravityviewapproved':
-			field.label = "<?php echo esc_js(__('Show Entry on Website', 'gravityview')); ?>";
+			field.label = "<?php echo esc_js( __( 'Show Entry on Website', 'gravityview' ) ); ?>";
 
-			field.adminLabel = "<?php echo esc_js(__('Opt-In', 'gravityview')); ?>";
+			field.adminLabel = "<?php echo esc_js( __( 'Opt-In', 'gravityview' ) ); ?>";
 			field.adminOnly = false;
 
 			field.choices = null;
@@ -234,7 +234,7 @@ 
 
 			if( !field.choices ) {
 				field.choices = new Array(
-					new Choice("<?php echo esc_js(__('Yes, display my entry on the website', 'gravityview')); ?>")
+					new Choice("<?php echo esc_js( __( 'Yes, display my entry on the website', 'gravityview' ) ); ?>")
 				);
 			}
 
@@ -263,9 +263,9 @@ 
      *
      * @return bool True: It worked; False: it failed
      */
-    public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0)
+    public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 )
     {
-        return GravityView_Entry_Approval::update_approved($entry_id, $approved, $form_id, $approvedcolumn);
+        return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
     }
 
     /**
@@ -278,9 +278,9 @@ 
      *
      * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
      */
-    public static function get_approved_column($form)
+    public static function get_approved_column( $form )
     {
-        return GravityView_Entry_Approval::get_approved_column($form);
+        return GravityView_Entry_Approval::get_approved_column( $form );
     }
 
     /**
@@ -296,20 +296,20 @@ 
      *
      * @return void
      */
-    public static function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string)
+    public static function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string )
     {
-        if (!GVCommon::has_cap('gravityview_moderate_entries', $entry['id'])) {
+        if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
             return;
         }
 
-        if (empty($entry['id'])) {
+        if ( empty( $entry[ 'id' ] ) ) {
             return;
         }
 
-        $status_value = GravityView_Entry_Approval::get_entry_status($entry, 'value');
+        $status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
 
-        if ($status_value) {
-            echo '<input type="hidden" class="entry_approval" id="entry_approved_'.$entry['id'].'" value="'.esc_attr($status_value).'" />';
+        if ( $status_value ) {
+            echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
         }
     }
 
@@ -322,14 +322,14 @@ 
      */
     private function get_form_id()
     {
-        $form_id = GFForms::get('id');
+        $form_id = GFForms::get( 'id' );
 
         // If there are no forms identified, use the first form. That's how GF does it.
-        if (empty($form_id) && class_exists('RGFormsModel')) {
+        if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
             $form_id = $this->get_first_form_id();
         }
 
-        return absint($form_id);
+        return absint( $form_id );
     }
 
     /**
@@ -342,71 +342,71 @@ 
      */
     private function get_first_form_id()
     {
-        $forms = RGFormsModel::get_forms(null, 'title');
+        $forms = RGFormsModel::get_forms( null, 'title' );
 
-        if (!isset($forms[0])) {
-            gravityview()->log->error('No forms were found');
+        if ( ! isset( $forms[ 0 ] ) ) {
+            gravityview()->log->error( 'No forms were found' );
 
             return 0;
         }
 
-        $first_form = $forms[0];
+        $first_form = $forms[ 0 ];
 
-        $form_id = is_object($forms[0]) ? $first_form->id : $first_form['id'];
+        $form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
 
-        return intval($form_id);
+        return intval( $form_id );
     }
 
-    public function add_scripts_and_styles($hook)
+    public function add_scripts_and_styles( $hook )
     {
-        if (!class_exists('GFForms')) {
-            gravityview()->log->error('GFForms does not exist.');
+        if ( ! class_exists( 'GFForms' ) ) {
+            gravityview()->log->error( 'GFForms does not exist.' );
 
             return;
         }
 
         // enqueue styles & scripts gf_entries
         // But only if we're on the main Entries page, not on reports pages
-        if (GFForms::get_page() !== 'entry_list') {
+        if ( GFForms::get_page() !== 'entry_list' ) {
             return;
         }
 
         $form_id = $this->get_form_id();
 
         // Things are broken; no forms were found
-        if (empty($form_id)) {
+        if ( empty( $form_id ) ) {
             return;
         }
 
-        wp_enqueue_style('gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+        wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), [ ], GravityView_Plugin::version );
 
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-        wp_enqueue_script('gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), ['jquery'], GravityView_Plugin::version);
+        wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), [ 'jquery' ], GravityView_Plugin::version );
 
-        wp_enqueue_script('gravityview_entries_list-popper', plugins_url('assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_script('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
-        wp_enqueue_style('gravityview_entries_list-tippy', plugins_url('assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE), [], GravityView_Plugin::version);
+        wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), [ ], GravityView_Plugin::version );
+        wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), [ ], GravityView_Plugin::version );
+        wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), [ ], GravityView_Plugin::version );
 
-        wp_localize_script('gravityview_gf_entries_scripts', 'gvGlobals', [
-            'nonce'                    => wp_create_nonce('gravityview_entry_approval'),
-            'admin_nonce'              => wp_create_nonce('gravityview_admin_entry_approval'),
+        wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', [
+            'nonce'                    => wp_create_nonce( 'gravityview_entry_approval' ),
+            'admin_nonce'              => wp_create_nonce( 'gravityview_admin_entry_approval' ),
             'form_id'                  => $form_id,
-            'show_column'              => (int) $this->show_approve_entry_column($form_id),
-            'add_bulk_action'          => (int) GVCommon::has_cap('gravityview_moderate_entries'),
+            'show_column'              => (int)$this->show_approve_entry_column( $form_id ),
+            'add_bulk_action'          => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
             'status_approved'          => GravityView_Entry_Approval_Status::APPROVED,
             'status_disapproved'       => GravityView_Entry_Approval_Status::DISAPPROVED,
             'status_unapproved'        => GravityView_Entry_Approval_Status::UNAPPROVED,
-            'bulk_actions'             => GravityView_Bulk_Actions::get_bulk_actions($form_id),
+            'bulk_actions'             => GravityView_Bulk_Actions::get_bulk_actions( $form_id ),
             'bulk_message'             => $this->bulk_update_message,
-            'unapprove_title'          => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
-            'approve_title'            => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
-            'disapprove_title'         => GravityView_Entry_Approval_Status::get_title_attr('approved'),
-            'column_title'             => __('Show entry in directory view?', 'gravityview'),
-            'column_link'              => esc_url($this->get_sort_link()),
+            'unapprove_title'          => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
+            'approve_title'            => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
+            'disapprove_title'         => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
+            'column_title'             => __( 'Show entry in directory view?', 'gravityview' ),
+            'column_link'              => esc_url( $this->get_sort_link() ),
             'status_popover_template'  => GravityView_Entry_Approval::get_popover_template(),
             'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
-        ]);
+        ] );
     }
 
     /**
@@ -421,14 +421,14 @@ 
      *
      * @return string Sorting link
      */
-    private function get_sort_link($form_id = 0)
+    private function get_sort_link( $form_id = 0 )
     {
         $args = [
             'orderby' => 'is_approved',
-            'order'   => ('desc' === \GV\Utils::_GET('order')) ? 'asc' : 'desc',
+            'order'   => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
         ];
 
-        return add_query_arg($args);
+        return add_query_arg( $args );
     }
 
     /**
@@ -440,9 +440,9 @@ 
      *
      * @return bool True: Show column; False: hide column
      */
-    private function show_approve_entry_column($form_id)
+    private function show_approve_entry_column( $form_id )
     {
-        $show_approve_column = GVCommon::has_cap('gravityview_moderate_entries');
+        $show_approve_column = GVCommon::has_cap( 'gravityview_moderate_entries' );
 
         /**
          * @filter `gravityview/approve_entries/hide-if-no-connections` Return true to hide reject/approve if there are no connected Views
@@ -451,12 +451,12 @@ 
          *
          * @param bool $hide_if_no_connections
          */
-        $hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false);
+        $hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
 
-        if ($hide_if_no_connections) {
-            $connected_views = gravityview_get_connected_views($form_id);
+        if ( $hide_if_no_connections ) {
+            $connected_views = gravityview_get_connected_views( $form_id );
 
-            if (empty($connected_views)) {
+            if ( empty( $connected_views ) ) {
                 $show_approve_column = false;
             }
         }
@@ -467,24 +467,24 @@ 
          * @param bool $show_approve_column Whether the column will be shown
          * @param int  $form_id             The ID of the Gravity Forms form for which entries are being shown
          */
-        $show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id);
+        $show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
         return $show_approve_column;
     }
 
-    public function register_gform_noconflict_script($scripts)
+    public function register_gform_noconflict_script( $scripts )
     {
-        $scripts[] = 'gravityview_gf_entries_scripts';
-        $scripts[] = 'gravityview_entries_list-popper';
-        $scripts[] = 'gravityview_entries_list-tippy';
+        $scripts[ ] = 'gravityview_gf_entries_scripts';
+        $scripts[ ] = 'gravityview_entries_list-popper';
+        $scripts[ ] = 'gravityview_entries_list-tippy';
 
         return $scripts;
     }
 
-    public function register_gform_noconflict_style($styles)
+    public function register_gform_noconflict_style( $styles )
     {
-        $styles[] = 'gravityview_entries_list';
-        $styles[] = 'gravityview_entries_list-tippy';
+        $styles[ ] = 'gravityview_entries_list';
+        $styles[ ] = 'gravityview_entries_list-tippy';
 
         return $styles;
     }

Braces +17 added lines, -34 removed lines

@@ -11,8 +11,7 @@ 
  *
  * @since 1.0.0
  */
-class GravityView_Admin_ApproveEntries
-{
+class GravityView_Admin_ApproveEntries {
     // hold notification messages
     public $bulk_update_message = '';
 
@@ -27,13 +26,11 @@ 
         'unapprove'  => 'gvunapprove',
     ];
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->add_hooks();
     }
 
-    private function add_hooks()
-    {
+    private function add_hooks() {
         /** Edit Gravity Form page */
 
         // Add button to left menu
@@ -70,8 +67,7 @@ 
      *
      * @return array Filter links, with GravityView approved/disapproved links added
      */
-    public function filter_links_entry_list($filter_links = [], $form = [], $include_counts = true)
-    {
+    public function filter_links_entry_list($filter_links = [], $form = [], $include_counts = true) {
 
         /**
          * @filter `gravityview/approve_entries/show_filter_links_entry_list` Disable filter links
@@ -146,8 +142,7 @@ 
      *
      * @return array Tooltips array with GravityView fields tooltip
      */
-    public function tooltips($tooltips)
-    {
+    public function tooltips($tooltips) {
         $tooltips['form_gravityview_fields'] = [
             'title' => __('GravityView Fields', 'gravityview'),
             'value' => __('Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
@@ -163,8 +158,7 @@ 
      *
      * @return array Array of fields
      */
-    public function add_field_buttons($field_groups)
-    {
+    public function add_field_buttons($field_groups) {
         $gravityview_fields = [
             'name'   => 'gravityview_fields',
             'label'  => 'GravityView',
@@ -198,8 +192,7 @@ 
      *
      * @return void
      */
-    public function set_defaults()
-    {
+    public function set_defaults() {
         ?>
 		case 'gravityviewapproved_admin':
 			field.label = "<?php echo esc_js(__('Approved? (Admin-only)', 'gravityview')); ?>";
@@ -263,8 +256,7 @@ 
      *
      * @return bool True: It worked; False: it failed
      */
-    public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0)
-    {
+    public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
         return GravityView_Entry_Approval::update_approved($entry_id, $approved, $form_id, $approvedcolumn);
     }
 
@@ -278,8 +270,7 @@ 
      *
      * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
      */
-    public static function get_approved_column($form)
-    {
+    public static function get_approved_column($form) {
         return GravityView_Entry_Approval::get_approved_column($form);
     }
 
@@ -296,8 +287,7 @@ 
      *
      * @return void
      */
-    public static function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string)
-    {
+    public static function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string) {
         if (!GVCommon::has_cap('gravityview_moderate_entries', $entry['id'])) {
             return;
         }
@@ -320,8 +310,7 @@ 
      *
      * @return int ID of the current form being displayed. `0` is returned if no forms are found.
      */
-    private function get_form_id()
-    {
+    private function get_form_id() {
         $form_id = GFForms::get('id');
 
         // If there are no forms identified, use the first form. That's how GF does it.
@@ -340,8 +329,7 @@ 
      *
      * @return int ID of the first form, sorted by title. `0` if no forms were found.
      */
-    private function get_first_form_id()
-    {
+    private function get_first_form_id() {
         $forms = RGFormsModel::get_forms(null, 'title');
 
         if (!isset($forms[0])) {
@@ -357,8 +345,7 @@ 
         return intval($form_id);
     }
 
-    public function add_scripts_and_styles($hook)
-    {
+    public function add_scripts_and_styles($hook) {
         if (!class_exists('GFForms')) {
             gravityview()->log->error('GFForms does not exist.');
 
@@ -421,8 +408,7 @@ 
      *
      * @return string Sorting link
      */
-    private function get_sort_link($form_id = 0)
-    {
+    private function get_sort_link($form_id = 0) {
         $args = [
             'orderby' => 'is_approved',
             'order'   => ('desc' === \GV\Utils::_GET('order')) ? 'asc' : 'desc',
@@ -440,8 +426,7 @@ 
      *
      * @return bool True: Show column; False: hide column
      */
-    private function show_approve_entry_column($form_id)
-    {
+    private function show_approve_entry_column($form_id) {
         $show_approve_column = GVCommon::has_cap('gravityview_moderate_entries');
 
         /**
@@ -472,8 +457,7 @@ 
         return $show_approve_column;
     }
 
-    public function register_gform_noconflict_script($scripts)
-    {
+    public function register_gform_noconflict_script($scripts) {
         $scripts[] = 'gravityview_gf_entries_scripts';
         $scripts[] = 'gravityview_entries_list-popper';
         $scripts[] = 'gravityview_entries_list-tippy';
@@ -481,8 +465,7 @@ 
         return $scripts;
     }
 
-    public function register_gform_noconflict_style($styles)
-    {
+    public function register_gform_noconflict_style($styles) {
         $styles[] = 'gravityview_entries_list';
         $styles[] = 'gravityview_entries_list-tippy';
 

includes/class-gravityview-admin-bar.php

Indentation +169 added lines, -169 removed lines

@@ -7,70 +7,70 @@ 
  */
 class GravityView_Admin_Bar
 {
-    /**
-     * @var GravityView_frontend|null
-     */
-    public $gravityview_view = null;
-
-    public function __construct()
-    {
-        $this->gravityview_view = GravityView_frontend::getInstance();
-
-        $this->add_hooks();
-    }
-
-    /**
-     * @since 1.13
-     */
-    private function add_hooks()
-    {
-        add_action('add_admin_bar_menus', [$this, 'remove_links'], 80);
-        add_action('admin_bar_menu', [$this, 'add_links'], 85);
-        add_action('wp_after_admin_bar_render', [$this, 'add_floaty_icon']);
-    }
-
-    /**
-     * Add helpful GV links to the menu bar, like Edit Entry on single entry page.
-     *
-     * @since 1.13
-     *
-     * @return void
-     */
-    public function add_links()
-    {
-        /** @var WP_Admin_Bar $wp_admin_bar */
-        global $wp_admin_bar;
-
-        if (is_admin() || !GVCommon::has_cap(['edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms'])) {
-            return;
-        }
-
-        $view_data = GravityView_View_Data::getInstance()->get_views();
-        if (empty($view_data)) {
-            return;
-        }
-
-        $wp_admin_bar->add_menu([
-            'id'    => 'gravityview',
-            'title' => __('GravityView', 'gravityview'),
-            'href'  => admin_url('edit.php?post_type=gravityview&page=gravityview_settings'),
-        ]);
-
-        $this->add_edit_view_and_form_link();
-
-        $this->add_edit_entry_link();
-    }
-
-    /**
-     * Add the Floaty icon to the toolbar without loading the whole icon font.
-     *
-     * @since 1.17
-     *
-     * @return void
-     */
-    public function add_floaty_icon()
-    {
-        ?>
+	/**
+	 * @var GravityView_frontend|null
+	 */
+	public $gravityview_view = null;
+
+	public function __construct()
+	{
+		$this->gravityview_view = GravityView_frontend::getInstance();
+
+		$this->add_hooks();
+	}
+
+	/**
+	 * @since 1.13
+	 */
+	private function add_hooks()
+	{
+		add_action('add_admin_bar_menus', [$this, 'remove_links'], 80);
+		add_action('admin_bar_menu', [$this, 'add_links'], 85);
+		add_action('wp_after_admin_bar_render', [$this, 'add_floaty_icon']);
+	}
+
+	/**
+	 * Add helpful GV links to the menu bar, like Edit Entry on single entry page.
+	 *
+	 * @since 1.13
+	 *
+	 * @return void
+	 */
+	public function add_links()
+	{
+		/** @var WP_Admin_Bar $wp_admin_bar */
+		global $wp_admin_bar;
+
+		if (is_admin() || !GVCommon::has_cap(['edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms'])) {
+			return;
+		}
+
+		$view_data = GravityView_View_Data::getInstance()->get_views();
+		if (empty($view_data)) {
+			return;
+		}
+
+		$wp_admin_bar->add_menu([
+			'id'    => 'gravityview',
+			'title' => __('GravityView', 'gravityview'),
+			'href'  => admin_url('edit.php?post_type=gravityview&page=gravityview_settings'),
+		]);
+
+		$this->add_edit_view_and_form_link();
+
+		$this->add_edit_entry_link();
+	}
+
+	/**
+	 * Add the Floaty icon to the toolbar without loading the whole icon font.
+	 *
+	 * @since 1.17
+	 *
+	 * @return void
+	 */
+	public function add_floaty_icon()
+	{
+		?>
 		<style>
 			#wp-admin-bar-gravityview > .ab-item:before {
 				content: '';
@@ -83,111 +83,111 @@ 
 			}
 		</style>
 		<?php
-    }
-
-    /**
-     * Add Edit Entry links when on a single entry.
-     *
-     * @since 1.13
-     *
-     * @return void
-     */
-    public function add_edit_entry_link()
-    {
-        /** @var WP_Admin_Bar $wp_admin_bar */
-        global $wp_admin_bar;
-
-        $entry = gravityview()->request->is_entry();
-
-        if ($entry && GVCommon::has_cap(['gravityforms_edit_entries', 'gravityview_edit_entries'], $entry->ID)) {
-            $wp_admin_bar->add_menu([
-                'id'     => 'edit-entry',
-                'parent' => 'gravityview',
-                'title'  => __('Edit Entry', 'gravityview'),
-                'meta'   => [
-                    'title' => sprintf(__('Edit Entry %s', 'gravityview'), $entry->get_slug()),
-                ],
-                'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id']))),
-            ]);
-        }
-    }
-
-    /**
-     * Add Edit View link when in embedded View.
-     *
-     * @since 1.13
-     *
-     * @return void
-     */
-    public function add_edit_view_and_form_link()
-    {
-        /** @var WP_Admin_Bar $wp_admin_bar */
-        global $wp_admin_bar;
-
-        if (GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms'])) {
-            $view_data = GravityView_View_Data::getInstance();
-            $views = $view_data->get_views();
-
-            // If there is a View embed, show Edit View link.
-            if (!empty($views)) {
-                $added_forms = [];
-                $added_views = [];
-
-                foreach ($views as $view) {
-                    $view = \GV\View::by_id($view['id']);
-                    $view_id = $view->ID;
-                    $form_id = $view->form ? $view->form->ID : null;
-
-                    $edit_view_title = __('Edit View', 'gravityview');
-                    $edit_form_title = __('Edit Form', 'gravityview');
-
-                    if (sizeof($views) > 1) {
-                        $edit_view_title = sprintf(_x('Edit View #%d', 'Edit View with the ID of %d', 'gravityview'), $view_id);
-                        $edit_form_title = sprintf(__('Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview'), $form_id);
-                    }
-
-                    if (GVCommon::has_cap('edit_gravityview', $view_id) && !in_array($view_id, $added_views)) {
-                        $added_views[] = $view_id;
-
-                        $wp_admin_bar->add_menu([
-                            'id'     => 'edit-view-'.$view_id,
-                            'parent' => 'gravityview',
-                            'title'  => $edit_view_title,
-                            'href'   => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view_id))),
-                        ]);
-                    }
-
-                    if (!empty($form_id) && GVCommon::has_cap(['gravityforms_edit_forms'], $form_id) && !in_array($form_id, $added_forms)) {
-                        $added_forms[] = $form_id;
-
-                        $wp_admin_bar->add_menu([
-                            'id'     => 'edit-form-'.$form_id,
-                            'parent' => 'gravityview',
-                            'title'  => $edit_form_title,
-                            'href'   => esc_url_raw(admin_url(sprintf('admin.php?page=gf_edit_forms&id=%d', $form_id))),
-                        ]);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Remove "Edit Page" or "Edit View" links when on single entry.
-     *
-     * @since 1.17 Also remove when on GravityView post type; the new GravityView menu will be the one-stop shop.
-     * @since 1.13
-     *
-     * @return void
-     */
-    public function remove_links()
-    {
-
-        // If we're on the single entry page, we don't want to cause confusion.
-        if ($this->gravityview_view->getSingleEntry() || $this->gravityview_view->isGravityviewPostType()) {
-            remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
-        }
-    }
+	}
+
+	/**
+	 * Add Edit Entry links when on a single entry.
+	 *
+	 * @since 1.13
+	 *
+	 * @return void
+	 */
+	public function add_edit_entry_link()
+	{
+		/** @var WP_Admin_Bar $wp_admin_bar */
+		global $wp_admin_bar;
+
+		$entry = gravityview()->request->is_entry();
+
+		if ($entry && GVCommon::has_cap(['gravityforms_edit_entries', 'gravityview_edit_entries'], $entry->ID)) {
+			$wp_admin_bar->add_menu([
+				'id'     => 'edit-entry',
+				'parent' => 'gravityview',
+				'title'  => __('Edit Entry', 'gravityview'),
+				'meta'   => [
+					'title' => sprintf(__('Edit Entry %s', 'gravityview'), $entry->get_slug()),
+				],
+				'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id']))),
+			]);
+		}
+	}
+
+	/**
+	 * Add Edit View link when in embedded View.
+	 *
+	 * @since 1.13
+	 *
+	 * @return void
+	 */
+	public function add_edit_view_and_form_link()
+	{
+		/** @var WP_Admin_Bar $wp_admin_bar */
+		global $wp_admin_bar;
+
+		if (GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms'])) {
+			$view_data = GravityView_View_Data::getInstance();
+			$views = $view_data->get_views();
+
+			// If there is a View embed, show Edit View link.
+			if (!empty($views)) {
+				$added_forms = [];
+				$added_views = [];
+
+				foreach ($views as $view) {
+					$view = \GV\View::by_id($view['id']);
+					$view_id = $view->ID;
+					$form_id = $view->form ? $view->form->ID : null;
+
+					$edit_view_title = __('Edit View', 'gravityview');
+					$edit_form_title = __('Edit Form', 'gravityview');
+
+					if (sizeof($views) > 1) {
+						$edit_view_title = sprintf(_x('Edit View #%d', 'Edit View with the ID of %d', 'gravityview'), $view_id);
+						$edit_form_title = sprintf(__('Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview'), $form_id);
+					}
+
+					if (GVCommon::has_cap('edit_gravityview', $view_id) && !in_array($view_id, $added_views)) {
+						$added_views[] = $view_id;
+
+						$wp_admin_bar->add_menu([
+							'id'     => 'edit-view-'.$view_id,
+							'parent' => 'gravityview',
+							'title'  => $edit_view_title,
+							'href'   => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view_id))),
+						]);
+					}
+
+					if (!empty($form_id) && GVCommon::has_cap(['gravityforms_edit_forms'], $form_id) && !in_array($form_id, $added_forms)) {
+						$added_forms[] = $form_id;
+
+						$wp_admin_bar->add_menu([
+							'id'     => 'edit-form-'.$form_id,
+							'parent' => 'gravityview',
+							'title'  => $edit_form_title,
+							'href'   => esc_url_raw(admin_url(sprintf('admin.php?page=gf_edit_forms&id=%d', $form_id))),
+						]);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Remove "Edit Page" or "Edit View" links when on single entry.
+	 *
+	 * @since 1.17 Also remove when on GravityView post type; the new GravityView menu will be the one-stop shop.
+	 * @since 1.13
+	 *
+	 * @return void
+	 */
+	public function remove_links()
+	{
+
+		// If we're on the single entry page, we don't want to cause confusion.
+		if ($this->gravityview_view->getSingleEntry() || $this->gravityview_view->isGravityviewPostType()) {
+			remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
+		}
+	}
 }
 
 new GravityView_Admin_Bar();

Spacing +40 added lines, -40 removed lines

@@ -24,9 +24,9 @@ 
      */
     private function add_hooks()
     {
-        add_action('add_admin_bar_menus', [$this, 'remove_links'], 80);
-        add_action('admin_bar_menu', [$this, 'add_links'], 85);
-        add_action('wp_after_admin_bar_render', [$this, 'add_floaty_icon']);
+        add_action( 'add_admin_bar_menus', [ $this, 'remove_links' ], 80 );
+        add_action( 'admin_bar_menu', [ $this, 'add_links' ], 85 );
+        add_action( 'wp_after_admin_bar_render', [ $this, 'add_floaty_icon' ] );
     }
 
     /**
@@ -41,20 +41,20 @@ 
         /** @var WP_Admin_Bar $wp_admin_bar */
         global $wp_admin_bar;
 
-        if (is_admin() || !GVCommon::has_cap(['edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms'])) {
+        if ( is_admin() || ! GVCommon::has_cap( [ 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ] ) ) {
             return;
         }
 
         $view_data = GravityView_View_Data::getInstance()->get_views();
-        if (empty($view_data)) {
+        if ( empty( $view_data ) ) {
             return;
         }
 
-        $wp_admin_bar->add_menu([
+        $wp_admin_bar->add_menu( [
             'id'    => 'gravityview',
-            'title' => __('GravityView', 'gravityview'),
-            'href'  => admin_url('edit.php?post_type=gravityview&page=gravityview_settings'),
-        ]);
+            'title' => __( 'GravityView', 'gravityview' ),
+            'href'  => admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ),
+        ] );
 
         $this->add_edit_view_and_form_link();
 
@@ -99,16 +99,16 @@ 
 
         $entry = gravityview()->request->is_entry();
 
-        if ($entry && GVCommon::has_cap(['gravityforms_edit_entries', 'gravityview_edit_entries'], $entry->ID)) {
-            $wp_admin_bar->add_menu([
+        if ( $entry && GVCommon::has_cap( [ 'gravityforms_edit_entries', 'gravityview_edit_entries' ], $entry->ID ) ) {
+            $wp_admin_bar->add_menu( [
                 'id'     => 'edit-entry',
                 'parent' => 'gravityview',
-                'title'  => __('Edit Entry', 'gravityview'),
+                'title'  => __( 'Edit Entry', 'gravityview' ),
                 'meta'   => [
-                    'title' => sprintf(__('Edit Entry %s', 'gravityview'), $entry->get_slug()),
+                    'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), $entry->get_slug() ),
                 ],
-                'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id']))),
-            ]);
+                'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
+            ] );
         }
     }
 
@@ -124,48 +124,48 @@ 
         /** @var WP_Admin_Bar $wp_admin_bar */
         global $wp_admin_bar;
 
-        if (GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms'])) {
+        if ( GVCommon::has_cap( [ 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ] ) ) {
             $view_data = GravityView_View_Data::getInstance();
             $views = $view_data->get_views();
 
             // If there is a View embed, show Edit View link.
-            if (!empty($views)) {
-                $added_forms = [];
-                $added_views = [];
+            if ( ! empty( $views ) ) {
+                $added_forms = [ ];
+                $added_views = [ ];
 
-                foreach ($views as $view) {
-                    $view = \GV\View::by_id($view['id']);
+                foreach ( $views as $view ) {
+                    $view = \GV\View::by_id( $view[ 'id' ] );
                     $view_id = $view->ID;
                     $form_id = $view->form ? $view->form->ID : null;
 
-                    $edit_view_title = __('Edit View', 'gravityview');
-                    $edit_form_title = __('Edit Form', 'gravityview');
+                    $edit_view_title = __( 'Edit View', 'gravityview' );
+                    $edit_form_title = __( 'Edit Form', 'gravityview' );
 
-                    if (sizeof($views) > 1) {
-                        $edit_view_title = sprintf(_x('Edit View #%d', 'Edit View with the ID of %d', 'gravityview'), $view_id);
-                        $edit_form_title = sprintf(__('Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview'), $form_id);
+                    if ( sizeof( $views ) > 1 ) {
+                        $edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
+                        $edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
                     }
 
-                    if (GVCommon::has_cap('edit_gravityview', $view_id) && !in_array($view_id, $added_views)) {
-                        $added_views[] = $view_id;
+                    if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
+                        $added_views[ ] = $view_id;
 
-                        $wp_admin_bar->add_menu([
-                            'id'     => 'edit-view-'.$view_id,
+                        $wp_admin_bar->add_menu( [
+                            'id'     => 'edit-view-' . $view_id,
                             'parent' => 'gravityview',
                             'title'  => $edit_view_title,
-                            'href'   => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view_id))),
-                        ]);
+                            'href'   => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view_id ) ) ),
+                        ] );
                     }
 
-                    if (!empty($form_id) && GVCommon::has_cap(['gravityforms_edit_forms'], $form_id) && !in_array($form_id, $added_forms)) {
-                        $added_forms[] = $form_id;
+                    if ( ! empty( $form_id ) && GVCommon::has_cap( [ 'gravityforms_edit_forms' ], $form_id ) && ! in_array( $form_id, $added_forms ) ) {
+                        $added_forms[ ] = $form_id;
 
-                        $wp_admin_bar->add_menu([
-                            'id'     => 'edit-form-'.$form_id,
+                        $wp_admin_bar->add_menu( [
+                            'id'     => 'edit-form-' . $form_id,
                             'parent' => 'gravityview',
                             'title'  => $edit_form_title,
-                            'href'   => esc_url_raw(admin_url(sprintf('admin.php?page=gf_edit_forms&id=%d', $form_id))),
-                        ]);
+                            'href'   => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $form_id ) ) ),
+                        ] );
                     }
                 }
             }
@@ -184,8 +184,8 @@ 
     {
 
         // If we're on the single entry page, we don't want to cause confusion.
-        if ($this->gravityview_view->getSingleEntry() || $this->gravityview_view->isGravityviewPostType()) {
-            remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
+        if ( $this->gravityview_view->getSingleEntry() || $this->gravityview_view->isGravityviewPostType() ) {
+            remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
         }
     }
 }

Braces +8 added lines, -16 removed lines

@@ -5,15 +5,13 @@ 
  *
  * @since 1.13
  */
-class GravityView_Admin_Bar
-{
+class GravityView_Admin_Bar {
     /**
      * @var GravityView_frontend|null
      */
     public $gravityview_view = null;
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->gravityview_view = GravityView_frontend::getInstance();
 
         $this->add_hooks();
@@ -22,8 +20,7 @@ 
     /**
      * @since 1.13
      */
-    private function add_hooks()
-    {
+    private function add_hooks() {
         add_action('add_admin_bar_menus', [$this, 'remove_links'], 80);
         add_action('admin_bar_menu', [$this, 'add_links'], 85);
         add_action('wp_after_admin_bar_render', [$this, 'add_floaty_icon']);
@@ -36,8 +33,7 @@ 
      *
      * @return void
      */
-    public function add_links()
-    {
+    public function add_links() {
         /** @var WP_Admin_Bar $wp_admin_bar */
         global $wp_admin_bar;
 
@@ -68,8 +64,7 @@ 
      *
      * @return void
      */
-    public function add_floaty_icon()
-    {
+    public function add_floaty_icon() {
         ?>
 		<style>
 			#wp-admin-bar-gravityview > .ab-item:before {
@@ -92,8 +87,7 @@ 
      *
      * @return void
      */
-    public function add_edit_entry_link()
-    {
+    public function add_edit_entry_link() {
         /** @var WP_Admin_Bar $wp_admin_bar */
         global $wp_admin_bar;
 
@@ -119,8 +113,7 @@ 
      *
      * @return void
      */
-    public function add_edit_view_and_form_link()
-    {
+    public function add_edit_view_and_form_link() {
         /** @var WP_Admin_Bar $wp_admin_bar */
         global $wp_admin_bar;
 
@@ -180,8 +173,7 @@ 
      *
      * @return void
      */
-    public function remove_links()
-    {
+    public function remove_links() {
 
         // If we're on the single entry page, we don't want to cause confusion.
         if ($this->gravityview_view->getSingleEntry() || $this->gravityview_view->isGravityviewPostType()) {

includes/default-widgets.php

Spacing +1 added lines, -1 removed lines

@@ -4,4 +4,4 @@
  *
  * @deprecated 1.7.5
  */
-include_once GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php';
+include_once GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php';

includes/class-template.php

Indentation +999 added lines, -999 removed lines

@@ -14,1021 +14,1021 @@
 
 /** If this file is called directly, abort. */
 if (!defined('ABSPATH')) {
-    exit;
+	exit;
 }
 
 if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require GRAVITYVIEW_DIR.'future/lib/class-gamajo-template-loader.php';
+	require GRAVITYVIEW_DIR.'future/lib/class-gamajo-template-loader.php';
 }
 
 class GravityView_View extends \GV\Gamajo_Template_Loader
 {
-    /**
-     * Prefix for filter names.
-     *
-     * @var string
-     */
-    protected $filter_prefix = 'gravityview';
-
-    /**
-     * Directory name where custom templates for this plugin should be found in the theme.
-     *
-     * @var string
-     */
-    protected $theme_template_directory = 'gravityview';
-
-    /**
-     * Reference to the root directory path of this plugin.
-     *
-     * @var string
-     */
-    protected $plugin_directory = GRAVITYVIEW_DIR;
-
-    /**
-     * Store templates locations that have already been located.
-     *
-     * @var array
-     */
-    protected $located_templates = [];
-
-    /**
-     * The name of the template, like "list", "table", or "datatables".
-     *
-     * @var string
-     */
-    protected $template_part_slug = '';
-
-    /**
-     * The name of the file part, like "body" or "single".
-     *
-     * @var string
-     */
-    protected $template_part_name = '';
-
-    /**
-     * @var int Gravity Forms form ID
-     */
-    protected $form_id = null;
-
-    /**
-     * @var int View ID
-     * @todo: this needs to be public until extensions support 1.7+
-     */
-    public $view_id = null;
-
-    /**
-     * @var array Fields for the form
-     */
-    protected $fields = [];
-
-    /**
-     * @var string Current screen. Defaults to "directory" or "single"
-     */
-    protected $context = 'directory';
-
-    /**
-     * @var int|null If in embedded post or page, the ID of it
-     */
-    protected $post_id = null;
-
-    /**
-     * @var array Gravity Forms form array at ID_id
-     */
-    protected $form = null;
-
-    /**
-     * @var array Configuration for the View
-     */
-    protected $atts = [];
-
-    /**
-     * @var array Entries for the current result. Single item in array for single entry View
-     */
-    protected $entries = [];
-
-    /**
-     * @var int Total entries count for the current result.
-     */
-    protected $total_entries = 0;
-
-    /**
-     * @var string The label to display back links
-     */
-    protected $back_link_label = '';
-
-    /**
-     * @var array Array with `offset` and `page_size` keys
-     */
-    protected $paging = [];
-
-    /**
-     * @var array Array with `sort_field` and `sort_direction` keys
-     */
-    protected $sorting = [];
-
-    /**
-     * @var bool Whether to hide the results until a search is performed
-     *
-     * @since 1.5.4
-     */
-    protected $hide_until_searched = false;
-
-    /**
-     * Current entry in the loop.
-     *
-     * @var array
-     */
-    protected $_current_entry = [];
-
-    /**
-     * @var array
-     */
-    protected $_current_field = [];
-
-    /**
-     * @var GravityView_View $instance
-     */
-    public static $instance = null;
-
-    /**
-     * Construct the view object.
-     *
-     * @param array $atts Associative array to set the data of
-     */
-    public function __construct($atts = [])
-    {
-        $atts = wp_parse_args($atts, [
-            'form_id' => null,
-            'view_id' => null,
-            'fields'  => null,
-            'context' => null,
-            'post_id' => null,
-            'form'    => null,
-            'atts'	   => null,
-        ]);
-
-        foreach ($atts as $key => $value) {
-            if (is_null($value)) {
-                continue;
-            }
-            $this->{$key} = $value;
-        }
-
-        // Add granular overrides
-        add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
-
-        // widget logic
-        add_action('gravityview/template/before', [$this, 'render_widget_hooks']);
-        add_action('gravityview/template/after', [$this, 'render_widget_hooks']);
-
-        /**
-         * Clear the current entry after the loop is done.
-         *
-         * @since 1.7.3
-         */
-        add_action('gravityview_footer', [$this, 'clearCurrentEntry'], 500);
-
-        self::$instance = &$this;
-    }
-
-    /**
-     * @param null $passed_post
-     *
-     * @return GravityView_View
-     */
-    public static function getInstance($passed_post = null)
-    {
-        if (empty(self::$instance)) {
-            self::$instance = new self($passed_post);
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * @param string|null $key The key to a specific attribute of the current field
-     *
-     * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
-     */
-    public function getCurrentField($key = null)
-    {
-        if (!empty($key)) {
-            if (isset($this->_current_field[$key])) {
-                return $this->_current_field[$key];
-            }
-
-            return null;
-        }
-
-        return $this->_current_field;
-    }
-
-    public function setCurrentFieldSetting($key, $value)
-    {
-        if (!empty($this->_current_field)) {
-            $this->_current_field['field_settings'][$key] = $value;
-        }
-    }
-
-    public function getCurrentFieldSetting($key)
-    {
-        $settings = $this->getCurrentField('field_settings');
-
-        if ($settings && !empty($settings[$key])) {
-            return $settings[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * @param array $passed_field
-     */
-    public function setCurrentField($passed_field)
-    {
-        $existing_field = $this->getCurrentField();
-
-        $set_field = wp_parse_args($passed_field, $existing_field);
-
-        $this->_current_field = $set_field;
-
-        /**
-         * Backward compatibility.
-         *
-         * @deprecated 1.6.2
-         */
-        $this->field_data = $set_field;
-    }
-
-    /**
-     * @param string|null $key The key to a specific field in the fields array
-     *
-     * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
-     */
-    public function getAtts($key = null)
-    {
-        if (!empty($key)) {
-            if (isset($this->atts[$key])) {
-                return $this->atts[$key];
-            }
-
-            return null;
-        }
-
-        return $this->atts;
-    }
-
-    /**
-     * @param array $atts
-     */
-    public function setAtts($atts)
-    {
-        $this->atts = $atts;
-    }
-
-    /**
-     * @return array
-     */
-    public function getForm()
-    {
-        return $this->form;
-    }
-
-    /**
-     * @param array $form
-     */
-    public function setForm($form)
-    {
-        $this->form = $form;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getPostId()
-    {
-        return $this->post_id;
-    }
-
-    /**
-     * @param int|null $post_id
-     */
-    public function setPostId($post_id)
-    {
-        $this->post_id = $post_id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * @param string $context
-     */
-    public function setContext($context)
-    {
-        $this->context = $context;
-    }
-
-    /**
-     * @param string|null $key The key to a specific field in the fields array
-     *
-     * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
-     */
-    public function getFields($key = null)
-    {
-        $fields = empty($this->fields) ? null : $this->fields;
-
-        if ($fields && !empty($key)) {
-            $fields = isset($fields[$key]) ? $fields[$key] : null;
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Get the fields for a specific context.
-     *
-     * @since 1.19.2
-     *
-     * @param string $context [Optional] "directory", "single", or "edit"
-     *
-     * @return array Array of GravityView field layout configurations
-     */
-    public function getContextFields($context = '')
-    {
-        if ('' === $context) {
-            $context = $this->getContext();
-        }
-
-        $fields = $this->getFields();
-
-        foreach ((array) $fields as $key => $context_fields) {
-
-            // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
-            $matches = explode('_', $key);
-
-            if (isset($matches[0]) && $matches[0] === $context) {
-                return $context_fields;
-            }
-        }
-
-        return [];
-    }
-
-    /**
-     * @param array $fields
-     */
-    public function setFields($fields)
-    {
-        $this->fields = $fields;
-    }
-
-    /**
-     * @param string $key The key to a specific field in the fields array
-     *
-     * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
-     */
-    public function getField($key)
-    {
-        if (!empty($key)) {
-            if (isset($this->fields[$key])) {
-                return $this->fields[$key];
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @param string $key   The key to a specific field in the fields array
-     * @param mixed  $value The value to set for the field
-     */
-    public function setField($key, $value)
-    {
-        $this->fields[$key] = $value;
-    }
-
-    /**
-     * @return int
-     */
-    public function getViewId()
-    {
-        return absint($this->view_id);
-    }
-
-    /**
-     * @param int $view_id
-     */
-    public function setViewId($view_id)
-    {
-        $this->view_id = intval($view_id);
-    }
-
-    /**
-     * @return int
-     */
-    public function getFormId()
-    {
-        return $this->form_id;
-    }
-
-    /**
-     * @param int $form_id
-     */
-    public function setFormId($form_id)
-    {
-        $this->form_id = $form_id;
-    }
-
-    /**
-     * @return array
-     */
-    public function getEntries()
-    {
-        return $this->entries;
-    }
-
-    /**
-     * @param array $entries
-     */
-    public function setEntries($entries)
-    {
-        $this->entries = $entries;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTotalEntries()
-    {
-        return (int) $this->total_entries;
-    }
-
-    /**
-     * @param int $total_entries
-     */
-    public function setTotalEntries($total_entries)
-    {
-        $this->total_entries = intval($total_entries);
-    }
-
-    /**
-     * @return array
-     */
-    public function getPaging()
-    {
-        $default_params = [
-            'offset'    => 0,
-            'page_size' => 20,
-        ];
-
-        return wp_parse_args($this->paging, $default_params);
-    }
-
-    /**
-     * @param array $paging
-     */
-    public function setPaging($paging)
-    {
-        $this->paging = $paging;
-    }
-
-    /**
-     * Get an array with pagination information.
-     *
-     * @since 1.13
-     *
-     * @return array {
-     *
-     *  @var int $first The starting entry number (counter, not ID)
-     *  @var int $last The last displayed entry number (counter, not ID)
-     *  @var int $total The total number of entries
-     * }
-     */
-    public function getPaginationCounts()
-    {
-        $paging = $this->getPaging();
-        $offset = $paging['offset'];
-        $page_size = $paging['page_size'];
-        $total = $this->getTotalEntries();
-
-        if (empty($total)) {
-            gravityview()->log->debug('No entries. Returning empty array.');
-
-            return [];
-        }
-
-        $first = empty($offset) ? 1 : $offset + 1;
-
-        // If the page size + starting entry is larger than total, the total is the max.
-        $last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
-
-        /**
-         * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
-         *
-         * @since 1.13
-         *
-         * @param array $counts Array with $first, $last, $total numbers in that order
-         */
-        list($first, $last, $total) = apply_filters('gravityview_pagination_counts', [$first, $last, $total]);
-
-        return ['first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total];
-    }
-
-    /**
-     * @return array
-     */
-    public function getSorting()
-    {
-        $defaults_params = [
-            'sort_field'     => 'date_created',
-            'sort_direction' => 'ASC',
-            'is_numeric'     => false,
-        ];
-
-        return wp_parse_args($this->sorting, $defaults_params);
-    }
-
-    /**
-     * @param array $sorting
-     */
-    public function setSorting($sorting)
-    {
-        $this->sorting = $sorting;
-    }
-
-    /**
-     * @param bool $do_replace Perform merge tag and shortcode processing on the label. Default: true.
-     *
-     * @since 2.0
-     * @deprecated Use $template->get_back_label();
-     *
-     * @return string
-     */
-    public function getBackLinkLabel($do_replace = true)
-    {
-        if ($do_replace) {
-            $back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
-
-            return do_shortcode($back_link_label);
-        }
-
-        return $this->back_link_label;
-    }
-
-    /**
-     * @param string $back_link_label
-     */
-    public function setBackLinkLabel($back_link_label)
-    {
-        $this->back_link_label = $back_link_label;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isHideUntilSearched()
-    {
-        return $this->hide_until_searched;
-    }
-
-    /**
-     * @param bool $hide_until_searched
-     */
-    public function setHideUntilSearched($hide_until_searched)
-    {
-        $this->hide_until_searched = $hide_until_searched;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplatePartSlug()
-    {
-        return $this->template_part_slug;
-    }
-
-    /**
-     * @param string $template_part_slug
-     */
-    public function setTemplatePartSlug($template_part_slug)
-    {
-        $this->template_part_slug = $template_part_slug;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplatePartName()
-    {
-        return $this->template_part_name;
-    }
-
-    /**
-     * @param string $template_part_name
-     */
-    public function setTemplatePartName($template_part_name)
-    {
-        $this->template_part_name = $template_part_name;
-    }
-
-    /**
-     * Return the current entry. If in the loop, the current entry. If single entry, the currently viewed entry.
-     *
-     * @return array
-     */
-    public function getCurrentEntry()
-    {
-        if (in_array($this->getContext(), ['edit', 'single'])) {
-            $entries = $this->getEntries();
-            $entry = $entries[0];
-        } else {
-            $entry = $this->_current_entry;
-        }
-
-        /** @since 1.16 Fixes DataTables empty entry issue */
-        if (empty($entry) && !empty($this->_current_field['entry'])) {
-            $entry = $this->_current_field['entry'];
-        }
-
-        return $entry;
-    }
-
-    /**
-     * @param array $current_entry
-     *
-     * @return void
-     */
-    public function setCurrentEntry($current_entry)
-    {
-        $this->_current_entry = $current_entry;
-    }
-
-    /**
-     * Clear the current entry after all entries in the loop have been displayed.
-     *
-     * @since 1.7.3
-     *
-     * @return void
-     */
-    public function clearCurrentEntry()
-    {
-        $this->_current_entry = null;
-    }
-
-    /**
-     * Render an output zone, as configured in the Admin.
-     *
-     * @since 1.16.4 Added $echo parameter
-     *
-     * @param string $zone The zone name, like 'footer-left'
-     * @param array  $atts
-     * @param bool   $echo Whether to print the output
-     *
-     * @deprecated This will never get called in new templates.
-     *
-     * @return string|null
-     */
-    public function renderZone($zone = '', $atts = [], $echo = true)
-    {
-        if (empty($zone)) {
-            gravityview()->log->error('No zone defined.');
-
-            return null;
-        }
-
-        $defaults = [
-            'slug'       => $this->getTemplatePartSlug(),
-            'context'    => $this->getContext(),
-            'entry'      => $this->getCurrentEntry(),
-            'form'       => $this->getForm(),
-            'hide_empty' => $this->getAtts('hide_empty'),
-        ];
-
-        $final_atts = wp_parse_args($atts, $defaults);
-
-        $output = '';
-
-        $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
-
-        $fields = $this->getField($final_atts['zone_id']);
-
-        // Backward compatibility
-        if ('table' === $this->getTemplatePartSlug()) {
-            /**
-             * @filter `gravityview_table_cells` Modify the fields displayed in a table
-             *
-             * @param array             $fields
-             * @param \GravityView_View $this
-             *
-             * @deprecated Use `gravityview/template/table/fields`
-             */
-            $fields = apply_filters('gravityview_table_cells', $fields, $this);
-        }
-
-        if (empty($fields)) {
-            gravityview()->log->error('Empty zone configuration for {zone_id}.', ['zone_id' => $final_atts['zone_id']]);
-
-            return null;
-        }
-
-        $field_output = '';
-        foreach ($fields as $field) {
-            $final_atts['field'] = $field;
-
-            $field_output .= gravityview_field_output($final_atts);
-        }
-
-        /**
-         * If a zone has no field output, choose whether to show wrapper
-         * False by default to keep backward compatibility.
-         *
-         * @since 1.7.6
-         *
-         * @param bool $hide_empty_zone Default: false
-         *
-         * @since 2.0
-         *
-         * @param \GV\Template_Context $context The context. Null here. Since this path is deprecated.
-         */
-        if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false, null)) {
-            return null;
-        }
-
-        if (!empty($final_atts['wrapper_class'])) {
-            $output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
-        }
-
-        $output .= $field_output;
-
-        if (!empty($final_atts['wrapper_class'])) {
-            $output .= '</div>';
-        }
-
-        if ($echo) {
-            echo $output;
-        }
-
-        return $output;
-    }
-
-    /**
-     * In order to improve lookup times, we store located templates in a local array.
-     *
-     * This improves performance by up to 1/2 second on a 250 entry View with 7 columns showing
-     *
-     * @inheritdoc
-     *
-     * @see Gamajo_Template_Loader::locate_template()
-     *
-     * @return null|string NULL: Template not found; String: path to template
-     */
-    public function locate_template($template_names, $load = false, $require_once = true)
-    {
-        if (is_string($template_names) && isset($this->located_templates[$template_names])) {
-            $located = $this->located_templates[$template_names];
-        } else {
-
-            // Set $load to always false so we handle it here.
-            $located = parent::locate_template($template_names, false, $require_once);
-
-            if (is_string($template_names)) {
-                $this->located_templates[$template_names] = $located;
-            }
-        }
-
-        if ($load && $located) {
-            load_template($located, $require_once);
-        }
-
-        return $located;
-    }
-
-    /**
-     * Magic Method: Instead of throwing an error when a variable isn't set, return null.
-     *
-     * @param string $name Key for the data retrieval.
-     *
-     * @return mixed|null The stored data.
-     */
-    public function __get($name)
-    {
-        if (isset($this->{$name})) {
-            return $this->{$name};
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Enable overrides of GravityView templates on a granular basis.
-     *
-     * The loading order is:
-     *
-     * - view-[View ID]-table-footer.php
-     * - form-[Form ID]-table-footer.php
-     * - page-[ID of post or page where view is embedded]-table-footer.php
-     * - table-footer.php
-     *
-     * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
-     *
-     * @param array  $templates Existing list of templates.
-     * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
-     * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
-     *
-     * @return array $templates Modified template array, merged with existing $templates values
-     */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
-        $additional = [];
-
-        // form-19-table-body.php
-        $additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
-
-        if ($view_id = $this->getViewId()) {
-            // view-3-table-body.php
-            $additional[] = sprintf('view-%d-%s-%s.php', $view_id, $slug, $name);
-        }
-
-        if ($this->getPostId()) {
-
-            // page-19-table-body.php
-            $additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
-        }
-
-        // Combine with existing table-body.php and table.php
-        $templates = array_merge($additional, $templates);
-
-        gravityview()->log->debug('List of Template Files', ['data' => $templates]);
-
-        return $templates;
-    }
-
-    // Load the template
-    public function render($slug, $name, $require_once = true)
-    {
-        $this->setTemplatePartSlug($slug);
-
-        $this->setTemplatePartName($name);
-
-        $template_file = $this->get_template_part($slug, $name, false);
-
-        gravityview()->log->debug('Rendering Template File: {path}', ['path' => $template_file]);
-
-        if (!empty($template_file)) {
-            if ($require_once) {
-                require_once $template_file;
-            } else {
-                require $template_file;
-            }
-        }
-    }
-
-    /**
-     * Output the widgets on before/after hooks.
-     *
-     * @param int|\GV\Template_Context $view_id_or_context The View ID or the context.
-     *
-     * @return void
-     */
-    public function render_widget_hooks($view_id_or_context)
-    {
-
-        /**
-         * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
-         */
-        if (is_numeric($view_id_or_context)) {
-            $view = \GV\View::by_id($view_id_or_context);
-            $is_single = gravityview_get_context() == 'single';
-            $total_entries = GravityView_View::getInstance()->getTotalEntries();
-
-            /**
-             * Fake new context for legacy template code.
-             */
-            $view_id_or_context = \GV\Template_Context::from_template([
-                'view' => $view,
-            ]);
-        } elseif ($view_id_or_context instanceof \GV\Template_Context) {
-            $view = $view_id_or_context->view;
-            $is_single = (bool) $view_id_or_context->request->is_entry();
-            $total_entries = $view_id_or_context->entries ? $view_id_or_context->entries->count() : 0;
-        } else {
-            gravityview()->log->error('No View ID or template context provided to render_widget_hooks');
-
-            return;
-        }
-
-        if ($is_single) {
-            gravityview()->log->debug('Not rendering widgets; single entry');
-
-            return;
-        }
-
-        switch (current_filter()) {
-            default:
-            case 'gravityview/template/before':
-            case 'gravityview_before':
-                $zone = 'header';
-                break;
-            case 'gravityview/template/after':
-            case 'gravityview_after':
-                $zone = 'footer';
-                break;
-        }
-
-        $widgets = $view->widgets->by_position("$zone*");
-
-        /**
-         * Prevent output if no widgets to show.
-         *
-         * @since 1.16
-         */
-        if (!$widgets->count()) {
-            gravityview()->log->debug('No widgets for View #{view_id} in zone {zone}', ['view_id' => $view->ID, 'zone' => $zone]);
-
-            return;
-        }
-
-        // Prevent being called twice
-        if (did_action("gravityview/widgets/$zone/{$view->ID}/rendered")) {
-            gravityview()->log->debug('Not rendering {zone}; already rendered', ['zone' => $zone.'_'.$view->ID.'_widgets']);
-
-            return;
-        }
-
-        $rows = \GV\Widget::get_default_widget_areas();
-
-        // TODO: Move to sep. method, use an action instead
-        wp_enqueue_style('gravityview_default_style');
-
-        $default_css_class = 'gv-grid gv-widgets-'.$zone;
-
-        if (!$total_entries) {
-            $default_css_class .= ' gv-widgets-no-results';
-        }
-
-        /**
-         * @filter `gravityview/widgets/wrapper_css_class` The CSS class applied to the widget container `<div>`.
-         *
-         * @since 1.16.2
-         *
-         * @param string $css_class Default: `gv-grid gv-widgets-{zone}` where `{zone}` is replaced by the current `$zone` value. If the View has no results, adds ` gv-widgets-no-results`
-         * @param string $zone      Current widget zone, either `header` or `footer`
-         * @param array  $widgets   Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
-         */
-        $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration());
-
-        $css_class = gravityview_sanitize_html_class($css_class);
-
-        // TODO Convert to partials?>
+	/**
+	 * Prefix for filter names.
+	 *
+	 * @var string
+	 */
+	protected $filter_prefix = 'gravityview';
+
+	/**
+	 * Directory name where custom templates for this plugin should be found in the theme.
+	 *
+	 * @var string
+	 */
+	protected $theme_template_directory = 'gravityview';
+
+	/**
+	 * Reference to the root directory path of this plugin.
+	 *
+	 * @var string
+	 */
+	protected $plugin_directory = GRAVITYVIEW_DIR;
+
+	/**
+	 * Store templates locations that have already been located.
+	 *
+	 * @var array
+	 */
+	protected $located_templates = [];
+
+	/**
+	 * The name of the template, like "list", "table", or "datatables".
+	 *
+	 * @var string
+	 */
+	protected $template_part_slug = '';
+
+	/**
+	 * The name of the file part, like "body" or "single".
+	 *
+	 * @var string
+	 */
+	protected $template_part_name = '';
+
+	/**
+	 * @var int Gravity Forms form ID
+	 */
+	protected $form_id = null;
+
+	/**
+	 * @var int View ID
+	 * @todo: this needs to be public until extensions support 1.7+
+	 */
+	public $view_id = null;
+
+	/**
+	 * @var array Fields for the form
+	 */
+	protected $fields = [];
+
+	/**
+	 * @var string Current screen. Defaults to "directory" or "single"
+	 */
+	protected $context = 'directory';
+
+	/**
+	 * @var int|null If in embedded post or page, the ID of it
+	 */
+	protected $post_id = null;
+
+	/**
+	 * @var array Gravity Forms form array at ID_id
+	 */
+	protected $form = null;
+
+	/**
+	 * @var array Configuration for the View
+	 */
+	protected $atts = [];
+
+	/**
+	 * @var array Entries for the current result. Single item in array for single entry View
+	 */
+	protected $entries = [];
+
+	/**
+	 * @var int Total entries count for the current result.
+	 */
+	protected $total_entries = 0;
+
+	/**
+	 * @var string The label to display back links
+	 */
+	protected $back_link_label = '';
+
+	/**
+	 * @var array Array with `offset` and `page_size` keys
+	 */
+	protected $paging = [];
+
+	/**
+	 * @var array Array with `sort_field` and `sort_direction` keys
+	 */
+	protected $sorting = [];
+
+	/**
+	 * @var bool Whether to hide the results until a search is performed
+	 *
+	 * @since 1.5.4
+	 */
+	protected $hide_until_searched = false;
+
+	/**
+	 * Current entry in the loop.
+	 *
+	 * @var array
+	 */
+	protected $_current_entry = [];
+
+	/**
+	 * @var array
+	 */
+	protected $_current_field = [];
+
+	/**
+	 * @var GravityView_View $instance
+	 */
+	public static $instance = null;
+
+	/**
+	 * Construct the view object.
+	 *
+	 * @param array $atts Associative array to set the data of
+	 */
+	public function __construct($atts = [])
+	{
+		$atts = wp_parse_args($atts, [
+			'form_id' => null,
+			'view_id' => null,
+			'fields'  => null,
+			'context' => null,
+			'post_id' => null,
+			'form'    => null,
+			'atts'	   => null,
+		]);
+
+		foreach ($atts as $key => $value) {
+			if (is_null($value)) {
+				continue;
+			}
+			$this->{$key} = $value;
+		}
+
+		// Add granular overrides
+		add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
+
+		// widget logic
+		add_action('gravityview/template/before', [$this, 'render_widget_hooks']);
+		add_action('gravityview/template/after', [$this, 'render_widget_hooks']);
+
+		/**
+		 * Clear the current entry after the loop is done.
+		 *
+		 * @since 1.7.3
+		 */
+		add_action('gravityview_footer', [$this, 'clearCurrentEntry'], 500);
+
+		self::$instance = &$this;
+	}
+
+	/**
+	 * @param null $passed_post
+	 *
+	 * @return GravityView_View
+	 */
+	public static function getInstance($passed_post = null)
+	{
+		if (empty(self::$instance)) {
+			self::$instance = new self($passed_post);
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * @param string|null $key The key to a specific attribute of the current field
+	 *
+	 * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
+	 */
+	public function getCurrentField($key = null)
+	{
+		if (!empty($key)) {
+			if (isset($this->_current_field[$key])) {
+				return $this->_current_field[$key];
+			}
+
+			return null;
+		}
+
+		return $this->_current_field;
+	}
+
+	public function setCurrentFieldSetting($key, $value)
+	{
+		if (!empty($this->_current_field)) {
+			$this->_current_field['field_settings'][$key] = $value;
+		}
+	}
+
+	public function getCurrentFieldSetting($key)
+	{
+		$settings = $this->getCurrentField('field_settings');
+
+		if ($settings && !empty($settings[$key])) {
+			return $settings[$key];
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param array $passed_field
+	 */
+	public function setCurrentField($passed_field)
+	{
+		$existing_field = $this->getCurrentField();
+
+		$set_field = wp_parse_args($passed_field, $existing_field);
+
+		$this->_current_field = $set_field;
+
+		/**
+		 * Backward compatibility.
+		 *
+		 * @deprecated 1.6.2
+		 */
+		$this->field_data = $set_field;
+	}
+
+	/**
+	 * @param string|null $key The key to a specific field in the fields array
+	 *
+	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
+	 */
+	public function getAtts($key = null)
+	{
+		if (!empty($key)) {
+			if (isset($this->atts[$key])) {
+				return $this->atts[$key];
+			}
+
+			return null;
+		}
+
+		return $this->atts;
+	}
+
+	/**
+	 * @param array $atts
+	 */
+	public function setAtts($atts)
+	{
+		$this->atts = $atts;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getForm()
+	{
+		return $this->form;
+	}
+
+	/**
+	 * @param array $form
+	 */
+	public function setForm($form)
+	{
+		$this->form = $form;
+	}
+
+	/**
+	 * @return int|null
+	 */
+	public function getPostId()
+	{
+		return $this->post_id;
+	}
+
+	/**
+	 * @param int|null $post_id
+	 */
+	public function setPostId($post_id)
+	{
+		$this->post_id = $post_id;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return $this->context;
+	}
+
+	/**
+	 * @param string $context
+	 */
+	public function setContext($context)
+	{
+		$this->context = $context;
+	}
+
+	/**
+	 * @param string|null $key The key to a specific field in the fields array
+	 *
+	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
+	 */
+	public function getFields($key = null)
+	{
+		$fields = empty($this->fields) ? null : $this->fields;
+
+		if ($fields && !empty($key)) {
+			$fields = isset($fields[$key]) ? $fields[$key] : null;
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Get the fields for a specific context.
+	 *
+	 * @since 1.19.2
+	 *
+	 * @param string $context [Optional] "directory", "single", or "edit"
+	 *
+	 * @return array Array of GravityView field layout configurations
+	 */
+	public function getContextFields($context = '')
+	{
+		if ('' === $context) {
+			$context = $this->getContext();
+		}
+
+		$fields = $this->getFields();
+
+		foreach ((array) $fields as $key => $context_fields) {
+
+			// Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
+			$matches = explode('_', $key);
+
+			if (isset($matches[0]) && $matches[0] === $context) {
+				return $context_fields;
+			}
+		}
+
+		return [];
+	}
+
+	/**
+	 * @param array $fields
+	 */
+	public function setFields($fields)
+	{
+		$this->fields = $fields;
+	}
+
+	/**
+	 * @param string $key The key to a specific field in the fields array
+	 *
+	 * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
+	 */
+	public function getField($key)
+	{
+		if (!empty($key)) {
+			if (isset($this->fields[$key])) {
+				return $this->fields[$key];
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param string $key   The key to a specific field in the fields array
+	 * @param mixed  $value The value to set for the field
+	 */
+	public function setField($key, $value)
+	{
+		$this->fields[$key] = $value;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getViewId()
+	{
+		return absint($this->view_id);
+	}
+
+	/**
+	 * @param int $view_id
+	 */
+	public function setViewId($view_id)
+	{
+		$this->view_id = intval($view_id);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getFormId()
+	{
+		return $this->form_id;
+	}
+
+	/**
+	 * @param int $form_id
+	 */
+	public function setFormId($form_id)
+	{
+		$this->form_id = $form_id;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getEntries()
+	{
+		return $this->entries;
+	}
+
+	/**
+	 * @param array $entries
+	 */
+	public function setEntries($entries)
+	{
+		$this->entries = $entries;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTotalEntries()
+	{
+		return (int) $this->total_entries;
+	}
+
+	/**
+	 * @param int $total_entries
+	 */
+	public function setTotalEntries($total_entries)
+	{
+		$this->total_entries = intval($total_entries);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPaging()
+	{
+		$default_params = [
+			'offset'    => 0,
+			'page_size' => 20,
+		];
+
+		return wp_parse_args($this->paging, $default_params);
+	}
+
+	/**
+	 * @param array $paging
+	 */
+	public function setPaging($paging)
+	{
+		$this->paging = $paging;
+	}
+
+	/**
+	 * Get an array with pagination information.
+	 *
+	 * @since 1.13
+	 *
+	 * @return array {
+	 *
+	 *  @var int $first The starting entry number (counter, not ID)
+	 *  @var int $last The last displayed entry number (counter, not ID)
+	 *  @var int $total The total number of entries
+	 * }
+	 */
+	public function getPaginationCounts()
+	{
+		$paging = $this->getPaging();
+		$offset = $paging['offset'];
+		$page_size = $paging['page_size'];
+		$total = $this->getTotalEntries();
+
+		if (empty($total)) {
+			gravityview()->log->debug('No entries. Returning empty array.');
+
+			return [];
+		}
+
+		$first = empty($offset) ? 1 : $offset + 1;
+
+		// If the page size + starting entry is larger than total, the total is the max.
+		$last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
+
+		/**
+		 * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
+		 *
+		 * @since 1.13
+		 *
+		 * @param array $counts Array with $first, $last, $total numbers in that order
+		 */
+		list($first, $last, $total) = apply_filters('gravityview_pagination_counts', [$first, $last, $total]);
+
+		return ['first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSorting()
+	{
+		$defaults_params = [
+			'sort_field'     => 'date_created',
+			'sort_direction' => 'ASC',
+			'is_numeric'     => false,
+		];
+
+		return wp_parse_args($this->sorting, $defaults_params);
+	}
+
+	/**
+	 * @param array $sorting
+	 */
+	public function setSorting($sorting)
+	{
+		$this->sorting = $sorting;
+	}
+
+	/**
+	 * @param bool $do_replace Perform merge tag and shortcode processing on the label. Default: true.
+	 *
+	 * @since 2.0
+	 * @deprecated Use $template->get_back_label();
+	 *
+	 * @return string
+	 */
+	public function getBackLinkLabel($do_replace = true)
+	{
+		if ($do_replace) {
+			$back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
+
+			return do_shortcode($back_link_label);
+		}
+
+		return $this->back_link_label;
+	}
+
+	/**
+	 * @param string $back_link_label
+	 */
+	public function setBackLinkLabel($back_link_label)
+	{
+		$this->back_link_label = $back_link_label;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isHideUntilSearched()
+	{
+		return $this->hide_until_searched;
+	}
+
+	/**
+	 * @param bool $hide_until_searched
+	 */
+	public function setHideUntilSearched($hide_until_searched)
+	{
+		$this->hide_until_searched = $hide_until_searched;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplatePartSlug()
+	{
+		return $this->template_part_slug;
+	}
+
+	/**
+	 * @param string $template_part_slug
+	 */
+	public function setTemplatePartSlug($template_part_slug)
+	{
+		$this->template_part_slug = $template_part_slug;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplatePartName()
+	{
+		return $this->template_part_name;
+	}
+
+	/**
+	 * @param string $template_part_name
+	 */
+	public function setTemplatePartName($template_part_name)
+	{
+		$this->template_part_name = $template_part_name;
+	}
+
+	/**
+	 * Return the current entry. If in the loop, the current entry. If single entry, the currently viewed entry.
+	 *
+	 * @return array
+	 */
+	public function getCurrentEntry()
+	{
+		if (in_array($this->getContext(), ['edit', 'single'])) {
+			$entries = $this->getEntries();
+			$entry = $entries[0];
+		} else {
+			$entry = $this->_current_entry;
+		}
+
+		/** @since 1.16 Fixes DataTables empty entry issue */
+		if (empty($entry) && !empty($this->_current_field['entry'])) {
+			$entry = $this->_current_field['entry'];
+		}
+
+		return $entry;
+	}
+
+	/**
+	 * @param array $current_entry
+	 *
+	 * @return void
+	 */
+	public function setCurrentEntry($current_entry)
+	{
+		$this->_current_entry = $current_entry;
+	}
+
+	/**
+	 * Clear the current entry after all entries in the loop have been displayed.
+	 *
+	 * @since 1.7.3
+	 *
+	 * @return void
+	 */
+	public function clearCurrentEntry()
+	{
+		$this->_current_entry = null;
+	}
+
+	/**
+	 * Render an output zone, as configured in the Admin.
+	 *
+	 * @since 1.16.4 Added $echo parameter
+	 *
+	 * @param string $zone The zone name, like 'footer-left'
+	 * @param array  $atts
+	 * @param bool   $echo Whether to print the output
+	 *
+	 * @deprecated This will never get called in new templates.
+	 *
+	 * @return string|null
+	 */
+	public function renderZone($zone = '', $atts = [], $echo = true)
+	{
+		if (empty($zone)) {
+			gravityview()->log->error('No zone defined.');
+
+			return null;
+		}
+
+		$defaults = [
+			'slug'       => $this->getTemplatePartSlug(),
+			'context'    => $this->getContext(),
+			'entry'      => $this->getCurrentEntry(),
+			'form'       => $this->getForm(),
+			'hide_empty' => $this->getAtts('hide_empty'),
+		];
+
+		$final_atts = wp_parse_args($atts, $defaults);
+
+		$output = '';
+
+		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+
+		$fields = $this->getField($final_atts['zone_id']);
+
+		// Backward compatibility
+		if ('table' === $this->getTemplatePartSlug()) {
+			/**
+			 * @filter `gravityview_table_cells` Modify the fields displayed in a table
+			 *
+			 * @param array             $fields
+			 * @param \GravityView_View $this
+			 *
+			 * @deprecated Use `gravityview/template/table/fields`
+			 */
+			$fields = apply_filters('gravityview_table_cells', $fields, $this);
+		}
+
+		if (empty($fields)) {
+			gravityview()->log->error('Empty zone configuration for {zone_id}.', ['zone_id' => $final_atts['zone_id']]);
+
+			return null;
+		}
+
+		$field_output = '';
+		foreach ($fields as $field) {
+			$final_atts['field'] = $field;
+
+			$field_output .= gravityview_field_output($final_atts);
+		}
+
+		/**
+		 * If a zone has no field output, choose whether to show wrapper
+		 * False by default to keep backward compatibility.
+		 *
+		 * @since 1.7.6
+		 *
+		 * @param bool $hide_empty_zone Default: false
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Template_Context $context The context. Null here. Since this path is deprecated.
+		 */
+		if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false, null)) {
+			return null;
+		}
+
+		if (!empty($final_atts['wrapper_class'])) {
+			$output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
+		}
+
+		$output .= $field_output;
+
+		if (!empty($final_atts['wrapper_class'])) {
+			$output .= '</div>';
+		}
+
+		if ($echo) {
+			echo $output;
+		}
+
+		return $output;
+	}
+
+	/**
+	 * In order to improve lookup times, we store located templates in a local array.
+	 *
+	 * This improves performance by up to 1/2 second on a 250 entry View with 7 columns showing
+	 *
+	 * @inheritdoc
+	 *
+	 * @see Gamajo_Template_Loader::locate_template()
+	 *
+	 * @return null|string NULL: Template not found; String: path to template
+	 */
+	public function locate_template($template_names, $load = false, $require_once = true)
+	{
+		if (is_string($template_names) && isset($this->located_templates[$template_names])) {
+			$located = $this->located_templates[$template_names];
+		} else {
+
+			// Set $load to always false so we handle it here.
+			$located = parent::locate_template($template_names, false, $require_once);
+
+			if (is_string($template_names)) {
+				$this->located_templates[$template_names] = $located;
+			}
+		}
+
+		if ($load && $located) {
+			load_template($located, $require_once);
+		}
+
+		return $located;
+	}
+
+	/**
+	 * Magic Method: Instead of throwing an error when a variable isn't set, return null.
+	 *
+	 * @param string $name Key for the data retrieval.
+	 *
+	 * @return mixed|null The stored data.
+	 */
+	public function __get($name)
+	{
+		if (isset($this->{$name})) {
+			return $this->{$name};
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Enable overrides of GravityView templates on a granular basis.
+	 *
+	 * The loading order is:
+	 *
+	 * - view-[View ID]-table-footer.php
+	 * - form-[Form ID]-table-footer.php
+	 * - page-[ID of post or page where view is embedded]-table-footer.php
+	 * - table-footer.php
+	 *
+	 * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
+	 *
+	 * @param array  $templates Existing list of templates.
+	 * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
+	 * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
+	 *
+	 * @return array $templates Modified template array, merged with existing $templates values
+	 */
+	public function add_id_specific_templates($templates, $slug, $name)
+	{
+		$additional = [];
+
+		// form-19-table-body.php
+		$additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
+
+		if ($view_id = $this->getViewId()) {
+			// view-3-table-body.php
+			$additional[] = sprintf('view-%d-%s-%s.php', $view_id, $slug, $name);
+		}
+
+		if ($this->getPostId()) {
+
+			// page-19-table-body.php
+			$additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
+		}
+
+		// Combine with existing table-body.php and table.php
+		$templates = array_merge($additional, $templates);
+
+		gravityview()->log->debug('List of Template Files', ['data' => $templates]);
+
+		return $templates;
+	}
+
+	// Load the template
+	public function render($slug, $name, $require_once = true)
+	{
+		$this->setTemplatePartSlug($slug);
+
+		$this->setTemplatePartName($name);
+
+		$template_file = $this->get_template_part($slug, $name, false);
+
+		gravityview()->log->debug('Rendering Template File: {path}', ['path' => $template_file]);
+
+		if (!empty($template_file)) {
+			if ($require_once) {
+				require_once $template_file;
+			} else {
+				require $template_file;
+			}
+		}
+	}
+
+	/**
+	 * Output the widgets on before/after hooks.
+	 *
+	 * @param int|\GV\Template_Context $view_id_or_context The View ID or the context.
+	 *
+	 * @return void
+	 */
+	public function render_widget_hooks($view_id_or_context)
+	{
+
+		/**
+		 * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
+		 */
+		if (is_numeric($view_id_or_context)) {
+			$view = \GV\View::by_id($view_id_or_context);
+			$is_single = gravityview_get_context() == 'single';
+			$total_entries = GravityView_View::getInstance()->getTotalEntries();
+
+			/**
+			 * Fake new context for legacy template code.
+			 */
+			$view_id_or_context = \GV\Template_Context::from_template([
+				'view' => $view,
+			]);
+		} elseif ($view_id_or_context instanceof \GV\Template_Context) {
+			$view = $view_id_or_context->view;
+			$is_single = (bool) $view_id_or_context->request->is_entry();
+			$total_entries = $view_id_or_context->entries ? $view_id_or_context->entries->count() : 0;
+		} else {
+			gravityview()->log->error('No View ID or template context provided to render_widget_hooks');
+
+			return;
+		}
+
+		if ($is_single) {
+			gravityview()->log->debug('Not rendering widgets; single entry');
+
+			return;
+		}
+
+		switch (current_filter()) {
+			default:
+			case 'gravityview/template/before':
+			case 'gravityview_before':
+				$zone = 'header';
+				break;
+			case 'gravityview/template/after':
+			case 'gravityview_after':
+				$zone = 'footer';
+				break;
+		}
+
+		$widgets = $view->widgets->by_position("$zone*");
+
+		/**
+		 * Prevent output if no widgets to show.
+		 *
+		 * @since 1.16
+		 */
+		if (!$widgets->count()) {
+			gravityview()->log->debug('No widgets for View #{view_id} in zone {zone}', ['view_id' => $view->ID, 'zone' => $zone]);
+
+			return;
+		}
+
+		// Prevent being called twice
+		if (did_action("gravityview/widgets/$zone/{$view->ID}/rendered")) {
+			gravityview()->log->debug('Not rendering {zone}; already rendered', ['zone' => $zone.'_'.$view->ID.'_widgets']);
+
+			return;
+		}
+
+		$rows = \GV\Widget::get_default_widget_areas();
+
+		// TODO: Move to sep. method, use an action instead
+		wp_enqueue_style('gravityview_default_style');
+
+		$default_css_class = 'gv-grid gv-widgets-'.$zone;
+
+		if (!$total_entries) {
+			$default_css_class .= ' gv-widgets-no-results';
+		}
+
+		/**
+		 * @filter `gravityview/widgets/wrapper_css_class` The CSS class applied to the widget container `<div>`.
+		 *
+		 * @since 1.16.2
+		 *
+		 * @param string $css_class Default: `gv-grid gv-widgets-{zone}` where `{zone}` is replaced by the current `$zone` value. If the View has no results, adds ` gv-widgets-no-results`
+		 * @param string $zone      Current widget zone, either `header` or `footer`
+		 * @param array  $widgets   Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
+		 */
+		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration());
+
+		$css_class = gravityview_sanitize_html_class($css_class);
+
+		// TODO Convert to partials?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-            foreach ($rows as $row) {
-                foreach ($row as $col => $areas) {
-                    $column = ($col == '2-2') ? '1-2 gv-right' : "$col gv-left"; ?>
+			foreach ($rows as $row) {
+				foreach ($row as $col => $areas) {
+					$column = ($col == '2-2') ? '1-2 gv-right' : "$col gv-left"; ?>
 					<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
 						<?php
-                        if (!empty($areas)) {
-                            foreach ($areas as $area) {
-                                foreach ($widgets->by_position($zone.'_'.$area['areaid'])->all() as $widget) {
-                                    do_action(sprintf('gravityview/widgets/%s/render', $widget->get_widget_id()), $widget->configuration->all(), null, $view_id_or_context);
-                                }
-                            }
-                        } ?>
+						if (!empty($areas)) {
+							foreach ($areas as $area) {
+								foreach ($widgets->by_position($zone.'_'.$area['areaid'])->all() as $widget) {
+									do_action(sprintf('gravityview/widgets/%s/render', $widget->get_widget_id()), $widget->configuration->all(), null, $view_id_or_context);
+								}
+							}
+						} ?>
 					</div>
 				<?php
-                } // $row?>
+				} // $row?>
 			<?php
-            } // $rows?>
+			} // $rows?>
 		</div>
 
 		<?php
 
-        /**
-         * Prevent widgets from being called twice.
-         * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin.
-         */
-        if (did_action('wp_head')) {
-            do_action("gravityview/widgets/$zone/{$view->ID}/rendered");
-        }
-    }
-
-    /**
-     * Include a file inside this context.
-     *
-     * @param string $path A path to the legacy template to include.
-     *
-     * @return void
-     */
-    public function _include($path)
-    {
-        if (file_exists($path)) {
-            include $path;
-        }
-    }
+		/**
+		 * Prevent widgets from being called twice.
+		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin.
+		 */
+		if (did_action('wp_head')) {
+			do_action("gravityview/widgets/$zone/{$view->ID}/rendered");
+		}
+	}
+
+	/**
+	 * Include a file inside this context.
+	 *
+	 * @param string $path A path to the legacy template to include.
+	 *
+	 * @return void
+	 */
+	public function _include($path)
+	{
+		if (file_exists($path)) {
+			include $path;
+		}
+	}
 }

Spacing +173 added lines, -173 removed lines

@@ -13,12 +13,12 @@ 
  */
 
 /** If this file is called directly, abort. */
-if (!defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
-if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require GRAVITYVIEW_DIR.'future/lib/class-gamajo-template-loader.php';
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
+    require GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php';
 }
 
 class GravityView_View extends \GV\Gamajo_Template_Loader
@@ -49,7 +49,7 @@ 
      *
      * @var array
      */
-    protected $located_templates = [];
+    protected $located_templates = [ ];
 
     /**
      * The name of the template, like "list", "table", or "datatables".
@@ -79,7 +79,7 @@ 
     /**
      * @var array Fields for the form
      */
-    protected $fields = [];
+    protected $fields = [ ];
 
     /**
      * @var string Current screen. Defaults to "directory" or "single"
@@ -99,12 +99,12 @@ 
     /**
      * @var array Configuration for the View
      */
-    protected $atts = [];
+    protected $atts = [ ];
 
     /**
      * @var array Entries for the current result. Single item in array for single entry View
      */
-    protected $entries = [];
+    protected $entries = [ ];
 
     /**
      * @var int Total entries count for the current result.
@@ -119,12 +119,12 @@ 
     /**
      * @var array Array with `offset` and `page_size` keys
      */
-    protected $paging = [];
+    protected $paging = [ ];
 
     /**
      * @var array Array with `sort_field` and `sort_direction` keys
      */
-    protected $sorting = [];
+    protected $sorting = [ ];
 
     /**
      * @var bool Whether to hide the results until a search is performed
@@ -138,12 +138,12 @@ 
      *
      * @var array
      */
-    protected $_current_entry = [];
+    protected $_current_entry = [ ];
 
     /**
      * @var array
      */
-    protected $_current_field = [];
+    protected $_current_field = [ ];
 
     /**
      * @var GravityView_View $instance
@@ -155,9 +155,9 @@ 
      *
      * @param array $atts Associative array to set the data of
      */
-    public function __construct($atts = [])
+    public function __construct( $atts = [ ] )
     {
-        $atts = wp_parse_args($atts, [
+        $atts = wp_parse_args( $atts, [
             'form_id' => null,
             'view_id' => null,
             'fields'  => null,
@@ -165,28 +165,28 @@ 
             'post_id' => null,
             'form'    => null,
             'atts'	   => null,
-        ]);
+        ] );
 
-        foreach ($atts as $key => $value) {
-            if (is_null($value)) {
+        foreach ( $atts as $key => $value ) {
+            if ( is_null( $value ) ) {
                 continue;
             }
             $this->{$key} = $value;
         }
 
         // Add granular overrides
-        add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
+        add_filter( $this->filter_prefix . '_get_template_part', [ $this, 'add_id_specific_templates' ], 10, 3 );
 
         // widget logic
-        add_action('gravityview/template/before', [$this, 'render_widget_hooks']);
-        add_action('gravityview/template/after', [$this, 'render_widget_hooks']);
+        add_action( 'gravityview/template/before', [ $this, 'render_widget_hooks' ] );
+        add_action( 'gravityview/template/after', [ $this, 'render_widget_hooks' ] );
 
         /**
          * Clear the current entry after the loop is done.
          *
          * @since 1.7.3
          */
-        add_action('gravityview_footer', [$this, 'clearCurrentEntry'], 500);
+        add_action( 'gravityview_footer', [ $this, 'clearCurrentEntry' ], 500 );
 
         self::$instance = &$this;
     }
@@ -196,10 +196,10 @@ 
      *
      * @return GravityView_View
      */
-    public static function getInstance($passed_post = null)
+    public static function getInstance( $passed_post = null )
     {
-        if (empty(self::$instance)) {
-            self::$instance = new self($passed_post);
+        if ( empty( self::$instance ) ) {
+            self::$instance = new self( $passed_post );
         }
 
         return self::$instance;
@@ -210,11 +210,11 @@ 
      *
      * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
      */
-    public function getCurrentField($key = null)
+    public function getCurrentField( $key = null )
     {
-        if (!empty($key)) {
-            if (isset($this->_current_field[$key])) {
-                return $this->_current_field[$key];
+        if ( ! empty( $key ) ) {
+            if ( isset( $this->_current_field[ $key ] ) ) {
+                return $this->_current_field[ $key ];
             }
 
             return null;
@@ -223,19 +223,19 @@ 
         return $this->_current_field;
     }
 
-    public function setCurrentFieldSetting($key, $value)
+    public function setCurrentFieldSetting( $key, $value )
     {
-        if (!empty($this->_current_field)) {
-            $this->_current_field['field_settings'][$key] = $value;
+        if ( ! empty( $this->_current_field ) ) {
+            $this->_current_field[ 'field_settings' ][ $key ] = $value;
         }
     }
 
-    public function getCurrentFieldSetting($key)
+    public function getCurrentFieldSetting( $key )
     {
-        $settings = $this->getCurrentField('field_settings');
+        $settings = $this->getCurrentField( 'field_settings' );
 
-        if ($settings && !empty($settings[$key])) {
-            return $settings[$key];
+        if ( $settings && ! empty( $settings[ $key ] ) ) {
+            return $settings[ $key ];
         }
 
         return null;
@@ -244,11 +244,11 @@ 
     /**
      * @param array $passed_field
      */
-    public function setCurrentField($passed_field)
+    public function setCurrentField( $passed_field )
     {
         $existing_field = $this->getCurrentField();
 
-        $set_field = wp_parse_args($passed_field, $existing_field);
+        $set_field = wp_parse_args( $passed_field, $existing_field );
 
         $this->_current_field = $set_field;
 
@@ -265,11 +265,11 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getAtts($key = null)
+    public function getAtts( $key = null )
     {
-        if (!empty($key)) {
-            if (isset($this->atts[$key])) {
-                return $this->atts[$key];
+        if ( ! empty( $key ) ) {
+            if ( isset( $this->atts[ $key ] ) ) {
+                return $this->atts[ $key ];
             }
 
             return null;
@@ -281,7 +281,7 @@ 
     /**
      * @param array $atts
      */
-    public function setAtts($atts)
+    public function setAtts( $atts )
     {
         $this->atts = $atts;
     }
@@ -297,7 +297,7 @@ 
     /**
      * @param array $form
      */
-    public function setForm($form)
+    public function setForm( $form )
     {
         $this->form = $form;
     }
@@ -313,7 +313,7 @@ 
     /**
      * @param int|null $post_id
      */
-    public function setPostId($post_id)
+    public function setPostId( $post_id )
     {
         $this->post_id = $post_id;
     }
@@ -329,7 +329,7 @@ 
     /**
      * @param string $context
      */
-    public function setContext($context)
+    public function setContext( $context )
     {
         $this->context = $context;
     }
@@ -339,12 +339,12 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getFields($key = null)
+    public function getFields( $key = null )
     {
-        $fields = empty($this->fields) ? null : $this->fields;
+        $fields = empty( $this->fields ) ? null : $this->fields;
 
-        if ($fields && !empty($key)) {
-            $fields = isset($fields[$key]) ? $fields[$key] : null;
+        if ( $fields && ! empty( $key ) ) {
+            $fields = isset( $fields[ $key ] ) ? $fields[ $key ] : null;
         }
 
         return $fields;
@@ -359,31 +359,31 @@ 
      *
      * @return array Array of GravityView field layout configurations
      */
-    public function getContextFields($context = '')
+    public function getContextFields( $context = '' )
     {
-        if ('' === $context) {
+        if ( '' === $context ) {
             $context = $this->getContext();
         }
 
         $fields = $this->getFields();
 
-        foreach ((array) $fields as $key => $context_fields) {
+        foreach ( (array)$fields as $key => $context_fields ) {
 
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
-            $matches = explode('_', $key);
+            $matches = explode( '_', $key );
 
-            if (isset($matches[0]) && $matches[0] === $context) {
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
                 return $context_fields;
             }
         }
 
-        return [];
+        return [ ];
     }
 
     /**
      * @param array $fields
      */
-    public function setFields($fields)
+    public function setFields( $fields )
     {
         $this->fields = $fields;
     }
@@ -393,11 +393,11 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getField($key)
+    public function getField( $key )
     {
-        if (!empty($key)) {
-            if (isset($this->fields[$key])) {
-                return $this->fields[$key];
+        if ( ! empty( $key ) ) {
+            if ( isset( $this->fields[ $key ] ) ) {
+                return $this->fields[ $key ];
             }
         }
 
@@ -408,9 +408,9 @@ 
      * @param string $key   The key to a specific field in the fields array
      * @param mixed  $value The value to set for the field
      */
-    public function setField($key, $value)
+    public function setField( $key, $value )
     {
-        $this->fields[$key] = $value;
+        $this->fields[ $key ] = $value;
     }
 
     /**
@@ -418,15 +418,15 @@ 
      */
     public function getViewId()
     {
-        return absint($this->view_id);
+        return absint( $this->view_id );
     }
 
     /**
      * @param int $view_id
      */
-    public function setViewId($view_id)
+    public function setViewId( $view_id )
     {
-        $this->view_id = intval($view_id);
+        $this->view_id = intval( $view_id );
     }
 
     /**
@@ -440,7 +440,7 @@ 
     /**
      * @param int $form_id
      */
-    public function setFormId($form_id)
+    public function setFormId( $form_id )
     {
         $this->form_id = $form_id;
     }
@@ -456,7 +456,7 @@ 
     /**
      * @param array $entries
      */
-    public function setEntries($entries)
+    public function setEntries( $entries )
     {
         $this->entries = $entries;
     }
@@ -466,15 +466,15 @@ 
      */
     public function getTotalEntries()
     {
-        return (int) $this->total_entries;
+        return (int)$this->total_entries;
     }
 
     /**
      * @param int $total_entries
      */
-    public function setTotalEntries($total_entries)
+    public function setTotalEntries( $total_entries )
     {
-        $this->total_entries = intval($total_entries);
+        $this->total_entries = intval( $total_entries );
     }
 
     /**
@@ -487,13 +487,13 @@ 
             'page_size' => 20,
         ];
 
-        return wp_parse_args($this->paging, $default_params);
+        return wp_parse_args( $this->paging, $default_params );
     }
 
     /**
      * @param array $paging
      */
-    public function setPaging($paging)
+    public function setPaging( $paging )
     {
         $this->paging = $paging;
     }
@@ -513,20 +513,20 @@ 
     public function getPaginationCounts()
     {
         $paging = $this->getPaging();
-        $offset = $paging['offset'];
-        $page_size = $paging['page_size'];
+        $offset = $paging[ 'offset' ];
+        $page_size = $paging[ 'page_size' ];
         $total = $this->getTotalEntries();
 
-        if (empty($total)) {
-            gravityview()->log->debug('No entries. Returning empty array.');
+        if ( empty( $total ) ) {
+            gravityview()->log->debug( 'No entries. Returning empty array.' );
 
-            return [];
+            return [ ];
         }
 
-        $first = empty($offset) ? 1 : $offset + 1;
+        $first = empty( $offset ) ? 1 : $offset + 1;
 
         // If the page size + starting entry is larger than total, the total is the max.
-        $last = ($offset + $page_size > $total) ? $total : $offset + $page_size;
+        $last = ( $offset + $page_size > $total ) ? $total : $offset + $page_size;
 
         /**
          * @filter `gravityview_pagination_counts` Modify the displayed pagination numbers
@@ -535,9 +535,9 @@ 
          *
          * @param array $counts Array with $first, $last, $total numbers in that order
          */
-        list($first, $last, $total) = apply_filters('gravityview_pagination_counts', [$first, $last, $total]);
+        list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', [ $first, $last, $total ] );
 
-        return ['first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total];
+        return [ 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total ];
     }
 
     /**
@@ -551,13 +551,13 @@ 
             'is_numeric'     => false,
         ];
 
-        return wp_parse_args($this->sorting, $defaults_params);
+        return wp_parse_args( $this->sorting, $defaults_params );
     }
 
     /**
      * @param array $sorting
      */
-    public function setSorting($sorting)
+    public function setSorting( $sorting )
     {
         $this->sorting = $sorting;
     }
@@ -570,12 +570,12 @@ 
      *
      * @return string
      */
-    public function getBackLinkLabel($do_replace = true)
+    public function getBackLinkLabel( $do_replace = true )
     {
-        if ($do_replace) {
-            $back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
+        if ( $do_replace ) {
+            $back_link_label = GravityView_API::replace_variables( $this->back_link_label, $this->getForm(), $this->getCurrentEntry() );
 
-            return do_shortcode($back_link_label);
+            return do_shortcode( $back_link_label );
         }
 
         return $this->back_link_label;
@@ -584,7 +584,7 @@ 
     /**
      * @param string $back_link_label
      */
-    public function setBackLinkLabel($back_link_label)
+    public function setBackLinkLabel( $back_link_label )
     {
         $this->back_link_label = $back_link_label;
     }
@@ -600,7 +600,7 @@ 
     /**
      * @param bool $hide_until_searched
      */
-    public function setHideUntilSearched($hide_until_searched)
+    public function setHideUntilSearched( $hide_until_searched )
     {
         $this->hide_until_searched = $hide_until_searched;
     }
@@ -616,7 +616,7 @@ 
     /**
      * @param string $template_part_slug
      */
-    public function setTemplatePartSlug($template_part_slug)
+    public function setTemplatePartSlug( $template_part_slug )
     {
         $this->template_part_slug = $template_part_slug;
     }
@@ -632,7 +632,7 @@ 
     /**
      * @param string $template_part_name
      */
-    public function setTemplatePartName($template_part_name)
+    public function setTemplatePartName( $template_part_name )
     {
         $this->template_part_name = $template_part_name;
     }
@@ -644,16 +644,16 @@ 
      */
     public function getCurrentEntry()
     {
-        if (in_array($this->getContext(), ['edit', 'single'])) {
+        if ( in_array( $this->getContext(), [ 'edit', 'single' ] ) ) {
             $entries = $this->getEntries();
-            $entry = $entries[0];
+            $entry = $entries[ 0 ];
         } else {
             $entry = $this->_current_entry;
         }
 
         /** @since 1.16 Fixes DataTables empty entry issue */
-        if (empty($entry) && !empty($this->_current_field['entry'])) {
-            $entry = $this->_current_field['entry'];
+        if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
+            $entry = $this->_current_field[ 'entry' ];
         }
 
         return $entry;
@@ -664,7 +664,7 @@ 
      *
      * @return void
      */
-    public function setCurrentEntry($current_entry)
+    public function setCurrentEntry( $current_entry )
     {
         $this->_current_entry = $current_entry;
     }
@@ -694,10 +694,10 @@ 
      *
      * @return string|null
      */
-    public function renderZone($zone = '', $atts = [], $echo = true)
+    public function renderZone( $zone = '', $atts = [ ], $echo = true )
     {
-        if (empty($zone)) {
-            gravityview()->log->error('No zone defined.');
+        if ( empty( $zone ) ) {
+            gravityview()->log->error( 'No zone defined.' );
 
             return null;
         }
@@ -707,19 +707,19 @@ 
             'context'    => $this->getContext(),
             'entry'      => $this->getCurrentEntry(),
             'form'       => $this->getForm(),
-            'hide_empty' => $this->getAtts('hide_empty'),
+            'hide_empty' => $this->getAtts( 'hide_empty' ),
         ];
 
-        $final_atts = wp_parse_args($atts, $defaults);
+        $final_atts = wp_parse_args( $atts, $defaults );
 
         $output = '';
 
-        $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+        $final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
 
-        $fields = $this->getField($final_atts['zone_id']);
+        $fields = $this->getField( $final_atts[ 'zone_id' ] );
 
         // Backward compatibility
-        if ('table' === $this->getTemplatePartSlug()) {
+        if ( 'table' === $this->getTemplatePartSlug() ) {
             /**
              * @filter `gravityview_table_cells` Modify the fields displayed in a table
              *
@@ -728,20 +728,20 @@ 
              *
              * @deprecated Use `gravityview/template/table/fields`
              */
-            $fields = apply_filters('gravityview_table_cells', $fields, $this);
+            $fields = apply_filters( 'gravityview_table_cells', $fields, $this );
         }
 
-        if (empty($fields)) {
-            gravityview()->log->error('Empty zone configuration for {zone_id}.', ['zone_id' => $final_atts['zone_id']]);
+        if ( empty( $fields ) ) {
+            gravityview()->log->error( 'Empty zone configuration for {zone_id}.', [ 'zone_id' => $final_atts[ 'zone_id' ] ] );
 
             return null;
         }
 
         $field_output = '';
-        foreach ($fields as $field) {
-            $final_atts['field'] = $field;
+        foreach ( $fields as $field ) {
+            $final_atts[ 'field' ] = $field;
 
-            $field_output .= gravityview_field_output($final_atts);
+            $field_output .= gravityview_field_output( $final_atts );
         }
 
         /**
@@ -756,21 +756,21 @@ 
          *
          * @param \GV\Template_Context $context The context. Null here. Since this path is deprecated.
          */
-        if (empty($field_output) && apply_filters('gravityview/render/hide-empty-zone', false, null)) {
+        if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false, null ) ) {
             return null;
         }
 
-        if (!empty($final_atts['wrapper_class'])) {
-            $output .= '<div class="'.gravityview_sanitize_html_class($final_atts['wrapper_class']).'">';
+        if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
+            $output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
         }
 
         $output .= $field_output;
 
-        if (!empty($final_atts['wrapper_class'])) {
+        if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
             $output .= '</div>';
         }
 
-        if ($echo) {
+        if ( $echo ) {
             echo $output;
         }
 
@@ -788,22 +788,22 @@ 
      *
      * @return null|string NULL: Template not found; String: path to template
      */
-    public function locate_template($template_names, $load = false, $require_once = true)
+    public function locate_template( $template_names, $load = false, $require_once = true )
     {
-        if (is_string($template_names) && isset($this->located_templates[$template_names])) {
-            $located = $this->located_templates[$template_names];
+        if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+            $located = $this->located_templates[ $template_names ];
         } else {
 
             // Set $load to always false so we handle it here.
-            $located = parent::locate_template($template_names, false, $require_once);
+            $located = parent::locate_template( $template_names, false, $require_once );
 
-            if (is_string($template_names)) {
-                $this->located_templates[$template_names] = $located;
+            if ( is_string( $template_names ) ) {
+                $this->located_templates[ $template_names ] = $located;
             }
         }
 
-        if ($load && $located) {
-            load_template($located, $require_once);
+        if ( $load && $located ) {
+            load_template( $located, $require_once );
         }
 
         return $located;
@@ -816,9 +816,9 @@ 
      *
      * @return mixed|null The stored data.
      */
-    public function __get($name)
+    public function __get( $name )
     {
-        if (isset($this->{$name})) {
+        if ( isset( $this->{$name}) ) {
             return $this->{$name};
         } else {
             return null;
@@ -843,45 +843,45 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
+    public function add_id_specific_templates( $templates, $slug, $name )
     {
-        $additional = [];
+        $additional = [ ];
 
         // form-19-table-body.php
-        $additional[] = sprintf('form-%d-%s-%s.php', $this->getFormId(), $slug, $name);
+        $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
 
-        if ($view_id = $this->getViewId()) {
+        if ( $view_id = $this->getViewId() ) {
             // view-3-table-body.php
-            $additional[] = sprintf('view-%d-%s-%s.php', $view_id, $slug, $name);
+            $additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
         }
 
-        if ($this->getPostId()) {
+        if ( $this->getPostId() ) {
 
             // page-19-table-body.php
-            $additional[] = sprintf('page-%d-%s-%s.php', $this->getPostId(), $slug, $name);
+            $additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
         }
 
         // Combine with existing table-body.php and table.php
-        $templates = array_merge($additional, $templates);
+        $templates = array_merge( $additional, $templates );
 
-        gravityview()->log->debug('List of Template Files', ['data' => $templates]);
+        gravityview()->log->debug( 'List of Template Files', [ 'data' => $templates ] );
 
         return $templates;
     }
 
     // Load the template
-    public function render($slug, $name, $require_once = true)
+    public function render( $slug, $name, $require_once = true )
     {
-        $this->setTemplatePartSlug($slug);
+        $this->setTemplatePartSlug( $slug );
 
-        $this->setTemplatePartName($name);
+        $this->setTemplatePartName( $name );
 
-        $template_file = $this->get_template_part($slug, $name, false);
+        $template_file = $this->get_template_part( $slug, $name, false );
 
-        gravityview()->log->debug('Rendering Template File: {path}', ['path' => $template_file]);
+        gravityview()->log->debug( 'Rendering Template File: {path}', [ 'path' => $template_file ] );
 
-        if (!empty($template_file)) {
-            if ($require_once) {
+        if ( ! empty( $template_file ) ) {
+            if ( $require_once ) {
                 require_once $template_file;
             } else {
                 require $template_file;
@@ -896,40 +896,40 @@ 
      *
      * @return void
      */
-    public function render_widget_hooks($view_id_or_context)
+    public function render_widget_hooks( $view_id_or_context )
     {
 
         /**
          * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
          */
-        if (is_numeric($view_id_or_context)) {
-            $view = \GV\View::by_id($view_id_or_context);
+        if ( is_numeric( $view_id_or_context ) ) {
+            $view = \GV\View::by_id( $view_id_or_context );
             $is_single = gravityview_get_context() == 'single';
             $total_entries = GravityView_View::getInstance()->getTotalEntries();
 
             /**
              * Fake new context for legacy template code.
              */
-            $view_id_or_context = \GV\Template_Context::from_template([
+            $view_id_or_context = \GV\Template_Context::from_template( [
                 'view' => $view,
-            ]);
-        } elseif ($view_id_or_context instanceof \GV\Template_Context) {
+            ] );
+        } elseif ( $view_id_or_context instanceof \GV\Template_Context ) {
             $view = $view_id_or_context->view;
-            $is_single = (bool) $view_id_or_context->request->is_entry();
+            $is_single = (bool)$view_id_or_context->request->is_entry();
             $total_entries = $view_id_or_context->entries ? $view_id_or_context->entries->count() : 0;
         } else {
-            gravityview()->log->error('No View ID or template context provided to render_widget_hooks');
+            gravityview()->log->error( 'No View ID or template context provided to render_widget_hooks' );
 
             return;
         }
 
-        if ($is_single) {
-            gravityview()->log->debug('Not rendering widgets; single entry');
+        if ( $is_single ) {
+            gravityview()->log->debug( 'Not rendering widgets; single entry' );
 
             return;
         }
 
-        switch (current_filter()) {
+        switch ( current_filter() ) {
             default:
             case 'gravityview/template/before':
             case 'gravityview_before':
@@ -941,22 +941,22 @@ 
                 break;
         }
 
-        $widgets = $view->widgets->by_position("$zone*");
+        $widgets = $view->widgets->by_position( "$zone*" );
 
         /**
          * Prevent output if no widgets to show.
          *
          * @since 1.16
          */
-        if (!$widgets->count()) {
-            gravityview()->log->debug('No widgets for View #{view_id} in zone {zone}', ['view_id' => $view->ID, 'zone' => $zone]);
+        if ( ! $widgets->count() ) {
+            gravityview()->log->debug( 'No widgets for View #{view_id} in zone {zone}', [ 'view_id' => $view->ID, 'zone' => $zone ] );
 
             return;
         }
 
         // Prevent being called twice
-        if (did_action("gravityview/widgets/$zone/{$view->ID}/rendered")) {
-            gravityview()->log->debug('Not rendering {zone}; already rendered', ['zone' => $zone.'_'.$view->ID.'_widgets']);
+        if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
+            gravityview()->log->debug( 'Not rendering {zone}; already rendered', [ 'zone' => $zone . '_' . $view->ID . '_widgets' ] );
 
             return;
         }
@@ -964,11 +964,11 @@ 
         $rows = \GV\Widget::get_default_widget_areas();
 
         // TODO: Move to sep. method, use an action instead
-        wp_enqueue_style('gravityview_default_style');
+        wp_enqueue_style( 'gravityview_default_style' );
 
-        $default_css_class = 'gv-grid gv-widgets-'.$zone;
+        $default_css_class = 'gv-grid gv-widgets-' . $zone;
 
-        if (!$total_entries) {
+        if ( ! $total_entries ) {
             $default_css_class .= ' gv-widgets-no-results';
         }
 
@@ -981,22 +981,22 @@ 
          * @param string $zone      Current widget zone, either `header` or `footer`
          * @param array  $widgets   Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
          */
-        $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration());
+        $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
 
-        $css_class = gravityview_sanitize_html_class($css_class);
+        $css_class = gravityview_sanitize_html_class( $css_class );
 
         // TODO Convert to partials?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-            foreach ($rows as $row) {
-                foreach ($row as $col => $areas) {
-                    $column = ($col == '2-2') ? '1-2 gv-right' : "$col gv-left"; ?>
-					<div class="gv-grid-col-<?php echo esc_attr($column); ?>">
+            foreach ( $rows as $row ) {
+                foreach ( $row as $col => $areas ) {
+                    $column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left"; ?>
+					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 						<?php
-                        if (!empty($areas)) {
-                            foreach ($areas as $area) {
-                                foreach ($widgets->by_position($zone.'_'.$area['areaid'])->all() as $widget) {
-                                    do_action(sprintf('gravityview/widgets/%s/render', $widget->get_widget_id()), $widget->configuration->all(), null, $view_id_or_context);
+                        if ( ! empty( $areas ) ) {
+                            foreach ( $areas as $area ) {
+                                foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
+                                    do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
                                 }
                             }
                         } ?>
@@ -1013,8 +1013,8 @@ 
          * Prevent widgets from being called twice.
          * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin.
          */
-        if (did_action('wp_head')) {
-            do_action("gravityview/widgets/$zone/{$view->ID}/rendered");
+        if ( did_action( 'wp_head' ) ) {
+            do_action( "gravityview/widgets/$zone/{$view->ID}/rendered" );
         }
     }
 
@@ -1025,9 +1025,9 @@ 
      *
      * @return void
      */
-    public function _include($path)
+    public function _include( $path )
     {
-        if (file_exists($path)) {
+        if ( file_exists( $path ) ) {
             include $path;
         }
     }

Braces +50 added lines, -100 removed lines

@@ -155,8 +155,7 @@ 
      *
      * @param array $atts Associative array to set the data of
      */
-    public function __construct($atts = [])
-    {
+    public function __construct($atts = []) {
         $atts = wp_parse_args($atts, [
             'form_id' => null,
             'view_id' => null,
@@ -196,8 +195,7 @@ 
      *
      * @return GravityView_View
      */
-    public static function getInstance($passed_post = null)
-    {
+    public static function getInstance($passed_post = null) {
         if (empty(self::$instance)) {
             self::$instance = new self($passed_post);
         }
@@ -210,8 +208,7 @@ 
      *
      * @return array|mixed|null If $key is set and attribute exists at $key, return that. If not set, return NULL. Otherwise, return current field array
      */
-    public function getCurrentField($key = null)
-    {
+    public function getCurrentField($key = null) {
         if (!empty($key)) {
             if (isset($this->_current_field[$key])) {
                 return $this->_current_field[$key];
@@ -223,15 +220,13 @@ 
         return $this->_current_field;
     }
 
-    public function setCurrentFieldSetting($key, $value)
-    {
+    public function setCurrentFieldSetting($key, $value) {
         if (!empty($this->_current_field)) {
             $this->_current_field['field_settings'][$key] = $value;
         }
     }
 
-    public function getCurrentFieldSetting($key)
-    {
+    public function getCurrentFieldSetting($key) {
         $settings = $this->getCurrentField('field_settings');
 
         if ($settings && !empty($settings[$key])) {
@@ -244,8 +239,7 @@ 
     /**
      * @param array $passed_field
      */
-    public function setCurrentField($passed_field)
-    {
+    public function setCurrentField($passed_field) {
         $existing_field = $this->getCurrentField();
 
         $set_field = wp_parse_args($passed_field, $existing_field);
@@ -265,8 +259,7 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getAtts($key = null)
-    {
+    public function getAtts($key = null) {
         if (!empty($key)) {
             if (isset($this->atts[$key])) {
                 return $this->atts[$key];
@@ -281,56 +274,49 @@ 
     /**
      * @param array $atts
      */
-    public function setAtts($atts)
-    {
+    public function setAtts($atts) {
         $this->atts = $atts;
     }
 
     /**
      * @return array
      */
-    public function getForm()
-    {
+    public function getForm() {
         return $this->form;
     }
 
     /**
      * @param array $form
      */
-    public function setForm($form)
-    {
+    public function setForm($form) {
         $this->form = $form;
     }
 
     /**
      * @return int|null
      */
-    public function getPostId()
-    {
+    public function getPostId() {
         return $this->post_id;
     }
 
     /**
      * @param int|null $post_id
      */
-    public function setPostId($post_id)
-    {
+    public function setPostId($post_id) {
         $this->post_id = $post_id;
     }
 
     /**
      * @return string
      */
-    public function getContext()
-    {
+    public function getContext() {
         return $this->context;
     }
 
     /**
      * @param string $context
      */
-    public function setContext($context)
-    {
+    public function setContext($context) {
         $this->context = $context;
     }
 
@@ -339,8 +325,7 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getFields($key = null)
-    {
+    public function getFields($key = null) {
         $fields = empty($this->fields) ? null : $this->fields;
 
         if ($fields && !empty($key)) {
@@ -359,8 +344,7 @@ 
      *
      * @return array Array of GravityView field layout configurations
      */
-    public function getContextFields($context = '')
-    {
+    public function getContextFields($context = '') {
         if ('' === $context) {
             $context = $this->getContext();
         }
@@ -383,8 +367,7 @@ 
     /**
      * @param array $fields
      */
-    public function setFields($fields)
-    {
+    public function setFields($fields) {
         $this->fields = $fields;
     }
 
@@ -393,8 +376,7 @@ 
      *
      * @return array|mixed|null If $key is set and field exists at $key, return that. If not set, return NULL. Otherwise, return array of fields.
      */
-    public function getField($key)
-    {
+    public function getField($key) {
         if (!empty($key)) {
             if (isset($this->fields[$key])) {
                 return $this->fields[$key];
@@ -408,80 +390,70 @@ 
      * @param string $key   The key to a specific field in the fields array
      * @param mixed  $value The value to set for the field
      */
-    public function setField($key, $value)
-    {
+    public function setField($key, $value) {
         $this->fields[$key] = $value;
     }
 
     /**
      * @return int
      */
-    public function getViewId()
-    {
+    public function getViewId() {
         return absint($this->view_id);
     }
 
     /**
      * @param int $view_id
      */
-    public function setViewId($view_id)
-    {
+    public function setViewId($view_id) {
         $this->view_id = intval($view_id);
     }
 
     /**
      * @return int
      */
-    public function getFormId()
-    {
+    public function getFormId() {
         return $this->form_id;
     }
 
     /**
      * @param int $form_id
      */
-    public function setFormId($form_id)
-    {
+    public function setFormId($form_id) {
         $this->form_id = $form_id;
     }
 
     /**
      * @return array
      */
-    public function getEntries()
-    {
+    public function getEntries() {
         return $this->entries;
     }
 
     /**
      * @param array $entries
      */
-    public function setEntries($entries)
-    {
+    public function setEntries($entries) {
         $this->entries = $entries;
     }
 
     /**
      * @return int
      */
-    public function getTotalEntries()
-    {
+    public function getTotalEntries() {
         return (int) $this->total_entries;
     }
 
     /**
      * @param int $total_entries
      */
-    public function setTotalEntries($total_entries)
-    {
+    public function setTotalEntries($total_entries) {
         $this->total_entries = intval($total_entries);
     }
 
     /**
      * @return array
      */
-    public function getPaging()
-    {
+    public function getPaging() {
         $default_params = [
             'offset'    => 0,
             'page_size' => 20,
@@ -493,8 +465,7 @@ 
     /**
      * @param array $paging
      */
-    public function setPaging($paging)
-    {
+    public function setPaging($paging) {
         $this->paging = $paging;
     }
 
@@ -510,8 +481,7 @@ 
      *  @var int $total The total number of entries
      * }
      */
-    public function getPaginationCounts()
-    {
+    public function getPaginationCounts() {
         $paging = $this->getPaging();
         $offset = $paging['offset'];
         $page_size = $paging['page_size'];
@@ -543,8 +513,7 @@ 
     /**
      * @return array
      */
-    public function getSorting()
-    {
+    public function getSorting() {
         $defaults_params = [
             'sort_field'     => 'date_created',
             'sort_direction' => 'ASC',
@@ -557,8 +526,7 @@ 
     /**
      * @param array $sorting
      */
-    public function setSorting($sorting)
-    {
+    public function setSorting($sorting) {
         $this->sorting = $sorting;
     }
 
@@ -570,8 +538,7 @@ 
      *
      * @return string
      */
-    public function getBackLinkLabel($do_replace = true)
-    {
+    public function getBackLinkLabel($do_replace = true) {
         if ($do_replace) {
             $back_link_label = GravityView_API::replace_variables($this->back_link_label, $this->getForm(), $this->getCurrentEntry());
 
@@ -584,56 +551,49 @@ 
     /**
      * @param string $back_link_label
      */
-    public function setBackLinkLabel($back_link_label)
-    {
+    public function setBackLinkLabel($back_link_label) {
         $this->back_link_label = $back_link_label;
     }
 
     /**
      * @return bool
      */
-    public function isHideUntilSearched()
-    {
+    public function isHideUntilSearched() {
         return $this->hide_until_searched;
     }
 
     /**
      * @param bool $hide_until_searched
      */
-    public function setHideUntilSearched($hide_until_searched)
-    {
+    public function setHideUntilSearched($hide_until_searched) {
         $this->hide_until_searched = $hide_until_searched;
     }
 
     /**
      * @return string
      */
-    public function getTemplatePartSlug()
-    {
+    public function getTemplatePartSlug() {
         return $this->template_part_slug;
     }
 
     /**
      * @param string $template_part_slug
      */
-    public function setTemplatePartSlug($template_part_slug)
-    {
+    public function setTemplatePartSlug($template_part_slug) {
         $this->template_part_slug = $template_part_slug;
     }
 
     /**
      * @return string
      */
-    public function getTemplatePartName()
-    {
+    public function getTemplatePartName() {
         return $this->template_part_name;
     }
 
     /**
      * @param string $template_part_name
      */
-    public function setTemplatePartName($template_part_name)
-    {
+    public function setTemplatePartName($template_part_name) {
         $this->template_part_name = $template_part_name;
     }
 
@@ -642,8 +602,7 @@ 
      *
      * @return array
      */
-    public function getCurrentEntry()
-    {
+    public function getCurrentEntry() {
         if (in_array($this->getContext(), ['edit', 'single'])) {
             $entries = $this->getEntries();
             $entry = $entries[0];
@@ -664,8 +623,7 @@ 
      *
      * @return void
      */
-    public function setCurrentEntry($current_entry)
-    {
+    public function setCurrentEntry($current_entry) {
         $this->_current_entry = $current_entry;
     }
 
@@ -676,8 +634,7 @@ 
      *
      * @return void
      */
-    public function clearCurrentEntry()
-    {
+    public function clearCurrentEntry() {
         $this->_current_entry = null;
     }
 
@@ -694,8 +651,7 @@ 
      *
      * @return string|null
      */
-    public function renderZone($zone = '', $atts = [], $echo = true)
-    {
+    public function renderZone($zone = '', $atts = [], $echo = true) {
         if (empty($zone)) {
             gravityview()->log->error('No zone defined.');
 
@@ -788,8 +744,7 @@ 
      *
      * @return null|string NULL: Template not found; String: path to template
      */
-    public function locate_template($template_names, $load = false, $require_once = true)
-    {
+    public function locate_template($template_names, $load = false, $require_once = true) {
         if (is_string($template_names) && isset($this->located_templates[$template_names])) {
             $located = $this->located_templates[$template_names];
         } else {
@@ -816,8 +771,7 @@ 
      *
      * @return mixed|null The stored data.
      */
-    public function __get($name)
-    {
+    public function __get($name) {
         if (isset($this->{$name})) {
             return $this->{$name};
         } else {
@@ -843,8 +797,7 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
+    public function add_id_specific_templates($templates, $slug, $name) {
         $additional = [];
 
         // form-19-table-body.php
@@ -870,8 +823,7 @@ 
     }
 
     // Load the template
-    public function render($slug, $name, $require_once = true)
-    {
+    public function render($slug, $name, $require_once = true) {
         $this->setTemplatePartSlug($slug);
 
         $this->setTemplatePartName($name);
@@ -896,8 +848,7 @@ 
      *
      * @return void
      */
-    public function render_widget_hooks($view_id_or_context)
-    {
+    public function render_widget_hooks($view_id_or_context) {
 
         /**
          * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
@@ -1025,8 +976,7 @@ 
      *
      * @return void
      */
-    public function _include($path)
-    {
+    public function _include($path) {
         if (file_exists($path)) {
             include $path;
         }