Advanced Ads - Version 1.7.13

Version Description

  • fix for class name sensitive systems and Tracking autoloader
Download this release

Release Info

Developer webzunft
Plugin Icon 128x128 Advanced Ads
Version 1.7.13
Comparing to
See all releases

Code changes from version 1.7.12 to 1.7.13

Files changed (11) hide show
  1. advanced-ads.php +2 -2
  2. classes/ad.php +4 -2
  3. classes/checks.php +1 -2
  4. composer.lock +1 -1
  5. modules/ad-blocker/classes/plugin.php +1 -1
  6. readme.txt +5 -1
  7. vendor/autoload_52.php +1 -1
  8. vendor/composer/ClassLoader.php +4 -4
  9. vendor/composer/LICENSE +1 -1
  10. vendor/composer/autoload_real.php +18 -20
  11. vendor/composer/autoload_real_52.php +3 -3
advanced-ads.php CHANGED
@@ -12,7 +12,7 @@
12
  * Plugin Name: Advanced Ads
13
  * Plugin URI: https://wpadvancedads.com
14
  * Description: Manage and optimize your ads in WordPress
15
- * Version: 1.7.12
16
  * Author: Thomas Maier
17
  * Author URI: http://webgilde.com
18
  * Text Domain: advanced-ads
@@ -39,7 +39,7 @@ define( 'ADVADS_BASE_DIR', dirname( ADVADS_BASE ) ); // directory of the plugin
39
  // general and global slug, e.g. to store options in WP, textdomain
40
  define( 'ADVADS_SLUG', 'advanced-ads' );
41
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
42
- define( 'ADVADS_VERSION', '1.7.12' );
43
 
