| @@ -4,96 +4,8 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | class FrmAddonsController { |
| 7 | 7 | |
| 8 | - /** | |
| 9 | - * @var string | |
| 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 | - protected static $plugin; | |
| 27 | - | |
| 28 | - /** | |
| 29 | - * @since 6.15 | |
| 30 | - * | |
| 31 | - * @return void | |
| 32 | - */ | |
| 33 | - public static function load_admin_hooks() { | |
| 34 | - add_action( 'admin_menu', self::class . '::menu', 100 ); | |
| 35 | - add_filter( 'pre_set_site_transient_update_plugins', self::class . '::check_update' ); | |
| 36 | - | |
| 37 | - if ( FrmAppHelper::is_admin_page( 'formidable-addons' ) ) { | |
| 38 | - self::$request_addon_url = 'https://connect.formidableforms.com/add-on-request/'; | |
| 39 | - | |
| 40 | - add_action( 'admin_enqueue_scripts', self::class . '::enqueue_assets', 15 ); | |
| 41 | - add_filter( 'frm_show_footer_links', '__return_false' ); | |
| 42 | - } | |
| 43 | - } | |
| 44 | - | |
| 45 | - /** | |
| 46 | - * Enqueues the Add-Ons page scripts and styles. | |
| 47 | - * | |
| 48 | - * @since 6.15 | |
| 49 | - * | |
| 50 | - * @return void | |
| 51 | - */ | |
| 52 | - public static function enqueue_assets() { | |
| 53 | - $plugin_url = FrmAppHelper::plugin_url(); | |
| 54 | - $version = FrmAppHelper::plugin_version(); | |
| 55 | - $js_dependencies = array( | |
| 56 | - 'wp-i18n', | |
| 57 | - // This prevents a console error "wp.hooks is undefined" in WP versions older than 5.7. | |
| 58 | - 'wp-hooks', | |
| 59 | - 'formidable_dom', | |
| 60 | - ); | |
| 61 | - | |
| 62 | - // Enqueue styles that needed. | |
| 63 | - wp_enqueue_style( 'formidable-admin' ); | |
| 64 | - wp_enqueue_style( 'formidable-grids' ); | |
| 65 | - | |
| 66 | - // Register and enqueue Add-Ons page style. | |
| 67 | - wp_register_style( self::SCRIPT_HANDLE, $plugin_url . '/css/admin/addons-page.css', array(), $version ); | |
| 68 | - wp_enqueue_style( self::SCRIPT_HANDLE ); | |
| 69 | - | |
| 70 | - // Register and enqueue Add-Ons page script. | |
| 71 | - wp_register_script( self::SCRIPT_HANDLE, $plugin_url . '/js/addons-page.js', $js_dependencies, $version, true ); | |
| 72 | - wp_localize_script( self::SCRIPT_HANDLE, 'frmAddonsVars', self::get_js_variables() ); | |
| 73 | - wp_enqueue_script( self::SCRIPT_HANDLE ); | |
| 74 | - wp_set_script_translations( self::SCRIPT_HANDLE, 'formidable' ); | |
| 75 | - | |
| 76 | - FrmAppHelper::dequeue_extra_global_scripts(); | |
| 77 | - } | |
| 78 | - | |
| 79 | - /** | |
| 80 | - * Get the Add-Ons page JS variables as an array. | |
| 81 | - * | |
| 82 | - * @since 6.15 | |
| 83 | - * | |
| 84 | - * @return array | |
| 85 | - */ | |
| 86 | - private static function get_js_variables() { | |
| 87 | - return array( | |
| 88 | - 'proIsIncluded' => FrmAppHelper::pro_is_included(), | |
| 89 | - 'addonRequestURL' => self::$request_addon_url, | |
| 90 | - ); | |
| 91 | - } | |
| 92 | - | |
| 93 | - /** | |
| 94 | - * @return void | |
| 95 | - */ | |
| 96 | 8 | public static function menu() { |
| 97 | 9 | if ( ! current_user_can( 'activate_plugins' ) ) { |
| 98 | 10 | return; |
| 99 | 11 | } |
| @@ -98,67 +10,50 @@ | ||
| 98 | 10 | return; |
| 99 | 11 | } |
| 100 | 12 | |
| 101 | 13 | $label = __( 'Add-Ons', 'formidable' ); |
| 102 | - $label = '<span style="color:#3FCA89">' . esc_html( $label ) . '</span>'; | |
| 103 | - | |
| 14 | + if ( FrmAppHelper::pro_is_installed() ) { | |
| 15 | + $label = '<span style="color:#fe5a1d">' . $label . '</span>'; | |
| 16 | + } | |
| 104 | 17 | add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' ); |
| 105 | 18 | |
| 106 | - // remove default created subpage, make the page with highest priority as default. | |
| 107 | - remove_submenu_page( 'formidable', 'formidable' ); | |
| 108 | - | |
| 109 | 19 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 110 | - $cta_text = FrmSalesApi::get_best_sale_value( 'menu_cta_text' ); | |
| 111 | - | |
| 112 | - if ( ! $cta_text ) { | |
| 113 | - $cta_text = __( 'Upgrade', 'formidable' ); | |
| 114 | - } | |
| 115 | - | |
| 116 | 20 | add_submenu_page( |
| 117 | 21 | 'formidable', |
| 118 | 22 | 'Formidable | ' . __( 'Upgrade', 'formidable' ), |
| 119 | - '<span class="frm-upgrade-submenu">' . esc_html( $cta_text ) . '</span>', | |
| 23 | + '<span style="color:#fe5a1d">' . __( 'Upgrade', 'formidable' ) . '</span>', | |
| 120 | 24 | 'frm_view_forms', |
| 121 | 25 | 'formidable-pro-upgrade', |
| 122 | - function () { | |
| 123 | - // This function doesn't need to do anything. | |
| 124 | - // The redirect is handled earlier to avoid issues with the headers being sent. | |
| 125 | - } | |
| 26 | + 'FrmAddonsController::upgrade_to_pro' | |
| 126 | 27 | ); |
| 127 | 28 | } elseif ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) ) { |
| 128 | 29 | wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) ); |
| 129 | 30 | exit; |
| 130 | - }//end if | |
| 31 | + } | |
| 131 | 32 | } |
| 132 | 33 | |
| 133 | - /** | |
| 134 | - * @return void | |
| 135 | - */ | |
| 136 | 34 | public static function list_addons() { |
| 137 | 35 | FrmAppHelper::include_svg(); |
| 36 | + $installed_addons = apply_filters( 'frm_installed_addons', array() ); | |
| 37 | + $license_type = ''; | |
| 138 | 38 | |
| 139 | - $view_path = FrmAppHelper::plugin_path() . '/classes/views/addons/'; | |
| 140 | - $installed_addons = apply_filters( 'frm_installed_addons', array() ); | |
| 141 | - $addons = self::get_api_addons(); | |
| 142 | - $errors = array(); | |
| 143 | - $license_type = ''; | |
| 144 | - $request_addon_url = self::$request_addon_url; | |
| 39 | + $addons = self::get_api_addons(); | |
| 40 | + $errors = array(); | |
| 145 | 41 | |
| 146 | 42 | if ( isset( $addons['error'] ) ) { |
| 147 | - $api = new FrmFormApi(); | |
| 148 | - $errors = $api->get_error_from_response( $addons ); | |
| 149 | - $license_type = $addons['error']['type'] ?? ''; | |
| 43 | + $api = new FrmFormApi(); | |
| 44 | + $errors = $api->get_error_from_response( $addons ); | |
| 45 | + $license_type = isset( $addons['error']['type'] ) ? $addons['error']['type'] : ''; | |
| 150 | 46 | unset( $addons['error'] ); |
| 151 | 47 | } |
| 152 | 48 | |
| 153 | - $pro = array( | |
| 49 | + $pro = array( | |
| 154 | 50 | 'pro' => array( |
| 155 | - 'title' => 'Formidable Forms Pro', | |
| 156 | - 'slug' => 'formidable-pro', | |
| 157 | - 'released' => '2011-02-05', | |
| 158 | - 'docs' => 'knowledgebase/', | |
| 159 | - 'categories' => array( 'basic', 'plus', 'business', 'elite' ), | |
| 160 | - 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.', | |
| 51 | + 'title' => 'Formidable Forms Pro', | |
| 52 | + 'slug' => 'formidable-pro', | |
| 53 | + 'released' => '2011-02-05', | |
| 54 | + 'docs' => 'knowledgebase/', | |
| 55 | + 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.', | |
| 161 | 56 | ), |
| 162 | 57 | ); |
| 163 | 58 | $addons = $pro + $addons; |
| 164 | 59 | self::prepare_addons( $addons ); |
| @@ -164,110 +59,13 @@ | ||
| 164 | 59 | self::prepare_addons( $addons ); |
| 165 | 60 | |
| 166 | 61 | $pricing = FrmAppHelper::admin_upgrade_link( 'addons' ); |
| 167 | 62 | |
| 168 | - self::organize_and_get_categories(); | |
| 169 | - $categories = self::$categories; | |
| 170 | - | |
| 171 | - include $view_path . 'index.php'; | |
| 63 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' ); | |
| 172 | 64 | } |
| 173 | 65 | |
| 174 | - /** | |
| 175 | - * Organize and set categories. | |
| 176 | - * | |
| 177 | - * @since 6.15 | |
| 178 | - * | |
| 179 | - * @return void | |
| 180 | - */ | |
| 181 | - protected static function organize_and_get_categories() { | |
| 182 | - unset( self::$categories['strategy11'] ); | |
| 183 | - ksort( self::$categories ); | |
| 184 | - | |
| 185 | - $bottom_categories = array(); | |
| 186 | - $plans = FrmFormsHelper::get_license_types( | |
| 187 | - array( | |
| 188 | - 'include_all' => false, | |
| 189 | - 'case_lower' => true, | |
| 190 | - ) | |
| 191 | - ); | |
| 192 | - | |
| 193 | - // Extract the elements to move | |
| 194 | - foreach ( $plans as $plan ) { | |
| 195 | - if ( isset( self::$categories[ $plan ] ) ) { | |
| 196 | - $bottom_categories[ $plan ] = self::$categories[ $plan ]; | |
| 197 | - unset( self::$categories[ $plan ] ); | |
| 198 | - } | |
| 199 | - } | |
| 200 | - | |
| 201 | - $special_categories = array(); | |
| 202 | - | |
| 203 | - if ( 'elite' !== self::license_type() ) { | |
| 204 | - $special_categories['available-addons'] = array( | |
| 205 | - 'name' => __( 'Available', 'formidable' ), | |
| 206 | - // To be assigned via JavaScript. | |
| 207 | - 'count' => 0, | |
| 208 | - ); | |
| 209 | - } | |
| 210 | - | |
| 211 | - $special_categories['active-addons'] = array( | |
| 212 | - 'name' => __( 'Active', 'formidable' ), | |
| 213 | - // To be assigned via JavaScript. | |
| 214 | - 'count' => 0, | |
| 215 | - ); | |
| 216 | - | |
| 217 | - $special_categories['all-items'] = array( | |
| 218 | - 'name' => __( 'All Add-Ons', 'formidable' ), | |
| 219 | - // To be assigned via JavaScript. | |
| 220 | - 'count' => 0, | |
| 221 | - ); | |
| 222 | - | |
| 223 | - self::$categories = array_merge( | |
| 224 | - $special_categories, | |
| 225 | - self::$categories, | |
| 226 | - $bottom_categories | |
| 227 | - ); | |
| 228 | - } | |
| 229 | - | |
| 230 | - /** | |
| 231 | - * Organize and set categories. | |
| 232 | - * | |
| 233 | - * @since 6.15 | |
| 234 | - * | |
| 235 | - * @param array $addon The addon array that will be modified by reference. | |
| 236 | - * | |
| 237 | - * @return void | |
| 238 | - */ | |
| 239 | - protected static function set_categories( &$addon ) { | |
| 240 | - if ( ! isset( $addon['categories'] ) ) { | |
| 241 | - return; | |
| 242 | - } | |
| 243 | - | |
| 244 | - $addon['category-slugs'] = array(); | |
| 245 | - | |
| 246 | - foreach ( $addon['categories'] as $category ) { | |
| 247 | - $category = FrmFormsHelper::convert_legacy_package_names( $category ); | |
| 248 | - $category_slug = sanitize_title( $category ); | |
| 249 | - | |
| 250 | - // Add the slug to the new array. | |
| 251 | - $addon['category-slugs'][] = $category_slug; | |
| 252 | - | |
| 253 | - if ( ! isset( self::$categories[ $category_slug ] ) ) { | |
| 254 | - self::$categories[ $category_slug ] = array( | |
| 255 | - 'name' => $category, | |
| 256 | - 'count' => 0, | |
| 257 | - ); | |
| 258 | - } | |
| 259 | - | |
| 260 | - ++self::$categories[ $category_slug ]['count']; | |
| 261 | - } | |
| 262 | - } | |
| 263 | - | |
| 264 | - /** | |
| 265 | - * @return void | |
| 266 | - */ | |
| 267 | 66 | public static function license_settings() { |
| 268 | 67 | $plugins = apply_filters( 'frm_installed_addons', array() ); |
| 269 | - | |
| 270 | 68 | if ( empty( $plugins ) ) { |
| 271 | 69 | esc_html_e( 'There are no plugins on your site that require a license', 'formidable' ); |
| 272 | 70 | |
| 273 | 71 | return; |
| @@ -274,14 +72,11 @@ | ||
| 274 | 72 | } |
| 275 | 73 | |
| 276 | 74 | ksort( $plugins ); |
| 277 | 75 | |
| 278 | - include FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php'; | |
| 76 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' ); | |
| 279 | 77 | } |
| 280 | 78 | |
| 281 | - /** | |
| 282 | - * @return array | |
| 283 | - */ | |
| 284 | 79 | protected static function get_api_addons() { |
| 285 | 80 | $api = new FrmFormApi(); |
| 286 | 81 | $addons = $api->get_api_info(); |
| 287 | 82 | |
| @@ -298,25 +93,11 @@ | ||
| 298 | 93 | return $addons; |
| 299 | 94 | } |
| 300 | 95 | |
| 301 | 96 | /** |
| 302 | - * Retrieves the count of available addons. | |
| 303 | - * | |
| 304 | - * @since 6.9 | |
| 305 | - * | |
| 306 | - * @return int Count of addons. | |
| 307 | - */ | |
| 308 | - public static function get_addons_count() { | |
| 309 | - $addons = self::get_api_addons(); | |
| 310 | - | |
| 311 | - return count( $addons ); | |
| 312 | - } | |
| 313 | - | |
| 314 | - /** | |
| 315 | 97 | * If the API is unable to connect, show something on the addons page |
| 316 | 98 | * |
| 317 | 99 | * @since 3.04.03 |
| 318 | - * | |
| 319 | 100 | * @return array |
| 320 | 101 | */ |
| 321 | 102 | protected static function fallback_plugin_list() { |
| 322 | 103 | $list = array( |
| @@ -326,10 +107,10 @@ | ||
| 326 | 107 | 'docs' => '', |
| 327 | 108 | 'excerpt' => 'Enhance your basic Formidable forms with a plethora of Pro field types and features. Create advanced forms and data-driven applications in minutes.', |
| 328 | 109 | ), |
| 329 | 110 | 'mailchimp' => array( |
| 330 | - 'title' => 'Mailchimp Forms', | |
| 331 | - 'excerpt' => 'Get on the path to more sales and leads in a matter of minutes. Add leads to a Mailchimp mailing list when they submit forms and update their information along with the entry.', | |
| 111 | + 'title' => 'MailChimp Forms', | |
| 112 | + 'excerpt' => 'Get on the path to more sales and leads in a matter of minutes. Add leads to a MailChimp mailing list when they submit forms and update their information along with the entry.', | |
| 332 | 113 | ), |
| 333 | 114 | 'registration' => array( |
| 334 | 115 | 'title' => 'User Registration Forms', |
| 335 | 116 | 'link' => 'downloads/user-registration/', |
| @@ -391,13 +172,8 @@ | ||
| 391 | 172 | 'views' => array( |
| 392 | 173 | 'title' => 'Formidable Views', |
| 393 | 174 | 'excerpt' => 'Add the power of views to your Formidable Forms to display your form submissions in listings, tables, calendars, and more.', |
| 394 | 175 | ), |
| 395 | - 'quiz_maker' => array( | |
| 396 | - 'title' => 'Quiz Maker', | |
| 397 | - 'link' => 'downloads/quiz-maker/', | |
| 398 | - 'excerpt' => 'Make quizzes, automatically score them and show user scores.', | |
| 399 | - ), | |
| 400 | 176 | ); |
| 401 | 177 | |
| 402 | 178 | $defaults = array( |
| 403 | 179 | 'released' => '', |
| @@ -413,9 +189,8 @@ | ||
| 413 | 189 | /** |
| 414 | 190 | * If Pro is missing but has been authenticated, include a download URL |
| 415 | 191 | * |
| 416 | 192 | * @since 3.04.03 |
| 417 | - * | |
| 418 | 193 | * @return string |
| 419 | 194 | */ |
| 420 | 195 | public static function get_pro_download_url() { |
| 421 | 196 | $license = self::get_pro_license(); |
| @@ -422,20 +197,17 @@ | ||
| 422 | 197 | $api = new FrmFormApi( $license ); |
| 423 | 198 | $downloads = $api->get_api_info(); |
| 424 | 199 | $pro = self::get_pro_from_addons( $downloads ); |
| 425 | 200 | |
| 426 | - return $pro['url'] ?? ''; | |
| 201 | + return isset( $pro['url'] ) ? $pro['url'] : ''; | |
| 427 | 202 | } |
| 428 | 203 | |
| 429 | 204 | /** |
| 430 | 205 | * @since 4.08 |
| 431 | - * | |
| 432 | - * @return string | |
| 433 | 206 | */ |
| 434 | 207 | public static function get_pro_license() { |
| 435 | 208 | $pro_cred_store = 'frmpro-credentials'; |
| 436 | 209 | $pro_wpmu_store = 'frmpro-wpmu-sitewide'; |
| 437 | - | |
| 438 | 210 | if ( is_multisite() && get_site_option( $pro_wpmu_store ) ) { |
| 439 | 211 | $creds = get_site_option( $pro_cred_store ); |
| 440 | 212 | } else { |
| 441 | 213 | $creds = get_option( $pro_cred_store ); |
| @@ -445,9 +217,8 @@ | ||
| 445 | 217 | return ''; |
| 446 | 218 | } |
| 447 | 219 | |
| 448 | 220 | $license = $creds['license']; |
| 449 | - | |
| 450 | 221 | if ( empty( $license ) ) { |
| 451 | 222 | return ''; |
| 452 | 223 | } |
| 453 | 224 | |
| @@ -459,21 +230,15 @@ | ||
| 459 | 230 | } |
| 460 | 231 | |
| 461 | 232 | /** |
| 462 | 233 | * @since 4.08 |
| 463 | - * | |
| 464 | - * @param array $addons | |
| 465 | - * | |
| 466 | - * @return array | |
| 467 | 234 | */ |
| 468 | 235 | protected static function get_pro_from_addons( $addons ) { |
| 469 | - return $addons['93790'] ?? array(); | |
| 236 | + return isset( $addons['93790'] ) ? $addons['93790'] : array(); | |
| 470 | 237 | } |
| 471 | 238 | |
| 472 | 239 | /** |
| 473 | 240 | * @since 4.06 |
| 474 | - * | |
| 475 | - * @return string | |
| 476 | 241 | */ |
| 477 | 242 | public static function license_type() { |
| 478 | 243 | if ( is_callable( 'FrmProAddonsController::license_type' ) ) { |
| 479 | 244 | return FrmProAddonsController::license_type(); |
| @@ -483,47 +248,39 @@ | ||
| 483 | 248 | } |
| 484 | 249 | |
| 485 | 250 | /** |
| 486 | 251 | * @since 4.0.01 |
| 487 | - * | |
| 488 | - * @return bool | |
| 489 | 252 | */ |
| 490 | 253 | public static function is_license_expired() { |
| 491 | 254 | $version_info = self::get_primary_license_info(); |
| 492 | - | |
| 493 | 255 | if ( ! isset( $version_info['error'] ) ) { |
| 494 | 256 | return false; |
| 495 | 257 | } |
| 496 | 258 | |
| 497 | - $expires = $version_info['error']['expires'] ?? 0; | |
| 259 | + return $version_info['error']; | |
| 260 | + } | |
| 498 | 261 | |
| 499 | - if ( empty( $expires ) || $expires > time() ) { | |
| 500 | - return false; | |
| 262 | + /** | |
| 263 | + * @since 4.08 | |
| 264 | + * | |
| 265 | + * @return boolean|int false or the number of days until expiration. | |
| 266 | + */ | |
| 267 | + public static function is_license_expiring() { | |
| 268 | + if ( is_callable( 'FrmProAddonsController::is_license_expiring' ) ) { | |
| 269 | + return FrmProAddonsController::is_license_expiring(); | |
| 501 | 270 | } |
| 502 | 271 | |
| 503 | - $rate_limited = ! empty( $version_info['response_code'] ) && 429 === (int) $version_info['response_code']; | |
| 504 | - | |
| 505 | - if ( $rate_limited ) { | |
| 506 | - // Do not return false positives for rate limited responses. | |
| 507 | - return false; | |
| 508 | - } | |
| 509 | - | |
| 510 | - return $version_info['error']; | |
| 272 | + return false; | |
| 511 | 273 | } |
| 512 | 274 | |
| 513 | 275 | /** |
| 514 | 276 | * @since 4.08 |
| 515 | - * @since 6.7 This is public. | |
| 516 | - * | |
| 517 | - * @return array|false | |
| 518 | 277 | */ |
| 519 | - public static function get_primary_license_info() { | |
| 278 | + protected static function get_primary_license_info() { | |
| 520 | 279 | $installed_addons = apply_filters( 'frm_installed_addons', array() ); |
| 521 | - | |
| 522 | 280 | if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) { |
| 523 | 281 | return false; |
| 524 | 282 | } |
| 525 | - | |
| 526 | 283 | $installed_addons = array( |
| 527 | 284 | 'formidable_pro' => $installed_addons['formidable_pro'], |
| 528 | 285 | ); |
| 529 | 286 | |
| @@ -531,12 +288,8 @@ | ||
| 531 | 288 | } |
| 532 | 289 | |
| 533 | 290 | /** |
| 534 | 291 | * @since 3.04.03 |
| 535 | - * | |
| 536 | - * @param mixed $transient | |
| 537 | - * | |
| 538 | - * @return object | |
| 539 | 292 | */ |
| 540 | 293 | public static function check_update( $transient ) { |
| 541 | 294 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| 542 | 295 | // Don't make any changes if only Lite is installed. |
| @@ -547,18 +300,22 @@ | ||
| 547 | 300 | $transient = new stdClass(); |
| 548 | 301 | } |
| 549 | 302 | |
| 550 | 303 | $installed_addons = apply_filters( 'frm_installed_addons', array() ); |
| 551 | - | |
| 552 | 304 | if ( empty( $installed_addons ) ) { |
| 553 | 305 | return $transient; |
| 554 | 306 | } |
| 555 | 307 | |
| 556 | - $version_info = self::fill_update_addon_info( $installed_addons ); | |
| 308 | + $version_info = self::fill_update_addon_info( $installed_addons ); | |
| 309 | + | |
| 557 | 310 | $transient->last_checked = time(); |
| 558 | - $wp_plugins = self::get_plugins(); | |
| 559 | 311 | |
| 560 | - foreach ( $version_info as $plugin ) { | |
| 312 | + if ( ! function_exists( 'get_plugins' ) ) { | |
| 313 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 314 | + } | |
| 315 | + $wp_plugins = get_plugins(); | |
| 316 | + | |
| 317 | + foreach ( $version_info as $id => $plugin ) { | |
| 561 | 318 | $plugin = (object) $plugin; |
| 562 | 319 | |
| 563 | 320 | if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) { |
| 564 | 321 | continue; |
| @@ -564,9 +321,8 @@ | ||
| 564 | 321 | continue; |
| 565 | 322 | } |
| 566 | 323 | |
| 567 | 324 | $folder = $plugin->plugin; |
| 568 | - | |
| 569 | 325 | if ( empty( $folder ) ) { |
| 570 | 326 | continue; |
| 571 | 327 | } |
| 572 | 328 | |
| @@ -574,52 +330,40 @@ | ||
| 574 | 330 | // don't show an update if the plugin isn't installed |
| 575 | 331 | continue; |
| 576 | 332 | } |
| 577 | 333 | |
| 578 | - $wp_plugin = $wp_plugins[ $folder ] ?? array(); | |
| 579 | - $wp_version = $wp_plugin['Version'] ?? '1.0'; | |
| 580 | - $plugin->slug = explode( '/', $folder )[0]; | |
| 334 | + $wp_plugin = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array(); | |
| 335 | + $wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0'; | |
| 581 | 336 | |
| 582 | 337 | if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) { |
| 338 | + $slug = explode( '/', $folder ); | |
| 339 | + $plugin->slug = $slug[0]; | |
| 583 | 340 | $transient->response[ $folder ] = $plugin; |
| 584 | - } else { | |
| 585 | - $transient->no_update[ $folder ] = $plugin; | |
| 586 | 341 | } |
| 587 | 342 | |
| 588 | 343 | $transient->checked[ $folder ] = $wp_version; |
| 589 | 344 | |
| 590 | - }//end foreach | |
| 345 | + } | |
| 591 | 346 | |
| 592 | 347 | return $transient; |
| 593 | 348 | } |
| 594 | 349 | |
| 595 | 350 | /** |
| 596 | - * Copy of FrmAppHelper::get_plugins. | |
| 597 | - * Because this gets called on "pre_set_site_transient_update_plugins" an old version of FrmAppHelper may be loaded on plugin update. | |
| 598 | - * This means that trying to access FrmAppHelper::get_plugins when upgrading from a Lite version before v5.5 results in a one-off error. | |
| 599 | - * | |
| 600 | - * @since 5.5.2 | |
| 601 | - * | |
| 602 | - * @return array | |
| 603 | - */ | |
| 604 | - protected static function get_plugins() { | |
| 605 | - if ( ! function_exists( 'get_plugins' ) ) { | |
| 606 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 607 | - } | |
| 608 | - return get_plugins(); | |
| 609 | - } | |
| 610 | - | |
| 611 | - /** | |
| 612 | 351 | * Check if a plugin is installed before showing an update for it |
| 613 | 352 | * |
| 614 | 353 | * @since 3.05 |
| 615 | 354 | * |
| 616 | - * @param string $plugin The folder/filename.php for a plugin. | |
| 355 | + * @param string $plugin - the folder/filename.php for a plugin | |
| 617 | 356 | * |
| 618 | 357 | * @return bool - True if installed |
| 619 | 358 | */ |
| 620 | 359 | protected static function is_installed( $plugin ) { |
| 621 | - $all_plugins = self::get_plugins(); | |
| 360 | + if ( ! function_exists( 'get_plugins' ) ) { | |
| 361 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 362 | + } | |
| 363 | + | |
| 364 | + $all_plugins = get_plugins(); | |
| 365 | + | |
| 622 | 366 | return isset( $all_plugins[ $plugin ] ); |
| 623 | 367 | } |
| 624 | 368 | |
| 625 | 369 | /** |
| @@ -639,9 +383,8 @@ | ||
| 639 | 383 | continue; |
| 640 | 384 | } |
| 641 | 385 | |
| 642 | 386 | $new_license = $addon->license; |
| 643 | - | |
| 644 | 387 | if ( empty( $new_license ) || in_array( $new_license, $checked_licenses ) ) { |
| 645 | 388 | continue; |
| 646 | 389 | } |
| 647 | 390 | |
| @@ -647,9 +390,8 @@ | ||
| 647 | 390 | |
| 648 | 391 | $checked_licenses[] = $new_license; |
| 649 | 392 | |
| 650 | 393 | $api = new FrmFormApi( $new_license ); |
| 651 | - | |
| 652 | 394 | if ( empty( $version_info ) ) { |
| 653 | 395 | $version_info = $api->get_api_info(); |
| 654 | 396 | continue; |
| 655 | 397 | } |
| @@ -654,21 +396,18 @@ | ||
| 654 | 396 | continue; |
| 655 | 397 | } |
| 656 | 398 | |
| 657 | 399 | $plugin = $api->get_addon_for_license( $addon, $version_info ); |
| 658 | - | |
| 659 | 400 | if ( empty( $plugin ) ) { |
| 660 | 401 | continue; |
| 661 | 402 | } |
| 662 | 403 | |
| 663 | - $download_id = $plugin['id'] ?? 0; | |
| 664 | - | |
| 404 | + $download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0; | |
| 665 | 405 | if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) { |
| 666 | 406 | // if this addon is using its own license, get the update url |
| 667 | 407 | $addon_info = $api->get_api_info(); |
| 668 | 408 | |
| 669 | 409 | $version_info[ $download_id ] = $addon_info[ $download_id ]; |
| 670 | - | |
| 671 | 410 | if ( isset( $addon_info['error'] ) ) { |
| 672 | 411 | $version_info[ $download_id ]['error'] = array( |
| 673 | 412 | 'message' => $addon_info['error']['message'], |
| 674 | 413 | 'code' => $addon_info['error']['code'], |
| @@ -674,9 +413,9 @@ | ||
| 674 | 413 | 'code' => $addon_info['error']['code'], |
| 675 | 414 | ); |
| 676 | 415 | } |
| 677 | 416 | } |
| 678 | - }//end foreach | |
| 417 | + } | |
| 679 | 418 | |
| 680 | 419 | return $version_info; |
| 681 | 420 | } |
| 682 | 421 | |
| @@ -683,11 +422,9 @@ | ||
| 683 | 422 | /** |
| 684 | 423 | * Get the action link for an addon that isn't active. |
| 685 | 424 | * |
| 686 | 425 | * @since 3.06.03 |
| 687 | - * | |
| 688 | - * @param string $plugin The plugin slug. | |
| 689 | - * | |
| 426 | + * @param string $plugin The plugin slug | |
| 690 | 427 | * @return array |
| 691 | 428 | */ |
| 692 | 429 | public static function install_link( $plugin ) { |
| 693 | 430 | $link = array(); |
| @@ -698,14 +435,14 @@ | ||
| 698 | 435 | $link = array( |
| 699 | 436 | 'url' => $addon['plugin'], |
| 700 | 437 | 'class' => 'frm-activate-addon', |
| 701 | 438 | ); |
| 702 | - } elseif ( ! empty( $addon['url'] ) ) { | |
| 439 | + } elseif ( isset( $addon['url'] ) && ! empty( $addon['url'] ) ) { | |
| 703 | 440 | $link = array( |
| 704 | 441 | 'url' => $addon['url'], |
| 705 | 442 | 'class' => 'frm-install-addon', |
| 706 | 443 | ); |
| 707 | - } elseif ( ! empty( $addon['categories'] ) ) { | |
| 444 | + } elseif ( isset( $addon['categories'] ) && ! empty( $addon['categories'] ) ) { | |
| 708 | 445 | $link = array( |
| 709 | 446 | 'categories' => $addon['categories'], |
| 710 | 447 | ); |
| 711 | 448 | } |
| @@ -712,14 +449,9 @@ | ||
| 712 | 449 | |
| 713 | 450 | if ( ! empty( $link ) ) { |
| 714 | 451 | $link['status'] = $addon['status']['type']; |
| 715 | 452 | } |
| 716 | - } elseif ( current_user_can( 'activate_plugins' ) && self::is_installed( 'formidable-' . $plugin . '/formidable-' . $plugin . '.php' ) ) { | |
| 717 | - $link = array( | |
| 718 | - 'url' => 'formidable-' . $plugin . '/formidable-' . $plugin . '.php', | |
| 719 | - 'class' => 'frm-activate-addon', | |
| 720 | - ); | |
| 721 | - }//end if | |
| 453 | + } | |
| 722 | 454 | |
| 723 | 455 | return $link; |
| 724 | 456 | } |
| 725 | 457 | |
| @@ -724,20 +456,16 @@ | ||
| 724 | 456 | } |
| 725 | 457 | |
| 726 | 458 | /** |
| 727 | 459 | * @since 4.09 |
| 728 | - * | |
| 729 | - * @param string $plugin The plugin slug. | |
| 730 | - * | |
| 460 | + * @param string $plugin The plugin slug | |
| 731 | 461 | * @return array|false |
| 732 | 462 | */ |
| 733 | - public static function get_addon( $plugin ) { | |
| 463 | + protected static function get_addon( $plugin ) { | |
| 734 | 464 | $addons = self::get_api_addons(); |
| 735 | 465 | self::prepare_addons( $addons ); |
| 736 | - | |
| 737 | 466 | foreach ( $addons as $addon ) { |
| 738 | 467 | $slug = explode( '/', $addon['plugin'] ); |
| 739 | - | |
| 740 | 468 | if ( $slug[0] === 'formidable-' . $plugin ) { |
| 741 | 469 | return $addon; |
| 742 | 470 | } |
| 743 | 471 | } |
| @@ -745,15 +473,13 @@ | ||
| 745 | 473 | } |
| 746 | 474 | |
| 747 | 475 | /** |
| 748 | 476 | * @since 4.09 |
| 749 | - * | |
| 750 | 477 | * @return string |
| 751 | 478 | */ |
| 752 | 479 | protected static function get_license_type() { |
| 753 | 480 | $license_type = ''; |
| 754 | 481 | $addons = self::get_api_addons(); |
| 755 | - | |
| 756 | 482 | if ( isset( $addons['error'] ) && isset( $addons['error']['type'] ) ) { |
| 757 | 483 | $license_type = $addons['error']['type']; |
| 758 | 484 | } |
| 759 | 485 | return $license_type; |
| @@ -761,10 +487,10 @@ | ||
| 761 | 487 | |
| 762 | 488 | /** |
| 763 | 489 | * @since 3.04.03 |
| 764 | 490 | * |
| 765 | - * @param array $addons | |
| 766 | - * @param object $license The FrmAddon object. | |
| 491 | + * @param array $addons | |
| 492 | + * @param object $license The FrmAddon object | |
| 767 | 493 | * |
| 768 | 494 | * @return array |
| 769 | 495 | */ |
| 770 | 496 | public static function get_addon_for_license( $addons, $license ) { |
| @@ -769,12 +495,11 @@ | ||
| 769 | 495 | */ |
| 770 | 496 | public static function get_addon_for_license( $addons, $license ) { |
| 771 | 497 | $download_id = $license->download_id; |
| 772 | 498 | $plugin = array(); |
| 773 | - | |
| 774 | 499 | if ( empty( $download_id ) && ! empty( $addons ) ) { |
| 775 | 500 | foreach ( $addons as $addon ) { |
| 776 | - if ( strtolower( $license->plugin_name ) === strtolower( $addon['title'] ) ) { | |
| 501 | + if ( strtolower( $license->plugin_name ) == strtolower( $addon['title'] ) ) { | |
| 777 | 502 | return $addon; |
| 778 | 503 | } |
| 779 | 504 | } |
| 780 | 505 | } elseif ( isset( $addons[ $download_id ] ) ) { |
| @@ -783,22 +508,15 @@ | ||
| 783 | 508 | |
| 784 | 509 | return $plugin; |
| 785 | 510 | } |
| 786 | 511 | |
| 787 | - /** | |
| 788 | - * @param array $addons | |
| 789 | - * | |
| 790 | - * @return void | |
| 791 | - */ | |
| 792 | 512 | protected static function prepare_addons( &$addons ) { |
| 793 | 513 | $activate_url = ''; |
| 794 | - | |
| 795 | 514 | if ( current_user_can( 'activate_plugins' ) ) { |
| 796 | 515 | $activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) ); |
| 797 | 516 | } |
| 798 | 517 | |
| 799 | 518 | $loop_addons = $addons; |
| 800 | - | |
| 801 | 519 | foreach ( $loop_addons as $id => $addon ) { |
| 802 | 520 | if ( is_numeric( $id ) ) { |
| 803 | 521 | $slug = str_replace( array( '-wordpress-plugin', '-wordpress' ), '', $addon['slug'] ); |
| 804 | 522 | $file_name = $addon['plugin']; |
| @@ -803,35 +521,23 @@ | ||
| 803 | 521 | $slug = str_replace( array( '-wordpress-plugin', '-wordpress' ), '', $addon['slug'] ); |
| 804 | 522 | $file_name = $addon['plugin']; |
| 805 | 523 | } else { |
| 806 | 524 | $slug = $id; |
| 807 | - | |
| 808 | 525 | if ( isset( $addon['file'] ) ) { |
| 809 | 526 | $base_file = $addon['file']; |
| 810 | 527 | } else { |
| 811 | 528 | $base_file = 'formidable-' . $slug; |
| 812 | 529 | } |
| 813 | - | |
| 814 | 530 | $file_name = $base_file . '/' . $base_file . '.php'; |
| 815 | - | |
| 816 | 531 | if ( ! isset( $addon['plugin'] ) ) { |
| 817 | 532 | $addon['plugin'] = $file_name; |
| 818 | 533 | } |
| 819 | 534 | } |
| 820 | 535 | |
| 821 | - $addon['installed'] = self::is_installed( $file_name ); | |
| 822 | - | |
| 823 | - if ( $addon['installed'] && 'formidable-views/formidable-views.php' === $file_name ) { | |
| 824 | - $active_views_version = self::get_active_views_version(); | |
| 825 | - | |
| 826 | - if ( false !== $active_views_version && $slug !== $active_views_version ) { | |
| 827 | - $addon['installed'] = false; | |
| 828 | - } | |
| 829 | - } | |
| 830 | - | |
| 536 | + $addon['installed'] = self::is_installed( $file_name ); | |
| 831 | 537 | $addon['activate_url'] = ''; |
| 832 | 538 | |
| 833 | - if ( $addon['installed'] && ! empty( $activate_url ) && ! self::is_plugin_active( $file_name, $slug ) ) { | |
| 539 | + if ( $addon['installed'] && ! empty( $activate_url ) && ! is_plugin_active( $file_name ) ) { | |
| 834 | 540 | $addon['activate_url'] = add_query_arg( |
| 835 | 541 | array( |
| 836 | 542 | '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $file_name ), |
| 837 | 543 | 'plugin' => $file_name, |
| @@ -847,62 +553,30 @@ | ||
| 847 | 553 | |
| 848 | 554 | if ( ! isset( $addon['link'] ) ) { |
| 849 | 555 | $addon['link'] = 'downloads/' . $slug . '/'; |
| 850 | 556 | } |
| 557 | + self::prepare_addon_link( $addon['link'] ); | |
| 851 | 558 | |
| 852 | - self::prepare_addon_link( $addon['link'] ); | |
| 853 | 559 | self::set_addon_status( $addon ); |
| 854 | - self::set_categories( $addon ); | |
| 855 | - | |
| 856 | 560 | $addons[ $id ] = $addon; |
| 857 | - }//end foreach | |
| 858 | - } | |
| 859 | - | |
| 860 | - /** | |
| 861 | - * @param string $file_name | |
| 862 | - * @param string $slug | |
| 863 | - * | |
| 864 | - * @return bool | |
| 865 | - */ | |
| 866 | - private static function is_plugin_active( $file_name, $slug ) { | |
| 867 | - if ( 'formidable-views/formidable-views.php' === $file_name ) { | |
| 868 | - return self::get_active_views_version() === $slug; | |
| 869 | 561 | } |
| 870 | - return is_plugin_active( $file_name ); | |
| 871 | 562 | } |
| 872 | 563 | |
| 873 | 564 | /** |
| 874 | - * @return false|string either 'visual-views' or 'views', false if one is not found. | |
| 875 | - */ | |
| 876 | - private static function get_active_views_version() { | |
| 877 | - if ( ! is_callable( 'FrmViewsAppHelper::plugin_version' ) ) { | |
| 878 | - return false; | |
| 879 | - } | |
| 880 | - | |
| 881 | - $plugin_version = FrmViewsAppHelper::plugin_version(); | |
| 882 | - return version_compare( $plugin_version, '5.0', '>=' ) ? 'visual-views' : 'views'; | |
| 883 | - } | |
| 884 | - | |
| 885 | - /** | |
| 886 | 565 | * @since 3.04.02 |
| 887 | - * | |
| 888 | - * @param string $link | |
| 889 | - * | |
| 890 | - * @return void | |
| 891 | 566 | */ |
| 892 | 567 | protected static function prepare_addon_link( &$link ) { |
| 893 | 568 | $site_url = 'https://formidableforms.com/'; |
| 894 | - | |
| 895 | 569 | if ( strpos( $link, 'http' ) !== 0 ) { |
| 896 | 570 | $link = $site_url . $link; |
| 897 | 571 | } |
| 898 | - | |
| 899 | 572 | $link = FrmAppHelper::make_affiliate_url( $link ); |
| 900 | - | |
| 901 | - $utm = array( | |
| 902 | - 'campaign' => 'addons', | |
| 573 | + $query_args = array( | |
| 574 | + 'utm_source' => 'WordPress', | |
| 575 | + 'utm_medium' => 'addons', | |
| 576 | + 'utm_campaign' => 'liteplugin', | |
| 903 | 577 | ); |
| 904 | - $link = FrmAppHelper::maybe_add_missing_utm( $link, $utm ); | |
| 578 | + $link = add_query_arg( $query_args, $link ); | |
| 905 | 579 | } |
| 906 | 580 | |
| 907 | 581 | /** |
| 908 | 582 | * Add the status to the addon array. Status options are: |
| @@ -908,12 +582,8 @@ | ||
| 908 | 582 | * Add the status to the addon array. Status options are: |
| 909 | 583 | * installed, active, not installed |
| 910 | 584 | * |
| 911 | 585 | * @since 3.04.02 |
| 912 | - * | |
| 913 | - * @param array $addon | |
| 914 | - * | |
| 915 | - * @return void | |
| 916 | 586 | */ |
| 917 | 587 | protected static function set_addon_status( &$addon ) { |
| 918 | 588 | if ( ! empty( $addon['activate_url'] ) ) { |
| 919 | 589 | $addon['status'] = array( |
| @@ -932,113 +602,273 @@ | ||
| 932 | 602 | ); |
| 933 | 603 | } |
| 934 | 604 | } |
| 935 | 605 | |
| 936 | - /** | |
| 937 | - * @since 5.5.2 | |
| 938 | - * | |
| 939 | - * @param string $plugin | |
| 940 | - * @param string $redirect | |
| 941 | - * @param bool $network_wide | |
| 942 | - * @param bool $silent | |
| 943 | - * | |
| 944 | - * @return WP_Error|null Null on success, WP_Error on invalid file. | |
| 945 | - */ | |
| 946 | - protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) { | |
| 947 | - if ( ! function_exists( 'activate_plugin' ) ) { | |
| 948 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 949 | - } | |
| 950 | - return activate_plugin( $plugin, $redirect, $network_wide, $silent ); | |
| 951 | - } | |
| 606 | + public static function upgrade_to_pro() { | |
| 607 | + FrmAppHelper::include_svg(); | |
| 952 | 608 | |
| 953 | - /** | |
| 954 | - * Deactivate a specified plugin. | |
| 955 | - * | |
| 956 | - * @since 6.8 | |
| 957 | - * | |
| 958 | - * @param string $plugin | |
| 959 | - * @param bool $silent | |
| 960 | - * | |
| 961 | - * @return void | |
| 962 | - */ | |
| 963 | - protected static function deactivate_plugin( $plugin, $silent = false ) { | |
| 964 | - if ( ! function_exists( 'deactivate_plugins' ) ) { | |
| 965 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 966 | - } | |
| 967 | - deactivate_plugins( $plugin, $silent ); | |
| 609 | + $link_parts = array( | |
| 610 | + 'medium' => 'upgrade', | |
| 611 | + 'content' => 'button', | |
| 612 | + ); | |
| 613 | + | |
| 614 | + $features = array( | |
| 615 | + 'Display Entries' => array( | |
| 616 | + array( | |
| 617 | + 'label' => 'Display form data with virtually limitless views', | |
| 618 | + 'link' => array( | |
| 619 | + 'content' => 'views', | |
| 620 | + 'param' => 'views-display-form-data', | |
| 621 | + ), | |
| 622 | + 'lite' => false, | |
| 623 | + ), | |
| 624 | + array( | |
| 625 | + 'label' => 'Generate graphs and stats based on your submitted data', | |
| 626 | + 'link' => array( | |
| 627 | + 'content' => 'graphs', | |
| 628 | + 'param' => 'statistics-graphs-wordpress-forms', | |
| 629 | + ), | |
| 630 | + 'lite' => false, | |
| 631 | + ), | |
| 632 | + ), | |
| 633 | + 'Entry Management' => array( | |
| 634 | + array( | |
| 635 | + 'label' => 'Import entries from a CSV', | |
| 636 | + 'link' => array( | |
| 637 | + 'content' => 'import-entries', | |
| 638 | + 'param' => 'importing-exporting-wordpress-forms', | |
| 639 | + ), | |
| 640 | + 'lite' => false, | |
| 641 | + ), | |
| 642 | + array( | |
| 643 | + 'label' => 'Logged-in users can save drafts and return later', | |
| 644 | + 'link' => array( | |
| 645 | + 'content' => 'save-drafts', | |
| 646 | + 'param' => 'save-drafts-wordpress-form', | |
| 647 | + ), | |
| 648 | + 'lite' => false, | |
| 649 | + ), | |
| 650 | + array( | |
| 651 | + 'label' => 'Flexibly and powerfully view, edit, and delete entries from anywhere on your site', | |
| 652 | + 'link' => array( | |
| 653 | + 'content' => 'front-edit', | |
| 654 | + 'param' => 'wordpress-front-end-editing', | |
| 655 | + ), | |
| 656 | + 'lite' => false, | |
| 657 | + ), | |
| 658 | + array( | |
| 659 | + 'label' => 'View form submissions from the back-end', | |
| 660 | + 'lite' => true, | |
| 661 | + ), | |
| 662 | + array( | |
| 663 | + 'label' => 'Export your entries to a CSV', | |
| 664 | + 'lite' => true, | |
| 665 | + ), | |
| 666 | + ), | |
| 667 | + 'Form Building' => array( | |
| 668 | + array( | |
| 669 | + 'label' => 'Save a calculated value into a field', | |
| 670 | + 'link' => array( | |
| 671 | + 'content' => 'calculations', | |
| 672 | + 'param' => 'field-calculations-wordpress-form', | |
| 673 | + ), | |
| 674 | + 'lite' => false, | |
| 675 | + ), | |
| 676 | + array( | |
| 677 | + 'label' => 'Allow multiple file uploads', | |
| 678 | + 'link' => array( | |
| 679 | + 'content' => 'file-uploads', | |
| 680 | + 'param' => 'wordpress-multi-file-upload-fields', | |
| 681 | + ), | |
| 682 | + 'lite' => false, | |
| 683 | + ), | |
| 684 | + array( | |
| 685 | + 'label' => 'Repeat sections of fields', | |
| 686 | + 'link' => array( | |
| 687 | + 'content' => 'repeaters', | |
| 688 | + 'param' => 'repeatable-sections-forms', | |
| 689 | + ), | |
| 690 | + 'lite' => false, | |
| 691 | + ), | |
| 692 | + array( | |
| 693 | + 'label' => 'Hide and show fields conditionally based on other fields or the user\'s role', | |
| 694 | + 'link' => array( | |
| 695 | + 'content' => 'conditional-logic', | |
| 696 | + 'param' => 'conditional-logic-wordpress-forms', | |
| 697 | + ), | |
| 698 | + 'lite' => false, | |
| 699 | + ), | |
| 700 | + array( | |
| 701 | + 'label' => 'Confirmation fields', | |
| 702 | + 'link' => array( | |
| 703 | + 'content' => 'confirmation-fields', | |
| 704 | + 'param' => 'confirmation-fields-wordpress-forms', | |
| 705 | + ), | |
| 706 | + 'lite' => false, | |
| 707 | + ), | |
| 708 | + array( | |
| 709 | + 'label' => 'Multi-paged forms', | |
| 710 | + 'link' => array( | |
| 711 | + 'content' => 'page-breaks', | |
| 712 | + 'param' => 'wordpress-multi-page-forms', | |
| 713 | + ), | |
| 714 | + 'lite' => false, | |
| 715 | + ), | |
| 716 | + array( | |
| 717 | + '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.', | |
| 718 | + 'lite' => false, | |
| 719 | + ), | |
| 720 | + array( | |
| 721 | + 'label' => 'Include text, email, url, paragraph text, radio, checkbox, dropdown fields, hidden fields, user ID fields, and HTML blocks in your form.', | |
| 722 | + 'lite' => true, | |
| 723 | + ), | |
| 724 | + array( | |
| 725 | + 'label' => 'Drag & Drop Form building', | |
| 726 | + 'link' => array( | |
| 727 | + 'content' => 'drag-drop', | |
| 728 | + 'param' => 'drag-drop-forms', | |
| 729 | + ), | |
| 730 | + 'lite' => true, | |
| 731 | + ), | |
| 732 | + array( | |
| 733 | + 'label' => 'Create forms from Templates', | |
| 734 | + 'link' => array( | |
| 735 | + 'content' => 'form-templates', | |
| 736 | + 'param' => 'wordpress-form-templates', | |
| 737 | + ), | |
| 738 | + 'lite' => true, | |
| 739 | + ), | |
| 740 | + array( | |
| 741 | + 'label' => 'Import and export forms with XML', | |
| 742 | + 'link' => array( | |
| 743 | + 'content' => 'import', | |
| 744 | + 'param' => 'importing-exporting-wordpress-forms', | |
| 745 | + ), | |
| 746 | + 'lite' => true, | |
| 747 | + ), | |
| 748 | + array( | |
| 749 | + 'label' => 'Use input placeholder text in your fields that clear when typing starts.', | |
| 750 | + 'lite' => true, | |
| 751 | + ), | |
| 752 | + ), | |
| 753 | + 'Form Actions' => array( | |
| 754 | + array( | |
| 755 | + 'label' => 'Conditionally send your email notifications based on values in your form', | |
| 756 | + 'link' => array( | |
| 757 | + 'content' => 'conditional-emails', | |
| 758 | + ), | |
| 759 | + 'lite' => false, | |
| 760 | + ), | |
| 761 | + array( | |
| 762 | + 'label' => 'Create and edit WordPress posts or custom posts from the front-end', | |
| 763 | + 'link' => array( | |
| 764 | + 'content' => 'create-posts', | |
| 765 | + 'param' => 'create-posts-pages-wordpress-forms', | |
| 766 | + ), | |
| 767 | + 'lite' => false, | |
| 768 | + ), | |
| 769 | + array( | |
| 770 | + 'label' => 'Send multiple emails and autoresponders', | |
| 771 | + 'link' => array( | |
| 772 | + 'content' => 'multiple-emails', | |
| 773 | + 'param' => 'virtually-unlimited-emails', | |
| 774 | + ), | |
| 775 | + 'lite' => true, | |
| 776 | + ), | |
| 777 | + ), | |
| 778 | + 'Form Appearance' => array( | |
| 779 | + array( | |
| 780 | + 'label' => 'Create Multiple styles for different forms', | |
| 781 | + 'link' => array( | |
| 782 | + 'content' => 'multiple-styles', | |
| 783 | + 'param' => 'wordpress-visual-form-styler', | |
| 784 | + ), | |
| 785 | + 'lite' => false, | |
| 786 | + ), | |
| 787 | + array( | |
| 788 | + 'label' => 'Customizable layout with CSS classes', | |
| 789 | + 'link' => array( | |
| 790 | + 'content' => 'form-layout', | |
| 791 | + 'param' => 'wordpress-mobile-friendly-forms', | |
| 792 | + ), | |
| 793 | + 'lite' => true, | |
| 794 | + ), | |
| 795 | + array( | |
| 796 | + 'label' => 'Customize the HTML for your forms', | |
| 797 | + 'link' => array( | |
| 798 | + 'content' => 'custom-html', | |
| 799 | + 'param' => 'customizable-html-wordpress-form', | |
| 800 | + ), | |
| 801 | + 'lite' => true, | |
| 802 | + ), | |
| 803 | + array( | |
| 804 | + 'label' => 'Style your form with the Visual Form Styler', | |
| 805 | + 'lite' => true, | |
| 806 | + ), | |
| 807 | + ), | |
| 808 | + ); | |
| 809 | + | |
| 810 | + include( FrmAppHelper::plugin_path() . '/classes/views/addons/upgrade_to_pro.php' ); | |
| 968 | 811 | } |
| 969 | 812 | |
| 970 | 813 | /** |
| 971 | - * Uninstall a specified plugin. | |
| 814 | + * Install Pro after connection with Formidable. | |
| 972 | 815 | * |
| 973 | - * @since 6.8 | |
| 974 | - * | |
| 975 | - * @param string $plugin | |
| 976 | - * | |
| 977 | - * @return true|WP_Error True on success, WP_Error on invalid file. | |
| 816 | + * @since 4.02.05 | |
| 978 | 817 | */ |
| 979 | - protected static function uninstall_plugin( $plugin ) { | |
| 980 | - if ( ! current_user_can( 'delete_plugins' ) ) { | |
| 981 | - return new WP_Error( 'uninstall_failed', __( 'Current user cannot delete plugins.', 'formidable' ) ); | |
| 982 | - } | |
| 818 | + public static function connect_pro() { | |
| 819 | + FrmAppHelper::permission_check( 'install_plugins' ); | |
| 820 | + check_ajax_referer( 'frm_ajax', 'nonce' ); | |
| 983 | 821 | |
| 984 | - if ( ! function_exists( 'delete_plugins' ) ) { | |
| 985 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 822 | + $url = FrmAppHelper::get_post_param( 'plugin', '', 'sanitize_text_field' ); | |
| 823 | + if ( FrmAppHelper::pro_is_installed() || empty( $url ) ) { | |
| 824 | + wp_die(); | |
| 986 | 825 | } |
| 987 | 826 | |
| 988 | - self::deactivate_plugin( $plugin, true ); | |
| 989 | - $result = delete_plugins( array( $plugin ) ); | |
| 827 | + $response = array(); | |
| 990 | 828 | |
| 991 | - if ( is_wp_error( $result ) ) { | |
| 992 | - return $result; | |
| 829 | + // It's already installed and active. | |
| 830 | + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 831 | + if ( is_wp_error( $active ) ) { | |
| 832 | + // The plugin was installed, but not active. Download it now. | |
| 833 | + self::ajax_install_addon(); | |
| 834 | + } else { | |
| 835 | + $response['active'] = true; | |
| 836 | + $response['success'] = true; | |
| 993 | 837 | } |
| 994 | 838 | |
| 995 | - return true; | |
| 839 | + echo json_encode( $response ); | |
| 840 | + wp_die(); | |
| 996 | 841 | } |
| 997 | 842 | |
| 998 | 843 | /** |
| 999 | - * @since 5.0.10 | |
| 1000 | - * | |
| 1001 | - * @return string | |
| 1002 | - */ | |
| 1003 | - protected static function get_current_plugin() { | |
| 1004 | - if ( empty( self::$plugin ) ) { | |
| 1005 | - self::$plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'esc_url_raw' ); | |
| 1006 | - } | |
| 1007 | - return self::$plugin; | |
| 1008 | - } | |
| 1009 | - | |
| 1010 | - /** | |
| 1011 | 844 | * @since 4.08 |
| 1012 | - * | |
| 1013 | - * @return array|void | |
| 1014 | 845 | */ |
| 1015 | 846 | protected static function download_and_activate() { |
| 847 | + // Set the current screen to avoid undefined notices. | |
| 1016 | 848 | if ( is_admin() ) { |
| 1017 | - FrmAppHelper::set_current_screen_and_hook_suffix(); | |
| 849 | + global $hook_suffix; | |
| 850 | + set_current_screen(); | |
| 1018 | 851 | } |
| 1019 | 852 | |
| 1020 | 853 | self::maybe_show_cred_form(); |
| 1021 | 854 | |
| 1022 | 855 | $installed = self::install_addon(); |
| 1023 | - | |
| 1024 | 856 | if ( is_array( $installed ) && isset( $installed['message'] ) ) { |
| 1025 | 857 | return $installed; |
| 1026 | 858 | } |
| 1027 | - self::handle_addon_action( $installed, 'activate' ); | |
| 859 | + self::maybe_activate_addon( $installed ); | |
| 1028 | 860 | } |
| 1029 | 861 | |
| 1030 | 862 | /** |
| 1031 | 863 | * @since 3.04.02 |
| 1032 | - * | |
| 1033 | - * @return void | |
| 1034 | 864 | */ |
| 1035 | 865 | protected static function maybe_show_cred_form() { |
| 1036 | 866 | if ( ! function_exists( 'request_filesystem_credentials' ) ) { |
| 1037 | - include_once ABSPATH . 'wp-admin/includes/file.php'; | |
| 867 | + include_once( ABSPATH . 'wp-admin/includes/file.php' ); | |
| 1038 | 868 | } |
| 1039 | 869 | |
| 1040 | - // Start output buffering to catch the filesystem form if credentials are needed. | |
| 870 | + // Start output bufferring to catch the filesystem form if credentials are needed. | |
| 1041 | 871 | ob_start(); |
| 1042 | 872 | |
| 1043 | 873 | $show_form = false; |
| 1044 | 874 | $method = ''; |
| @@ -1068,40 +898,18 @@ | ||
| 1068 | 898 | ob_end_clean(); |
| 1069 | 899 | } |
| 1070 | 900 | |
| 1071 | 901 | /** |
| 1072 | - * Checks if an addon download url is allowed. | |
| 1073 | - * | |
| 1074 | - * @since 6.2 | |
| 1075 | - * | |
| 1076 | - * @param string $download_url | |
| 1077 | - * | |
| 1078 | - * @return bool | |
| 1079 | - */ | |
| 1080 | - public static function url_is_allowed( $download_url ) { | |
| 1081 | - return FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) || in_array( $download_url, self::allowed_external_urls(), true ); | |
| 1082 | - } | |
| 1083 | - | |
| 1084 | - /** | |
| 1085 | 902 | * We do not need any extra credentials if we have gotten this far, |
| 1086 | 903 | * so let's install the plugin. |
| 1087 | 904 | * |
| 1088 | 905 | * @since 3.04.02 |
| 1089 | - * | |
| 1090 | - * @return array|string | |
| 1091 | 906 | */ |
| 1092 | 907 | protected static function install_addon() { |
| 1093 | - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; | |
| 908 | + require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); | |
| 1094 | 909 | |
| 1095 | - $download_url = self::get_current_plugin(); | |
| 910 | + $download_url = FrmAppHelper::get_param( 'plugin', '', 'post', 'esc_url_raw' ); | |
| 1096 | 911 | |
| 1097 | - if ( ! self::url_is_allowed( $download_url ) ) { | |
| 1098 | - return array( | |
| 1099 | - 'message' => 'Plugin URL is not valid', | |
| 1100 | - 'success' => false, | |
| 1101 | - ); | |
| 1102 | - } | |
| 1103 | - | |
| 1104 | 912 | // Create the plugin upgrader with our custom skin. |
| 1105 | 913 | $installer = new Plugin_Upgrader( new FrmInstallerSkin() ); |
| 1106 | 914 | $installer->install( $download_url ); |
| 1107 | 915 | |
| @@ -1108,10 +916,9 @@ | ||
| 1108 | 916 | // Flush the cache and return the newly installed plugin basename. |
| 1109 | 917 | wp_cache_flush(); |
| 1110 | 918 | |
| 1111 | 919 | $plugin = $installer->plugin_info(); |
| 1112 | - | |
| 1113 | - if ( ! $plugin ) { | |
| 920 | + if ( empty( $plugin ) ) { | |
| 1114 | 921 | return array( |
| 1115 | 922 | 'message' => 'Plugin was not installed. ' . $installer->result, |
| 1116 | 923 | 'success' => false, |
| 1117 | 924 | ); |
| @@ -1119,178 +926,60 @@ | ||
| 1119 | 926 | return $plugin; |
| 1120 | 927 | } |
| 1121 | 928 | |
| 1122 | 929 | /** |
| 1123 | - * Handle the AJAX request to activate an add-on. | |
| 1124 | - * | |
| 1125 | - * @since 6.8 | |
| 1126 | - * | |
| 1127 | - * @return void | |
| 930 | + * @since 3.06.03 | |
| 1128 | 931 | */ |
| 1129 | 932 | public static function ajax_activate_addon() { |
| 1130 | - self::process_addon_action( | |
| 1131 | - function ( $plugin ) { | |
| 1132 | - return self::handle_addon_action( $plugin, 'activate' ); | |
| 1133 | - }, | |
| 1134 | - array( 'FrmAddonsController', 'get_addon_activation_response' ) | |
| 1135 | - ); | |
| 1136 | - } | |
| 1137 | 933 | |
| 1138 | - /** | |
| 1139 | - * @since 3.04.02 | |
| 1140 | - * | |
| 1141 | - * @param string $installed The plugin folder name with file name. | |
| 1142 | - */ | |
| 1143 | - protected static function maybe_activate_addon( $installed ) { | |
| 1144 | - self::ajax_activate_addon(); | |
| 1145 | - } | |
| 934 | + self::install_addon_permissions(); | |
| 1146 | 935 | |
| 1147 | - /** | |
| 1148 | - * Handle the AJAX request to deactivate an add-on. | |
| 1149 | - * | |
| 1150 | - * @since 6.8 | |
| 1151 | - * | |
| 1152 | - * @return void | |
| 1153 | - */ | |
| 1154 | - public static function ajax_deactivate_addon() { | |
| 1155 | - self::process_addon_action( | |
| 1156 | - function ( $plugin ) { | |
| 1157 | - return self::handle_addon_action( $plugin, 'deactivate' ); | |
| 1158 | - } | |
| 1159 | - ); | |
| 1160 | - } | |
| 936 | + // Set the current screen to avoid undefined notices. | |
| 937 | + global $hook_suffix; | |
| 938 | + set_current_screen(); | |
| 1161 | 939 | |
| 1162 | - /** | |
| 1163 | - * Handle the AJAX request to uninstall an add-on. | |
| 1164 | - * | |
| 1165 | - * @since 6.8 | |
| 1166 | - * | |
| 1167 | - * @return void | |
| 1168 | - */ | |
| 1169 | - public static function ajax_uninstall_addon() { | |
| 1170 | - self::process_addon_action( | |
| 1171 | - function ( $plugin ) { | |
| 1172 | - return self::handle_addon_action( $plugin, 'uninstall' ); | |
| 1173 | - } | |
| 1174 | - ); | |
| 1175 | - } | |
| 1176 | - | |
| 1177 | - /** | |
| 1178 | - * Process a specific action (activate, deactivate, uninstall) on an add-on. | |
| 1179 | - * | |
| 1180 | - * @since 6.8 | |
| 1181 | - * | |
| 1182 | - * @param callable $action_callback The specific add-on action to be executed. | |
| 1183 | - * @param callable|null $response_callback Optional. The response handling callback. Default null. | |
| 1184 | - * | |
| 1185 | - * @return void | |
| 1186 | - */ | |
| 1187 | - private static function process_addon_action( $action_callback, $response_callback = null ) { | |
| 1188 | - self::install_addon_permissions(); | |
| 1189 | - FrmAppHelper::set_current_screen_and_hook_suffix(); | |
| 1190 | - | |
| 1191 | 940 | $plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' ); |
| 1192 | - call_user_func( $action_callback, $plugin ); | |
| 941 | + self::maybe_activate_addon( $plugin ); | |
| 1193 | 942 | |
| 1194 | - if ( is_callable( $response_callback ) ) { | |
| 1195 | - wp_send_json_success( call_user_func( $response_callback ) ); | |
| 1196 | - return; | |
| 1197 | - } | |
| 1198 | - | |
| 1199 | - wp_send_json_success(); | |
| 943 | + // Send back a response. | |
| 944 | + echo json_encode( __( 'Your plugin has been activated. Please reload the page to see more options.', 'formidable' ) ); | |
| 945 | + wp_die(); | |
| 1200 | 946 | } |
| 1201 | 947 | |
| 1202 | 948 | /** |
| 1203 | - * Attempt to perform a specific action (activate, deactivate, uninstall) on an add-on. | |
| 1204 | - * | |
| 1205 | - * @since 6.8 | |
| 1206 | - * | |
| 1207 | - * @param string $installed The plugin folder name with file name. | |
| 1208 | - * @param string $action The action type ('activate', 'deactivate', 'uninstall'). | |
| 1209 | - * | |
| 1210 | - * @return array|void | |
| 949 | + * @since 3.04.02 | |
| 950 | + * @param string $installed The plugin folder name with file name | |
| 1211 | 951 | */ |
| 1212 | - protected static function handle_addon_action( $installed, $action ) { | |
| 1213 | - if ( ! $installed || ! $action ) { | |
| 952 | + protected static function maybe_activate_addon( $installed ) { | |
| 953 | + if ( ! $installed ) { | |
| 1214 | 954 | return; |
| 1215 | 955 | } |
| 1216 | 956 | |
| 1217 | - $result = null; | |
| 1218 | - switch ( $action ) { | |
| 1219 | - case 'activate': | |
| 1220 | - $result = self::activate_plugin( $installed ); | |
| 1221 | - break; | |
| 1222 | - case 'deactivate': | |
| 1223 | - self::deactivate_plugin( $installed ); | |
| 1224 | - break; | |
| 1225 | - case 'uninstall': | |
| 1226 | - $result = self::uninstall_plugin( $installed ); | |
| 1227 | - break; | |
| 1228 | - } | |
| 1229 | - | |
| 1230 | - if ( is_wp_error( $result ) ) { | |
| 957 | + $activate = activate_plugin( $installed ); | |
| 958 | + if ( is_wp_error( $activate ) ) { | |
| 1231 | 959 | // Ignore the invalid header message that shows with nested plugins. |
| 1232 | - if ( $result->get_error_code() !== 'no_plugin_header' ) { | |
| 960 | + if ( $activate->get_error_code() !== 'no_plugin_header' ) { | |
| 1233 | 961 | if ( wp_doing_ajax() ) { |
| 1234 | - wp_send_json_error( array( 'error' => $result->get_error_message() ) ); | |
| 962 | + echo json_encode( array( 'error' => $activate->get_error_message() ) ); | |
| 963 | + wp_die(); | |
| 1235 | 964 | } |
| 1236 | 965 | return array( |
| 1237 | - 'message' => $result->get_error_message(), | |
| 966 | + 'message' => $activate->get_error_message(), | |
| 1238 | 967 | 'success' => false, |
| 1239 | 968 | ); |
| 1240 | 969 | } |
| 1241 | 970 | } |
| 1242 | - | |
| 1243 | - return $result; | |
| 1244 | 971 | } |
| 1245 | 972 | |
| 1246 | 973 | /** |
| 1247 | - * @return array | |
| 1248 | - */ | |
| 1249 | - private static function get_addon_activation_response() { | |
| 1250 | - $activating_page = self::get_activating_page(); | |
| 1251 | - | |
| 1252 | - $message = $activating_page ? __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ) : __( 'Your plugin has been activated.', 'formidable' ); | |
| 1253 | - | |
| 1254 | - $response = array( | |
| 1255 | - 'message' => $message, | |
| 1256 | - 'saveAndReload' => $activating_page, | |
| 1257 | - ); | |
| 1258 | - | |
| 1259 | - return $response; | |
| 1260 | - } | |
| 1261 | - | |
| 1262 | - /** | |
| 1263 | - * Return a string that reflects the page from which the addon is being activated on, | |
| 1264 | - * if it is from settings or form builder, otherwise return empty string. | |
| 1265 | - * | |
| 1266 | - * @return string | |
| 1267 | - */ | |
| 1268 | - private static function get_activating_page() { | |
| 1269 | - $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' ); | |
| 1270 | - | |
| 1271 | - if ( false !== strpos( $referer, 'frm_action=settings' ) ) { | |
| 1272 | - return 'settings'; | |
| 1273 | - } | |
| 1274 | - | |
| 1275 | - if ( false !== strpos( $referer, 'frm_action=edit' ) ) { | |
| 1276 | - return 'form_builder'; | |
| 1277 | - } | |
| 1278 | - | |
| 1279 | - return ''; | |
| 1280 | - } | |
| 1281 | - | |
| 1282 | - /** | |
| 1283 | 974 | * Run security checks before installing |
| 1284 | 975 | * |
| 1285 | 976 | * @since 3.04.02 |
| 1286 | - * | |
| 1287 | - * @return void | |
| 1288 | 977 | */ |
| 1289 | 978 | protected static function install_addon_permissions() { |
| 1290 | 979 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1291 | 980 | |
| 1292 | - if ( ! current_user_can( 'activate_plugins' ) || ! self::get_current_plugin() ) { | |
| 981 | + if ( ! current_user_can( 'activate_plugins' ) || ! isset( $_POST['plugin'] ) ) { | |
| 1293 | 982 | echo json_encode( true ); |
| 1294 | 983 | wp_die(); |
| 1295 | 984 | } |
| 1296 | 985 | } |
| @@ -1296,27 +985,20 @@ | ||
| 1296 | 985 | } |
| 1297 | 986 | |
| 1298 | 987 | /** |
| 1299 | 988 | * @since 4.08 |
| 1300 | - * | |
| 1301 | - * @return string | |
| 1302 | 989 | */ |
| 1303 | 990 | public static function connect_link() { |
| 1304 | 991 | $auth = get_option( 'frm_connect_token' ); |
| 1305 | - | |
| 1306 | 992 | if ( empty( $auth ) ) { |
| 1307 | 993 | $auth = hash( 'sha512', wp_rand() ); |
| 1308 | - update_option( 'frm_connect_token', $auth, 'no' ); | |
| 994 | + update_option( 'frm_connect_token', $auth ); | |
| 1309 | 995 | } |
| 1310 | - | |
| 1311 | - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title', 'formidable-settings' ); | |
| 1312 | - $link = 'https://formidableforms.com/api-connect/'; | |
| 996 | + $link = FrmAppHelper::admin_upgrade_link( 'connect', 'api-connect' ); | |
| 1313 | 997 | $args = array( |
| 1314 | 998 | 'v' => 2, |
| 1315 | 999 | 'siteurl' => FrmAppHelper::site_url(), |
| 1316 | 1000 | 'url' => get_rest_url(), |
| 1317 | - 'inst' => (int) FrmAppHelper::pro_is_included(), | |
| 1318 | - 'return' => $page, | |
| 1319 | 1001 | 'token' => $auth, |
| 1320 | 1002 | 'l' => self::get_pro_license(), |
| 1321 | 1003 | ); |
| 1322 | 1004 | |
| @@ -1334,19 +1016,14 @@ | ||
| 1334 | 1016 | // Verify params present (auth & download link). |
| 1335 | 1017 | $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' ); |
| 1336 | 1018 | $post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' ); |
| 1337 | 1019 | |
| 1338 | - // The download link is not required if already installed. | |
| 1339 | - $is_installed = FrmAppHelper::pro_is_included(); | |
| 1340 | - $file_missing = ! $is_installed && empty( $post_url ); | |
| 1341 | - | |
| 1342 | - if ( ! $post_auth || $file_missing ) { | |
| 1020 | + if ( empty( $post_auth ) || empty( $post_url ) ) { | |
| 1343 | 1021 | return false; |
| 1344 | 1022 | } |
| 1345 | 1023 | |
| 1346 | 1024 | // Verify auth. |
| 1347 | 1025 | $auth = get_option( 'frm_connect_token' ); |
| 1348 | - | |
| 1349 | 1026 | if ( empty( $auth ) || ! hash_equals( $auth, $post_auth ) ) { |
| 1350 | 1027 | return false; |
| 1351 | 1028 | } |
| 1352 | 1029 | |
| @@ -1356,25 +1033,25 @@ | ||
| 1356 | 1033 | /** |
| 1357 | 1034 | * Install and/or activate the add-on file. |
| 1358 | 1035 | * |
| 1359 | 1036 | * @since 4.08 |
| 1360 | - * | |
| 1361 | - * @return array | |
| 1362 | 1037 | */ |
| 1363 | 1038 | public static function install_addon_api() { |
| 1364 | - self::$plugin = FrmAppHelper::get_param( 'file_url', '', 'request', 'esc_url_raw' ); | |
| 1039 | + // Sanitize when it's used to prevent double sanitizing. | |
| 1040 | + // phpcs:ignore WordPress.Security.ValidatedSanitizedInput | |
| 1041 | + $_POST['plugin'] = isset( $_REQUEST['file_url'] ) ? $_REQUEST['file_url'] : ''; // Set for later use | |
| 1365 | 1042 | |
| 1043 | + $error = esc_html__( 'Could not install an upgrade. Please download from formidableforms.com and install manually.', 'formidable' ); | |
| 1044 | + | |
| 1366 | 1045 | // Delete so cannot replay. |
| 1367 | 1046 | delete_option( 'frm_connect_token' ); |
| 1368 | 1047 | |
| 1369 | 1048 | // It's already installed and active. |
| 1370 | - $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 1371 | - | |
| 1049 | + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 1372 | 1050 | if ( is_wp_error( $active ) ) { |
| 1373 | - $response = self::maybe_download_and_activate(); | |
| 1374 | - | |
| 1375 | - if ( is_array( $response ) ) { | |
| 1376 | - // The download failed. | |
| 1051 | + // Download plugin now. | |
| 1052 | + $response = self::download_and_activate(); | |
| 1053 | + if ( is_array( $response ) && isset( $response['success'] ) ) { | |
| 1377 | 1054 | return $response; |
| 1378 | 1055 | } |
| 1379 | 1056 | } |
| 1380 | 1057 | |
| @@ -1381,10 +1058,9 @@ | ||
| 1381 | 1058 | // If empty license, save it now. |
| 1382 | 1059 | if ( empty( self::get_pro_license() ) && function_exists( 'load_formidable_pro' ) ) { |
| 1383 | 1060 | load_formidable_pro(); |
| 1384 | 1061 | $license = stripslashes( FrmAppHelper::get_param( 'key', '', 'request', 'sanitize_text_field' ) ); |
| 1385 | - | |
| 1386 | - if ( ! $license ) { | |
| 1062 | + if ( empty( $license ) ) { | |
| 1387 | 1063 | return array( |
| 1388 | 1064 | 'success' => false, |
| 1389 | 1065 | 'error' => 'That site does not have a valid license key.', |
| 1390 | 1066 | ); |
| @@ -1390,9 +1066,8 @@ | ||
| 1390 | 1066 | ); |
| 1391 | 1067 | } |
| 1392 | 1068 | |
| 1393 | 1069 | $response = FrmAddon::activate_license_for_plugin( $license, 'formidable_pro' ); |
| 1394 | - | |
| 1395 | 1070 | if ( ! $response['success'] ) { |
| 1396 | 1071 | // Could not activate license. |
| 1397 | 1072 | return $response; |
| 1398 | 1073 | } |
| @@ -1403,60 +1078,22 @@ | ||
| 1403 | 1078 | ); |
| 1404 | 1079 | } |
| 1405 | 1080 | |
| 1406 | 1081 | /** |
| 1407 | - * @since 6.8.3 | |
| 1408 | - * | |
| 1409 | - * @return array|true | |
| 1410 | - */ | |
| 1411 | - private static function maybe_download_and_activate() { | |
| 1412 | - if ( ! self::$plugin ) { | |
| 1413 | - return array( | |
| 1414 | - 'success' => false, | |
| 1415 | - 'message' => __( 'The plugin download was not found.', 'formidable' ), | |
| 1416 | - ); | |
| 1417 | - } | |
| 1418 | - | |
| 1419 | - // Download plugin now. | |
| 1420 | - $response = self::download_and_activate(); | |
| 1421 | - | |
| 1422 | - if ( is_array( $response ) && isset( $response['success'] ) ) { | |
| 1423 | - // The download failed. | |
| 1424 | - return $response; | |
| 1425 | - } | |
| 1426 | - | |
| 1427 | - return true; | |
| 1428 | - } | |
| 1429 | - | |
| 1430 | - /** | |
| 1431 | 1082 | * Render a conditional action button for a specified plugin |
| 1432 | 1083 | * |
| 1084 | + * @param string $plugin | |
| 1085 | + * @param array|string $upgrade_link_args | |
| 1433 | 1086 | * @since 4.09 |
| 1434 | - * | |
| 1435 | - * @param string $plugin | |
| 1436 | - * @param array|string $upgrade_link_args | |
| 1437 | - * | |
| 1438 | - * @return void | |
| 1439 | 1087 | */ |
| 1440 | 1088 | public static function conditional_action_button( $plugin, $upgrade_link_args ) { |
| 1441 | 1089 | if ( is_callable( 'FrmProAddonsController::conditional_action_button' ) ) { |
| 1442 | - FrmProAddonsController::conditional_action_button( $plugin, $upgrade_link_args ); | |
| 1443 | - return; | |
| 1090 | + return FrmProAddonsController::conditional_action_button( $plugin, $upgrade_link_args ); | |
| 1444 | 1091 | } |
| 1445 | 1092 | |
| 1446 | 1093 | $addon = self::get_addon( $plugin ); |
| 1447 | 1094 | $upgrade_link = FrmAppHelper::admin_upgrade_link( $upgrade_link_args ); |
| 1448 | - | |
| 1449 | - if ( ! is_array( $upgrade_link_args ) ) { | |
| 1450 | - // A string $upgrade_link_args is used for the utm-medium value when calling | |
| 1451 | - // FrmAppHelper::admin_upgrade_link above. | |
| 1452 | - // For self::addon_upgrade_link, we'll pass just an empty array with the link key (set below). | |
| 1453 | - $upgrade_link_args = array(); | |
| 1454 | - } | |
| 1455 | - | |
| 1456 | - $upgrade_link_args['link'] = $upgrade_link; | |
| 1457 | - | |
| 1458 | - self::addon_upgrade_link( $addon, $upgrade_link_args ); | |
| 1095 | + self::addon_upgrade_link( $addon, $upgrade_link ); | |
| 1459 | 1096 | } |
| 1460 | 1097 | |
| 1461 | 1098 | /** |
| 1462 | 1099 | * Render a conditional action button for an add on |
| @@ -1461,24 +1098,16 @@ | ||
| 1461 | 1098 | /** |
| 1462 | 1099 | * Render a conditional action button for an add on |
| 1463 | 1100 | * |
| 1464 | 1101 | * @since 4.09.01 |
| 1465 | - * | |
| 1466 | - * @param array $atts { | |
| 1467 | - * Button attributes. | |
| 1468 | - * | |
| 1469 | - * @type array $addon | |
| 1470 | - * @type false|string $license_type | |
| 1471 | - * @type string $plan_required | |
| 1472 | - * @type string $upgrade_link | |
| 1473 | - * } | |
| 1474 | - * | |
| 1475 | - * @return void | |
| 1102 | + * @param array $addon | |
| 1103 | + * @param string|false $license_type | |
| 1104 | + * @param string $plan_required | |
| 1105 | + * @param string $upgrade_link | |
| 1476 | 1106 | */ |
| 1477 | 1107 | public static function show_conditional_action_button( $atts ) { |
| 1478 | 1108 | if ( is_callable( 'FrmProAddonsController::show_conditional_action_button' ) ) { |
| 1479 | - FrmProAddonsController::show_conditional_action_button( $atts ); | |
| 1480 | - return; | |
| 1109 | + return FrmProAddonsController::show_conditional_action_button( $atts ); | |
| 1481 | 1110 | } |
| 1482 | 1111 | |
| 1483 | 1112 | self::addon_upgrade_link( $atts['addon'], $atts['upgrade_link'] ); |
| 1484 | 1113 | } |
| @@ -1484,19 +1113,10 @@ | ||
| 1484 | 1113 | } |
| 1485 | 1114 | |
| 1486 | 1115 | /** |
| 1487 | 1116 | * @since 4.09.01 |
| 1488 | - * | |
| 1489 | - * @param array|false $addon | |
| 1490 | - * @param array|string $upgrade_link | |
| 1491 | - * | |
| 1492 | - * @return void | |
| 1493 | 1117 | */ |
| 1494 | - public static function addon_upgrade_link( $addon, $upgrade_link ) { | |
| 1495 | - $atts = is_array( $upgrade_link ) ? $upgrade_link : array(); | |
| 1496 | - $upgrade_link = is_array( $upgrade_link ) ? $upgrade_link['link'] : $upgrade_link; | |
| 1497 | - $text = ! empty( $atts['text'] ) ? $atts['text'] : __( 'Upgrade Now', 'formidable' ); | |
| 1498 | - | |
| 1118 | + protected static function addon_upgrade_link( $addon, $upgrade_link ) { | |
| 1499 | 1119 | if ( $addon ) { |
| 1500 | 1120 | $upgrade_link .= '&utm_content=' . $addon['slug']; |
| 1501 | 1121 | } |
| 1502 | 1122 | |
| @@ -1503,17 +1123,11 @@ | ||
| 1503 | 1123 | if ( $addon && isset( $addon['categories'] ) && in_array( 'Solution', $addon['categories'], true ) ) { |
| 1504 | 1124 | // Solutions will go to a separate page. |
| 1505 | 1125 | $upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] ); |
| 1506 | 1126 | } |
| 1507 | - | |
| 1508 | - $class = ! empty( $atts['class'] ) ? $atts['class'] : ''; | |
| 1509 | - | |
| 1510 | - if ( strpos( $class, 'frm-button' ) === false ) { | |
| 1511 | - $class .= ' frm-button-secondary frm-button-sm'; | |
| 1512 | - } | |
| 1513 | 1127 | ?> |
| 1514 | - <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' ); ?>"> | |
| 1515 | - <?php echo esc_html( $text ); ?> | |
| 1128 | + <a class="install-now button button-secondary frm-button-secondary" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>"> | |
| 1129 | + <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?> | |
| 1516 | 1130 | </a> |
| 1517 | 1131 | <?php |
| 1518 | 1132 | } |
| 1519 | 1133 | |
| @@ -1518,78 +1132,109 @@ | ||
| 1518 | 1132 | } |
| 1519 | 1133 | |
| 1520 | 1134 | /** |
| 1521 | 1135 | * @since 3.04.02 |
| 1522 | - * | |
| 1523 | - * @return void | |
| 1524 | 1136 | */ |
| 1525 | 1137 | public static function ajax_install_addon() { |
| 1526 | 1138 | self::install_addon_permissions(); |
| 1527 | 1139 | |
| 1528 | - $result = self::download_and_activate(); | |
| 1140 | + self::download_and_activate(); | |
| 1529 | 1141 | |
| 1530 | - if ( isset( $result['success'] ) && ! $result['success'] ) { | |
| 1531 | - echo json_encode( $result ); | |
| 1532 | - wp_die(); | |
| 1533 | - } | |
| 1142 | + // Send back a response. | |
| 1143 | + echo json_encode( __( 'Your plugin has been installed. Please reload the page to see more options.', 'formidable' ) ); | |
| 1144 | + wp_die(); | |
| 1145 | + } | |
| 1534 | 1146 | |
| 1535 | - echo json_encode( self::get_addon_activation_response() ); | |
| 1536 | - wp_die(); | |
| 1147 | + /** | |
| 1148 | + * @since 4.06.02 | |
| 1149 | + * @deprecated 4.09.01 | |
| 1150 | + */ | |
| 1151 | + public static function ajax_multiple_addons() { | |
| 1152 | + FrmDeprecated::ajax_multiple_addons(); | |
| 1537 | 1153 | } |
| 1538 | 1154 | |
| 1539 | 1155 | /** |
| 1540 | - * Allowed URLs used for internal source of plugins installation. | |
| 1541 | - * | |
| 1542 | - * @since 6.3.1 | |
| 1543 | - * | |
| 1156 | + * @since 3.04.03 | |
| 1157 | + * @deprecated 3.06 | |
| 1158 | + * @codeCoverageIgnore | |
| 1544 | 1159 | * @return array |
| 1545 | 1160 | */ |
| 1546 | - private static function allowed_external_urls() { | |
| 1547 | - $allowed_url_list = array( | |
| 1548 | - 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip', | |
| 1549 | - 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip', | |
| 1550 | - 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip', | |
| 1551 | - ); | |
| 1161 | + public static function error_for_license( $license ) { | |
| 1162 | + return FrmDeprecated::error_for_license( $license ); | |
| 1163 | + } | |
| 1552 | 1164 | |
| 1553 | - /** | |
| 1554 | - * List of URLs used in plugin formidable internal installation. | |
| 1555 | - * | |
| 1556 | - * @since 6.3.1 | |
| 1557 | - * | |
| 1558 | - * @param array $allowed_url_list List of URLs. | |
| 1559 | - */ | |
| 1560 | - $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list ); | |
| 1165 | + /** | |
| 1166 | + * @since 3.04.03 | |
| 1167 | + * @deprecated 3.06 | |
| 1168 | + * @codeCoverageIgnore | |
| 1169 | + */ | |
| 1170 | + public static function get_pro_updater() { | |
| 1171 | + return FrmDeprecated::get_pro_updater(); | |
| 1172 | + } | |
| 1561 | 1173 | |
| 1562 | - if ( ! is_array( $allowed_url_list ) ) { | |
| 1563 | - _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' ); | |
| 1174 | + /** | |
| 1175 | + * @since 3.04.03 | |
| 1176 | + * @deprecated 3.06 | |
| 1177 | + * @codeCoverageIgnore | |
| 1178 | + * | |
| 1179 | + * @return array | |
| 1180 | + */ | |
| 1181 | + public static function get_addon_info( $license = '' ) { | |
| 1182 | + return FrmDeprecated::get_addon_info( $license ); | |
| 1183 | + } | |
| 1564 | 1184 | |
| 1565 | - return array(); | |
| 1566 | - } | |
| 1185 | + /** | |
| 1186 | + * @since 3.04.03 | |
| 1187 | + * @deprecated 3.06 | |
| 1188 | + * @codeCoverageIgnore | |
| 1189 | + * | |
| 1190 | + * @return string | |
| 1191 | + */ | |
| 1192 | + public static function get_cache_key( $license ) { | |
| 1193 | + return FrmDeprecated::get_cache_key( $license ); | |
| 1194 | + } | |
| 1567 | 1195 | |
| 1568 | - return $allowed_url_list; | |
| 1196 | + /** | |
| 1197 | + * @since 3.04.03 | |
| 1198 | + * @deprecated 3.06 | |
| 1199 | + * @codeCoverageIgnore | |
| 1200 | + */ | |
| 1201 | + public static function reset_cached_addons( $license = '' ) { | |
| 1202 | + FrmDeprecated::reset_cached_addons( $license ); | |
| 1569 | 1203 | } |
| 1570 | 1204 | |
| 1571 | 1205 | /** |
| 1572 | - * Gets required plan for an addon. | |
| 1206 | + * @since 2.03.08 | |
| 1207 | + * @deprecated 3.04.03 | |
| 1208 | + * @codeCoverageIgnore | |
| 1573 | 1209 | * |
| 1574 | - * @since 6.4.2 | |
| 1210 | + * @param boolean $return | |
| 1211 | + * @param string $package | |
| 1575 | 1212 | * |
| 1576 | - * @param int|string $addon_id | |
| 1213 | + * @return boolean | |
| 1214 | + */ | |
| 1215 | + public static function add_shorten_edd_filename_filter( $return, $package ) { | |
| 1216 | + return FrmDeprecated::add_shorten_edd_filename_filter( $return, $package ); | |
| 1217 | + } | |
| 1218 | + | |
| 1219 | + /** | |
| 1220 | + * @since 2.03.08 | |
| 1221 | + * @deprecated 3.04.03 | |
| 1222 | + * @codeCoverageIgnore | |
| 1577 | 1223 | * |
| 1578 | - * @return string Empty string if no plan is required for active license. | |
| 1224 | + * @param string $filename | |
| 1225 | + * @param string $ext | |
| 1226 | + * | |
| 1227 | + * @return string | |
| 1579 | 1228 | */ |
| 1580 | - public static function get_addon_required_plan( $addon_id ) { | |
| 1581 | - $api = new FrmFormApi(); | |
| 1582 | - $addons = $api->get_api_info(); | |
| 1229 | + public static function shorten_edd_filename( $filename, $ext ) { | |
| 1230 | + return FrmDeprecated::shorten_edd_filename( $filename, $ext ); | |
| 1231 | + } | |
| 1583 | 1232 | |
| 1584 | - if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) { | |
| 1585 | - $dates = $addons[ $addon_id ]; | |
| 1586 | - $requires = FrmFormsHelper::get_plan_required( $dates ); | |
| 1587 | - } | |
| 1588 | - | |
| 1589 | - if ( ! isset( $requires ) || ! is_string( $requires ) ) { | |
| 1590 | - $requires = ''; | |
| 1591 | - } | |
| 1592 | - | |
| 1593 | - return $requires; | |
| 1233 | + /** | |
| 1234 | + * @deprecated 3.04.03 | |
| 1235 | + * @codeCoverageIgnore | |
| 1236 | + */ | |
| 1237 | + public static function get_licenses() { | |
| 1238 | + FrmDeprecated::get_licenses(); | |
| 1594 | 1239 | } |
| 1595 | 1240 | } |
