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