44
  /*----------------------------------------------------------------------------*
45
  * Autoloading, modules and functions
12
  * Plugin Name: Advanced Ads
13
  * Plugin URI: https://wpadvancedads.com
14
  * Description: Manage and optimize your ads in WordPress
15
+ * Version: 1.7.13
16
  * Author: Thomas Maier
17
  * Author URI: http://webgilde.com
18
  * Text Domain: advanced-ads
39
  // general and global slug, e.g. to store options in WP, textdomain
40
  define( 'ADVADS_SLUG', 'advanced-ads' );
41
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
42
+ define( 'ADVADS_VERSION', '1.7.13' );
43
 
44
  /*----------------------------------------------------------------------------*
45
  * Autoloading, modules and functions
classes/ad.php CHANGED
@@ -277,8 +277,10 @@ class Advanced_Ads_Ad {
277
  $advads = Advanced_Ads::get_instance();
278
  if ( $output_options['global_output'] ) {
279
  $new_ad = array('type' => 'ad', 'id' => $this->id, 'title' => $this->title, 'output' => $output);
280
- if ( method_exists( 'Advanced_ads_Tracking_Plugin' , 'check_ad_tracking_enabled' ) ) {
281
- $new_ad['tracking_enabled'] = Advanced_ads_Tracking_Plugin::get_instance()->check_ad_tracking_enabled( $this );
 
 
282
  }
283
  $advads->current_ads[] = $new_ad;
284
  }
277
  $advads = Advanced_Ads::get_instance();
278
  if ( $output_options['global_output'] ) {
279
  $new_ad = array('type' => 'ad', 'id' => $this->id, 'title' => $this->title, 'output' => $output);
280
+ // if ( method_exists( 'Advanced_Ads_Tracking_Plugin' , 'check_ad_tracking_enabled' ) ) {
281
+ // if ( class_exists( 'Advanced_Ads_Tracking_Plugin', false ) ) {
282
+ if ( defined( 'AAT_VERSION' ) && -1 < version_compare( AAT_VERSION, '1.4.2' ) ) {
283
+ $new_ad['tracking_enabled'] = Advanced_Ads_Tracking_Plugin::get_instance()->check_ad_tracking_enabled( $this );
284
  }
285
  $advads->current_ads[] = $new_ad;
286
  }
classes/checks.php CHANGED
@@ -30,10 +30,9 @@ class Advanced_Ads_Checks {
30
  if ( ( defined( 'WP_CACHE' ) && WP_CACHE ) // general cache constant
31
  || defined('W3TC') // W3 Total Cache
32
  || function_exists( 'wp_super_cache_text_domain' ) // WP SUper Cache
33
- || class_exists('zencache\\plugin') // ZenCache
34
  || defined( 'WP_ROCKET_SLUG' ) //WP Rocket
35
  || defined( 'WPFC_WP_CONTENT_DIR' ) //WP Fastest Cache
36
- || class_exists( 'HyperCache' ) // Hyper Cache
37
  || defined( 'CE_CACHE_DIR' ) // Cache Enabler
38
  ){
39
  return true;
30
  if ( ( defined( 'WP_CACHE' ) && WP_CACHE ) // general cache constant
31
  || defined('W3TC') // W3 Total Cache
32
  || function_exists( 'wp_super_cache_text_domain' ) // WP SUper Cache
 
33
  || defined( 'WP_ROCKET_SLUG' ) //WP Rocket
34
  || defined( 'WPFC_WP_CONTENT_DIR' ) //WP Fastest Cache
35
+ || class_exists( 'HyperCache', false ) // Hyper Cache
36
  || defined( 'CE_CACHE_DIR' ) // Cache Enabler
37
  ){
38
  return true;
composer.lock CHANGED
@@ -4,7 +4,7 @@
4
  "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5
  "This file is @generated automatically"
6
  ],
7
- "hash": "b52900a2013c2cb8d13b725b76b888c2",
8
  "content-hash": "ad3eee4861f3aff012912967c0a17906",
9
  "packages": [
10
  {
4
  "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5
  "This file is @generated automatically"
6
  ],
7
+ "hash": "a5682b6980988f749640ce92382a6247",
8
  "content-hash": "ad3eee4861f3aff012912967c0a17906",
9
  "packages": [
10
  {
modules/ad-blocker/classes/plugin.php CHANGED
@@ -84,7 +84,7 @@ class Advanced_Ads_Ad_Blocker
84
  if( isset( $options['folder_name'] ) && $options['folder_name'] != '' )
85
  {
86
  // Loop through all script files and change the URL from which they are loaded
87
- if( is_array( $wp_scripts->registered ) )foreach( $wp_scripts->registered as $script )
88
  {
89
  if( strpos( $script->src, 'advanced-ads' ) !== false )
90
  {
84
  if( isset( $options['folder_name'] ) && $options['folder_name'] != '' )
85
  {
86
  // Loop through all script files and change the URL from which they are loaded
87
+ if( is_object( $wp_scripts ) && is_array( $wp_scripts->registered ) ) foreach( $wp_scripts->registered as $script )
88
  {
89
  if( strpos( $script->src, 'advanced-ads' ) !== false )
90
  {
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id
4
  Tags: ads, ad, ad inserter, ad injection, ad manager, ads manager, ad widget, adrotate, adsense, advertise, advertisements, advertising, adverts, advert, amazon, banner, banners, buysellads, chitika, clickbank, dfp, doubleclick, geotarget, geolocation, geo location, google dfp, monetization, widget
5
  Requires at least: WP 4.2, PHP 5.3
6
  Tested up to: 4.7
7
- Stable tag: 1.7.12
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -206,6 +206,10 @@ There is no revenue share. Advanced Ads doesn’t alter your ad codes in a way t
206
 
207
  == Changelog ==
208
 
 
 
 
 
209
  = 1.7.12 =
210
 
211
  * better highlighting of AND and OR connectors in display and visitor conditions
4
  Tags: ads, ad, ad inserter, ad injection, ad manager, ads manager, ad widget, adrotate, adsense, advertise, advertisements, advertising, adverts, advert, amazon, banner, banners, buysellads, chitika, clickbank, dfp, doubleclick, geotarget, geolocation, geo location, google dfp, monetization, widget
5
  Requires at least: WP 4.2, PHP 5.3
6
  Tested up to: 4.7
7
+ Stable tag: 1.7.13
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
206
 
207
  == Changelog ==
208
 
209
+ = 1.7.13 =
210
+
211
+ * fix for class name sensitive systems and Tracking autoloader
212
+
213
  = 1.7.12 =
214
 
215
  * better highlighting of AND and OR connectors in display and visitor conditions
vendor/autoload_52.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
- return ComposerAutoloaderInit6e590c8f788597289790b8a2042eb075::getLoader();
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
+ return ComposerAutoloaderInitc6cea8661c50e22aa59252816d770131::getLoader();
vendor/composer/ClassLoader.php CHANGED
@@ -13,7 +13,9 @@
13
  namespace Composer\Autoload;
14
 
15
  /**
16
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
 
 
17
  *
18
  * $loader = new \Composer\Autoload\ClassLoader();
19
  *
@@ -37,8 +39,6 @@ namespace Composer\Autoload;
37
  *
38
  * @author Fabien Potencier <fabien@symfony.com>
39
  * @author Jordi Boggiano <j.boggiano@seld.be>
40
- * @see http://www.php-fig.org/psr/psr-0/
41
- * @see http://www.php-fig.org/psr/psr-4/
42
  */
43
  class ClassLoader
