Changeset 2848034

Timestamp:

01/13/2023 03:47:51 PM (3 years ago)

Author:

gravitywp

Message:

Bump GravityWP - Count to version 0.9.9. PHP 8+ compatibility for calculations.

Location:

gravitywp-count

Files:

• tags/0.9.9 (added)
• tags/0.9.9/LICENSE (added)
• tags/0.9.9/gravitywp-count.php (added)
• tags/0.9.9/readme.txt (added)
• trunk/gravitywp-count.php (modified) (10 diffs)
• trunk/readme.txt (modified) (2 diffs)

gravitywp-count/trunk/gravitywp-count.php

@@ -5 +5 @@
  * Description: Adds a shortcode to count, filter and display Gravity Forms entries or the total of a number field in multiple entries.
  * Author: GravityWP
- * Version: 0.9.8
+ * Version: 0.9.9
  * Author URI: https://gravitywp.com/add-on/count/
  * License: GPL2
@@ -12 +12 @@
 if ( class_exists( 'GFForms' ) ) {
 
+    /**
+     * gravitywp_count_func.
+     *
+     * @param   array<mixed>    $atts       
+     * @param   string|null $content    Default: null
+     * @return  string
+     */
     function gravitywp_count_func( $atts, $content = null ) {
         $atts = shortcode_atts(
@@ -145 +152 @@
             $search_criteria['field_filters'][] = array(
                 'key'   => 'is_starred',
-                'value' => true,
+                'value' => 1,
             );
         }
@@ -151 +158 @@
             $search_criteria['field_filters'][] = array(
                 'key'   => 'is_starred',
-                'value' => false,
+                'value' => 0,
             );
         }
@@ -158 +165 @@
             $search_criteria['field_filters'][] = array(
                 'key'   => 'is_read',
-                'value' => true,
+                'value' => 1,
             );
         }
@@ -164 +171 @@
             $search_criteria['field_filters'][] = array(
                 'key'   => 'is_read',
-                'value' => false,
+                'value' => 0,
             );
         }
@@ -171 +178 @@
             if ( $is_approved === 'yes' ) {
                 $search_criteria['field_filters'][] = array(
-                    'key'   => GravityView_Entry_Approval::meta_key,
-                    'value' => GravityView_Entry_Approval_Status::APPROVED,
+                    'key'   => 'is_approved', // GravityView_Entry_Approval::meta_key.
+                    'value' => 1, // GravityView_Entry_Approval_Status::APPROVED.
                 );
             }
             if ( $is_approved === 'no' ) {
                 $search_criteria['field_filters'][] = array(
-                    'key'   => GravityView_Entry_Approval::meta_key,
+                    'key'   => 'is_approved', // GravityView_Entry_Approval::meta_key.
                     'is_approved',
-                    'value' => GravityView_Entry_Approval_Status::DISAPPROVED,
+                    'value' => 2, // GravityView_Entry_Approval_Status::DISAPPROVED.
                 );
             }
@@ -232 +239 @@
         $formids      = explode( ',', $formids );
         $countentries = GFAPI::count_entries( $formids, $search_criteria );
-        $raw_value    = $add_number + $countentries;
+        $raw_value    = floatval( $add_number ) + $countentries;
 
         $sorting = null;
@@ -250 +257 @@
             $entries = GFAPI::get_entries( $formids, $search_criteria, $sorting, $paging );
 
-            $raw_value = $add_number;
+            if ( is_wp_error( $entries ) ) {
+                return 'ERROR';
+            }
+
+            $raw_value = floatval( $add_number );
 
             // Loop through each entry and add number to count.
             for ( $row = 0; $row < $countentries; $row ++ ) {
-                $raw_value += is_numeric( $entries[ $row ][ $number_field ] ) ? $entries[ $row ][ $number_field ] : 0;
+                $raw_value += is_numeric( $entries[ $row ][ $number_field ] ) ? floatval( $entries[ $row ][ $number_field ] ) : 0;
             }
             // Apply multiplier to value.
-            $raw_value *= $multiply;
+            $raw_value *= floatval( $multiply );
             // Format raw value.
             $formatted_value = number_format( $raw_value, (int) $decimals, $dec_point, $thousands_sep );
         } else {
             // Apply multiplier to value.
-            $raw_value *= $multiply;
+            $raw_value *= floatval( $multiply );
             // Format raw value.
-            $formatted_value = number_format( $raw_value, '0', '.', $thousands_sep );
+            $formatted_value = number_format( $raw_value, 0, '.', $thousands_sep );
         }
 
@@ -270 +281 @@
          * Apply filter for result from count.
          *
-         * @param str $formatted_value
-         * @param str $raw_value
-         * @param array $formids
-         * @return str
+         * @param string $formatted_value
+         * @param float $raw_value
+         * @param array<string> $formids
+         * @return string
          */
-
         return apply_filters( 'gwp_count_result', $formatted_value, $raw_value, $formids );
     }

gravitywp-count/trunk/readme.txt

@@ -4 +4 @@
 Tags: gravity forms, number field, count, form, forms, gravity form
 Requires at least: 3.0.1
-Tested up to: 5.9
-Stable tag: 0.9.8
+Tested up to: 6.1
+Stable tag: 0.9.9
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -32 +32 @@
 
 == Changelog ==
+
+= 0.9.9 =
+* PHP 8+ compatibility for calculations.
 
 = 0.9.8 =