Changeset 1559296
- Timestamp:
- 12/21/2016 08:52:50 PM (9 years ago)
- Location:
- ad-blocking-detector/trunk
- Files:
-
- 1 added
- 1 deleted
- 5 edited
-
ad-blocking-detector.php (modified) (2 diffs)
-
assets/anti-adblock/plugin-files/ad-blocking-detector-block-list-countermeasure.php (modified) (2 diffs)
-
assets/anti-adblock/ugly-hose-manual.zip (deleted)
-
assets/anti-adblock/well-representative-manual.zip (added)
-
assets/anti-adblock/zip-name.txt (modified) (1 diff)
-
readme.txt (modified) (4 diffs)
-
views/admin-views.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ad-blocking-detector/trunk/ad-blocking-detector.php
r1482111 r1559296 4 4 * Plugin URI: http://adblockingdetector.jtmorris.net 5 5 * 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.5. 17 * Author: John Morris8 * Author URI: http:// cs.johnmorris.me6 * Version: 3.5.2 7 * Author: Admiral 8 * Author URI: http://getadmiral.com 9 9 * License: GPL2 10 10 */ … … 41 41 * \/ \/ \/ \/ */ 42 42 43 define( 'ABD_VERSION', '3.5. 1' );43 define( 'ABD_VERSION', '3.5.2' ); 44 44 45 45 /* /\ /\ /\ /\ -
ad-blocking-detector/trunk/assets/anti-adblock/plugin-files/ad-blocking-detector-block-list-countermeasure.php
r1482111 r1559296 4 4 * Plugin URI: http://adblockingdetector.johnmorris.me 5 5 * Description: Provides fallback files in the event the main Ad Blocking Detector's assets are blocked. 6 * Version: 3.5. 17 * Author: John Morris8 * Author URI: http:// cs.johnmorris.me6 * Version: 3.5.2 7 * Author: Admiral 8 * Author URI: http://getadmiral.com 9 9 * License: GPL2 10 10 */ … … 39 39 * \/ \/ \/ \/ */ 40 40 41 define( 'ABDBLC_VERSION', '3.5. 1' );41 define( 'ABDBLC_VERSION', '3.5.2' ); 42 42 43 43 /* /\ /\ /\ /\ -
ad-blocking-detector/trunk/assets/anti-adblock/zip-name.txt
r1482111 r1559296 1 ugly-hose-manual1 well-representative-manual -
ad-blocking-detector/trunk/readme.txt
r1505543 r1559296 4 4 Tags: adblock, adblocker, ad blocker, adblock plus, detector, advertisement, ads, ad blocking 5 5 Requires at least: 4.4 6 Tested up to: 4. 6.17 Stable tag: 3.5. 16 Tested up to: 4.7 7 Stable tag: 3.5.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 56 56 = Using WordPress.org's Plugin Repository (recommended) = 57 57 1. Search for "Ad Blocking Detector" in your WordPress "Add New" plugin section of your dashboard. 58 1. Install and activate the "[Ad Blocking Detector](http://wordpress.org/plugins/ad-blocking-detector/)" plugin by John Morris.58 1. Install and activate the "[Ad Blocking Detector](http://wordpress.org/plugins/ad-blocking-detector/)" plugin. 59 59 1. Visit the newly added "Ad Blocking" menu in your admin section to get started. 60 60 … … 88 88 89 89 If you want more information on how to replicate the obscuring of content, check out this blog post 90 on the plugin's website: [http://adblockingdetector.johnmorris.me/combine-javascript-and-ad-blocking-detector/] http://adblockingdetector.johnmorris.me/combine-javascript-and-ad-blocking-detector/)90 on the plugin's website: [http://adblockingdetector.johnmorris.me/combine-javascript-and-ad-blocking-detector/](http://adblockingdetector.johnmorris.me/combine-javascript-and-ad-blocking-detector/) 91 91 92 92 … … 124 124 125 125 == Changelog == 126 = 3.5.2 = 127 * Fix typos. 128 * Change developer contact information. 126 129 = 3.5.1 = 127 130 * Add requested "ABD_enabled" filter, for selective enabling/disabling of plugin. -
ad-blocking-detector/trunk/views/admin-views.php
r1434224 r1559296 45 45 46 46 /////// Dev Info 47 'emaildev' => 'mailto: [email protected]?subject=Ad%20Blocking%20Detector%20Support',48 'devemail' => 'mailto: [email protected]?subject=Ad%20Blocking%20Detector%20Support',49 'devwebsite' => 'http:// cs.johnmorris.me',47 'emaildev' => 'mailto:[email protected]?subject=Ad%20Blocking%20Detector%20Support', 48 'devemail' => 'mailto:[email protected]?subject=Ad%20Blocking%20Detector%20Support', 49 'devwebsite' => 'http://getadmiral.com', 50 50 51 51 /////// Plugin Website/Repo … … 55 55 ////// Miscellaneous 56 56 // Tweet love of this plugin 57 'twitterlove' => 'http://twitter.com/home?status=I%20love%20the%20Ad%20Blocking%20Detector%20WordPress%20plugin %20by%20%40jt_morris!%20http://wordpress.org/plugins/ad-blocking-detector/'57 'twitterlove' => 'http://twitter.com/home?status=I%20love%20the%20Ad%20Blocking%20Detector%20WordPress%20plugin!%20http://wordpress.org/plugins/ad-blocking-detector/' 58 58 ); 59 59 … … 194 194 * consistent, logical, and concise than a vanilla Settings API implementation would 195 195 * be. With a little bit of familiarity, I think you'll agree that this thing is 196 * awesome. 196 * awesome. But I am biased. 197 197 */ 198 198 … … 854 854 <h3><?php ABD_L::_e( 'Support This Plugin' ); ?></h3> 855 855 <p> 856 <?php ABD_L::_e( 'Is this plugin useful for you? If so, please support its ongoing development and improvement with a donation.' ); ?> 857 </p> 858 <p> 859 <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank"> 860 <input type="hidden" name="cmd" value="_s-xclick"> 861 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----"> 862 <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> 863 <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1"> 864 </form> 865 </p> 866 <p> 867 <?php ABD_L::_e( 'Or, if you are short on funds, there are other ways to help out:' ); ?> 856 <?php ABD_L::_e( 'Is this plugin useful for you? If so, please support its ongoing development and improvement by spreading the word.' ); ?> 868 857 </p> 869 858 <ul> … … 1381 1370 1382 1371 <p> 1383 <?php echo sprintf( ABD_L::__( 'The best ways to get of the developer is through this plugin\'s %sWordPress.org support forum%s, or by %semail%s. Either contact method is acceptable; however, asking questions on the support forum, instead of privately by email, may help others with the same problem.' ), '<a href="' . self::$our_links['wporgsupport'] . '" target="_blank">', '</a>', '<a href="' . self::$our_links['emaildev'] . '">', '</a>' ); ?>1372 <?php echo sprintf( ABD_L::__( 'The best ways to get a hold of the developer is through this plugin\'s %sWordPress.org support forum%s, or by %semail%s. Either contact method is acceptable; however, asking questions on the support forum, instead of privately by email, may help others with the same problem.' ), '<a href="' . self::$our_links['wporgsupport'] . '" target="_blank">', '</a>', '<a href="' . self::$our_links['emaildev'] . '">', '</a>' ); ?> 1384 1373 </p> 1385 1374 <p> 1386 1375 <table> 1387 1376 <tr> 1388 <th><?php ABD_L::_e( 'Developer Name' ); ?></th>1389 <td> John Morris</td>1377 <th><?php ABD_L::_e( 'Developer' ); ?></th> 1378 <td><a href="<?php echo self::$our_links['devwebsite']; ?>" target="_blank">Admiral</a></td> 1390 1379 </tr> 1391 <!-- <tr>1392 <th><?php ABD_L::_e( 'Website' ); ?></th>1393 <td><a href="<?php echo self::$our_links['devwebsite']; ?>" target="_blank"><?php echo self::$our_links['devwebsite']; ?></a></td>1394 </tr> -->1395 1380 <tr> 1396 1381 <th><?php ABD_L::_e( 'Email Address' ); ?></th> 1397 <td><a href="<?php echo self::$our_links['emaildev']; ?>"> [email protected]</a></td>1382 <td><a href="<?php echo self::$our_links['emaildev']; ?>">[email protected]</a></td> 1398 1383 </tr> 1399 1384 </table> 1400 </p>1401 <p>1402 <?php ABD_L::_e( 'Please note I have several WordPress plugins, and other projects, live at any given time. I generally provide support on a first-come, first-served basis, with exceptions for critical plugin bugs.' ); ?>1403 </p>1404 <p>1405 <?php ABD_L::_e( 'I will usually respond within forty-eight hours. However, if I have a lot of queued support requests, it can take up to several weeks.' ); ?>1406 1385 </p> 1407 1386 </div> … … 1433 1412 <a href='<?php echo wp_nonce_url( admin_url( 'admin-post.php?action=abd_clear_log' ), 'user instructed deletion of all log entries' ); ?>' class='button'> 1434 1413 <?php ABD_L::_e('Clear Log'); ?> 1435 </a>1436 <a href='<?php echo wp_nonce_url( admin_url( 'admin-post.php?action=abd_send_usage_info' ), 'user instructed sending usage info to dev' ); ?>' class='button abd-submit-log-to-dev-button'>1437 <?php ABD_L::_e( 'Send a Copy of Log to Developer' ); ?>1438 1414 </a> 1439 1415 </div> … … 1478 1454 1479 1455 <textarea id="abd-results-textarea">DETECTION RESULTS ================== ================== </textarea> 1480 </div>1481 1482 1483 1484 1485 1486 1487 1488 <div class="abd-masonry-block">1489 <h3><?php ABD_L::_e( 'Revert to An Old Version' ); ?></h3>1490 <p><?php ABD_L::_e( 'I work very hard to make sure plugin updates do not break what used to work, or removes features you may rely on. However, if I have failed in this regard, you can revert to previous versions of this plugin. I have included download links to some stable and mature plugin versions below, and will continue to update this list.' ); ?></p>1491 <p><?php echo sprintf( ABD_L::__( 'You can also download every released version of this plugin from its %sWordPress.org plugin repository%s if you want more choices.' ), '<a href="https://wordpress.org/plugins/ad-blocking-detector/developers/" target="_blank">', '</a>' ); ?></p>1492 <p><em><?php ABD_L::_e( 'Be warned, reverting to one of these plugin versions will stop update notifications, and I only provide support for the latest releases.' ); ?></em></p>1493 1494 <ul>1495 <li><?php echo sprintf( ABD_L::__( '%sVersion 2.2.8%s: The last stable release of the version 2 branch. It was stable and effective, however, it was vulnerable to ad blocker block lists, and had some minor user-interface issues.' ), '<a href="https://downloads.wordpress.org/plugin/ad-blocking-detector.2.2.8.zip">', '</a>' ); ?></li>1496 </ul>1497 1456 </div> 1498 1457 </div>
Note: See TracChangeset
for help on using the changeset viewer.