PluginProbe
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More / 5.3
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More v5.3
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 +32 -183 6.3.25.3 View file →
@@ -37,11 +37,8 @@
37 37 exit;
38 38 }
39 39 }
40 40
41 - /**
42 - * @return void
43 - */
44 41 public static function list_addons() {
45 42 FrmAppHelper::include_svg();
46 43 $installed_addons = apply_filters( 'frm_installed_addons', array() );
47 44 $license_type = '';
@@ -72,11 +69,8 @@
72 69
73 70 include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' );
74 71 }
75 72
76 - /**
77 - * @return void
78 - */
79 73 public static function license_settings() {
80 74 $plugins = apply_filters( 'frm_installed_addons', array() );
81 75 if ( empty( $plugins ) ) {
82 76 esc_html_e( 'There are no plugins on your site that require a license', 'formidable' );
@@ -88,11 +82,8 @@
88 82
89 83 include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' );
90 84 }
91 85
92 - /**
93 - * @return array
94 - */
95 86 protected static function get_api_addons() {
96 87 $api = new FrmFormApi();
97 88 $addons = $api->get_api_info();
98 89
@@ -123,10 +114,10 @@
123 114 'docs' => '',
124 115 'excerpt' => 'Enhance your basic Formidable forms with a plethora of Pro field types and features. Create advanced forms and data-driven applications in minutes.',
125 116 ),
126 117 'mailchimp' => array(
127 - 'title' => 'Mailchimp Forms',
128 - '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.',
118 + 'title' => 'MailChimp Forms',
119 + '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.',
129 120 ),
130 121 'registration' => array(
131 122 'title' => 'User Registration Forms',
132 123 'link' => 'downloads/user-registration/',
@@ -251,11 +242,8 @@
251 242 }
252 243
253 244 /**
254 245 * @since 4.08
255 - *
256 - * @param array $addons
257 - * @return array
258 246 */
259 247 protected static function get_pro_from_addons( $addons ) {
260 248 return isset( $addons['93790'] ) ? $addons['93790'] : array();
261 249 }
@@ -297,10 +285,8 @@
297 285 }
298 286
299 287 /**
300 288 * @since 4.08
301 - *
302 - * @return array|false
303 289 */
304 290 protected static function get_primary_license_info() {
305 291 $installed_addons = apply_filters( 'frm_installed_addons', array() );
306 292 if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) {
@@ -330,12 +316,17 @@
330 316 if ( empty( $installed_addons ) ) {
331 317 return $transient;
332 318 }
333 319
334 - $version_info = self::fill_update_addon_info( $installed_addons );
320 + $version_info = self::fill_update_addon_info( $installed_addons );
321 +
335 322 $transient->last_checked = time();
336 - $wp_plugins = self::get_plugins();
337 323
324 + if ( ! function_exists( 'get_plugins' ) ) {
325 + require_once ABSPATH . 'wp-admin/includes/plugin.php';
326 + }
327 + $wp_plugins = get_plugins();
328 +
338 329 foreach ( $version_info as $id => $plugin ) {
339 330 $plugin = (object) $plugin;
340 331
341 332 if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) {
@@ -368,23 +359,8 @@
368 359 return $transient;
369 360 }
370 361
371 362 /**
372 - * Copy of FrmAppHelper::get_plugins.
373 - * Because this gets called on "pre_set_site_transient_update_plugins" an old version of FrmAppHelper may be loaded on plugin update.
374 - * This means that trying to access FrmAppHelper::get_plugins when upgrading from a Lite version before v5.5 results in a one-off error.
375 - *
376 - * @since 5.5.2
377 - * @return array
378 - */
379 - protected static function get_plugins() {
380 - if ( ! function_exists( 'get_plugins' ) ) {
381 - require_once ABSPATH . 'wp-admin/includes/plugin.php';
382 - }
383 - return get_plugins();
384 - }
385 -
386 - /**
387 363 * Check if a plugin is installed before showing an update for it
388 364 *
389 365 * @since 3.05
390 366 *
@@ -392,9 +368,14 @@
392 368 *
393 369 * @return bool - True if installed
394 370 */
395 371 protected static function is_installed( $plugin ) {
396 - $all_plugins = self::get_plugins();
372 + if ( ! function_exists( 'get_plugins' ) ) {
373 + require_once ABSPATH . 'wp-admin/includes/plugin.php';
374 + }
375 +
376 + $all_plugins = get_plugins();
377 +
397 378 return isset( $all_plugins[ $plugin ] );
398 379 }
399 380
400 381 /**
@@ -544,11 +525,8 @@
544 525
545 526 return $plugin;
546 527 }
547 528
548 - /**
549 - * @return void
550 - */
551 529 protected static function prepare_addons( &$addons ) {
552 530 $activate_url = '';
553 531 if ( current_user_can( 'activate_plugins' ) ) {
554 532 $activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) );
@@ -606,11 +584,8 @@
606 584 $addons[ $id ] = $addon;
607 585 }
608 586 }
609 587
610 - /**
611 - * @return bool
612 - */
613 588 private static function is_plugin_active( $file_name, $slug ) {
614 589 if ( 'formidable-views/formidable-views.php' === $file_name ) {
615 590 return self::get_active_views_version() === $slug;
616 591 }
@@ -629,10 +604,8 @@
629 604 }
630 605
631 606 /**
632 607 * @since 3.04.02
633 - *
634 - * @return void
635 608 */
636 609 protected static function prepare_addon_link( &$link ) {
637 610 $site_url = 'https://formidableforms.com/';
638 611 if ( strpos( $link, 'http' ) !== 0 ) {
@@ -651,10 +624,8 @@
651 624 * Add the status to the addon array. Status options are:
652 625 * installed, active, not installed
653 626 *
654 627 * @since 3.04.02
655 - *
656 - * @return void
657 628 */
658 629 protected static function set_addon_status( &$addon ) {
659 630 if ( ! empty( $addon['activate_url'] ) ) {
660 631 $addon['status'] = array(
@@ -673,11 +644,8 @@
673 644 );
674 645 }
675 646 }
676 647
677 - /**
678 - * @return void
679 - */
680 648 public static function upgrade_to_pro() {
681 649 FrmAppHelper::include_svg();
682 650
683 651 $link_parts = array(
@@ -887,10 +855,8 @@
887 855 /**
888 856 * Install Pro after connection with Formidable.
889 857 *
890 858 * @since 4.02.05
891 - *
892 - * @return void
893 859 */
894 860 public static function connect_pro() {
895 861 FrmAppHelper::permission_check( 'install_plugins' );
896 862 check_ajax_referer( 'frm_ajax', 'nonce' );
@@ -902,9 +868,9 @@
902 868
903 869 $response = array();
904 870
905 871 // It's already installed and active.
906 - $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
872 + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
907 873 if ( is_wp_error( $active ) ) {
908 874 // The plugin was installed, but not active. Download it now.
909 875 self::ajax_install_addon();
910 876 } else {
@@ -916,24 +882,8 @@
916 882 wp_die();
917 883 }
918 884
919 885 /**
920 - * @since 5.5.2
921 - *
922 - * @param string $plugin
923 - * @param string $redirect
924 - * @param bool $network_wide
925 - * @param bool $silent
926 - * @return null|WP_Error Null on success, WP_Error on invalid file.
927 - */
928 - protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
929 - if ( ! function_exists( 'activate_plugin' ) ) {
930 - require_once ABSPATH . 'wp-admin/includes/plugin.php';
931 - }
932 - return activate_plugin( $plugin, $redirect, $network_wide, $silent );
933 - }
934 -
935 - /**
936 886 * @since 5.0.10
937 887 *
938 888 * @return string
939 889 */
@@ -962,10 +912,8 @@
962 912 }
963 913
964 914 /**
965 915 * @since 3.04.02
966 - *
967 - * @return void
968 916 */
969 917 protected static function maybe_show_cred_form() {
970 918 if ( ! function_exists( 'request_filesystem_credentials' ) ) {
971 919 include_once( ABSPATH . 'wp-admin/includes/file.php' );
@@ -1002,23 +950,8 @@
1002 950 ob_end_clean();
1003 951 }
1004 952
1005 953 /**
1006 - * Checks if an addon download url is allowed.
1007 - *
1008 - * @since 6.2
1009 - *
1010 - * @param string $download_url
1011 - *
1012 - * @return bool
1013 - */
1014 - public static function url_is_allowed( $download_url ) {
1015 - return (
1016 - FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) || in_array( $download_url, self::allowed_external_urls(), true )
1017 - );
1018 - }
1019 -
1020 - /**
1021 954 * We do not need any extra credentials if we have gotten this far,
1022 955 * so let's install the plugin.
1023 956 *
1024 957 * @since 3.04.02
@@ -1023,21 +956,12 @@
1023 956 *
1024 957 * @since 3.04.02
1025 958 */
1026 959 protected static function install_addon() {
1027 - FrmAppHelper::permission_check( 'install_plugins' );
1028 -
1029 960 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
1030 961
1031 962 $download_url = self::get_current_plugin();
1032 963
1033 - if ( ! self::url_is_allowed( $download_url ) ) {
1034 - return array(
1035 - 'message' => 'Plugin URL is not valid',
1036 - 'success' => false,
1037 - );
1038 - }
1039 -
1040 964 // Create the plugin upgrader with our custom skin.
1041 965 $installer = new Plugin_Upgrader( new FrmInstallerSkin() );
1042 966 $installer->install( $download_url );
1043 967
@@ -1055,10 +979,8 @@
1055 979 }
1056 980
1057 981 /**
1058 982 * @since 3.06.03
1059 - *
1060 - * @return void
1061 983 */
1062 984 public static function ajax_activate_addon() {
1063 985
1064 986 self::install_addon_permissions();
@@ -1072,43 +994,31 @@
1072 994 wp_die();
1073 995 }
1074 996
1075 997 /**
1076 - * @return array
998 + * @return array|string
1077 999 */
1078 1000 private static function get_addon_activation_response() {
1079 - $activating_page = self::get_activating_page();
1080 -
1081 - $response = array(
1082 - 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ),
1083 - 'saveAndReload' => $activating_page,
1084 - );
1085 -
1001 + if ( self::activating_from_settings_page() ) {
1002 + $response = array(
1003 + 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ),
1004 + 'saveAndReload' => 'settings',
1005 + );
1006 + } else {
1007 + $response = __( 'Your plugin has been activated. Please reload the page to see more options.', 'formidable' );
1008 + }
1086 1009 return $response;
1087 1010 }
1088 1011
1089 1012 /**
1090 - * Return a string that reflects the page from which the addon is being activated on,
1091 - * if it is from settings or form builder, otherwise return empty string.
1092 - *
1093 - * @return string
1013 + * @return bool
1094 1014 */
1095 - private static function get_activating_page() {
1096 - $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' );
1097 - if ( false !== strpos( $referer, 'frm_action=settings' ) ) {
1098 - return 'settings';
1099 - }
1100 -
1101 - if ( false !== strpos( $referer, 'frm_action=edit' ) ) {
1102 - return 'form_builder';
1103 - }
1104 -
1105 - return '';
1015 + private static function activating_from_settings_page() {
1016 + return false !== strpos( FrmAppHelper::get_server_value( 'HTTP_REFERER' ), 'frm_action=settings' );
1106 1017 }
1107 1018
1108 1019 /**
1109 1020 * @since 3.04.02
1110 - *
1111 1021 * @param string $installed The plugin folder name with file name
1112 1022 */
1113 1023 protected static function maybe_activate_addon( $installed ) {
1114 1024 if ( ! $installed ) {
@@ -1114,9 +1024,9 @@
1114 1024 if ( ! $installed ) {
1115 1025 return;
1116 1026 }
1117 1027
1118 - $activate = self::activate_plugin( $installed );
1028 + $activate = activate_plugin( $installed );
1119 1029 if ( is_wp_error( $activate ) ) {
1120 1030 // Ignore the invalid header message that shows with nested plugins.
1121 1031 if ( $activate->get_error_code() !== 'no_plugin_header' ) {
1122 1032 if ( wp_doing_ajax() ) {
@@ -1134,10 +1044,8 @@
1134 1044 /**
1135 1045 * Run security checks before installing
1136 1046 *
1137 1047 * @since 3.04.02
1138 - *
1139 - * @return void
1140 1048 */
1141 1049 protected static function install_addon_permissions() {
1142 1050 check_ajax_referer( 'frm_ajax', 'nonce' );
1143 1051
@@ -1148,10 +1056,8 @@
1148 1056 }
1149 1057
1150 1058 /**
1151 1059 * @since 4.08
1152 - *
1153 - * @return string
1154 1060 */
1155 1061 public static function connect_link() {
1156 1062 $auth = get_option( 'frm_connect_token' );
1157 1063 if ( empty( $auth ) ) {
@@ -1177,12 +1083,8 @@
1177 1083 *
1178 1084 * @return bool
1179 1085 */
1180 1086 public static function can_install_addon_api() {
1181 - if ( ! current_user_can( 'activate_plugins' ) ) {
1182 - return false;
1183 - }
1184 -
1185 1087 // Verify params present (auth & download link).
1186 1088 $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' );
1187 1089 $post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' );
1188 1090
@@ -1212,9 +1114,9 @@
1212 1114 // Delete so cannot replay.
1213 1115 delete_option( 'frm_connect_token' );
1214 1116
1215 1117 // It's already installed and active.
1216 - $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
1118 + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
1217 1119 if ( is_wp_error( $active ) ) {
1218 1120 // Download plugin now.
1219 1121 $response = self::download_and_activate();
1220 1122 if ( is_array( $response ) && isset( $response['success'] ) ) {
@@ -1265,9 +1167,8 @@
1265 1167 /**
1266 1168 * Render a conditional action button for an add on
1267 1169 *
1268 1170 * @since 4.09.01
1269 - *
1270 1171 * @param array $addon
1271 1172 * @param string|false $license_type
1272 1173 * @param string $plan_required
1273 1174 * @param string $upgrade_link
@@ -1281,12 +1182,8 @@
1281 1182 }
1282 1183
1283 1184 /**
1284 1185 * @since 4.09.01
1285 - *
1286 - * @param array|false $addon
1287 - *
1288 - * @return void
1289 1186 */
1290 1187 protected static function addon_upgrade_link( $addon, $upgrade_link ) {
1291 1188 if ( $addon ) {
1292 1189 $upgrade_link .= '&utm_content=' . $addon['slug'];
@@ -1296,9 +1193,9 @@
1296 1193 // Solutions will go to a separate page.
1297 1194 $upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] );
1298 1195 }
1299 1196 ?>
1300 - <a class="install-now button frm-button-secondary frm-button-sm" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>">
1197 + <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' ); ?>">
1301 1198 <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?>
1302 1199 </a>
1303 1200 <?php
1304 1201 }
@@ -1304,19 +1201,13 @@
1304 1201 }
1305 1202
1306 1203 /**
1307 1204 * @since 3.04.02
1308 - *
1309 - * @return void
1310 1205 */
1311 1206 public static function ajax_install_addon() {
1312 1207 self::install_addon_permissions();
1313 1208
1314 - $result = self::download_and_activate();
1315 - if ( isset( $result['success'] ) && ! $result['success'] ) {
1316 - echo json_encode( $result );
1317 - wp_die();
1318 - }
1209 + self::download_and_activate();
1319 1210
1320 1211 echo json_encode( self::get_addon_activation_response() );
1321 1212 wp_die();
1322 1213 }
@@ -1321,45 +1212,10 @@
1321 1212 wp_die();
1322 1213 }
1323 1214
1324 1215 /**
1325 - * Allowed URLs used for internal source of plugins installation.
1326 - *
1327 - * @since 6.3.1
1328 - *
1329 - * @return array
1330 - */
1331 - private static function allowed_external_urls() {
1332 - $allowed_url_list = array(
1333 - 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip',
1334 - 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip',
1335 - 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip',
1336 - );
1337 -
1338 - /**
1339 - * List of URLs used in plugin formidable internal installation.
1340 - *
1341 - * @since 6.3.1
1342 - *
1343 - * @param array $allowed_url_list List of URLs.
1344 - */
1345 - $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list );
1346 -
1347 - if ( ! is_array( $allowed_url_list ) ) {
1348 - _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' );
1349 -
1350 - return array();
1351 - }
1352 -
1353 - return $allowed_url_list;
1354 - }
1355 -
1356 - /**
1357 1216 * @since 4.06.02
1358 - *
1359 1217 * @deprecated 4.09.01
1360 - *
1361 - * @return void
1362 1218 */
1363 1219 public static function ajax_multiple_addons() {
1364 1220 FrmDeprecated::ajax_multiple_addons();
1365 1221 }
@@ -1406,14 +1262,10 @@
1406 1262 }
1407 1263
1408 1264 /**
1409 1265 * @since 3.04.03
1410 - *
1411 1266 * @deprecated 3.06
1412 - *
1413 1267 * @codeCoverageIgnore
1414 - *
1415 - * @return void
1416 1268 */
1417 1269 public static function reset_cached_addons( $license = '' ) {
1418 1270 FrmDeprecated::reset_cached_addons( $license );
1419 1271 }
@@ -1447,12 +1299,9 @@
1447 1299 }
1448 1300
1449 1301 /**
1450 1302 * @deprecated 3.04.03
1451 - *
1452 1303 * @codeCoverageIgnore
1453 - *
1454 - * @return void
1455 1304 */
1456 1305 public static function get_licenses() {
1457 1306 FrmDeprecated::get_licenses();
1458 1307 }