Changeset 3746820 for formidable/trunk/classes/controllers/FrmAddonsController.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/controllers/FrmAddonsController.php (modified) (15 diffs)

formidable/trunk/classes/controllers/FrmAddonsController.php

@@ -19 +19 @@
          * @var string
          */
-        private static $request_addon_url;
-
-        /**
-         * @var string
-         */
         protected static $plugin;
 
@@ -38 +33 @@
                         return;
                 }
-
-                self::$request_addon_url = 'https://connect.formidableforms.com/add-on-request/';
 
                 add_action( 'admin_enqueue_scripts', self::class . '::enqueue_assets', 15 );
@@ -88 +81 @@
         private static function get_js_variables() {
                 return array(
-                        'proIsIncluded'   => FrmAppHelper::pro_is_included(),
-                        'addonRequestURL' => self::$request_addon_url,
+                        'proIsIncluded' => FrmAppHelper::pro_is_included(),
                 );
         }
@@ -139 +131 @@
                 FrmAppHelper::include_svg();
 
-                $view_path         = FrmAppHelper::plugin_path() . '/classes/views/addons/';
-                $installed_addons  = apply_filters( 'frm_installed_addons', array() );
-                $addons            = self::get_api_addons();
-                $errors            = array();
-                $license_type      = '';
-                $request_addon_url = self::$request_addon_url;
+                $view_path        = FrmAppHelper::plugin_path() . '/classes/views/addons/';
+                $installed_addons = apply_filters( 'frm_installed_addons', array() );
+                $addons           = self::get_api_addons();
+                $errors           = array();
+                $license_type     = '';
 
                 if ( isset( $addons['error'] ) ) {
@@ -164 +155 @@
                         ),
                 );
-                $addons = $pro + $addons;
+                $addons = $pro + self::get_built_in_addons() + $addons;
+                $addons = self::move_addon_after( $addons, 'stripe', 'stripe-payments' );
                 self::prepare_addons( $addons );
 
@@ -173 +165 @@
 
                 include $view_path . 'index.php';
+        }
+
+        /**
+         * Get the payment gateways that ship inside Lite so they render as active add-on cards.
+         *
+         * These are not installable plugins. The `built_in` flag gives them an active
+         * status, keeps them unlocked, and limits the card footer to the docs link.
+         *
+         * @since 7.0
+         *
+         * @return array<string,array<string,mixed>>
+         */
+        protected static function get_built_in_addons() {
+                return array(
+                        'stripe-payments' => array(
+                                'slug'       => 'stripe-payments',
+                                'title'      => 'Stripe',
+                                'built_in'   => true,
+                                'categories' => array( 'Ecommerce' ),
+                                'docs'       => 'knowledgebase/stripe/',
+                                'excerpt'    => 'Any Formidable forms on your site can accept credit card payments without users ever leaving your site.',
+                        ),
+                        'square-payments' => array(
+                                'slug'       => 'square-payments',
+                                'title'      => 'Square',
+                                'built_in'   => true,
+                                'categories' => array( 'Ecommerce' ),
+                                'docs'       => 'knowledgebase/square/',
+                                'excerpt'    => 'Take one-time payments with Square, with support for Apple Pay and Google Pay.',
+                        ),
+                        'paypal-commerce' => array(
+                                'slug'       => 'paypal-commerce',
+                                'title'      => 'PayPal Commerce',
+                                'built_in'   => true,
+                                'categories' => array( 'Ecommerce' ),
+                                'docs'       => 'knowledgebase/formidable-paypal/',
+                                'excerpt'    => 'Collect instant payments and recurring payments with PayPal Commerce on any Formidable form.',
+                        ),
+                );
+        }
+
+        /**
+         * Move an add-on to display immediately after another one.
+         *
+         * Used to keep "Stripe Pro" next to the always-on "Stripe" card, since
+         * the API add-ons are otherwise appended after all built-in gateways.
+         * Add-ons are matched by their normalized slug rather than their array
+         * key, because API-sourced add-ons are keyed by a numeric download id
+         * with the real slug in their `slug` field.
+         *
+         * @since 7.0
+         *
+         * @param array<int|string,array<string,mixed>> $addons     The full addons array, keyed by slug or id.
+         * @param string                                $slug       Normalized slug of the add-on to move.
+         * @param string                                $after_slug Normalized slug of the add-on it should follow.
+         *
+         * @return array<int|string,array<string,mixed>>
+         */
+        protected static function move_addon_after( $addons, $slug, $after_slug ) {
+                $target_id = self::find_addon_id_by_slug( $addons, $slug );
+                $after_id  = self::find_addon_id_by_slug( $addons, $after_slug );
+
+                if ( null === $target_id || null === $after_id ) {
+                        return $addons;
+                }
+
+                $addon = $addons[ $target_id ];
+                unset( $addons[ $target_id ] );
+
+                $reordered = array();
+
+                foreach ( $addons as $id => $value ) {
+                        $reordered[ $id ] = $value;
+
+                        if ( $id === $after_id ) {
+                                $reordered[ $target_id ] = $addon;
+                        }
+                }
+
+                return $reordered;
+        }
+
+        /**
+         * Find an add-on's array key by its normalized slug.
+         *
+         * Mirrors the slug derivation in prepare_addons(): a numeric key names
+         * an API-sourced add-on whose real slug lives in its `slug` field,
+         * while a string key (built-in gateways, the fallback list) already is
+         * the slug.
+         *
+         * @since 7.0
+         *
+         * @param array<int|string,array<string,mixed>> $addons The full addons array, keyed by slug or id.
+         * @param string                                $slug   Normalized slug to find.
+         *
+         * @return int|string|null
+         */
+        protected static function find_addon_id_by_slug( $addons, $slug ) {
+                foreach ( $addons as $id => $addon ) {
+                        $addon_slug = is_numeric( $id )
+                        ? str_replace( array( '-wordpress-plugin', '-wordpress' ), '', $addon['slug'] )
+                        : $id;
+
+                        if ( $addon_slug === $slug ) {
+                                return $id;
+                        }
+                }
+
+                return null;
+        }
+
+        /**
+         * Override how an add-on is presented on the Add-Ons page.
+         *
+         * The built-in gateways cover base payment processing, so the add-ons that
+         * extend them are presented as their Pro/Legacy tiers until the API reflects
+         * it. Names only — the add-ons keep their original excerpts.
+         *
+         * @since 7.0
+         *
+         * @param array  $addon The addon array that will be modified by reference.
+         * @param string $slug  The addon slug.
+         *
+         * @return void
+         */
+        protected static function override_addon_display( &$addon, $slug ) {
+                $overrides = array(
+                        'stripe'          => array(
+                                'display_name' => 'Stripe Pro',
+                        ),
+                        'paypal-standard' => array(
+                                'display_name' => 'PayPal Legacy',
+                        ),
+                );
+
+                if ( isset( $overrides[ $slug ] ) ) {
+                        $addon = array_merge( $addon, $overrides[ $slug ] );
+                }
         }
 
