Changeset 3746820 for formidable/trunk/classes/models/FrmAddon.php

Timestamp:

10/14/2026 04:54:36 PM (2 weeks ago)

Author:

formidableforms

Message:

Update to version 7.0 from GitHub

File:

• formidable/trunk/classes/models/FrmAddon.php (modified) (12 diffs)

formidable/trunk/classes/models/FrmAddon.php

@@ -81 +81 @@
          */
         protected $save_status;
+
+        /**
+         * Whether the last license request returned a decoded JSON response.
+         *
+         * @since 7.0
+         *
+         * @var bool
+         */
+        private $license_response_is_json = false;
 
         /**
@@ -586 +595 @@
                         $response = $this->activate_license( $license );
 
-                        if ( ! $response['success'] ) {
+                        // Drop the license only when the API reported on it. An unreachable API says
+                        // nothing, so the defined license is kept and checked again later.
+                        if ( ! $response['success'] && empty( $response['inconclusive'] ) ) {
                                 $license = '';
                         }
@@ -656 +667 @@
          *
          * @since 6.8.3
-         *
-         * @param bool|string $is_valid If license activation was successful. May be a string 'valid'.
-         *
-         * @return void
-         */
-        protected function maybe_set_active( $is_valid ) {
+         * @since 7.0 Added the $is_conclusive param.
+         *
+         * @param bool|string $is_valid      If license activation was successful. May be a string 'valid'.
+         * @param bool        $is_conclusive Whether the API reported on the license. False when the
+         *                                   check could not reach a verdict, such as a connection
+         *                                   error, in which case the saved license is left alone.
+         *
+         * @return void
+         */
+        protected function maybe_set_active( $is_valid, $is_conclusive = true ) {
+                if ( ! $is_valid && ! $is_conclusive ) {
+                        // Nothing came back about this license, so don't discard what is saved.
+                        return;
+                }
+
                 update_option( $this->option_name . 'active', $is_valid );
 
@@ -1003 +1023 @@
                 $response = $this->get_license_status();
 
-                if ( ! empty( $this->save_status['response_code'] ) && 429 === $this->save_status['response_code'] ) {
-                        // If we got a rate limit response, don't clear the license.
+                if ( ! empty( $response['inconclusive'] ) ) {
+                        // The API did not report on this license, so there is nothing to act on. A
+                        // license that activated before stays in place until the API says otherwise.
                         return;
                 }
@@ -1143 +1164 @@
          */
         private function activate_license( $license ) {
-                $this->set_license( $license );
-                $this->license = $license;
+                $previous_license = $this->license;
+                $this->license    = $license;
 
                 $this->die_if_not_allowed();
@@ -1154 +1175 @@
                 $is_valid = false;
 
-                if ( $response['error'] ) {
-                        $response['message'] = $response['status'];
+                if ( $response['inconclusive'] ) {
+                        $response['message'] = $response['status'] ? $response['status'] : __( 'You had an error communicating with the Formidable API.', 'formidable' );
+                        $this->license       = $previous_license;
                 } else {
+                        $this->set_license( $license );
                         $messages = $this->get_messages();
 
@@ -1169 +1192 @@
                                 $response['success'] = true;
                         }
-
-                        $this->maybe_set_active( $is_valid );
-                }
-
+                }
+
+                $this->maybe_set_active( $is_valid, ! $response['inconclusive'] );
+
+                // Record the check under the license now in place, even when the API gave no
+                // verdict. Otherwise a defined license is retried, and refused, on the next page load.
                 $this->update_last_checked( (bool) $is_valid );
 
+                if ( $is_valid ) {
+                        // Setting the license active clears the license caches, so the new license details are available here.
+                        return $this->add_activation_response_data( $response );
+                }
+
+                return $response;
+        }
+
+        /**
+         * Add extra details to the response for a license that just activated.
+         * Pro overrides this to include the license type, so the license message
+         * can be updated without reloading the page.
+         *
+         * @since 7.0
+         *
+         * @param array $response The activation response.
+         *
+         * @return array
+         */
+        protected function add_activation_response_data( $response ) {
                 return $response;
         }
@@ -1198 +1243 @@
 
         /**
+         * @since 7.0 Added the inconclusive key, so a check that never reached the API
+         *            can be told apart from one where the API reported on the license.
+         *
          * @return array
          */
@@ -1204 +1252 @@
 
                 $response = array(
-                        'status' => 'missing',
-                        'error'  => true,
+                        'status'       => '',
+                        'error'        => true,
+                        'inconclusive' => true,
                 );
 
                 if ( ! $this->license ) {
-                        $response['error'] = false;
+                        $response['status']       = 'missing';
+                        $response['error']        = false;
+                        $response['inconclusive'] = false;
                         return $response;
                 }
@@ -1216 +1267 @@
 
                 try {
-                        $response['error'] = false;
-                        $license_data      = $this->send_mothership_request( 'activate_license' );
-
-                        // $license_data->license will be either "valid" or "invalid"
+                        $license_data = $this->send_mothership_request( 'activate_license' );
+                        $status       = '';
+
+                        // $license_data['license'] will be a status such as "valid" or "invalid". A
+                        // string response is an error message rather than a license status.
                         if ( is_array( $license_data ) ) {
-                                if ( ! empty( $license_data['license'] ) && in_array( $license_data['license'], array( 'valid', 'invalid' ), true ) ) {
-                                        $response['status']          = $license_data['license'];
-                                        $this->save_status['status'] = $license_data['license'];
-                                        $is_valid                    = 'valid' === $license_data['license'];
+                                if ( ! empty( $license_data['license'] ) && is_string( $license_data['license'] ) ) {
+                                        $status = $license_data['license'];
                                 }
-                        } else {
-                                $response['status'] = $license_data;
+                        } elseif ( is_string( $license_data ) ) {
+                                $status = $license_data;
+                        }
+
+                        if ( $status ) {
+                                $response['status'] = $status;
+                        }
+
+                        if ( $status && $this->license_response_is_json && 429 !== (int) ( $this->save_status['response_code'] ?? 0 ) ) {
+                                $response['error']        = false;
+                                $response['inconclusive'] = false;
+                                $is_valid                 = 'valid' === $status;
+
+                                if ( in_array( $status, array( 'valid', 'invalid' ), true ) ) {
+                                        $this->save_status['status'] = $status;
+                                }
                         }
                 } catch ( Exception $e ) {
                         $response['status'] = $e->getMessage();
-                }
+                }//end try
 
                 $this->update_last_checked( $is_valid );
@@ -1320 +1384 @@
 
         /**
-         * @param string $action
-         *
-         * @return string
+         * @since 7.0 The return type covers the decoded body, which is an array when the
+         *            API answers with JSON, and an error message string otherwise.
+         *
+         * @param string $action The request to send, such as activate_license.
+         *
+         * @return array|string
          */
         public function send_mothership_request( $action ) {
-                $api_params = array(
+                $this->license_response_is_json = false;
+                $api_params                     = array(
                         'edd_action' => $action,
                         'license'    => $this->license,
@@ -1365 +1433 @@
 
                         if ( null !== $json_res ) {
-                                $message = is_array( $json_res ) && isset( $json_res['error'] ) ? $json_res['error'] : $json_res;
+                                $this->license_response_is_json = true;
+                                $message                        = is_array( $json_res ) && isset( $json_res['error'] ) ? $json_res['error'] : $json_res;
                         } elseif ( ! empty( $resp['response'] ) && ! empty( $resp['response']['code'] ) ) {
                                 $resp['body'] = wp_strip_all_tags( $resp['body'] );