| @@ -5,93 +5,15 @@ | ||
| 5 | 5 | |
| 6 | 6 | class FrmAddonsController { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | - * @var string | |
| 9 | + * @var string $plugin | |
| 10 | 10 | */ |
| 11 | - const SCRIPT_HANDLE = 'frm-addons-page'; | |
| 12 | - | |
| 13 | - /** | |
| 14 | - * @var array | |
| 15 | - */ | |
| 16 | - private static $categories = array(); | |
| 17 | - | |
| 18 | - /** | |
| 19 | - * @var string | |
| 20 | - */ | |
| 21 | - private static $request_addon_url; | |
| 22 | - | |
| 23 | - /** | |
| 24 | - * @var string | |
| 25 | - */ | |
| 26 | 11 | protected static $plugin; |
| 27 | 12 | |
| 28 | 13 | /** |
| 29 | - * @since 6.15 | |
| 30 | - */ | |
| 31 | - public static function load_admin_hooks() { | |
| 32 | - add_action( 'admin_menu', self::class . '::menu', 100 ); | |
| 33 | - add_filter( 'pre_set_site_transient_update_plugins', self::class . '::check_update' ); | |
| 34 | - | |
| 35 | - if ( FrmAppHelper::is_admin_page( 'formidable-addons' ) ) { | |
| 36 | - self::$request_addon_url = 'https://connect.formidableforms.com/add-on-request/'; | |
| 37 | - | |
| 38 | - add_action( 'admin_enqueue_scripts', self::class . '::enqueue_assets', 15 ); | |
| 39 | - add_filter( 'frm_show_footer_links', '__return_false' ); | |
| 40 | - } | |
| 41 | - } | |
| 42 | - | |
| 43 | - /** | |
| 44 | - * Enqueues the Add-Ons page scripts and styles. | |
| 45 | - * | |
| 46 | - * @since 6.15 | |
| 47 | - * | |
| 48 | 14 | * @return void |
| 49 | 15 | */ |
| 50 | - public static function enqueue_assets() { | |
| 51 | - $plugin_url = FrmAppHelper::plugin_url(); | |
| 52 | - $version = FrmAppHelper::plugin_version(); | |
| 53 | - $js_dependencies = array( | |
| 54 | - 'wp-i18n', | |
| 55 | - // This prevents a console error "wp.hooks is undefined" in WP versions older than 5.7. | |
| 56 | - 'wp-hooks', | |
| 57 | - 'formidable_dom', | |
| 58 | - ); | |
| 59 | - | |
| 60 | - // Enqueue styles that needed. | |
| 61 | - wp_enqueue_style( 'formidable-admin' ); | |
| 62 | - wp_enqueue_style( 'formidable-grids' ); | |
| 63 | - | |
| 64 | - // Register and enqueue Add-Ons page style. | |
| 65 | - wp_register_style( self::SCRIPT_HANDLE, $plugin_url . '/css/admin/addons-page.css', array(), $version ); | |
| 66 | - wp_enqueue_style( self::SCRIPT_HANDLE ); | |
| 67 | - | |
| 68 | - // Register and enqueue Add-Ons page script. | |
| 69 | - wp_register_script( self::SCRIPT_HANDLE, $plugin_url . '/js/addons-page.js', $js_dependencies, $version, true ); | |
| 70 | - wp_localize_script( self::SCRIPT_HANDLE, 'frmAddonsVars', self::get_js_variables() ); | |
| 71 | - wp_enqueue_script( self::SCRIPT_HANDLE ); | |
| 72 | - wp_set_script_translations( self::SCRIPT_HANDLE, 'formidable' ); | |
| 73 | - | |
| 74 | - FrmAppHelper::dequeue_extra_global_scripts(); | |
| 75 | - } | |
| 76 | - | |
| 77 | - /** | |
| 78 | - * Get the Add-Ons page JS variables as an array. | |
| 79 | - * | |
| 80 | - * @since 6.15 | |
| 81 | - * | |
| 82 | - * @return array | |
| 83 | - */ | |
| 84 | - private static function get_js_variables() { | |
| 85 | - return array( | |
| 86 | - 'proIsIncluded' => FrmAppHelper::pro_is_included(), | |
| 87 | - 'addonRequestURL' => self::$request_addon_url, | |
| 88 | - ); | |
| 89 | - } | |
| 90 | - | |
| 91 | - /** | |
| 92 | - * @return void | |
| 93 | - */ | |
| 94 | 16 | public static function menu() { |
| 95 | 17 | if ( ! current_user_can( 'activate_plugins' ) ) { |
| 96 | 18 | return; |
| 97 | 19 | } |
| @@ -96,36 +18,25 @@ | ||
| 96 | 18 | return; |
| 97 | 19 | } |
| 98 | 20 | |
| 99 | 21 | $label = __( 'Add-Ons', 'formidable' ); |
| 100 | - $label = '<span style="color:#3FCA89">' . esc_html( $label ) . '</span>'; | |
| 22 | + $label = '<span style="color:#1da867">' . $label . '</span>'; | |
| 101 | 23 | |
| 102 | 24 | add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' ); |
| 103 | 25 | |
| 104 | - // remove default created subpage, make the page with highest priority as default. | |
| 105 | - remove_submenu_page( 'formidable', 'formidable' ); | |
| 106 | - | |
| 107 | 26 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 108 | - $cta_text = FrmSalesApi::get_best_sale_value( 'menu_cta_text' ); | |
| 109 | - if ( ! $cta_text ) { | |
| 110 | - $cta_text = __( 'Upgrade', 'formidable' ); | |
| 111 | - } | |
| 112 | - | |
| 113 | 27 | add_submenu_page( |
| 114 | 28 | 'formidable', |
| 115 | 29 | 'Formidable | ' . __( 'Upgrade', 'formidable' ), |
| 116 | - '<span class="frm-upgrade-submenu">' . esc_html( $cta_text ) . '</span>', | |
| 30 | + '<span class="frm-upgrade-submenu">' . __( 'Upgrade', 'formidable' ) . '</span>', | |
| 117 | 31 | 'frm_view_forms', |
| 118 | 32 | 'formidable-pro-upgrade', |
| 119 | - function () { | |
| 120 | - // This function doesn't need to do anything. | |
| 121 | - // The redirect is handled earlier to avoid issues with the headers being sent. | |
| 122 | - } | |
| 33 | + 'FrmAddonsController::upgrade_to_pro' | |
| 123 | 34 | ); |
| 124 | 35 | } elseif ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) ) { |
| 125 | 36 | wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); |
| 126 | 37 | exit; |
| 127 | - }//end if | |
| 38 | + } | |
| 128 | 39 | } |
| 129 | 40 | |
| 130 | 41 | /** |
| 131 | 42 | * @return void |
| @@ -131,31 +42,28 @@ | ||
| 131 | 42 | * @return void |
| 132 | 43 | */ |
| 133 | 44 | public static function list_addons() { |
| 134 | 45 | FrmAppHelper::include_svg(); |
| 46 | + $installed_addons = apply_filters( 'frm_installed_addons', array() ); | |
| 47 | + $license_type = ''; | |
| 135 | 48 | |
| 136 | - $view_path = FrmAppHelper::plugin_path() . '/classes/views/addons/'; | |
| 137 | - $installed_addons = apply_filters( 'frm_installed_addons', array() ); | |
| 138 | - $addons = self::get_api_addons(); | |
| 139 | - $errors = array(); | |
| 140 | - $license_type = ''; | |
| 141 | - $request_addon_url = self::$request_addon_url; | |
| 49 | + $addons = self::get_api_addons(); | |
| 50 | + $errors = array(); | |
| 142 | 51 | |
| 143 | 52 | if ( isset( $addons['error'] ) ) { |
| 144 | - $api = new FrmFormApi(); | |
| 145 | - $errors = $api->get_error_from_response( $addons ); | |
| 146 | - $license_type = $addons['error']['type'] ?? ''; | |
| 53 | + $api = new FrmFormApi(); | |
| 54 | + $errors = $api->get_error_from_response( $addons ); | |
| 55 | + $license_type = isset( $addons['error']['type'] ) ? $addons['error']['type'] : ''; | |
| 147 | 56 | unset( $addons['error'] ); |
| 148 | 57 | } |
| 149 | 58 | |
| 150 | - $pro = array( | |
| 59 | + $pro = array( | |
| 151 | 60 | 'pro' => array( |
| 152 | - 'title' => 'Formidable Forms Pro', | |
| 153 | - 'slug' => 'formidable-pro', | |
| 154 | - 'released' => '2011-02-05', | |
| 155 | - 'docs' => 'knowledgebase/', | |
| 156 | - 'categories' => array( 'basic', 'plus', 'business', 'elite' ), | |
| 157 | - 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.', | |
| 61 | + 'title' => 'Formidable Forms Pro', | |
| 62 | + 'slug' => 'formidable-pro', | |
| 63 | + 'released' => '2011-02-05', | |
| 64 | + 'docs' => 'knowledgebase/', | |
| 65 | + 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.', | |
| 158 | 66 | ), |
| 159 | 67 | ); |
| 160 | 68 | $addons = $pro + $addons; |
| 161 | 69 | self::prepare_addons( $addons ); |
| @@ -161,105 +69,14 @@ | ||
| 161 | 69 | self::prepare_addons( $addons ); |
| 162 | 70 | |
| 163 | 71 | $pricing = FrmAppHelper::admin_upgrade_link( 'addons' ); |
| 164 | 72 | |
| 165 | - self::organize_and_get_categories(); | |
| 166 | - $categories = self::$categories; | |
| 167 | - | |
| 168 | - include $view_path . 'index.php'; | |
| 73 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' ); | |
| 169 | 74 | } |
| 170 | 75 | |
| 171 | 76 | /** |
| 172 | - * Organize and set categories. | |
| 173 | - * | |
| 174 | - * @since 6.15 | |
| 175 | - * | |
| 176 | 77 | * @return void |
| 177 | 78 | */ |
| 178 | - protected static function organize_and_get_categories() { | |
| 179 | - unset( self::$categories['strategy11'] ); | |
| 180 | - ksort( self::$categories ); | |
| 181 | - | |
| 182 | - $bottom_categories = array(); | |
| 183 | - $plans = FrmFormsHelper::get_license_types( | |
| 184 | - array( | |
| 185 | - 'include_all' => false, | |
| 186 | - 'case_lower' => true, | |
| 187 | - ) | |
| 188 | - ); | |
| 189 | - | |
| 190 | - // Extract the elements to move | |
| 191 | - foreach ( $plans as $plan ) { | |
| 192 | - if ( isset( self::$categories[ $plan ] ) ) { | |
| 193 | - $bottom_categories[ $plan ] = self::$categories[ $plan ]; | |
| 194 | - unset( self::$categories[ $plan ] ); | |
| 195 | - } | |
| 196 | - } | |
| 197 | - | |
| 198 | - $special_categories = array(); | |
| 199 | - if ( 'elite' !== self::license_type() ) { | |
| 200 | - $special_categories['available-addons'] = array( | |
| 201 | - 'name' => __( 'Available', 'formidable' ), | |
| 202 | - // To be assigned via JavaScript. | |
| 203 | - 'count' => 0, | |
| 204 | - ); | |
| 205 | - } | |
| 206 | - | |
| 207 | - $special_categories['active-addons'] = array( | |
| 208 | - 'name' => __( 'Active', 'formidable' ), | |
| 209 | - // To be assigned via JavaScript. | |
| 210 | - 'count' => 0, | |
| 211 | - ); | |
| 212 | - | |
| 213 | - $special_categories['all-items'] = array( | |
| 214 | - 'name' => __( 'All Add-Ons', 'formidable' ), | |
| 215 | - // To be assigned via JavaScript. | |
| 216 | - 'count' => 0, | |
| 217 | - ); | |
| 218 | - | |
| 219 | - self::$categories = array_merge( | |
| 220 | - $special_categories, | |
| 221 | - self::$categories, | |
| 222 | - $bottom_categories | |
| 223 | - ); | |
| 224 | - } | |
| 225 | - | |
| 226 | - /** | |
| 227 | - * Organize and set categories. | |
| 228 | - * | |
| 229 | - * @since 6.15 | |
| 230 | - * | |
| 231 | - * @param array $addon The addon array that will be modified by reference. | |
| 232 | - * @return void | |
| 233 | - */ | |
| 234 | - protected static function set_categories( &$addon ) { | |
| 235 | - if ( ! isset( $addon['categories'] ) ) { | |
| 236 | - return; | |
| 237 | - } | |
| 238 | - | |
| 239 | - $addon['category-slugs'] = array(); | |
| 240 | - | |
| 241 | - foreach ( $addon['categories'] as $category ) { | |
| 242 | - $category = FrmFormsHelper::convert_legacy_package_names( $category ); | |
| 243 | - $category_slug = sanitize_title( $category ); | |
| 244 | - | |
| 245 | - // Add the slug to the new array. | |
| 246 | - $addon['category-slugs'][] = $category_slug; | |
| 247 | - | |
| 248 | - if ( ! isset( self::$categories[ $category_slug ] ) ) { | |
| 249 | - self::$categories[ $category_slug ] = array( | |
| 250 | - 'name' => $category, | |
| 251 | - 'count' => 0, | |
| 252 | - ); | |
| 253 | - } | |
| 254 | - | |
| 255 | - ++self::$categories[ $category_slug ]['count']; | |
| 256 | - } | |
| 257 | - } | |
| 258 | - | |
| 259 | - /** | |
| 260 | - * @return void | |
| 261 | - */ | |
| 262 | 79 | public static function license_settings() { |
| 263 | 80 | $plugins = apply_filters( 'frm_installed_addons', array() ); |
| 264 | 81 | if ( empty( $plugins ) ) { |
| 265 | 82 | esc_html_e( 'There are no plugins on your site that require a license', 'formidable' ); |
| @@ -268,9 +85,9 @@ | ||
| 268 | 85 | } |
| 269 | 86 | |
| 270 | 87 | ksort( $plugins ); |
| 271 | 88 | |
| 272 | - include FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php'; | |
| 89 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' ); | |
| 273 | 90 | } |
| 274 | 91 | |
| 275 | 92 | /** |
| 276 | 93 | * @return array |
| @@ -292,21 +109,8 @@ | ||
| 292 | 109 | return $addons; |
| 293 | 110 | } |
| 294 | 111 | |
| 295 | 112 | /** |
| 296 | - * Retrieves the count of available addons. | |
| 297 | - * | |
| 298 | - * @since 6.9 | |
| 299 | - * | |
| 300 | - * @return int Count of addons. | |
| 301 | - */ | |
| 302 | - public static function get_addons_count() { | |
| 303 | - $addons = self::get_api_addons(); | |
| 304 | - | |
| 305 | - return count( $addons ); | |
| 306 | - } | |
| 307 | - | |
| 308 | - /** | |
| 309 | 113 | * If the API is unable to connect, show something on the addons page |
| 310 | 114 | * |
| 311 | 115 | * @since 3.04.03 |
| 312 | 116 | * @return array |
| @@ -414,9 +218,9 @@ | ||
| 414 | 218 | $api = new FrmFormApi( $license ); |
| 415 | 219 | $downloads = $api->get_api_info(); |
| 416 | 220 | $pro = self::get_pro_from_addons( $downloads ); |
| 417 | 221 | |
| 418 | - return $pro['url'] ?? ''; | |
| 222 | + return isset( $pro['url'] ) ? $pro['url'] : ''; | |
| 419 | 223 | } |
| 420 | 224 | |
| 421 | 225 | /** |
| 422 | 226 | * @since 4.08 |
| @@ -452,9 +256,9 @@ | ||
| 452 | 256 | * @param array $addons |
| 453 | 257 | * @return array |
| 454 | 258 | */ |
| 455 | 259 | protected static function get_pro_from_addons( $addons ) { |
| 456 | - return $addons['93790'] ?? array(); | |
| 260 | + return isset( $addons['93790'] ) ? $addons['93790'] : array(); | |
| 457 | 261 | } |
| 458 | 262 | |
| 459 | 263 | /** |
| 460 | 264 | * @since 4.06 |
| @@ -468,10 +272,8 @@ | ||
| 468 | 272 | } |
| 469 | 273 | |
| 470 | 274 | /** |
| 471 | 275 | * @since 4.0.01 |
| 472 | - * | |
| 473 | - * @return bool | |
| 474 | 276 | */ |
| 475 | 277 | public static function is_license_expired() { |
| 476 | 278 | $version_info = self::get_primary_license_info(); |
| 477 | 279 | if ( ! isset( $version_info['error'] ) ) { |
| @@ -477,20 +279,22 @@ | ||
| 477 | 279 | if ( ! isset( $version_info['error'] ) ) { |
| 478 | 280 | return false; |
| 479 | 281 | } |
| 480 | 282 | |
| 481 | - $expires = $version_info['error']['expires'] ?? 0; | |
| 482 | - if ( empty( $expires ) || $expires > time() ) { | |
| 483 | - return false; | |
| 484 | - } | |
| 283 | + return $version_info['error']; | |
| 284 | + } | |
| 485 | 285 | |
| 486 | - $rate_limited = ! empty( $version_info['response_code'] ) && 429 === (int) $version_info['response_code']; | |
| 487 | - if ( $rate_limited ) { | |
| 488 | - // Do not return false positives for rate limited responses. | |
| 489 | - return false; | |
| 286 | + /** | |
| 287 | + * @since 4.08 | |
| 288 | + * | |
| 289 | + * @return boolean|int false or the number of days until expiration. | |
| 290 | + */ | |
| 291 | + public static function is_license_expiring() { | |
| 292 | + if ( is_callable( 'FrmProAddonsController::is_license_expiring' ) ) { | |
| 293 | + return FrmProAddonsController::is_license_expiring(); | |
| 490 | 294 | } |
| 491 | 295 | |
| 492 | - return $version_info['error']; | |
| 296 | + return false; | |
| 493 | 297 | } |
| 494 | 298 | |
| 495 | 299 | /** |
| 496 | 300 | * @since 4.08 |
| @@ -531,9 +335,9 @@ | ||
| 531 | 335 | $version_info = self::fill_update_addon_info( $installed_addons ); |
| 532 | 336 | $transient->last_checked = time(); |
| 533 | 337 | $wp_plugins = self::get_plugins(); |
| 534 | 338 | |
| 535 | - foreach ( $version_info as $plugin ) { | |
| 339 | + foreach ( $version_info as $id => $plugin ) { | |
| 536 | 340 | $plugin = (object) $plugin; |
| 537 | 341 | |
| 538 | 342 | if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) { |
| 539 | 343 | continue; |
| @@ -548,10 +352,10 @@ | ||
| 548 | 352 | // don't show an update if the plugin isn't installed |
| 549 | 353 | continue; |
| 550 | 354 | } |
| 551 | 355 | |
| 552 | - $wp_plugin = $wp_plugins[ $folder ] ?? array(); | |
| 553 | - $wp_version = $wp_plugin['Version'] ?? '1.0'; | |
| 356 | + $wp_plugin = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array(); | |
| 357 | + $wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0'; | |
| 554 | 358 | $plugin->slug = explode( '/', $folder )[0]; |
| 555 | 359 | |
| 556 | 360 | if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) { |
| 557 | 361 | $transient->response[ $folder ] = $plugin; |
| @@ -629,9 +433,9 @@ | ||
| 629 | 433 | if ( empty( $plugin ) ) { |
| 630 | 434 | continue; |
| 631 | 435 | } |
| 632 | 436 | |
| 633 | - $download_id = $plugin['id'] ?? 0; | |
| 437 | + $download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0; | |
| 634 | 438 | if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) { |
| 635 | 439 | // if this addon is using its own license, get the update url |
| 636 | 440 | $addon_info = $api->get_api_info(); |
| 637 | 441 | |
| @@ -664,14 +468,14 @@ | ||
| 664 | 468 | $link = array( |
| 665 | 469 | 'url' => $addon['plugin'], |
| 666 | 470 | 'class' => 'frm-activate-addon', |
| 667 | 471 | ); |
| 668 | - } elseif ( ! empty( $addon['url'] ) ) { | |
| 472 | + } elseif ( isset( $addon['url'] ) && ! empty( $addon['url'] ) ) { | |
| 669 | 473 | $link = array( |
| 670 | 474 | 'url' => $addon['url'], |
| 671 | 475 | 'class' => 'frm-install-addon', |
| 672 | 476 | ); |
| 673 | - } elseif ( ! empty( $addon['categories'] ) ) { | |
| 477 | + } elseif ( isset( $addon['categories'] ) && ! empty( $addon['categories'] ) ) { | |
| 674 | 478 | $link = array( |
| 675 | 479 | 'categories' => $addon['categories'], |
| 676 | 480 | ); |
| 677 | 481 | } |
| @@ -693,9 +497,9 @@ | ||
| 693 | 497 | * @since 4.09 |
| 694 | 498 | * @param string $plugin The plugin slug. |
| 695 | 499 | * @return array|false |
| 696 | 500 | */ |
| 697 | - public static function get_addon( $plugin ) { | |
| 501 | + protected static function get_addon( $plugin ) { | |
| 698 | 502 | $addons = self::get_api_addons(); |
| 699 | 503 | self::prepare_addons( $addons ); |
| 700 | 504 | foreach ( $addons as $addon ) { |
| 701 | 505 | $slug = explode( '/', $addon['plugin'] ); |
| @@ -731,9 +535,9 @@ | ||
| 731 | 535 | $download_id = $license->download_id; |
| 732 | 536 | $plugin = array(); |
| 733 | 537 | if ( empty( $download_id ) && ! empty( $addons ) ) { |
| 734 | 538 | foreach ( $addons as $addon ) { |
| 735 | - if ( strtolower( $license->plugin_name ) === strtolower( $addon['title'] ) ) { | |
| 539 | + if ( strtolower( $license->plugin_name ) == strtolower( $addon['title'] ) ) { | |
| 736 | 540 | return $addon; |
| 737 | 541 | } |
| 738 | 542 | } |
| 739 | 543 | } elseif ( isset( $addons[ $download_id ] ) ) { |
| @@ -797,13 +601,11 @@ | ||
| 797 | 601 | |
| 798 | 602 | if ( ! isset( $addon['link'] ) ) { |
| 799 | 603 | $addon['link'] = 'downloads/' . $slug . '/'; |
| 800 | 604 | } |
| 605 | + self::prepare_addon_link( $addon['link'] ); | |
| 801 | 606 | |
| 802 | - self::prepare_addon_link( $addon['link'] ); | |
| 803 | 607 | self::set_addon_status( $addon ); |
| 804 | - self::set_categories( $addon ); | |
| 805 | - | |
| 806 | 608 | $addons[ $id ] = $addon; |
| 807 | 609 | }//end foreach |
| 808 | 610 | } |
| 809 | 611 | |
| @@ -817,9 +619,9 @@ | ||
| 817 | 619 | return is_plugin_active( $file_name ); |
| 818 | 620 | } |
| 819 | 621 | |
| 820 | 622 | /** |
| 821 | - * @return false|string either 'visual-views' or 'views', false if one is not found. | |
| 623 | + * @return string|false either 'visual-views' or 'views', false if one is not found. | |
| 822 | 624 | */ |
| 823 | 625 | private static function get_active_views_version() { |
| 824 | 626 | if ( ! is_callable( 'FrmViewsAppHelper::plugin_version' ) ) { |
| 825 | 627 | return false; |
| @@ -874,64 +676,263 @@ | ||
| 874 | 676 | } |
| 875 | 677 | } |
| 876 | 678 | |
| 877 | 679 | /** |
| 878 | - * @since 5.5.2 | |
| 879 | - * | |
| 880 | - * @param string $plugin | |
| 881 | - * @param string $redirect | |
| 882 | - * @param bool $network_wide | |
| 883 | - * @param bool $silent | |
| 884 | - * @return WP_Error|null Null on success, WP_Error on invalid file. | |
| 680 | + * @return void | |
| 885 | 681 | */ |
| 886 | - protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) { | |
| 887 | - if ( ! function_exists( 'activate_plugin' ) ) { | |
| 888 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 889 | - } | |
| 890 | - return activate_plugin( $plugin, $redirect, $network_wide, $silent ); | |
| 682 | + public static function upgrade_to_pro() { | |
| 683 | + FrmAppHelper::include_svg(); | |
| 684 | + | |
| 685 | + $link_parts = array( | |
| 686 | + 'medium' => 'upgrade', | |
| 687 | + 'content' => 'button', | |
| 688 | + ); | |
| 689 | + | |
| 690 | + $features = array( | |
| 691 | + 'Display Entries' => array( | |
| 692 | + array( | |
| 693 | + 'label' => 'Display form data with virtually limitless views', | |
| 694 | + 'link' => array( | |
| 695 | + 'content' => 'views', | |
| 696 | + 'param' => 'views-display-form-data', | |
| 697 | + ), | |
| 698 | + 'lite' => false, | |
| 699 | + ), | |
| 700 | + array( | |
| 701 | + 'label' => 'Generate graphs and stats based on your submitted data', | |
| 702 | + 'link' => array( | |
| 703 | + 'content' => 'graphs', | |
| 704 | + 'param' => 'statistics-graphs-wordpress-forms', | |
| 705 | + ), | |
| 706 | + 'lite' => false, | |
| 707 | + ), | |
| 708 | + ), | |
| 709 | + 'Entry Management' => array( | |
| 710 | + array( | |
| 711 | + 'label' => 'Import entries from a CSV', | |
| 712 | + 'link' => array( | |
| 713 | + 'content' => 'import-entries', | |
| 714 | + 'param' => 'importing-exporting-wordpress-forms', | |
| 715 | + ), | |
| 716 | + 'lite' => false, | |
| 717 | + ), | |
| 718 | + array( | |
| 719 | + 'label' => 'Logged-in users can save drafts and return later', | |
| 720 | + 'link' => array( | |
| 721 | + 'content' => 'save-drafts', | |
| 722 | + 'param' => 'save-drafts-wordpress-form', | |
| 723 | + ), | |
| 724 | + 'lite' => false, | |
| 725 | + ), | |
| 726 | + array( | |
| 727 | + 'label' => 'Flexibly and powerfully view, edit, and delete entries from anywhere on your site', | |
| 728 | + 'link' => array( | |
| 729 | + 'content' => 'front-edit', | |
| 730 | + 'param' => 'wordpress-front-end-editing', | |
| 731 | + ), | |
| 732 | + 'lite' => false, | |
| 733 | + ), | |
| 734 | + array( | |
| 735 | + 'label' => 'View form submissions from the back-end', | |
| 736 | + 'lite' => true, | |
| 737 | + ), | |
| 738 | + array( | |
| 739 | + 'label' => 'Export your entries to a CSV', | |
| 740 | + 'lite' => true, | |
| 741 | + ), | |
| 742 | + ), | |
| 743 | + 'Form Building' => array( | |
| 744 | + array( | |
| 745 | + 'label' => 'Save a calculated value into a field', | |
| 746 | + 'link' => array( | |
| 747 | + 'content' => 'calculations', | |
| 748 | + 'param' => 'field-calculations-wordpress-form', | |
| 749 | + ), | |
| 750 | + 'lite' => false, | |
| 751 | + ), | |
| 752 | + array( | |
| 753 | + 'label' => 'Allow multiple file uploads', | |
| 754 | + 'link' => array( | |
| 755 | + 'content' => 'file-uploads', | |
| 756 | + 'param' => 'wordpress-multi-file-upload-fields', | |
| 757 | + ), | |
| 758 | + 'lite' => false, | |
| 759 | + ), | |
| 760 | + array( | |
| 761 | + 'label' => 'Repeat sections of fields', | |
| 762 | + 'link' => array( | |
| 763 | + 'content' => 'repeaters', | |
| 764 | + 'param' => 'repeatable-sections-forms', | |
| 765 | + ), | |
| 766 | + 'lite' => false, | |
| 767 | + ), | |
| 768 | + array( | |
| 769 | + 'label' => 'Hide and show fields conditionally based on other fields or the user\'s role', | |
| 770 | + 'link' => array( | |
| 771 | + 'content' => 'conditional-logic', | |
| 772 | + 'param' => 'conditional-logic-wordpress-forms', | |
| 773 | + ), | |
| 774 | + 'lite' => false, | |
| 775 | + ), | |
| 776 | + array( | |
| 777 | + 'label' => 'Confirmation fields', | |
| 778 | + 'link' => array( | |
| 779 | + 'content' => 'confirmation-fields', | |
| 780 | + 'param' => 'confirmation-fields-wordpress-forms', | |
| 781 | + ), | |
| 782 | + 'lite' => false, | |
| 783 | + ), | |
| 784 | + array( | |
| 785 | + 'label' => 'Multi-paged forms', | |
| 786 | + 'link' => array( | |
| 787 | + 'content' => 'page-breaks', | |
| 788 | + 'param' => 'wordpress-multi-page-forms', | |
| 789 | + ), | |
| 790 | + 'lite' => false, | |
| 791 | + ), | |
| 792 | + array( | |
| 793 | + 'label' => 'Include section headings, page breaks, rich text, dates, times, scales, star ratings, sliders, toggles, dynamic fields populated from other forms, passwords, and tags in advanced forms.', | |
| 794 | + 'lite' => false, | |
| 795 | + ), | |
| 796 | + array( | |
| 797 | + 'label' => 'Include text, email, url, paragraph text, radio, checkbox, dropdown fields, hidden fields, user ID fields, and HTML blocks in your form.', | |
| 798 | + 'lite' => true, | |
| 799 | + ), | |
| 800 | + array( | |
| 801 | + 'label' => 'Drag & Drop Form building', | |
| 802 | + 'link' => array( | |
| 803 | + 'content' => 'drag-drop', | |
| 804 | + 'param' => 'drag-drop-forms', | |
| 805 | + ), | |
| 806 | + 'lite' => true, | |
| 807 | + ), | |
| 808 | + array( | |
| 809 | + 'label' => 'Create forms from Templates', | |
| 810 | + 'link' => array( | |
| 811 | + 'content' => 'form-templates', | |
| 812 | + 'param' => 'wordpress-form-templates', | |
| 813 | + ), | |
| 814 | + 'lite' => true, | |
| 815 | + ), | |
| 816 | + array( | |
| 817 | + 'label' => 'Import and export forms with XML', | |
| 818 | + 'link' => array( | |
| 819 | + 'content' => 'import', | |
| 820 | + 'param' => 'importing-exporting-wordpress-forms', | |
| 821 | + ), | |
| 822 | + 'lite' => true, | |
| 823 | + ), | |
| 824 | + array( | |
| 825 | + 'label' => 'Use input placeholder text in your fields that clear when typing starts.', | |
| 826 | + 'lite' => true, | |
| 827 | + ), | |
| 828 | + ), | |
| 829 | + 'Form Actions' => array( | |
| 830 | + array( | |
| 831 | + 'label' => 'Conditionally send your email notifications based on values in your form', | |
| 832 | + 'link' => array( | |
| 833 | + 'content' => 'conditional-emails', | |
| 834 | + ), | |
| 835 | + 'lite' => false, | |
| 836 | + ), | |
| 837 | + array( | |
| 838 | + 'label' => 'Create and edit WordPress posts or custom posts from the front-end', | |
| 839 | + 'link' => array( | |
| 840 | + 'content' => 'create-posts', | |
| 841 | + 'param' => 'create-posts-pages-wordpress-forms', | |
| 842 | + ), | |
| 843 | + 'lite' => false, | |
| 844 | + ), | |
| 845 | + array( | |
| 846 | + 'label' => 'Send multiple emails and autoresponders', | |
| 847 | + 'link' => array( | |
| 848 | + 'content' => 'multiple-emails', | |
| 849 | + 'param' => 'virtually-unlimited-emails', | |
| 850 | + ), | |
| 851 | + 'lite' => true, | |
| 852 | + ), | |
| 853 | + ), | |
| 854 | + 'Form Appearance' => array( | |
| 855 | + array( | |
| 856 | + 'label' => 'Create Multiple styles for different forms', | |
| 857 | + 'link' => array( | |
| 858 | + 'content' => 'multiple-styles', | |
| 859 | + 'param' => 'wordpress-visual-form-styler', | |
| 860 | + ), | |
| 861 | + 'lite' => false, | |
| 862 | + ), | |
| 863 | + array( | |
| 864 | + 'label' => 'Customizable layout with CSS classes', | |
| 865 | + 'link' => array( | |
| 866 | + 'content' => 'form-layout', | |
| 867 | + 'param' => 'wordpress-mobile-friendly-forms', | |
| 868 | + ), | |
| 869 | + 'lite' => true, | |
| 870 | + ), | |
| 871 | + array( | |
| 872 | + 'label' => 'Customize the HTML for your forms', | |
| 873 | + 'link' => array( | |
| 874 | + 'content' => 'custom-html', | |
| 875 | + 'param' => 'customizable-html-wordpress-form', | |
| 876 | + ), | |
| 877 | + 'lite' => true, | |
| 878 | + ), | |
| 879 | + array( | |
| 880 | + 'label' => 'Style your form with the Visual Form Styler', | |
| 881 | + 'lite' => true, | |
| 882 | + ), | |
| 883 | + ), | |
| 884 | + ); | |
| 885 | + | |
| 886 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/upgrade_to_pro.php' ); | |
| 891 | 887 | } |
| 892 | 888 | |
| 893 | 889 | /** |
| 894 | - * Deactivate a specified plugin. | |
| 890 | + * Install Pro after connection with Formidable. | |
| 895 | 891 | * |
| 896 | - * @since 6.8 | |
| 892 | + * @since 4.02.05 | |
| 897 | 893 | * |
| 898 | - * @param string $plugin | |
| 899 | - * @param bool $silent | |
| 900 | 894 | * @return void |
| 901 | 895 | */ |
| 902 | - protected static function deactivate_plugin( $plugin, $silent = false ) { | |
| 903 | - if ( ! function_exists( 'deactivate_plugins' ) ) { | |
| 904 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 896 | + public static function connect_pro() { | |
| 897 | + FrmAppHelper::permission_check( 'install_plugins' ); | |
| 898 | + check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 899 | + | |
| 900 | + $url = self::get_current_plugin(); | |
| 901 | + if ( FrmAppHelper::pro_is_installed() || empty( $url ) ) { | |
| 902 | + wp_die(); | |
| 905 | 903 | } |
| 906 | - deactivate_plugins( $plugin, $silent ); | |
| 904 | + | |
| 905 | + $response = array(); | |
| 906 | + | |
| 907 | + // It's already installed and active. | |
| 908 | + $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 909 | + if ( is_wp_error( $active ) ) { | |
| 910 | + // The plugin was installed, but not active. Download it now. | |
| 911 | + self::ajax_install_addon(); | |
| 912 | + } else { | |
| 913 | + $response['active'] = true; | |
| 914 | + $response['success'] = true; | |
| 915 | + } | |
| 916 | + | |
| 917 | + echo json_encode( $response ); | |
| 918 | + wp_die(); | |
| 907 | 919 | } |
| 908 | 920 | |
| 909 | 921 | /** |
| 910 | - * Uninstall a specified plugin. | |
| 922 | + * @since 5.5.2 | |
| 911 | 923 | * |
| 912 | - * @since 6.8 | |
| 913 | - * | |
| 914 | 924 | * @param string $plugin |
| 915 | - * @return true|WP_Error True on success, WP_Error on invalid file. | |
| 925 | + * @param string $redirect | |
| 926 | + * @param bool $network_wide | |
| 927 | + * @param bool $silent | |
| 928 | + * @return null|WP_Error Null on success, WP_Error on invalid file. | |
| 916 | 929 | */ |
| 917 | - protected static function uninstall_plugin( $plugin ) { | |
| 918 | - if ( ! current_user_can( 'delete_plugins' ) ) { | |
| 919 | - return new WP_Error( 'uninstall_failed', __( 'Current user cannot delete plugins.', 'formidable' ) ); | |
| 920 | - } | |
| 921 | - | |
| 922 | - if ( ! function_exists( 'delete_plugins' ) ) { | |
| 930 | + protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) { | |
| 931 | + if ( ! function_exists( 'activate_plugin' ) ) { | |
| 923 | 932 | require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
| 924 | 933 | } |
| 925 | - | |
| 926 | - self::deactivate_plugin( $plugin, true ); | |
| 927 | - $result = delete_plugins( array( $plugin ) ); | |
| 928 | - | |
| 929 | - if ( is_wp_error( $result ) ) { | |
| 930 | - return $result; | |
| 931 | - } | |
| 932 | - | |
| 933 | - return true; | |
| 934 | + return activate_plugin( $plugin, $redirect, $network_wide, $silent ); | |
| 934 | 935 | } |
| 935 | 936 | |
| 936 | 937 | /** |
| 937 | 938 | * @since 5.0.10 |
| @@ -946,10 +947,8 @@ | ||
| 946 | 947 | } |
| 947 | 948 | |
| 948 | 949 | /** |
| 949 | 950 | * @since 4.08 |
| 950 | - * | |
| 951 | - * @return array|void | |
| 952 | 951 | */ |
| 953 | 952 | protected static function download_and_activate() { |
| 954 | 953 | if ( is_admin() ) { |
| 955 | 954 | FrmAppHelper::set_current_screen_and_hook_suffix(); |
| @@ -960,9 +959,9 @@ | ||
| 960 | 959 | $installed = self::install_addon(); |
| 961 | 960 | if ( is_array( $installed ) && isset( $installed['message'] ) ) { |
| 962 | 961 | return $installed; |
| 963 | 962 | } |
| 964 | - self::handle_addon_action( $installed, 'activate' ); | |
| 963 | + self::maybe_activate_addon( $installed ); | |
| 965 | 964 | } |
| 966 | 965 | |
| 967 | 966 | /** |
| 968 | 967 | * @since 3.04.02 |
| @@ -970,12 +969,12 @@ | ||
| 970 | 969 | * @return void |
| 971 | 970 | */ |
| 972 | 971 | protected static function maybe_show_cred_form() { |
| 973 | 972 | if ( ! function_exists( 'request_filesystem_credentials' ) ) { |
| 974 | - include_once ABSPATH . 'wp-admin/includes/file.php'; | |
| 973 | + include_once( ABSPATH . 'wp-admin/includes/file.php' ); | |
| 975 | 974 | } |
| 976 | 975 | |
| 977 | - // Start output buffering to catch the filesystem form if credentials are needed. | |
| 976 | + // Start output bufferring to catch the filesystem form if credentials are needed. | |
| 978 | 977 | ob_start(); |
| 979 | 978 | |
| 980 | 979 | $show_form = false; |
| 981 | 980 | $method = ''; |
| @@ -1014,9 +1013,11 @@ | ||
| 1014 | 1013 | * |
| 1015 | 1014 | * @return bool |
| 1016 | 1015 | */ |
| 1017 | 1016 | public static function url_is_allowed( $download_url ) { |
| 1018 | - return FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) || in_array( $download_url, self::allowed_external_urls(), true ); | |
| 1017 | + return ( | |
| 1018 | + FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) || in_array( $download_url, self::allowed_external_urls(), true ) | |
| 1019 | + ); | |
| 1019 | 1020 | } |
| 1020 | 1021 | |
| 1021 | 1022 | /** |
| 1022 | 1023 | * We do not need any extra credentials if we have gotten this far, |
| @@ -1053,130 +1054,26 @@ | ||
| 1053 | 1054 | return $plugin; |
| 1054 | 1055 | } |
| 1055 | 1056 | |
| 1056 | 1057 | /** |
| 1057 | - * Handle the AJAX request to activate an add-on. | |
| 1058 | + * @since 3.06.03 | |
| 1058 | 1059 | * |
| 1059 | - * @since 6.8 | |
| 1060 | - * | |
| 1061 | 1060 | * @return void |
| 1062 | 1061 | */ |
| 1063 | 1062 | public static function ajax_activate_addon() { |
| 1064 | - self::process_addon_action( | |
| 1065 | - function ( $plugin ) { | |
| 1066 | - return self::handle_addon_action( $plugin, 'activate' ); | |
| 1067 | - }, | |
| 1068 | - array( 'FrmAddonsController', 'get_addon_activation_response' ) | |
| 1069 | - ); | |
| 1070 | - } | |
| 1071 | 1063 | |
| 1072 | - /** | |
| 1073 | - * @since 3.04.02 | |
| 1074 | - * | |
| 1075 | - * @param string $installed The plugin folder name with file name. | |
| 1076 | - */ | |
| 1077 | - protected static function maybe_activate_addon( $installed ) { | |
| 1078 | - self::ajax_activate_addon(); | |
| 1079 | - } | |
| 1064 | + self::install_addon_permissions(); | |
| 1080 | 1065 | |
| 1081 | - /** | |
| 1082 | - * Handle the AJAX request to deactivate an add-on. | |
| 1083 | - * | |
| 1084 | - * @since 6.8 | |
| 1085 | - * | |
| 1086 | - * @return void | |
| 1087 | - */ | |
| 1088 | - public static function ajax_deactivate_addon() { | |
| 1089 | - self::process_addon_action( | |
| 1090 | - function ( $plugin ) { | |
| 1091 | - return self::handle_addon_action( $plugin, 'deactivate' ); | |
| 1092 | - } | |
| 1093 | - ); | |
| 1094 | - } | |
| 1095 | - | |
| 1096 | - /** | |
| 1097 | - * Handle the AJAX request to uninstall an add-on. | |
| 1098 | - * | |
| 1099 | - * @since 6.8 | |
| 1100 | - * | |
| 1101 | - * @return void | |
| 1102 | - */ | |
| 1103 | - public static function ajax_uninstall_addon() { | |
| 1104 | - self::process_addon_action( | |
| 1105 | - function ( $plugin ) { | |
| 1106 | - return self::handle_addon_action( $plugin, 'uninstall' ); | |
| 1107 | - } | |
| 1108 | - ); | |
| 1109 | - } | |
| 1110 | - | |
| 1111 | - /** | |
| 1112 | - * Process a specific action (activate, deactivate, uninstall) on an add-on. | |
| 1113 | - * | |
| 1114 | - * @since 6.8 | |
| 1115 | - * | |
| 1116 | - * @param callable $action_callback The specific add-on action to be executed. | |
| 1117 | - * @param callable|null $response_callback Optional. The response handling callback. Default null. | |
| 1118 | - * @return void | |
| 1119 | - */ | |
| 1120 | - private static function process_addon_action( $action_callback, $response_callback = null ) { | |
| 1121 | - self::install_addon_permissions(); | |
| 1122 | 1066 | FrmAppHelper::set_current_screen_and_hook_suffix(); |
| 1123 | 1067 | |
| 1124 | 1068 | $plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 1125 | - call_user_func( $action_callback, $plugin ); | |
| 1069 | + self::maybe_activate_addon( $plugin ); | |
| 1126 | 1070 | |
| 1127 | - if ( is_callable( $response_callback ) ) { | |
| 1128 | - wp_send_json_success( call_user_func( $response_callback ) ); | |
| 1129 | - return; | |
| 1130 | - } | |
| 1131 | - | |
| 1132 | - wp_send_json_success(); | |
| 1071 | + echo json_encode( self::get_addon_activation_response() ); | |
| 1072 | + wp_die(); | |
| 1133 | 1073 | } |
| 1134 | 1074 | |
| 1135 | 1075 | /** |
| 1136 | - * Attempt to perform a specific action (activate, deactivate, uninstall) on an add-on. | |
| 1137 | - * | |
| 1138 | - * @since 6.8 | |
| 1139 | - * | |
| 1140 | - * @param string $installed The plugin folder name with file name. | |
| 1141 | - * @param string $action The action type ('activate', 'deactivate', 'uninstall'). | |
| 1142 | - * @return array|void | |
| 1143 | - */ | |
| 1144 | - protected static function handle_addon_action( $installed, $action ) { | |
| 1145 | - if ( ! $installed || ! $action ) { | |
| 1146 | - return; | |
| 1147 | - } | |
| 1148 | - | |
| 1149 | - $result = null; | |
| 1150 | - switch ( $action ) { | |
| 1151 | - case 'activate': | |
| 1152 | - $result = self::activate_plugin( $installed ); | |
| 1153 | - break; | |
| 1154 | - case 'deactivate': | |
| 1155 | - self::deactivate_plugin( $installed ); | |
| 1156 | - break; | |
| 1157 | - case 'uninstall': | |
| 1158 | - $result = self::uninstall_plugin( $installed ); | |
| 1159 | - break; | |
| 1160 | - } | |
| 1161 | - | |
| 1162 | - if ( is_wp_error( $result ) ) { | |
| 1163 | - // Ignore the invalid header message that shows with nested plugins. | |
| 1164 | - if ( $result->get_error_code() !== 'no_plugin_header' ) { | |
| 1165 | - if ( wp_doing_ajax() ) { | |
| 1166 | - wp_send_json_error( array( 'error' => $result->get_error_message() ) ); | |
| 1167 | - } | |
| 1168 | - return array( | |
| 1169 | - 'message' => $result->get_error_message(), | |
| 1170 | - 'success' => false, | |
| 1171 | - ); | |
| 1172 | - } | |
| 1173 | - } | |
| 1174 | - | |
| 1175 | - return $result; | |
| 1176 | - } | |
| 1177 | - | |
| 1178 | - /** | |
| 1179 | 1076 | * @return array |
| 1180 | 1077 | */ |
| 1181 | 1078 | private static function get_addon_activation_response() { |
| 1182 | 1079 | $activating_page = self::get_activating_page(); |
| @@ -1210,8 +1107,34 @@ | ||
| 1210 | 1107 | return ''; |
| 1211 | 1108 | } |
| 1212 | 1109 | |
| 1213 | 1110 | /** |
| 1111 | + * @since 3.04.02 | |
| 1112 | + * | |
| 1113 | + * @param string $installed The plugin folder name with file name. | |
| 1114 | + */ | |
| 1115 | + protected static function maybe_activate_addon( $installed ) { | |
| 1116 | + if ( ! $installed ) { | |
| 1117 | + return; | |
| 1118 | + } | |
| 1119 | + | |
| 1120 | + $activate = self::activate_plugin( $installed ); | |
| 1121 | + if ( is_wp_error( $activate ) ) { | |
| 1122 | + // Ignore the invalid header message that shows with nested plugins. | |
| 1123 | + if ( $activate->get_error_code() !== 'no_plugin_header' ) { | |
| 1124 | + if ( wp_doing_ajax() ) { | |
| 1125 | + echo json_encode( array( 'error' => $activate->get_error_message() ) ); | |
| 1126 | + wp_die(); | |
| 1127 | + } | |
| 1128 | + return array( | |
| 1129 | + 'message' => $activate->get_error_message(), | |
| 1130 | + 'success' => false, | |
| 1131 | + ); | |
| 1132 | + } | |
| 1133 | + } | |
| 1134 | + } | |
| 1135 | + | |
| 1136 | + /** | |
| 1214 | 1137 | * Run security checks before installing |
| 1215 | 1138 | * |
| 1216 | 1139 | * @since 3.04.02 |
| 1217 | 1140 | * |
| @@ -1234,18 +1157,15 @@ | ||
| 1234 | 1157 | public static function connect_link() { |
| 1235 | 1158 | $auth = get_option( 'frm_connect_token' ); |
| 1236 | 1159 | if ( empty( $auth ) ) { |
| 1237 | 1160 | $auth = hash( 'sha512', wp_rand() ); |
| 1238 | - update_option( 'frm_connect_token', $auth, 'no' ); | |
| 1161 | + update_option( 'frm_connect_token', $auth ); | |
| 1239 | 1162 | } |
| 1240 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title', 'formidable-settings' ); | |
| 1241 | - $link = 'https://formidableforms.com/api-connect/'; | |
| 1163 | + $link = FrmAppHelper::admin_upgrade_link( 'connect', 'api-connect' ); | |
| 1242 | 1164 | $args = array( |
| 1243 | 1165 | 'v' => 2, |
| 1244 | 1166 | 'siteurl' => FrmAppHelper::site_url(), |
| 1245 | 1167 | 'url' => get_rest_url(), |
| 1246 | - 'inst' => (int) FrmAppHelper::pro_is_included(), | |
| 1247 | - 'return' => $page, | |
| 1248 | 1168 | 'token' => $auth, |
| 1249 | 1169 | 'l' => self::get_pro_license(), |
| 1250 | 1170 | ); |
| 1251 | 1171 | |
| @@ -1263,12 +1183,9 @@ | ||
| 1263 | 1183 | // Verify params present (auth & download link). |
| 1264 | 1184 | $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' ); |
| 1265 | 1185 | $post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' ); |
| 1266 | 1186 | |
| 1267 | - // The download link is not required if already installed. | |
| 1268 | - $is_installed = FrmAppHelper::pro_is_included(); | |
| 1269 | - $file_missing = ! $is_installed && empty( $post_url ); | |
| 1270 | - if ( ! $post_auth || $file_missing ) { | |
| 1187 | + if ( ! $post_auth || ! $post_url ) { | |
| 1271 | 1188 | return false; |
| 1272 | 1189 | } |
| 1273 | 1190 | |
| 1274 | 1191 | // Verify auth. |
| @@ -1283,10 +1200,8 @@ | ||
| 1283 | 1200 | /** |
| 1284 | 1201 | * Install and/or activate the add-on file. |
| 1285 | 1202 | * |
| 1286 | 1203 | * @since 4.08 |
| 1287 | - * | |
| 1288 | - * @return array | |
| 1289 | 1204 | */ |
| 1290 | 1205 | public static function install_addon_api() { |
| 1291 | 1206 | self::$plugin = FrmAppHelper::get_param( 'file_url', '', 'request', 'esc_url_raw' ); |
| 1292 | 1207 | |
| @@ -1297,11 +1212,11 @@ | ||
| 1297 | 1212 | |
| 1298 | 1213 | // It's already installed and active. |
| 1299 | 1214 | $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); |
| 1300 | 1215 | if ( is_wp_error( $active ) ) { |
| 1301 | - $response = self::maybe_download_and_activate(); | |
| 1302 | - if ( is_array( $response ) ) { | |
| 1303 | - // The download failed. | |
| 1216 | + // Download plugin now. | |
| 1217 | + $response = self::download_and_activate(); | |
| 1218 | + if ( is_array( $response ) && isset( $response['success'] ) ) { | |
| 1304 | 1219 | return $response; |
| 1305 | 1220 | } |
| 1306 | 1221 | } |
| 1307 | 1222 | |
| @@ -1328,31 +1243,8 @@ | ||
| 1328 | 1243 | ); |
| 1329 | 1244 | } |
| 1330 | 1245 | |
| 1331 | 1246 | /** |
| 1332 | - * @since 6.8.3 | |
| 1333 | - * | |
| 1334 | - * @return array|true | |
| 1335 | - */ | |
| 1336 | - private static function maybe_download_and_activate() { | |
| 1337 | - if ( ! self::$plugin ) { | |
| 1338 | - return array( | |
| 1339 | - 'success' => false, | |
| 1340 | - 'message' => __( 'The plugin download was not found.', 'formidable' ), | |
| 1341 | - ); | |
| 1342 | - } | |
| 1343 | - | |
| 1344 | - // Download plugin now. | |
| 1345 | - $response = self::download_and_activate(); | |
| 1346 | - if ( is_array( $response ) && isset( $response['success'] ) ) { | |
| 1347 | - // The download failed. | |
| 1348 | - return $response; | |
| 1349 | - } | |
| 1350 | - | |
| 1351 | - return true; | |
| 1352 | - } | |
| 1353 | - | |
| 1354 | - /** | |
| 1355 | 1247 | * Render a conditional action button for a specified plugin |
| 1356 | 1248 | * |
| 1357 | 1249 | * @since 4.09 |
| 1358 | 1250 | * |
| @@ -1389,9 +1281,9 @@ | ||
| 1389 | 1281 | * @param array $atts { |
| 1390 | 1282 | * Button attributes. |
| 1391 | 1283 | * |
| 1392 | 1284 | * @type array $addon |
| 1393 | - * @type false|string $license_type | |
| 1285 | + * @type string|false $license_type | |
| 1394 | 1286 | * @type string $plan_required |
| 1395 | 1287 | * @type string $upgrade_link |
| 1396 | 1288 | * } |
| 1397 | 1289 | * @return void |
| @@ -1408,16 +1300,15 @@ | ||
| 1408 | 1300 | /** |
| 1409 | 1301 | * @since 4.09.01 |
| 1410 | 1302 | * |
| 1411 | 1303 | * @param array|false $addon |
| 1412 | - * @param array|string $upgrade_link | |
| 1304 | + * @param string|array $upgrade_link | |
| 1413 | 1305 | * |
| 1414 | 1306 | * @return void |
| 1415 | 1307 | */ |
| 1416 | - public static function addon_upgrade_link( $addon, $upgrade_link ) { | |
| 1308 | + protected static function addon_upgrade_link( $addon, $upgrade_link ) { | |
| 1417 | 1309 | $atts = is_array( $upgrade_link ) ? $upgrade_link : array(); |
| 1418 | 1310 | $upgrade_link = is_array( $upgrade_link ) ? $upgrade_link['link'] : $upgrade_link; |
| 1419 | - $text = ! empty( $atts['text'] ) ? $atts['text'] : __( 'Upgrade Now', 'formidable' ); | |
| 1420 | 1311 | |
| 1421 | 1312 | if ( $addon ) { |
| 1422 | 1313 | $upgrade_link .= '&utm_content=' . $addon['slug']; |
| 1423 | 1314 | } |
| @@ -1432,9 +1323,9 @@ | ||
| 1432 | 1323 | $class .= ' frm-button-secondary frm-button-sm'; |
| 1433 | 1324 | } |
| 1434 | 1325 | ?> |
| 1435 | 1326 | <a class="install-now button <?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>"> |
| 1436 | - <?php echo esc_html( $text ); ?> | |
| 1327 | + <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?> | |
| 1437 | 1328 | </a> |
| 1438 | 1329 | <?php |
| 1439 | 1330 | } |
| 1440 | 1331 | |
| @@ -1508,6 +1399,110 @@ | ||
| 1508 | 1399 | $requires = ''; |
| 1509 | 1400 | } |
| 1510 | 1401 | |
| 1511 | 1402 | return $requires; |
| 1403 | + } | |
| 1404 | + | |
| 1405 | + /** | |
| 1406 | + * @since 4.06.02 | |
| 1407 | + * | |
| 1408 | + * @deprecated 4.09.01 | |
| 1409 | + * | |
| 1410 | + * @return void | |
| 1411 | + */ | |
| 1412 | + public static function ajax_multiple_addons() { | |
| 1413 | + FrmDeprecated::ajax_multiple_addons(); | |
| 1414 | + } | |
| 1415 | + | |
| 1416 | + /** | |
| 1417 | + * @since 3.04.03 | |
| 1418 | + * @deprecated 3.06 | |
| 1419 | + * @codeCoverageIgnore | |
| 1420 | + * @return array | |
| 1421 | + */ | |
| 1422 | + public static function error_for_license( $license ) { | |
| 1423 | + return FrmDeprecated::error_for_license( $license ); | |
| 1424 | + } | |
| 1425 | + | |
| 1426 | + /** | |
| 1427 | + * @since 3.04.03 | |
| 1428 | + * @deprecated 3.06 | |
| 1429 | + * @codeCoverageIgnore | |
| 1430 | + */ | |
| 1431 | + public static function get_pro_updater() { | |
| 1432 | + return FrmDeprecated::get_pro_updater(); | |
| 1433 | + } | |
| 1434 | + | |
| 1435 | + /** | |
| 1436 | + * @since 3.04.03 | |
| 1437 | + * @deprecated 3.06 | |
| 1438 | + * @codeCoverageIgnore | |
| 1439 | + * | |
| 1440 | + * @return array | |
| 1441 | + */ | |
| 1442 | + public static function get_addon_info( $license = '' ) { | |
| 1443 | + return FrmDeprecated::get_addon_info( $license ); | |
| 1444 | + } | |
| 1445 | + | |
| 1446 | + /** | |
| 1447 | + * @since 3.04.03 | |
| 1448 | + * @deprecated 3.06 | |
| 1449 | + * @codeCoverageIgnore | |
| 1450 | + * | |
| 1451 | + * @return string | |
| 1452 | + */ | |
| 1453 | + public static function get_cache_key( $license ) { | |
| 1454 | + return FrmDeprecated::get_cache_key( $license ); | |
| 1455 | + } | |
| 1456 | + | |
| 1457 | + /** | |
| 1458 | + * @since 3.04.03 | |
| 1459 | + * | |
| 1460 | + * @deprecated 3.06 | |
| 1461 | + * | |
| 1462 | + * @codeCoverageIgnore | |
| 1463 | + * | |
| 1464 | + * @return void | |
| 1465 | + */ | |
| 1466 | + public static function reset_cached_addons( $license = '' ) { | |
| 1467 | + FrmDeprecated::reset_cached_addons( $license ); | |
| 1468 | + } | |
| 1469 | + | |
| 1470 | + /** | |
| 1471 | + * @since 2.03.08 | |
| 1472 | + * @deprecated 3.04.03 | |
| 1473 | + * @codeCoverageIgnore | |
| 1474 | + * | |
| 1475 | + * @param boolean $return | |
| 1476 | + * @param string $package | |
| 1477 | + * | |
| 1478 | + * @return boolean | |
| 1479 | + */ | |
| 1480 | + public static function add_shorten_edd_filename_filter( $return, $package ) { | |
| 1481 | + return FrmDeprecated::add_shorten_edd_filename_filter( $return, $package ); | |
| 1482 | + } | |
| 1483 | + | |
| 1484 | + /** | |
| 1485 | + * @since 2.03.08 | |
| 1486 | + * @deprecated 3.04.03 | |
| 1487 | + * @codeCoverageIgnore | |
| 1488 | + * | |
| 1489 | + * @param string $filename | |
| 1490 | + * @param string $ext | |
| 1491 | + * | |
| 1492 | + * @return string | |
| 1493 | + */ | |
| 1494 | + public static function shorten_edd_filename( $filename, $ext ) { | |
| 1495 | + return FrmDeprecated::shorten_edd_filename( $filename, $ext ); | |
| 1496 | + } | |
| 1497 | + | |
| 1498 | + /** | |
| 1499 | + * @deprecated 3.04.03 | |
| 1500 | + * | |
| 1501 | + * @codeCoverageIgnore | |
| 1502 | + * | |
| 1503 | + * @return void | |
| 1504 | + */ | |
| 1505 | + public static function get_licenses() { | |
| 1506 | + FrmDeprecated::get_licenses(); | |
| 1512 | 1507 | } |
| 1513 | 1508 | } |
