| @@ -9,11 +9,8 @@ | ||
| 9 | 9 | * @var string $plugin |
| 10 | 10 | */ |
| 11 | 11 | protected static $plugin; |
| 12 | 12 | |
| 13 | - /** | |
| 14 | - * @return void | |
| 15 | - */ | |
| 16 | 13 | public static function menu() { |
| 17 | 14 | if ( ! current_user_can( 'activate_plugins' ) ) { |
| 18 | 15 | return; |
| 19 | 16 | } |
| @@ -37,11 +34,8 @@ | ||
| 37 | 34 | exit; |
| 38 | 35 | } |
| 39 | 36 | } |
| 40 | 37 | |
| 41 | - /** | |
| 42 | - * @return void | |
| 43 | - */ | |
| 44 | 38 | public static function list_addons() { |
| 45 | 39 | FrmAppHelper::include_svg(); |
| 46 | 40 | $installed_addons = apply_filters( 'frm_installed_addons', array() ); |
| 47 | 41 | $license_type = ''; |
| @@ -72,11 +66,8 @@ | ||
| 72 | 66 | |
| 73 | 67 | include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' ); |
| 74 | 68 | } |
| 75 | 69 | |
| 76 | - /** | |
| 77 | - * @return void | |
| 78 | - */ | |
| 79 | 70 | public static function license_settings() { |
| 80 | 71 | $plugins = apply_filters( 'frm_installed_addons', array() ); |
| 81 | 72 | if ( empty( $plugins ) ) { |
| 82 | 73 | esc_html_e( 'There are no plugins on your site that require a license', 'formidable' ); |
| @@ -88,11 +79,8 @@ | ||
| 88 | 79 | |
| 89 | 80 | include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' ); |
| 90 | 81 | } |
| 91 | 82 | |
| 92 | - /** | |
| 93 | - * @return array | |
| 94 | - */ | |
| 95 | 83 | protected static function get_api_addons() { |
| 96 | 84 | $api = new FrmFormApi(); |
| 97 | 85 | $addons = $api->get_api_info(); |
| 98 | 86 | |
| @@ -123,10 +111,10 @@ | ||
| 123 | 111 | 'docs' => '', |
| 124 | 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.', |
| 125 | 113 | ), |
| 126 | 114 | '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.', | |
| 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.', | |
| 129 | 117 | ), |
| 130 | 118 | 'registration' => array( |
| 131 | 119 | 'title' => 'User Registration Forms', |
| 132 | 120 | 'link' => 'downloads/user-registration/', |
| @@ -188,13 +176,8 @@ | ||
| 188 | 176 | 'views' => array( |
| 189 | 177 | 'title' => 'Formidable Views', |
| 190 | 178 | 'excerpt' => 'Add the power of views to your Formidable Forms to display your form submissions in listings, tables, calendars, and more.', |
| 191 | 179 | ), |
| 192 | - 'quiz_maker' => array( | |
| 193 | - 'title' => 'Quiz Maker', | |
| 194 | - 'link' => 'downloads/quiz-maker/', | |
| 195 | - 'excerpt' => 'Make quizzes, automatically score them and show user scores.', | |
| 196 | - ), | |
| 197 | 180 | ); |
| 198 | 181 | |
| 199 | 182 | $defaults = array( |
| 200 | 183 | 'released' => '', |
| @@ -251,11 +234,8 @@ | ||
| 251 | 234 | } |
| 252 | 235 | |
| 253 | 236 | /** |
| 254 | 237 | * @since 4.08 |
| 255 | - * | |
| 256 | - * @param array $addons | |
| 257 | - * @return array | |
| 258 | 238 | */ |
| 259 | 239 | protected static function get_pro_from_addons( $addons ) { |
| 260 | 240 | return isset( $addons['93790'] ) ? $addons['93790'] : array(); |
| 261 | 241 | } |
| @@ -297,10 +277,8 @@ | ||
| 297 | 277 | } |
| 298 | 278 | |
| 299 | 279 | /** |
| 300 | 280 | * @since 4.08 |
| 301 | - * | |
| 302 | - * @return array|false | |
| 303 | 281 | */ |
| 304 | 282 | protected static function get_primary_license_info() { |
| 305 | 283 | $installed_addons = apply_filters( 'frm_installed_addons', array() ); |
| 306 | 284 | if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) { |
| @@ -330,12 +308,17 @@ | ||
| 330 | 308 | if ( empty( $installed_addons ) ) { |
| 331 | 309 | return $transient; |
| 332 | 310 | } |
| 333 | 311 | |
| 334 | - $version_info = self::fill_update_addon_info( $installed_addons ); | |
| 312 | + $version_info = self::fill_update_addon_info( $installed_addons ); | |
| 313 | + | |
| 335 | 314 | $transient->last_checked = time(); |
| 336 | - $wp_plugins = self::get_plugins(); | |
| 337 | 315 | |
| 316 | + if ( ! function_exists( 'get_plugins' ) ) { | |
| 317 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 318 | + } | |
| 319 | + $wp_plugins = get_plugins(); | |
| 320 | + | |
| 338 | 321 | foreach ( $version_info as $id => $plugin ) { |
| 339 | 322 | $plugin = (object) $plugin; |
| 340 | 323 | |
| 341 | 324 | if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) { |
| @@ -368,23 +351,8 @@ | ||
| 368 | 351 | return $transient; |
| 369 | 352 | } |
| 370 | 353 | |
| 371 | 354 | /** |
| 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 | 355 | * Check if a plugin is installed before showing an update for it |
| 388 | 356 | * |
| 389 | 357 | * @since 3.05 |
| 390 | 358 | * |
| @@ -392,9 +360,14 @@ | ||
| 392 | 360 | * |
| 393 | 361 | * @return bool - True if installed |
| 394 | 362 | */ |
| 395 | 363 | protected static function is_installed( $plugin ) { |
| 396 | - $all_plugins = self::get_plugins(); | |
| 364 | + if ( ! function_exists( 'get_plugins' ) ) { | |
| 365 | + require_once ABSPATH . 'wp-admin/includes/plugin.php'; | |
| 366 | + } | |
| 367 | + | |
| 368 | + $all_plugins = get_plugins(); | |
| 369 | + | |
| 397 | 370 | return isset( $all_plugins[ $plugin ] ); |
| 398 | 371 | } |
| 399 | 372 | |
| 400 | 373 | /** |
| @@ -544,11 +517,8 @@ | ||
| 544 | 517 | |
| 545 | 518 | return $plugin; |
| 546 | 519 | } |
| 547 | 520 | |
| 548 | - /** | |
| 549 | - * @return void | |
| 550 | - */ | |
| 551 | 521 | protected static function prepare_addons( &$addons ) { |
| 552 | 522 | $activate_url = ''; |
| 553 | 523 | if ( current_user_can( 'activate_plugins' ) ) { |
| 554 | 524 | $activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) ); |
| @@ -606,11 +576,8 @@ | ||
| 606 | 576 | $addons[ $id ] = $addon; |
| 607 | 577 | } |
| 608 | 578 | } |
| 609 | 579 | |
| 610 | - /** | |
| 611 | - * @return bool | |
| 612 | - */ | |
| 613 | 580 | private static function is_plugin_active( $file_name, $slug ) { |
| 614 | 581 | if ( 'formidable-views/formidable-views.php' === $file_name ) { |
| 615 | 582 | return self::get_active_views_version() === $slug; |
| 616 | 583 | } |
| @@ -629,10 +596,8 @@ | ||
| 629 | 596 | } |
| 630 | 597 | |
| 631 | 598 | /** |
| 632 | 599 | * @since 3.04.02 |
| 633 | - * | |
| 634 | - * @return void | |
| 635 | 600 | */ |
| 636 | 601 | protected static function prepare_addon_link( &$link ) { |
| 637 | 602 | $site_url = 'https://formidableforms.com/'; |
| 638 | 603 | if ( strpos( $link, 'http' ) !== 0 ) { |
| @@ -651,10 +616,8 @@ | ||
| 651 | 616 | * Add the status to the addon array. Status options are: |
| 652 | 617 | * installed, active, not installed |
| 653 | 618 | * |
| 654 | 619 | * @since 3.04.02 |
| 655 | - * | |
| 656 | - * @return void | |
| 657 | 620 | */ |
| 658 | 621 | protected static function set_addon_status( &$addon ) { |
| 659 | 622 | if ( ! empty( $addon['activate_url'] ) ) { |
| 660 | 623 | $addon['status'] = array( |
| @@ -673,11 +636,8 @@ | ||
| 673 | 636 | ); |
| 674 | 637 | } |
| 675 | 638 | } |
| 676 | 639 | |
| 677 | - /** | |
| 678 | - * @return void | |
| 679 | - */ | |
| 680 | 640 | public static function upgrade_to_pro() { |
| 681 | 641 | FrmAppHelper::include_svg(); |
| 682 | 642 | |
| 683 | 643 | $link_parts = array( |
| @@ -887,10 +847,8 @@ | ||
| 887 | 847 | /** |
| 888 | 848 | * Install Pro after connection with Formidable. |
| 889 | 849 | * |
| 890 | 850 | * @since 4.02.05 |
| 891 | - * | |
| 892 | - * @return void | |
| 893 | 851 | */ |
| 894 | 852 | public static function connect_pro() { |
| 895 | 853 | FrmAppHelper::permission_check( 'install_plugins' ); |
| 896 | 854 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -902,9 +860,9 @@ | ||
| 902 | 860 | |
| 903 | 861 | $response = array(); |
| 904 | 862 | |
| 905 | 863 | // It's already installed and active. |
| 906 | - $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 864 | + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 907 | 865 | if ( is_wp_error( $active ) ) { |
| 908 | 866 | // The plugin was installed, but not active. Download it now. |
| 909 | 867 | self::ajax_install_addon(); |
| 910 | 868 | } else { |
| @@ -916,24 +874,8 @@ | ||
| 916 | 874 | wp_die(); |
| 917 | 875 | } |
| 918 | 876 | |
| 919 | 877 | /** |
| 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 | 878 | * @since 5.0.10 |
| 937 | 879 | * |
| 938 | 880 | * @return string |
| 939 | 881 | */ |
| @@ -962,10 +904,8 @@ | ||
| 962 | 904 | } |
| 963 | 905 | |
| 964 | 906 | /** |
| 965 | 907 | * @since 3.04.02 |
| 966 | - * | |
| 967 | - * @return void | |
| 968 | 908 | */ |
| 969 | 909 | protected static function maybe_show_cred_form() { |
| 970 | 910 | if ( ! function_exists( 'request_filesystem_credentials' ) ) { |
| 971 | 911 | include_once( ABSPATH . 'wp-admin/includes/file.php' ); |
| @@ -1002,23 +942,8 @@ | ||
| 1002 | 942 | ob_end_clean(); |
| 1003 | 943 | } |
| 1004 | 944 | |
| 1005 | 945 | /** |
| 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 | 946 | * We do not need any extra credentials if we have gotten this far, |
| 1022 | 947 | * so let's install the plugin. |
| 1023 | 948 | * |
| 1024 | 949 | * @since 3.04.02 |
| @@ -1023,21 +948,12 @@ | ||
| 1023 | 948 | * |
| 1024 | 949 | * @since 3.04.02 |
| 1025 | 950 | */ |
| 1026 | 951 | protected static function install_addon() { |
| 1027 | - FrmAppHelper::permission_check( 'install_plugins' ); | |
| 1028 | - | |
| 1029 | 952 | require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
| 1030 | 953 | |
| 1031 | 954 | $download_url = self::get_current_plugin(); |
| 1032 | 955 | |
| 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 | 956 | // Create the plugin upgrader with our custom skin. |
| 1041 | 957 | $installer = new Plugin_Upgrader( new FrmInstallerSkin() ); |
| 1042 | 958 | $installer->install( $download_url ); |
| 1043 | 959 | |
| @@ -1055,10 +971,8 @@ | ||
| 1055 | 971 | } |
| 1056 | 972 | |
| 1057 | 973 | /** |
| 1058 | 974 | * @since 3.06.03 |
| 1059 | - * | |
| 1060 | - * @return void | |
| 1061 | 975 | */ |
| 1062 | 976 | public static function ajax_activate_addon() { |
| 1063 | 977 | |
| 1064 | 978 | self::install_addon_permissions(); |
| @@ -1072,43 +986,31 @@ | ||
| 1072 | 986 | wp_die(); |
| 1073 | 987 | } |
| 1074 | 988 | |
| 1075 | 989 | /** |
| 1076 | - * @return array | |
| 990 | + * @return array|string | |
| 1077 | 991 | */ |
| 1078 | 992 | 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 | - | |
| 993 | + if ( self::activating_from_settings_page() ) { | |
| 994 | + $response = array( | |
| 995 | + 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ), | |
| 996 | + 'saveAndReload' => 'settings', | |
| 997 | + ); | |
| 998 | + } else { | |
| 999 | + $response = __( 'Your plugin has been activated. Please reload the page to see more options.', 'formidable' ); | |
| 1000 | + } | |
| 1086 | 1001 | return $response; |
| 1087 | 1002 | } |
| 1088 | 1003 | |
| 1089 | 1004 | /** |
| 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 | |
| 1005 | + * @return bool | |
| 1094 | 1006 | */ |
| 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 ''; | |
| 1007 | + private static function activating_from_settings_page() { | |
| 1008 | + return false !== strpos( FrmAppHelper::get_server_value( 'HTTP_REFERER' ), 'frm_action=settings' ); | |
| 1106 | 1009 | } |
| 1107 | 1010 | |
| 1108 | 1011 | /** |
| 1109 | 1012 | * @since 3.04.02 |
| 1110 | - * | |
| 1111 | 1013 | * @param string $installed The plugin folder name with file name |
| 1112 | 1014 | */ |
| 1113 | 1015 | protected static function maybe_activate_addon( $installed ) { |
| 1114 | 1016 | if ( ! $installed ) { |
| @@ -1114,9 +1016,9 @@ | ||
| 1114 | 1016 | if ( ! $installed ) { |
| 1115 | 1017 | return; |
| 1116 | 1018 | } |
| 1117 | 1019 | |
| 1118 | - $activate = self::activate_plugin( $installed ); | |
| 1020 | + $activate = activate_plugin( $installed ); | |
| 1119 | 1021 | if ( is_wp_error( $activate ) ) { |
| 1120 | 1022 | // Ignore the invalid header message that shows with nested plugins. |
| 1121 | 1023 | if ( $activate->get_error_code() !== 'no_plugin_header' ) { |
| 1122 | 1024 | if ( wp_doing_ajax() ) { |
| @@ -1134,10 +1036,8 @@ | ||
| 1134 | 1036 | /** |
| 1135 | 1037 | * Run security checks before installing |
| 1136 | 1038 | * |
| 1137 | 1039 | * @since 3.04.02 |
| 1138 | - * | |
| 1139 | - * @return void | |
| 1140 | 1040 | */ |
| 1141 | 1041 | protected static function install_addon_permissions() { |
| 1142 | 1042 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1143 | 1043 | |
| @@ -1148,10 +1048,8 @@ | ||
| 1148 | 1048 | } |
| 1149 | 1049 | |
| 1150 | 1050 | /** |
| 1151 | 1051 | * @since 4.08 |
| 1152 | - * | |
| 1153 | - * @return string | |
| 1154 | 1052 | */ |
| 1155 | 1053 | public static function connect_link() { |
| 1156 | 1054 | $auth = get_option( 'frm_connect_token' ); |
| 1157 | 1055 | if ( empty( $auth ) ) { |
| @@ -1177,12 +1075,8 @@ | ||
| 1177 | 1075 | * |
| 1178 | 1076 | * @return bool |
| 1179 | 1077 | */ |
| 1180 | 1078 | public static function can_install_addon_api() { |
| 1181 | - if ( ! current_user_can( 'activate_plugins' ) ) { | |
| 1182 | - return false; | |
| 1183 | - } | |
| 1184 | - | |
| 1185 | 1079 | // Verify params present (auth & download link). |
| 1186 | 1080 | $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' ); |
| 1187 | 1081 | $post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' ); |
| 1188 | 1082 | |
| @@ -1212,9 +1106,9 @@ | ||
| 1212 | 1106 | // Delete so cannot replay. |
| 1213 | 1107 | delete_option( 'frm_connect_token' ); |
| 1214 | 1108 | |
| 1215 | 1109 | // It's already installed and active. |
| 1216 | - $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 1110 | + $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true ); | |
| 1217 | 1111 | if ( is_wp_error( $active ) ) { |
| 1218 | 1112 | // Download plugin now. |
| 1219 | 1113 | $response = self::download_and_activate(); |
| 1220 | 1114 | if ( is_array( $response ) && isset( $response['success'] ) ) { |
| @@ -1265,9 +1159,8 @@ | ||
| 1265 | 1159 | /** |
| 1266 | 1160 | * Render a conditional action button for an add on |
| 1267 | 1161 | * |
| 1268 | 1162 | * @since 4.09.01 |
| 1269 | - * | |
| 1270 | 1163 | * @param array $addon |
| 1271 | 1164 | * @param string|false $license_type |
| 1272 | 1165 | * @param string $plan_required |
| 1273 | 1166 | * @param string $upgrade_link |
| @@ -1281,12 +1174,8 @@ | ||
| 1281 | 1174 | } |
| 1282 | 1175 | |
| 1283 | 1176 | /** |
| 1284 | 1177 | * @since 4.09.01 |
| 1285 | - * | |
| 1286 | - * @param array|false $addon | |
| 1287 | - * | |
| 1288 | - * @return void | |
| 1289 | 1178 | */ |
| 1290 | 1179 | protected static function addon_upgrade_link( $addon, $upgrade_link ) { |
| 1291 | 1180 | if ( $addon ) { |
| 1292 | 1181 | $upgrade_link .= '&utm_content=' . $addon['slug']; |
| @@ -1296,9 +1185,9 @@ | ||
| 1296 | 1185 | // Solutions will go to a separate page. |
| 1297 | 1186 | $upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] ); |
| 1298 | 1187 | } |
| 1299 | 1188 | ?> |
| 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' ); ?>"> | |
| 1189 | + <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 | 1190 | <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?> |
| 1302 | 1191 | </a> |
| 1303 | 1192 | <?php |
| 1304 | 1193 | } |
| @@ -1304,19 +1193,13 @@ | ||
| 1304 | 1193 | } |
| 1305 | 1194 | |
| 1306 | 1195 | /** |
| 1307 | 1196 | * @since 3.04.02 |
| 1308 | - * | |
| 1309 | - * @return void | |
| 1310 | 1197 | */ |
| 1311 | 1198 | public static function ajax_install_addon() { |
| 1312 | 1199 | self::install_addon_permissions(); |
| 1313 | 1200 | |
| 1314 | - $result = self::download_and_activate(); | |
| 1315 | - if ( isset( $result['success'] ) && ! $result['success'] ) { | |
| 1316 | - echo json_encode( $result ); | |
| 1317 | - wp_die(); | |
| 1318 | - } | |
| 1201 | + self::download_and_activate(); | |
| 1319 | 1202 | |
| 1320 | 1203 | echo json_encode( self::get_addon_activation_response() ); |
| 1321 | 1204 | wp_die(); |
| 1322 | 1205 | } |
| @@ -1321,45 +1204,10 @@ | ||
| 1321 | 1204 | wp_die(); |
| 1322 | 1205 | } |
| 1323 | 1206 | |
| 1324 | 1207 | /** |
| 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 | 1208 | * @since 4.06.02 |
| 1358 | - * | |
| 1359 | 1209 | * @deprecated 4.09.01 |
| 1360 | - * | |
| 1361 | - * @return void | |
| 1362 | 1210 | */ |
| 1363 | 1211 | public static function ajax_multiple_addons() { |
| 1364 | 1212 | FrmDeprecated::ajax_multiple_addons(); |
| 1365 | 1213 | } |
| @@ -1406,14 +1254,10 @@ | ||
| 1406 | 1254 | } |
| 1407 | 1255 | |
| 1408 | 1256 | /** |
| 1409 | 1257 | * @since 3.04.03 |
| 1410 | - * | |
| 1411 | 1258 | * @deprecated 3.06 |
| 1412 | - * | |
| 1413 | 1259 | * @codeCoverageIgnore |
| 1414 | - * | |
| 1415 | - * @return void | |
| 1416 | 1260 | */ |
| 1417 | 1261 | public static function reset_cached_addons( $license = '' ) { |
| 1418 | 1262 | FrmDeprecated::reset_cached_addons( $license ); |
| 1419 | 1263 | } |
| @@ -1447,12 +1291,9 @@ | ||
| 1447 | 1291 | } |
| 1448 | 1292 | |
| 1449 | 1293 | /** |
| 1450 | 1294 | * @deprecated 3.04.03 |
| 1451 | - * | |
| 1452 | 1295 | * @codeCoverageIgnore |
| 1453 | - * | |
| 1454 | - * @return void | |
| 1455 | 1296 | */ |
| 1456 | 1297 | public static function get_licenses() { |
| 1457 | 1298 | FrmDeprecated::get_licenses(); |
| 1458 | 1299 | } |
