Merge pull request #6 from minimus/develop

Develop

.gitignore

@@ -1 +1,2 @@
 .idea/workspace.xml
+test.html

README.md

@@ -33,9 +33,10 @@ Features
 * Customizable limitation of displaying advertisements by hits
 * Customizable limitation of displaying advertisements by clicks
 * Statistics of hits
-* Statistics of clicks (your own advertisment image mode)
+* Statistics of clicks (excluding iframes and swf-banners)
 * Customizable accuracy of bots and crawlers detection
 * Counting revenue from ads placement, display ads and clicks on advertisement
+* Compatible with all caching plugins
 
 Requirements
 ------------
@@ -68,7 +69,7 @@ Do not upgrade this plugin from Update page! Upgrade it from Plugins page!
 Change log
 ==========
 
-1.8.71
+1.8.72
 * Javascript output of ads (for caching compatibility) is added
 * Custom Taxonomies restrictions are added
 * Building query for SQL request is optimised
@@ -77,6 +78,7 @@ Change log
 * Updater is fixed and improved
 * Language pack folder is added
 * bbPress support is added
+* Some bugs are fixed
 
 1.7.63
 * Some bugs (Ads Block style, Click Tracker) are resolved.

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://load.payoneer.com/[email protected]
 Tags: ad, adbrite, adgridwork, adify, admin, adpinion, adroll, ads, adsense, adserver, advertisement, advertising, affiliate, banner, banners, chitika, cj, commercial, commission, crispads, dfp, google, income, junction, link, manager, media, money, plugin, random, referral, revenue, rotator, seo, server, shoppingads, widget, widgetbucks, yahoo, ypn
 Requires at least: 3.5
 Tested up to: 3.8
-Stable tag: 1.8.71
+Stable tag: 1.8.72
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -42,9 +42,10 @@ Simple Ads Manager is easy to use plugin providing a flexible logic of displayin
 * Customizable limitation of displaying advertisements by hits
 * Customizable limitation of displaying advertisements by clicks
 * Statistics of hits
-* Statistics of clicks (your own advertisment image mode)
+* Statistics of clicks (excluding iframes and swf-banners)
 * Customizable accuracy of bots and crawlers detection
-* Counting revenue from ads placement, display ads and clicks on advertisements 
+* Counting revenue from ads placement, display ads and clicks on advertisements
+* Compatible with all caching plugins
 
 = Requirements =
 * PHP 5.2.14+
@@ -86,7 +87,7 @@ No questions now...
 
 == Changelog ==
 
-= 1.8.71 =
+= 1.8.72 =
 * Javascript output of ads (for caching compatibility) is added
 * Custom Taxonomies restrictions are added
 * Building query for SQL request is optimised
@@ -95,6 +96,7 @@ No questions now...
 * Updater is fixed and improved
 * Language pack folder is added
 * bbPress support is added
+* Some bugs are fixed
 = 1.7.63 =
 * Some bugs (Ads Block style, Click Tracker) are resolved.
 = 1.7.61 =
@@ -180,6 +182,8 @@ No questions now...
 
 == Upgrade Notice ==
 
+= 1.8.72 =
+Caching plugins compatibility, bbPress compatibility, Custom Taxonomies restrictions, etc.
 = 1.7.63 =
 Some bugs (Ads Block style, Click Tracker) are resolved.
 = 1.7.61 =

sam.class.php

@@ -54,7 +54,7 @@ class SimpleAdsManager {
 	  );
 
 	  public function __construct() {
-      define('SAM_VERSION', '1.8.71');
+      define('SAM_VERSION', '1.8.72');
       define('SAM_DB_VERSION', '2.5');
       define('SAM_PATH', dirname( __FILE__ ));
       define('SAM_URL', plugins_url( '/',  __FILE__  ) );

simple-ads-manager.php

@@ -3,7 +3,7 @@
 Plugin Name: Simple Ads Manager
 Plugin URI: http://www.simplelib.com/?p=480
 Description: "Simple Ads Manager" is easy to use plugin providing a flexible logic of displaying advertisements. Visit <a href="http://www.simplelib.com/">SimpleLib blog</a> for more details.
-Version: 1.8.71
+Version: 1.8.72
 Author: minimus
 Author URI: http://blogcoding.ru
 */