@@ -977 +1107 @@
                         }
 
+                        self::override_addon_display( $addon, $slug );
+
                         $addon['installed'] = self::is_installed( $file_name );
 
@@ -1079 +1211 @@
          */
         protected static function set_addon_status( &$addon ) {
-                if ( ! empty( $addon['activate_url'] ) ) {
+                if ( ! empty( $addon['built_in'] ) ) {
+                        $addon['status'] = array(
+                                'type'  => 'active',
+                                'label' => __( 'Active', 'formidable' ),
+                        );
+                } elseif ( ! empty( $addon['activate_url'] ) ) {
                         $addon['status'] = array(
                                 'type'  => 'installed',
@@ -1094 +1231 @@
                                 'label' => __( 'Not Installed', 'formidable' ),
                         );
-                }
+                }//end if
         }
 
@@ -1458 +1595 @@
          */
         public static function connect_link() {
+                $user_id = get_current_user_id();
+
+                if ( ! self::user_can_connect_account( $user_id ) ) {
+                        return '';
+                }
+
                 $auth = get_option( 'frm_connect_token' );
 
-                if ( ! $auth ) {
-                        $auth = hash( 'sha512', wp_rand() );
+                if ( ! $auth || ! self::user_can_connect_account( (int) get_option( 'frm_connect_user' ) ) ) {
+                        $auth = hash( 'sha512', wp_generate_password( 64, true, true ) );
                         update_option( 'frm_connect_token', $auth, false );
+                        update_option( 'frm_connect_user', $user_id, false );
                 }
 
@@ -1481 +1625 @@
 
         /**
+         * Check whether a user can authorize the account connection.
+         *
+         * @since 7.0
+         *
+         * @param int $user_id The user authorizing the account connection.
+         *
+         * @return bool
+         */
+        private static function user_can_connect_account( $user_id ) {
+                if ( ! $user_id || ! user_can( $user_id, 'activate_plugins' ) ) {
+                        return false;
+                }
+
+                return user_can( $user_id, 'install_plugins' ) || FrmAppHelper::pro_is_included() || self::is_installed( 'formidable-pro/formidable-pro.php' );
+        }
+
+        /**
          * Check the auth value for install permission.
          *
@@ -1488 +1649 @@
          */
         public static function can_install_addon_api() {
+                // The external callback uses the permissions of the user who initiated the connection.
+                if ( ! self::user_can_connect_account( (int) get_option( 'frm_connect_user' ) ) ) {
+                        return false;
+                }
+
                 // Verify params present (auth & download link).
                 $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' );
@@ -1493 +1659 @@
 
                 // The download link is not required if already installed.
-                $is_installed = FrmAppHelper::pro_is_included();
+                $is_installed = FrmAppHelper::pro_is_included() || self::is_installed( 'formidable-pro/formidable-pro.php' );
                 $file_missing = ! $is_installed && ! $post_url;
 
@@ -1513 +1679 @@
          */
         public static function install_addon_api() {
-                self::$plugin = FrmAppHelper::get_param( 'file_url', '', 'request', 'esc_url_raw' );
+                self::$plugin        = FrmAppHelper::get_param( 'file_url', '', 'request', 'esc_url_raw' );
+                $can_install_plugins = user_can( (int) get_option( 'frm_connect_user' ), 'install_plugins' );
 
                 // Delete so cannot replay.
                 delete_option( 'frm_connect_token' );
+                delete_option( 'frm_connect_user' );
 
                 // It's already installed and active.
@@ -1522 +1690 @@
 
                 if ( is_wp_error( $active ) ) {
+                        if ( ! $can_install_plugins ) {
+                                return array(
+                                        'success' => false,
+                                        'message' => __( 'You do not have permission to install plugins.', 'formidable' ),
+                                );
+                        }
+
                         $response = self::maybe_download_and_activate();