Changeset 3045208
- Timestamp:
- 03/04/2024 07:00:42 PM (2 years ago)
- Location:
- spam-master
- Files:
-
- 93 added
- 4 edited
-
tags/7.3.4 (added)
-
tags/7.3.4/class-spammaster.php (added)
-
tags/7.3.4/css (added)
-
tags/7.3.4/css/index.php (added)
-
tags/7.3.4/css/spam-master-firewall.css (added)
-
tags/7.3.4/css/spam-master.css (added)
-
tags/7.3.4/images (added)
-
tags/7.3.4/images/index.php (added)
-
tags/7.3.4/images/spam-master-logs-detailed.png (added)
-
tags/7.3.4/images/spam-master-logs.png (added)
-
tags/7.3.4/images/spam-master-stars.png (added)
-
tags/7.3.4/images/spam-master.gif (added)
-
tags/7.3.4/images/spammaster-logo.png (added)
-
tags/7.3.4/images/spammaster-wp-plugin-internal-banner.jpg (added)
-
tags/7.3.4/includes (added)
-
tags/7.3.4/includes/admin (added)
-
tags/7.3.4/includes/admin/index.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-connection-sender.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-footer.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-integrations-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-key-sender.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-offer-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-online-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-status-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-test-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin-tools-table.php (added)
-
tags/7.3.4/includes/admin/spam-master-admin.php (added)
-
tags/7.3.4/includes/admin/spam-master-tasks.php (added)
-
tags/7.3.4/includes/admin/upgrade (added)
-
tags/7.3.4/includes/admin/upgrade/index.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-0.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-1.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-19.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-2.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-3.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-5.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-6.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-0.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-2.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-6.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-5.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-6.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-7.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6-9-8.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-6.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-1-1.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-1-2.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-7.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-8.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-9.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-1.php (added)
-
tags/7.3.4/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-2.php (added)
-
tags/7.3.4/includes/controllers (added)
-
tags/7.3.4/includes/controllers/class-spammasteractioncontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasteradminmenutablecontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasteradmintableinactivecontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasteradmintablelogscontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterbuffercontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammastercollectcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammastercomconcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterelusivecontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasteremailcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterfloodcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterhafcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterhoneycontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterinvitationcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterkeycontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterlogcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterregistrationcontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterusercontroller.php (added)
-
tags/7.3.4/includes/controllers/class-spammasterwhitecontroller.php (added)
-
tags/7.3.4/includes/controllers/index.php (added)
-
tags/7.3.4/includes/controllers/spam-master-classes.php (added)
-
tags/7.3.4/includes/index.php (added)
-
tags/7.3.4/includes/protection (added)
-
tags/7.3.4/includes/protection/index.php (added)
-
tags/7.3.4/includes/protection/spam-master-action.php (added)
-
tags/7.3.4/includes/protection/spam-master-admin-other-protection-frontend-firewall.html (added)
-
tags/7.3.4/includes/protection/spam-master-amp-fun.php (added)
-
tags/7.3.4/includes/protection/spam-master-auto-update.php (added)
-
tags/7.3.4/includes/protection/spam-master-comment.php (added)
-
tags/7.3.4/includes/protection/spam-master-contact-form-7.php (added)
-
tags/7.3.4/includes/protection/spam-master-firewall.php (added)
-
tags/7.3.4/includes/protection/spam-master-honeypot.php (added)
-
tags/7.3.4/includes/protection/spam-master-registration.php (added)
-
tags/7.3.4/includes/protection/spam-master-shortcodes.php (added)
-
tags/7.3.4/includes/protection/spam-master-signatures.php (added)
-
tags/7.3.4/includes/protection/spam-master-widget-top-menu-firewall.php (added)
-
tags/7.3.4/includes/protection/spam-master-woocommerce-reg.php (added)
-
tags/7.3.4/includes/protection/spam-master-woocommerce-sig.php (added)
-
tags/7.3.4/index.php (added)
-
tags/7.3.4/readme.txt (added)
-
tags/7.3.4/uninstall.php (added)
-
trunk/class-spammaster.php (modified) (3 diffs)
-
trunk/includes/admin/spam-master-admin-status-table.php (modified) (19 diffs)
-
trunk/includes/admin/spam-master-admin-tools-table.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
spam-master/trunk/class-spammaster.php
r3045173 r3045208 3 3 * Plugin Name: Spam Master 4 4 * Plugin URI: https://www.spammaster.org 5 * Version: 7.3. 35 * Version: 7.3.4 6 6 * Author: TechGasp 7 7 * Author URI: https://www.techgasp.com … … 34 34 if ( ! class_exists( 'SpamMaster' ) ) : 35 35 36 define( 'SPAM_MASTER_VERSION', '7.3. 3' );36 define( 'SPAM_MASTER_VERSION', '7.3.4' ); 37 37 define( 'SPAM_MASTER_NAME', 'Spam Master' ); 38 38 define( 'SPAM_MASTER_DOMAIN', 'SpamMaster.org' ); … … 1140 1140 ?> 1141 1141 <div class="notice notice-warning is-dismissible"> 1142 <p><strong><?php echo esc_attr( __( 'Spam Master Malfunction 8!!!', 'spam-master' ) ); ?></strong>. <?php echo esc_attr( __( 'We have detected CDN WAF that masks the end users IP addresses with CDN, WAF Ips. Please read Spam Master online documentation to solve the issue.', 'spam-master' ) ); ?>1142 <p><strong><?php echo esc_attr( __( 'Spam Master Malfunction 8!!!', 'spam-master' ) ); ?></strong>. <?php echo esc_attr( __( 'We have detected CDN WAF that masks the end users IP addresses with CDN, WAF Ips. In Spam Master Settings -> Protection Tools tab activate CDN. Please read Spam Master online documentation to solve the issue.', 'spam-master' ) ); ?> 1143 1143 </div> 1144 1144 <?php -
spam-master/trunk/includes/admin/spam-master-admin-status-table.php
r3045149 r3045208 203 203 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching 204 204 $wpdb->update( $spam_master_keys, $data_ip, $where_ip ); 205 206 if ( ! empty( $_POST['spam_master_new_license'] ) ) { 207 $spam_master_new_license = sanitize_text_field( wp_unslash( $_POST['spam_master_new_license'] ) ); 208 $spam_license_key = $spam_master_new_license; 209 $data_spam2 = array( 'spamvalue' => substr( $spam_master_new_license, 0, 64 ) ); 210 $where_spam2 = array( 211 'spamkey' => 'Option', 212 'spamtype' => 'spam_license_key', 213 ); 214 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching 215 $wpdb->update( $spam_master_keys, $data_spam2, $where_spam2 ); 216 } 205 217 206 218 if ( ! empty( $spam_license_key ) ) { … … 327 339 ?> 328 340 <div id="message" class="updated fade"> 329 <p>< ?php echo esc_attr( __( 'Key RE-SYNC Done. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></p>341 <p><strong><?php echo esc_attr( __( 'Key RE-SYNC Done. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></strong></p> 330 342 </div> 331 343 <?php … … 333 345 ?> 334 346 <div class="notice notice-warning is-dismissible"> 335 <p>< ?php echo esc_attr( __( 'Your Key is empty, insert a valid key, press Save & Refresh. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></p>347 <p><strong><?php echo esc_attr( __( 'Your Key is empty, insert a valid key, press Save & Refresh. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></strong></p> 336 348 </div> 337 349 <?php … … 505 517 ?> 506 518 <div id="message" class="updated fade"> 507 <p>< ?php echo esc_attr( __( 'Key Saved. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></p>519 <p><strong><?php echo esc_attr( __( 'Key Saved. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></strong></p> 508 520 </div> 509 521 <?php … … 511 523 ?> 512 524 <div class="notice notice-warning is-dismissible"> 513 <p>< ?php echo esc_attr( __( 'Your Key is empty, insert a valid key. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></p>525 <p><strong><?php echo esc_attr( __( 'Your Key is empty, insert a valid key. Please wait refreshing in 5 seconds.', 'spam-master' ) ); ?></strong></p> 514 526 </div> 515 527 <?php … … 544 556 // STATUS EXPIRED. 545 557 if ( 'EXPIRED' === $spam_master_status ) { 558 $spam_master_type_small_display = 'PRO'; 559 $spam_master_type_small_span = 'spam-master-admin-red spam-master-top-admin-shadow-offline'; 546 560 $spam_master_protection_selection = __( 'EXPIRED > OFFLINE', 'spam-master' ); 547 561 $spam_master_protection_bgcolor = 'spam-master-top-admin-red'; … … 554 568 // STATUS MALFUNCTION_1. 555 569 if ( 'MALFUNCTION_1' === $spam_master_status ) { 570 if ( 'FULL' === $spam_master_type ) { 571 $spam_master_type_small_display = 'PRO'; 572 $spam_master_type_small_span = 'spam-master-admin-green spam-master-top-admin-shadow-offline'; 573 } else { 574 $spam_master_type_small_display = $spam_master_type; 575 $spam_master_type_small_span = 'spam-master-admin-yellow spam-master-top-admin-shadow-red'; 576 } 556 577 $spam_master_protection_selection = __( 'MALFUNCTION 1 > ACTIVE > ONLINE', 'spam-master' ); 557 578 $spam_master_protection_bgcolor = 'spam-master-top-admin-orange'; … … 564 585 // STATUS MALFUNCTION_2. 565 586 if ( 'MALFUNCTION_2' === $spam_master_status ) { 587 if ( 'FULL' === $spam_master_type ) { 588 $spam_master_type_small_display = 'PRO'; 589 $spam_master_type_small_span = 'spam-master-admin-green spam-master-top-admin-shadow-offline'; 590 } else { 591 $spam_master_type_small_display = $spam_master_type; 592 $spam_master_type_small_span = 'spam-master-admin-yellow spam-master-top-admin-shadow-red'; 593 } 566 594 $spam_master_protection_selection = __( 'MALFUNCTION 2 > ACTIVE > ONLINE', 'spam-master' ); 567 595 $spam_master_protection_bgcolor = 'spam-master-top-admin-orangina'; … … 574 602 // STATUS MALFUNCTION_3. 575 603 if ( 'MALFUNCTION_3' === $spam_master_status ) { 604 $spam_master_type_small_display = false; 605 $spam_master_type_small_span = false; 576 606 $spam_master_protection_selection = __( 'MALFUNCTION 3 > INACTIVE > OFFLINE', 'spam-master' ); 577 607 $spam_master_protection_bgcolor = 'spam-master-top-admin-red'; … … 585 615 // STATUS MALFUNCTION_4. 586 616 if ( 'MALFUNCTION_4' === $spam_master_status ) { 617 $spam_master_type_small_display = false; 618 $spam_master_type_small_span = false; 587 619 $spam_master_protection_selection = __( 'MALFUNCTION 4 > INACTIVE > OFFLINE', 'spam-master' ); 588 620 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 596 628 // STATUS MALFUNCTION_5. 597 629 if ( 'MALFUNCTION_5' === $spam_master_status ) { 630 $spam_master_type_small_display = false; 631 $spam_master_type_small_span = false; 598 632 $spam_master_protection_selection = __( 'MALFUNCTION 5 > INACTIVE > OFFLINE', 'spam-master' ); 599 633 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 607 641 // STATUS MALFUNCTION_6. 608 642 if ( 'MALFUNCTION_6' === $spam_master_status ) { 643 $spam_master_type_small_display = false; 644 $spam_master_type_small_span = false; 609 645 $spam_master_protection_selection = __( 'MALFUNCTION 6 > INACTIVE > OFFLINE', 'spam-master' ); 610 646 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 618 654 // STATUS MALFUNCTION_7. 619 655 if ( 'MALFUNCTION_7' === $spam_master_status ) { 656 $spam_master_type_small_display = false; 657 $spam_master_type_small_span = false; 620 658 $spam_master_protection_selection = __( 'MALFUNCTION 7 > INACTIVE > OFFLINE', 'spam-master' ); 621 659 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 629 667 // STATUS MALFUNCTION_8. 630 668 if ( 'MALFUNCTION_8' === $spam_master_status ) { 669 $spam_master_type_small_display = false; 670 $spam_master_type_small_span = false; 631 671 $spam_master_protection_selection = __( 'MALFUNCTION 8 > INACTIVE > OFFLINE', 'spam-master' ); 632 672 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 640 680 // STATUS DISCONNECTED. 641 681 if ( 'DISCONNECTED' === $spam_master_status ) { 682 $spam_master_type_small_display = false; 683 $spam_master_type_small_span = false; 642 684 $spam_master_protection_selection = __( 'DISCONNECTED > INACTIVE > OFFLINE', 'spam-master' ); 643 685 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 651 693 // STATUS UNSTABLE. 652 694 if ( 'UNSTABLE' === $spam_master_status ) { 695 $spam_master_type_small_display = false; 696 $spam_master_type_small_span = false; 653 697 $spam_master_protection_selection = __( 'UNSTABLE > WARNING', 'spam-master' ); 654 698 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 662 706 // STATUS HIGH VOLUME. 663 707 if ( 'HIGH_VOLUME' === $spam_master_status ) { 708 $spam_master_type_small_display = false; 709 $spam_master_type_small_span = false; 664 710 $spam_master_protection_selection = __( 'HIGH VOLUME > WARNING', 'spam-master' ); 665 711 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 673 719 // STATUS INACTIVE, NO KEY SENT YET. 674 720 if ( 'INACTIVE' === $spam_master_status ) { 721 $spam_master_type_small_display = false; 722 $spam_master_type_small_span = false; 675 723 $spam_master_protection_selection = __( 'INACTIVE > OFFLINE', 'spam-master' ); 676 724 $spam_master_protection_bgcolor = 'spam-master-top-admin-yellow'; … … 689 737 if ( empty( $spam_master_expires ) ) { 690 738 $spam_master_expires = '0000-00-00 00:00:00'; 739 } 740 if ( empty( $spam_master_attached ) ) { 741 $spam_master_attached = 'NO ATTACHED EMAIL'; 691 742 } 692 743 -
spam-master/trunk/includes/admin/spam-master-admin-tools-table.php
r3045150 r3045208 512 512 </tr>'; 513 513 } 514 if ( 'VALID' === $spam_master_status || 'MALFUNCTION_1' === $spam_master_status || 'MALFUNCTION_2' === $spam_master_status ) {514 if ( 'VALID' === $spam_master_status || 'MALFUNCTION_1' === $spam_master_status || 'MALFUNCTION_2' === $spam_master_status || 'MALFUNCTION_8' === $spam_master_status) { 515 515 ?> 516 516 <form method="post" width='1'> -
spam-master/trunk/readme.txt
r3045173 r3045208 4 4 Requires at least: 5.0 5 5 Tested up to: 6.4.3 6 Stable tag: 7.3. 36 Stable tag: 7.3.4 7 7 License: GPLv2 or later 8 8 … … 215 215 216 216 == Changelog == 217 218 = 7.3.4 = 219 Fixing Undefined variable: spam_master_type_small_span 220 Fixing Undefined variable: spam_master_type_small_display 221 Fixing inserting new key. 222 Fixing re-sync key. 223 Fixing protection tools with malfunction_8 217 224 218 225 = 7.3.3 =
Note: See TracChangeset
for help on using the changeset viewer.