| @@ -18,9 +18,9 @@ | ||
| 18 | 18 | return; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $label = __( 'Add-Ons', 'formidable' ); |
| 22 | - $label = '<span style="color:#1da867">' . $label . '</span>'; | |
| 22 | + $label = '<span style="color:#fe5a1d">' . $label . '</span>'; | |
| 23 | 23 | |
| 24 | 24 | add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' ); |
| 25 | 25 | |
| 26 | 26 | if ( ! FrmAppHelper::pro_is_installed() ) { |
| @@ -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 | |
| @@ -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'] ) ) { |
| @@ -544,11 +530,8 @@ | ||
| 544 | 530 | |
| 545 | 531 | return $plugin; |
| 546 | 532 | } |
| 547 | 533 | |
| 548 | - /** | |
| 549 | - * @return void | |
| 550 | - */ | |
| 551 | 534 | protected static function prepare_addons( &$addons ) { |
| 552 | 535 | $activate_url = ''; |
| 553 | 536 | if ( current_user_can( 'activate_plugins' ) ) { |
| 554 | 537 | $activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) ); |
| @@ -606,11 +589,8 @@ | ||
| 606 | 589 | $addons[ $id ] = $addon; |
| 607 | 590 | } |
| 608 | 591 | } |
| 609 | 592 | |
| 610 | - /** | |
| 611 | - * @return bool | |
| 612 | - */ | |
| 613 | 593 | private static function is_plugin_active( $file_name, $slug ) { |
| 614 | 594 | if ( 'formidable-views/formidable-views.php' === $file_name ) { |
| 615 | 595 | return self::get_active_views_version() === $slug; |
| 616 | 596 | } |
| @@ -629,10 +609,8 @@ | ||
| 629 | 609 | } |
| 630 | 610 | |
| 631 | 611 | /** |
| 632 | 612 | * @since 3.04.02 |
| 633 | - * | |
| 634 | - * @return void | |
| 635 | 613 | */ |
| 636 | 614 | protected static function prepare_addon_link( &$link ) { |
| 637 | 615 | $site_url = 'https://formidableforms.com/'; |
| 638 | 616 | if ( strpos( $link, 'http' ) !== 0 ) { |
| @@ -651,10 +629,8 @@ | ||
| 651 | 629 | * Add the status to the addon array. Status options are: |
| 652 | 630 | * installed, active, not installed |
| 653 | 631 | * |
| 654 | 632 | * @since 3.04.02 |
| 655 | - * | |
| 656 | - * @return void | |
| 657 | 633 | */ |
| 658 | 634 | protected static function set_addon_status( &$addon ) { |
| 659 | 635 | if ( ! empty( $addon['activate_url'] ) ) { |
| 660 | 636 | $addon['status'] = array( |
| @@ -673,11 +649,8 @@ | ||
| 673 | 649 | ); |
| 674 | 650 | } |
| 675 | 651 | } |
| 676 | 652 | |
| 677 | - /** | |
| 678 | - * @return void | |
| 679 | - */ | |
| 680 | 653 | public static function upgrade_to_pro() { |
| 681 | 654 | FrmAppHelper::include_svg(); |
| 682 | 655 | |
| 683 | 656 | $link_parts = array( |
| @@ -887,10 +860,8 @@ | ||
| 887 | 860 | /** |
| 888 | 861 | * Install Pro after connection with Formidable. |
| 889 | 862 | * |
| 890 | 863 | * @since 4.02.05 |
| 891 | - * | |
| 892 | - * @return void | |
| 893 | 864 | */ |
| 894 | 865 | public static function connect_pro() { |
| 895 | 866 | FrmAppHelper::permission_check( 'install_plugins' ); |
| 896 | 867 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| @@ -962,10 +933,8 @@ | ||
| 962 | 933 | } |
| 963 | 934 | |
| 964 | 935 | /** |
| 965 | 936 | * @since 3.04.02 |
| 966 | - * | |
| 967 | - * @return void | |
| 968 | 937 | */ |
| 969 | 938 | protected static function maybe_show_cred_form() { |
| 970 | 939 | if ( ! function_exists( 'request_filesystem_credentials' ) ) { |
| 971 | 940 | include_once( ABSPATH . 'wp-admin/includes/file.php' ); |
| @@ -1002,23 +971,8 @@ | ||
| 1002 | 971 | ob_end_clean(); |
| 1003 | 972 | } |
| 1004 | 973 | |
| 1005 | 974 | /** |
| 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 | 975 | * We do not need any extra credentials if we have gotten this far, |
| 1022 | 976 | * so let's install the plugin. |
| 1023 | 977 | * |
| 1024 | 978 | * @since 3.04.02 |
| @@ -1023,15 +977,13 @@ | ||
| 1023 | 977 | * |
| 1024 | 978 | * @since 3.04.02 |
| 1025 | 979 | */ |
| 1026 | 980 | protected static function install_addon() { |
| 1027 | - FrmAppHelper::permission_check( 'install_plugins' ); | |
| 1028 | - | |
| 1029 | 981 | require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; |
| 1030 | 982 | |
| 1031 | 983 | $download_url = self::get_current_plugin(); |
| 1032 | 984 | |
| 1033 | - if ( ! self::url_is_allowed( $download_url ) ) { | |
| 985 | + if ( ! FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) ) { | |
| 1034 | 986 | return array( |
| 1035 | 987 | 'message' => 'Plugin URL is not valid', |
| 1036 | 988 | 'success' => false, |
| 1037 | 989 | ); |
| @@ -1055,10 +1007,8 @@ | ||
| 1055 | 1007 | } |
| 1056 | 1008 | |
| 1057 | 1009 | /** |
| 1058 | 1010 | * @since 3.06.03 |
| 1059 | - * | |
| 1060 | - * @return void | |
| 1061 | 1011 | */ |
| 1062 | 1012 | public static function ajax_activate_addon() { |
| 1063 | 1013 | |
| 1064 | 1014 | self::install_addon_permissions(); |
| @@ -1072,17 +1022,15 @@ | ||
| 1072 | 1022 | wp_die(); |
| 1073 | 1023 | } |
| 1074 | 1024 | |
| 1075 | 1025 | /** |
| 1076 | - * @return array | |
| 1026 | + * @return array|string | |
| 1077 | 1027 | */ |
| 1078 | 1028 | private static function get_addon_activation_response() { |
| 1079 | 1029 | $activating_page = self::get_activating_page(); |
| 1080 | 1030 | |
| 1081 | - $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' ); | |
| 1082 | - | |
| 1083 | 1031 | $response = array( |
| 1084 | - 'message' => $message, | |
| 1032 | + 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ), | |
| 1085 | 1033 | 'saveAndReload' => $activating_page, |
| 1086 | 1034 | ); |
| 1087 | 1035 | |
| 1088 | 1036 | return $response; |
| @@ -1108,9 +1056,8 @@ | ||
| 1108 | 1056 | } |
| 1109 | 1057 | |
| 1110 | 1058 | /** |
| 1111 | 1059 | * @since 3.04.02 |
| 1112 | - * | |
| 1113 | 1060 | * @param string $installed The plugin folder name with file name |
| 1114 | 1061 | */ |
| 1115 | 1062 | protected static function maybe_activate_addon( $installed ) { |
| 1116 | 1063 | if ( ! $installed ) { |
| @@ -1136,10 +1083,8 @@ | ||
| 1136 | 1083 | /** |
| 1137 | 1084 | * Run security checks before installing |
| 1138 | 1085 | * |
| 1139 | 1086 | * @since 3.04.02 |
| 1140 | - * | |
| 1141 | - * @return void | |
| 1142 | 1087 | */ |
| 1143 | 1088 | protected static function install_addon_permissions() { |
| 1144 | 1089 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 1145 | 1090 | |
| @@ -1150,10 +1095,8 @@ | ||
| 1150 | 1095 | } |
| 1151 | 1096 | |
| 1152 | 1097 | /** |
| 1153 | 1098 | * @since 4.08 |
| 1154 | - * | |
| 1155 | - * @return string | |
| 1156 | 1099 | */ |
| 1157 | 1100 | public static function connect_link() { |
| 1158 | 1101 | $auth = get_option( 'frm_connect_token' ); |
| 1159 | 1102 | if ( empty( $auth ) ) { |
| @@ -1179,12 +1122,8 @@ | ||
| 1179 | 1122 | * |
| 1180 | 1123 | * @return bool |
| 1181 | 1124 | */ |
| 1182 | 1125 | public static function can_install_addon_api() { |
| 1183 | - if ( ! current_user_can( 'activate_plugins' ) ) { | |
| 1184 | - return false; | |
| 1185 | - } | |
| 1186 | - | |
| 1187 | 1126 | // Verify params present (auth & download link). |
| 1188 | 1127 | $post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' ); |
| 1189 | 1128 | $post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' ); |
| 1190 | 1129 | |
| @@ -1267,9 +1206,8 @@ | ||
| 1267 | 1206 | /** |
| 1268 | 1207 | * Render a conditional action button for an add on |
| 1269 | 1208 | * |
| 1270 | 1209 | * @since 4.09.01 |
| 1271 | - * | |
| 1272 | 1210 | * @param array $addon |
| 1273 | 1211 | * @param string|false $license_type |
| 1274 | 1212 | * @param string $plan_required |
| 1275 | 1213 | * @param string $upgrade_link |
| @@ -1283,12 +1221,8 @@ | ||
| 1283 | 1221 | } |
| 1284 | 1222 | |
| 1285 | 1223 | /** |
| 1286 | 1224 | * @since 4.09.01 |
| 1287 | - * | |
| 1288 | - * @param array|false $addon | |
| 1289 | - * | |
| 1290 | - * @return void | |
| 1291 | 1225 | */ |
| 1292 | 1226 | protected static function addon_upgrade_link( $addon, $upgrade_link ) { |
| 1293 | 1227 | if ( $addon ) { |
| 1294 | 1228 | $upgrade_link .= '&utm_content=' . $addon['slug']; |
| @@ -1298,9 +1232,9 @@ | ||
| 1298 | 1232 | // Solutions will go to a separate page. |
| 1299 | 1233 | $upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] ); |
| 1300 | 1234 | } |
| 1301 | 1235 | ?> |
| 1302 | - <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' ); ?>"> | |
| 1236 | + <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' ); ?>"> | |
| 1303 | 1237 | <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?> |
| 1304 | 1238 | </a> |
| 1305 | 1239 | <?php |
| 1306 | 1240 | } |
| @@ -1306,10 +1240,8 @@ | ||
| 1306 | 1240 | } |
| 1307 | 1241 | |
| 1308 | 1242 | /** |
| 1309 | 1243 | * @since 3.04.02 |
| 1310 | - * | |
| 1311 | - * @return void | |
| 1312 | 1244 | */ |
| 1313 | 1245 | public static function ajax_install_addon() { |
| 1314 | 1246 | self::install_addon_permissions(); |
| 1315 | 1247 | |
| @@ -1323,68 +1255,10 @@ | ||
| 1323 | 1255 | wp_die(); |
| 1324 | 1256 | } |
| 1325 | 1257 | |
| 1326 | 1258 | /** |
| 1327 | - * Allowed URLs used for internal source of plugins installation. | |
| 1328 | - * | |
| 1329 | - * @since 6.3.1 | |
| 1330 | - * | |
| 1331 | - * @return array | |
| 1332 | - */ | |
| 1333 | - private static function allowed_external_urls() { | |
| 1334 | - $allowed_url_list = array( | |
| 1335 | - 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip', | |
| 1336 | - 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip', | |
| 1337 | - 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip', | |
| 1338 | - ); | |
| 1339 | - | |
| 1340 | - /** | |
| 1341 | - * List of URLs used in plugin formidable internal installation. | |
| 1342 | - * | |
| 1343 | - * @since 6.3.1 | |
| 1344 | - * | |
| 1345 | - * @param array $allowed_url_list List of URLs. | |
| 1346 | - */ | |
| 1347 | - $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list ); | |
| 1348 | - | |
| 1349 | - if ( ! is_array( $allowed_url_list ) ) { | |
| 1350 | - _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' ); | |
| 1351 | - | |
| 1352 | - return array(); | |
| 1353 | - } | |
| 1354 | - | |
| 1355 | - return $allowed_url_list; | |
| 1356 | - } | |
| 1357 | - | |
| 1358 | - /** | |
| 1359 | - * Gets required plan for an addon. | |
| 1360 | - * | |
| 1361 | - * @since x.x | |
| 1362 | - * | |
| 1363 | - * @return string Empty string if no plan is required for active license. | |
| 1364 | - */ | |
| 1365 | - public static function get_addon_required_plan( $addon_id ) { | |
| 1366 | - $api = new FrmFormApi(); | |
| 1367 | - $addons = $api->get_api_info(); | |
| 1368 | - | |
| 1369 | - if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) { | |
| 1370 | - $dates = $addons[ $addon_id ]; | |
| 1371 | - $requires = FrmFormsHelper::get_plan_required( $dates ); | |
| 1372 | - } | |
| 1373 | - | |
| 1374 | - if ( ! isset( $requires ) || ! is_string( $requires ) ) { | |
| 1375 | - $requires = ''; | |
| 1376 | - } | |
| 1377 | - | |
| 1378 | - return $requires; | |
| 1379 | - } | |
| 1380 | - | |
| 1381 | - /** | |
| 1382 | 1259 | * @since 4.06.02 |
| 1383 | - * | |
| 1384 | 1260 | * @deprecated 4.09.01 |
| 1385 | - * | |
| 1386 | - * @return void | |
| 1387 | 1261 | */ |
| 1388 | 1262 | public static function ajax_multiple_addons() { |
| 1389 | 1263 | FrmDeprecated::ajax_multiple_addons(); |
| 1390 | 1264 | } |
| @@ -1431,14 +1305,10 @@ | ||
| 1431 | 1305 | } |
| 1432 | 1306 | |
| 1433 | 1307 | /** |
| 1434 | 1308 | * @since 3.04.03 |
| 1435 | - * | |
| 1436 | 1309 | * @deprecated 3.06 |
| 1437 | - * | |
| 1438 | 1310 | * @codeCoverageIgnore |
| 1439 | - * | |
| 1440 | - * @return void | |
| 1441 | 1311 | */ |
| 1442 | 1312 | public static function reset_cached_addons( $license = '' ) { |
| 1443 | 1313 | FrmDeprecated::reset_cached_addons( $license ); |
| 1444 | 1314 | } |
| @@ -1472,12 +1342,9 @@ | ||
| 1472 | 1342 | } |
| 1473 | 1343 | |
| 1474 | 1344 | /** |
| 1475 | 1345 | * @deprecated 3.04.03 |
| 1476 | - * | |
| 1477 | 1346 | * @codeCoverageIgnore |
| 1478 | - * | |
| 1479 | - * @return void | |
| 1480 | 1347 | */ |
| 1481 | 1348 | public static function get_licenses() { |
| 1482 | 1349 | FrmDeprecated::get_licenses(); |
| 1483 | 1350 | } |
