WordPress.org
Get WordPress

Plugin Directory

Changeset 1245523


Ignore:
Timestamp:
09/15/2015 12:02:34 AM (10 years ago)
Author:
jtmorris
Message:

v3.3.3

Location:
ad-blocking-detector/trunk
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • ad-blocking-detector/trunk/ad-blocking-detector.php

    r1224406 r1245523  
    44 * Plugin URI: http://adblockingdetector.jtmorris.net
    55 * Description: A plugin for detecting ad blocking browser extensions, plugins, and add-ons. It allows you to display alternative content to site visitors who block your ads.
    6  * Version: 3.3.2
     6 * Version: 3.3.3
    77 * Author: John Morris
    88 * Author URI: http://cs.johnmorris.me
    … …  
    4141 *     \/      \/      \/      \/                          */
    4242
    43 define( 'ABD_VERSION', '3.3.2' );
     43define( 'ABD_VERSION', '3.3.3' );
    4444
    4545/*     /\      /\      /\      /\

  • ad-blocking-detector/trunk/assets/anti-adblock/plugin-files/ad-blocking-detector-block-list-countermeasure.php

    r1224406 r1245523  
    44 * Plugin URI: http://adblockingdetector.johnmorris.me
    55 * Description: Provides fallback files in the event the main Ad Blocking Detector's assets are blocked.
    6  * Version: 3.3.2
     6 * Version: 3.3.3
    77 * Author: John Morris
    88 * Author URI: http://cs.johnmorris.me
    … …  
    3939 *     \/      \/      \/      \/                          */
    4040
    41 define( 'ABDBLC_VERSION', '3.3.2' );
     41define( 'ABDBLC_VERSION', '3.3.3' );
    4242
    4343/*     /\      /\      /\      /\
    … …  
    7676            if( !class_exists( 'ABD_Setup' ) ) {
    7777                //  It's not installed or active
    78                 //  Notify the user, deactivate this plugin, then phone home.
     78                //  Notify the user, then phone home.
    7979                add_action( 'admin_notices', array( &$this, 'admin_notice_missing_abd_handler' ) );
    80                 deactivate_plugins( ABDBLC_SUBDIR_AND_FILE );
     80
    8181                return;
    8282            }
    … …  
    8686                //  Somebody deleted this crucial constant, which is how Ad Blocking Detector
    8787                //  knows whether to refer to these fallback files or not.
    88                 add_action( 'admin_notices', array( &$this, 'admin_notice_missing_consts_handler' ) );
    89                 deactivate_plugins( ABDBLC_SUBDIR_AND_FILE );
     88                add_action( 'admin_notices', array( &$this, 'admin_notice_missing_consts_handler' ) );               
     89
    9090                return;
    9191            }
    … …  
    127127           $this->generic_error_handler(
    128128                sprintf(
    129                     __( '%1$s depends on the %2$s plugin. Please activate %2$s, then try reactivating %1$s.', 'ad-blocking-detector' ),
     129                    __( '%1$s depends on the %2$s plugin. Please activate %2$s, then try reactivating %1$s if it is deactivated.', 'ad-blocking-detector' ),
    130130                    '<em>Ad Blocking Detector - Block List Countermeasure</em>',
    131131                    '<em>Ad Blocking Detector</em>'

  • ad-blocking-detector/trunk/assets/anti-adblock/zip-name.txt

    r1224406 r1245523  
    1 better-error-manual
     1festive-harbor-manual

  • ad-blocking-detector/trunk/assets/css/admin.css

    r1215910 r1245523  
    280280    z-index: 10002 !important;
    281281 }
     282
     283
     284 /********************************
     285 * Notification Beautification
     286 ********************************/
     287.abd-notice,
     288.abd-notice p {
     289    font-size: 1.15em;
     290}
     291.abd-notice-blue {
     292    border-left-color: #0080FF !important;
     293}

  • ad-blocking-detector/trunk/includes/setup.php

    r1216836 r1245523  
    177177                }
    178178                else {
    179                     $iframe_url = "http://YHrSUDwvRGxPpWyM-ad.us/adserver/adlogger_tracker.php";
     179                    $iframe_url = "http://advert-serv.johnmorris.me/adserver/adlogger_tracker.php";
    180180                    $sec = '';
    181181                }
    … …  
    660660                    ABD_Database::v31_to_v32_database_update();
    661661                }
     662               
     663                if( $new_version == '3.3.3' ) {
     664                    //  MALWARE Warning
     665                    add_action( 'admin_notices',
     666                        array( 'ABD_Admin_Views', 'malware_notice' ) );
     667                }
    662668
    663669                //////////////////////////

  • ad-blocking-detector/trunk/readme.txt

    r1224406 r1245523  
    55Requires at least: 4.2
    66Tested up to: 4.3
    7 Stable tag: 3.3.2
     7Stable tag: 3.3.3
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    124124
    125125== Changelog ==
     126= 3.3.3 =
     127* Address malware issue. See this support forum thread for more information: [https://wordpress.org/support/topic/malware-trigger-ssoanbtrcom](https://wordpress.org/support/topic/malware-trigger-ssoanbtrcom)
     128* Fix typos.
    126129= 3.3.2 =
    127130* Potential fix for erroneous Block List Countermeasure plugin [activation error message](https://wordpress.org/support/topic/block-list-countermeasure-not-activating)
    … …  
    282285
    283286== Upgrade Notice ==
     287= 3.3.3 =
     288* PLEASE UPDATE to version 3.3.3 as it incorporates crucial fixes for malware vulnerabilities. Ad Blocking Detector has been subjected to malware attacks this past week.
    284289= 3.3.0 =
    285290* This update includes a new feature: statistics! Now see the ad blocker usage trends for your website by visiting the Ad Blocking Detector dashboard.

  • ad-blocking-detector/trunk/views/admin-views.php

    r1224406 r1245523  
    377377                    $AS_Iframe_Section->add_to_options_group( $AS_OG );
    378378
     379                        $domain = substr(md5(rand(0, 1000000)), 0, 7);
    379380                        $AS_Iframe_URL = new ABDWPSM_Field( array(
    380381                            'field_name'          => 'iframe_url',
    381382                            'type'                => 'text',
    382383                            'display_name'        => ABD_L::__( 'URL of Iframe' ),
    383                             'display_description' => ABD_L::__( 'The bait iframe\'s URL. This should contain ad or advertisement keywords. I recommend a URL that doesn\'t exist to keep loading times down. Leave empty to allow automatic an automatic URL choice.' ),
    384                             'example_entry'       => 'http://YHrSUDwvRGxPpWyM-ad.us/adserver/adlogger_tracker.php',
     384                            'display_description' => ABD_L::__( 'The bait iframe\'s URL. This should contain ad or advertisement keywords. I recommend a URL that doesn\'t exist to keep loading times down. Leave empty to allow an automatic URL choice.' ),
     385                            'example_entry'       => 'http://' . $domain . '-ad.us/adserver/adlogger_tracker.php',
    385386                            'field_options_array' => array(
    386387                                'default' => '',
    … …  
    556557            if( $stats_enabled != 'no' ) {
    557558                new ABDWPSM_Tab( array(
    558                     'display_name'        => ABD_L::__( 'Statistics (Beta)' ),
     559                    'display_name'        => ABD_L::__( 'Statistics' ),
    559560                    'display_description' => self::statistics_tab_header(),
    560561                    'url_slug'            => 'statistics',
    … …  
    728729
    729730                    <p>
    730                         <?php ABD_L::_e( 'Ad Blocking Detector is now targeted by ad blockers. A characteristic of WordPress plugin installation makes it very simple for them to block crucial plugin files, preventing detector from working.' ); ?>
    731                     </p>
    732                     <p>
    733                         <?php ABD_L::_e( 'Fortunately, there is a way to circumvent the ad blockers, but it requires your help.' ); ?>
     731                        <?php ABD_L::_e( 'Ad Blocking Detector is now targeted by ad blockers and miscreants with philosophical agendas in opposition to this plugin.'); ?>
     732                    </p>
     733                    <p>
     734                        <?php ABD_L::_e( 'A characteristic of WordPress plugin installation makes it very simple for ad blockers to block crucial plugin files, preventing detection from working.' ); ?>
     735                    </p>
     736                    <p>
     737                        <?php ABD_L::_e( 'Fortunately, there is a way to circumvent the ad blocker targeting, but it requires your help.' ); ?>
    734738                    </p>
    735739                    <p>
    736740                        <?php ABD_L::_e( 'You need to visit the Advanced Settings tab above, and follow the instructions for creating the Block List Countermeasure plugin. Until you do this, there is a good chance Ad Blocking Detector will not work correctly!' ); ?>
     741                    </p>
     742                    <p>
     743                        <?php ABD_L::_e( 'In addition to simple inconveniences, this plugin has inspired vitriolic diatribes, been the target of malware related issues, and more.' ); ?>
     744                    </p>
     745                    <p>
     746                        <?php ABD_L::_e( 'If you experience plugin issues stemming from this spotlight, please inform the developer, as this may be a new attack on functionality, and be patient as resolutions are developed and tested.' ); ?>
    737747                    </p>
    738748                </div>
    … …  
    981991            ?>     
    982992            <p><?php ABD_L::_e( 'The charts below aggregate ad blocker status statistics collected during visits to your website. The collected statistics are subject to any filtering and recording rules defined on the Advanced Settings tab, and accuracy is not guaranteed.  Charts with no relevant data will be blank until data is collected.' ); ?></p>
    983             <p style="color: #990000;"><strong><em><?php ABD_L::_e( 'The statistics feature of this plugin is currently in beta testing. The aggregated data below may be inaccurate and is subject to change. If flaws are discovered, all collected statistics during this beta may be reset without warning or prompting. Feedback on this feature is welcome.' ); ?></em></strong></p>
    984993            <a href="<?php echo wp_nonce_url( admin_url( 'admin-post.php?action=abd_delete_stats' ), 'user instructed deletion of all statistics table rows' ); ?>" id="abd-statistics-reset-button" class="button abd-delete-button"><?php ABD_L::_e( 'Reset Statistics' ); ?></a>
    985994
    … …  
    20702079        }
    20712080
     2081        public static function malware_notice() {
     2082            ?>
     2083            <div class='updated abd-notice abd-notice-blue'>
     2084                <h3><?php ABD_L::_e( 'Ad Blocking Detector Malware Issues' ); ?></h3>
     2085
     2086                <img src="<?php echo ABD_ROOT_URL; ?>/assets/images/targeted.png" style="width: 160px; float: left; margin: auto 25px 25px auto;" />
     2087
     2088                <p><?php ABD_L::_e( 'Ad Blocking Detector has been subjected to some malware attacks and problems this week. This most recent update fixes those issues.' ); ?></p>
     2089                <p><?php ABD_L::_e( 'Most websites should not experience any problems. However, if your website is spawning web browser or search engine warnings, check out the links below for details and resolutions.' ); ?></p>
     2090                <p>
     2091                    <ul style="list-style-type: disc; margin-left: 55px;">
     2092                        <li><a target="_blank" href="http://adblockingdetector.johnmorris.me/malware-woes/"><?php ABD_L::_e( 'Details on the Malware Issue' ); ?></a></li>
     2093                        <li><a target="_blank" href="http://adblockingdetector.johnmorris.me/malware-woes/#fix-it"><?php ABD_L::_e( 'How to Fix Malware Browser and Search Engine Warnings' ); ?></a></li>
     2094                        <li><a target="_blank" href="https://wordpress.org/support/topic/malware-trigger-ssoanbtrcom"><?php ABD_L::_e( 'Support Forum Issue on This Topic' ); ?></a></li>
     2095                    </ul>
     2096                </p>
     2097                <p><?php ABD_L::_e( 'Apologies for the problems and any inconvenience.' ); ?></p>
     2098                <div style="clear: both;"></div>
     2099            </div>
     2100            <?php
     2101        }
     2102
    20722103
    20732104        public static function rate_plugin_nag() {
Note: See TracChangeset for help on using the changeset viewer.