44
  {
@@ -147,7 +147,7 @@ class ClassLoader
147
  * appending or prepending to the ones previously set for this namespace.
148
  *
149
  * @param string $prefix The prefix/namespace, with trailing '\\'
150
- * @param array|string $paths The PSR-4 base directories
151
  * @param bool $prepend Whether to prepend the directories
152
  *
153
  * @throws \InvalidArgumentException
13
  namespace Composer\Autoload;
14
 
15
  /**
16
+ * ClassLoader implements a PSR-0 class loader
17
+ *
18
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
19
  *
20
  * $loader = new \Composer\Autoload\ClassLoader();
21
  *
39
  *
40
  * @author Fabien Potencier <fabien@symfony.com>
41
  * @author Jordi Boggiano <j.boggiano@seld.be>
 
 
42
  */
43
  class ClassLoader
44
  {
147
  * appending or prepending to the ones previously set for this namespace.
148
  *
149
  * @param string $prefix The prefix/namespace, with trailing '\\'
150
+ * @param array|string $paths The PSR-0 base directories
151
  * @param bool $prepend Whether to prepend the directories
152
  *
153
  * @throws \InvalidArgumentException
vendor/composer/LICENSE CHANGED
@@ -1,5 +1,5 @@
1
 
2
- Copyright (c) 2016 Nils Adermann, Jordi Boggiano
3
 
4
  Permission is hereby granted, free of charge, to any person obtaining a copy
5
  of this software and associated documentation files (the "Software"), to deal
1
 
2
+ Copyright (c) 2015 Nils Adermann, Jordi Boggiano
3
 
4
  Permission is hereby granted, free of charge, to any person obtaining a copy
5
  of this software and associated documentation files (the "Software"), to deal
vendor/composer/autoload_real.php CHANGED
@@ -23,26 +23,19 @@ class ComposerAutoloaderInitd24de3c06687d3cf4aad0b15c83747be
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
  spl_autoload_unregister(array('ComposerAutoloaderInitd24de3c06687d3cf4aad0b15c83747be', 'loadClassLoader'));
25
 
26
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
27
- if ($useStaticLoader) {
28
- require_once __DIR__ . '/autoload_static.php';
29
-
30
- call_user_func(\Composer\Autoload\ComposerStaticInitd24de3c06687d3cf4aad0b15c83747be::getInitializer($loader));
31
- } else {
32
- $map = require __DIR__ . '/autoload_namespaces.php';
33
- foreach ($map as $namespace => $path) {
34
- $loader->set($namespace, $path);
35
- }
36
-
37
- $map = require __DIR__ . '/autoload_psr4.php';
38
- foreach ($map as $namespace => $path) {
39
- $loader->setPsr4($namespace, $path);
40
- }
41
-
42
- $classMap = require __DIR__ . '/autoload_classmap.php';
43
- if ($classMap) {
44
- $loader->addClassMap($classMap);
45
- }
46
  }
47
 
48
  $loader->register(true);
@@ -50,3 +43,8 @@ class ComposerAutoloaderInitd24de3c06687d3cf4aad0b15c83747be
50
  return $loader;
51
  }
52
  }
 
 
 
 
 
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
  spl_autoload_unregister(array('ComposerAutoloaderInitd24de3c06687d3cf4aad0b15c83747be', 'loadClassLoader'));
25
 
26
+ $map = require __DIR__ . '/autoload_namespaces.php';
27
+ foreach ($map as $namespace => $path) {
28
+ $loader->set($namespace, $path);
29
+ }
30
+
31
+ $map = require __DIR__ . '/autoload_psr4.php';
32
+ foreach ($map as $namespace => $path) {
33
+ $loader->setPsr4($namespace, $path);
34
+ }
35
+
36
+ $classMap = require __DIR__ . '/autoload_classmap.php';
37
+ if ($classMap) {
38
+ $loader->addClassMap($classMap);
 
 
 
 
 
 
 
39
  }
40
 
41
  $loader->register(true);
43
  return $loader;
44
  }
45
  }
46
+
47
+ function composerRequired24de3c06687d3cf4aad0b15c83747be($file)
48
+ {
49
+ require $file;
50
+ }
vendor/composer/autoload_real_52.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
- class ComposerAutoloaderInit6e590c8f788597289790b8a2042eb075 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit6e590c8f788597289790b8a2042eb075 {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit6e590c8f788597289790b8a2042eb075', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit6e590c8f788597289790b8a2042eb075', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
+ class ComposerAutoloaderInitc6cea8661c50e22aa59252816d770131 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInitc6cea8661c50e22aa59252816d770131', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInitc6cea8661c50e22aa59252816d770131', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);