AdSense Plugin WP QUADS - Version 1.4.6

Version Description

  • New: Theme API for custom theme integration of AdSense ads supports margin and alignment options now
  • New: Create WP QUADS admin menue logo
  • Fix: Admin warning if no adsense spots are activated is not working properly
Download this release

Release Info

Developer ReneHermi
Plugin Icon 128x128 AdSense Plugin WP QUADS
Version 1.4.6
Comparing to
See all releases

Code changes from version 1.4.5 to 1.4.6

Files changed (6) hide show
  1. includes/admin/admin-notices.php +71 -63
  2. includes/admin/admin-pages.php +3 -1
  3. includes/api.php +1 -1
  4. includes/template-functions.php +50 -14
  5. quick-adsense-reloaded.php +2 -2
  6. readme.txt +6 -1
includes/admin/admin-notices.php CHANGED
@@ -22,39 +22,39 @@ if( !defined( 'ABSPATH' ) )
22
  function quads_admin_messages() {
23
  global $quads_options;
24
 
25
- if( !current_user_can( 'update_plugins' ) ){
26
  return;
27
  }
28
-
29
  quads_theme_notice();
30
-
31
  quads_update_notice();
32
-
33
- if (!quads_is_any_ad_activated() && quads_is_admin_page() ){
34
- echo '<div class="notice notice-warning">'.sprintf(__('<strong>No ads are activated!</strong> You need to assign at least 1 ad to an ad spot. Fix this in <a href="%s">General Settings</a>! Alternatively you need to use a shortcode in your posts or no ads are shown at all.', 'quick-adsense-reloaded'), admin_url().'admin.php?page=quads-settings#quads_settingsgeneral_header').'</div>';
35
  }
36
-
37
- if (quads_get_active_ads() === 0 && quads_is_admin_page() ){
38
- echo '<div class="notice notice-warning">'.sprintf(__('<strong>No ads defined!</strong> You need to create at least one ad code. Fix this in <a href="%s">ADSENSE CODE</a>.', 'quick-adsense-reloaded'), admin_url().'admin.php?page=quads-settings#quads_settingsadsense_header').'</div>';
39
  }
40
-
41
- if (!quads_is_post_type_activated() && quads_is_admin_page() ){
42
- echo '<div class="notice notice-warning">'.sprintf(__('<strong>No ads are shown - No post types selected</strong> You need to select at least 1 post type like <i>blog</i> or <i>page</i>. Fix this in <a href="%s">General Settings</a> or no ads are shown at all.', 'quick-adsense-reloaded'), admin_url().'admin.php?page=quads-settings#quads_settingsgeneral_header').'</div>';
43
  }
44
-
45
- if (isset($_GET['quads-action']) && $_GET['quads-action'] === 'validate' && quads_is_admin_page() && quads_is_any_ad_activated() && quads_is_post_type_activated() && quads_get_active_ads() > 0 ){
46
- echo '<div class="notice notice-success">' . sprintf(__('<strong>No errors detected in WP QUADS settings.</strong> If ads are still not shown read the <a href="%s" target="_blank">troubleshooting guide</a>'), 'http://wpquads.com/docs/adsense-ads-are-not-showing/?utm_source=plugin&utm_campaign=wpquads-settings&utm_medium=website&utm_term=toplink') . '</div>';
47
  }
48
 
49
  //quads_plugin_deactivated_notice();
50
-
51
  $install_date = get_option( 'quads_install_date' );
52
  $display_date = date( 'Y-m-d h:i:s' );
53
  $datetime1 = new DateTime( $install_date );
54
  $datetime2 = new DateTime( $display_date );
55
  $diff_intrval = round( ($datetime2->format( 'U' ) - $datetime1->format( 'U' )) / (60 * 60 * 24) );
56
-
57
-
58
  if( $diff_intrval >= 7 && get_option( 'quads_rating_div' ) == "no" || false === get_option( 'quads_rating_div' ) || quads_rate_again() ) {
59
  echo '<div class="quads_fivestar updated " style="box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);background-color:white;">
60
  <p>Awesome, you\'ve been using <strong>WP QUADS</strong> for more than 1 week. <br> May i ask you to give it a <strong>5-star rating</strong> on Wordpress? </br>
@@ -139,6 +139,7 @@ function quads_hide_rating_div() {
139
  echo json_encode( array("success") );
140
  exit;
141
  }
 
142
  add_action( 'wp_ajax_quads_hide_rating', 'quads_hide_rating_div' );
143
 
144
  /**
@@ -147,22 +148,23 @@ add_action( 'wp_ajax_quads_hide_rating', 'quads_hide_rating_div' );
147
  function quads_hide_rating_notice_week() {
148
  $nextweek = time() + (7 * 24 * 60 * 60);
149
  $human_date = date( 'Y-m-d h:i:s', $nextweek );
150
- update_option( 'quads_date_next_notice', $human_date );
151
- update_option( 'quads_rating_div', 'yes' );
152
  echo json_encode( array("success") );
153
  exit;
154
  }
 
155
  add_action( 'wp_ajax_quads_hide_rating_week', 'quads_hide_rating_notice_week' );
156
 
157
  /**
158
  * Check if admin notice will open again after one week of closing
159
  * @return boolean
160
  */
161
- function quads_rate_again(){
162
-
163
  $rate_again_date = get_option( 'quads_date_next_notice' );
164
 
165
- if (false === $rate_again_date){
166
  return false;
167
  }
168
 
@@ -171,12 +173,11 @@ function quads_rate_again(){
171
  $datetime2 = new DateTime( $current_date );
172
  $diff_intrval = round( ($datetime2->format( 'U' ) - $datetime1->format( 'U' )) / (60 * 60 * 24) );
173
 
174
- if ($diff_intrval >= 0){
175
  return true;
176
  }
177
  }
178
 
179
-
180
  /**
181
  * Show a message when pro or free plugin gets disabled
182
  *
@@ -203,12 +204,12 @@ function quads_plugin_deactivated_notice() {
203
  *
204
  * Not used at the moment
205
  */
206
- function quads_theme_notice(){
207
-
208
- $show_notice = get_option('quads_show_theme_notice');
209
-
210
- if( false !== $show_notice && 'no' !== $show_notice && quads_is_commercial_theme() ) {
211
- $message = __( '<strong>Extend the' . quads_is_commercial_theme(). '</strong> theme with <strong>WP QUADS PRO!</strong><br>Save time and earn more - Bring your AdSense earnings to next level. <a href="http://wpquads.com?utm_campaign=adminnotice&utm_source=admin_notice&utm_medium=admin&utm_content=bimber_upgrade_notice" target="_blank"> Purchase Now</a> or <a href="http://wpquads.com?utm_campaign=free_plugin&utm_source=admin_notice&utm_medium=admin&utm_content=bimber_upgrade_notice" target="_blank">Get Details</a> <p> <a href="'.admin_url().'admin.php?page=quads-settings&quads-action=close_upgrade_notice" class="button">Close Notice</a>', 'quick-adsense-reloaded' );
212
  ?>
213
  <div class="updated notice" style="border-left: 4px solid #ffba00;">
214
  <p><?php echo $message; ?></p>
@@ -233,29 +234,31 @@ function quads_update_notice() {
233
  if( (version_compare( QUADS_VERSION, '1.3.9', '>=' ) ) && quads_is_advanced() && (version_compare( QUADS_PRO_VERSION, '1.3.0', '<' ) ) ) {
234
  $message = sprintf( __( '<strong>WP QUADS ' . QUADS_VERSION . ': </strong> Update WP QUADS PRO to get custom post type support from <a href="%s">General Settings</a>.', 'quick-adsense-reloaded' ), admin_url() . 'admin.php?page=quads-settings' );
235
  $message .= '<br><br><a href="' . admin_url() . 'admin.php?page=quads-settings&quads-action=hide_update_notice" class="button-primary thankyou" target="_self" title="Close Notice" style="font-weight:bold;">Close Notice</a>';
236
- ?>
237
- <div class="updated notice" style="border-left: 4px solid #ffba00;">
238
- <p><?php echo $message; ?></p>
239
- </div> <?php
240
  //update_option ('quads_show_update_notice', 'no');
241
  } else
242
- if( !quads_is_advanced() ) {
243
  $message = sprintf( __( '<strong>WP QUADS ' . QUADS_VERSION . ': </strong> Install <a href="%1s" target="_blank">WP QUADS PRO</a> to get custom post type support in <a href="%2s">General Settings</a>.', 'quick-adsense-reloaded' ), 'http://wpquads.com?utm_campaign=admin_notice&utm_source=admin_notice&utm_medium=admin&utm_content=custom_post_type', admin_url() . 'admin.php?page=quads-settings' );
244
  $message .= '<br><br><a href="' . admin_url() . 'admin.php?page=quads-settings&quads-action=hide_update_notice" class="button-primary thankyou" target="_self" title="Close Notice" style="font-weight:bold;">Close Notice</a>';
245
- ?>
246
- <div class="updated notice" style="border-left: 4px solid #ffba00;">
247
- <p><?php echo $message; ?></p>
248
- </div>
249
  <?php
250
  }
251
  }
 
252
  /**
253
  * Hide Notice and update db option quads_hide_notice
254
  */
255
- function quads_hide_notice(){
256
- update_option ('quads_show_update_notice', 'no');
257
  }
258
- add_action('quads_hide_update_notice', 'quads_hide_notice', 10);
 
259
 
260
  /**
261
  * Check if any ad is activated and assigned in general settings
@@ -275,21 +278,26 @@ function quads_is_any_ad_activated() {
275
  }
276
  }
277
  }
278
- //wp_die(print_r($check));
279
-
280
- if( count( $check ) === 0 &&
281
- !isset( $quads_options['pos1']['BegnAds'] ) &&
282
- !isset( $quads_options['pos2']['MiddAds'] ) &&
283
- !isset( $quads_options['pos3']['EndiAds'] ) &&
284
- !isset( $quads_options['pos4']['MoreAds'] ) &&
285
- !isset( $quads_options['pos5']['LapaAds'] ) &&
286
- !isset( $quads_options['pos6']['Par1Ads'] ) &&
287
- !isset( $quads_options['pos7']['Par2Ads'] ) &&
288
- !isset( $quads_options['pos8']['Par3Ads'] ) &&
289
- !isset( $quads_options['pos9']['Img1Ads'] ) ) {
290
- return false;
291
  }
292
- return true;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
293
  }
294
 
295
  /**
@@ -298,13 +306,13 @@ function quads_is_any_ad_activated() {
298
  * @global array $quads_options
299
  * @return boolean
300
  */
301
- function quads_is_post_type_activated(){
302
- global $quads_options;
303
 
304
- if (empty($quads_options['post_types'])){
305
- return false;
306
- }
307
- return true;
308
  }
309
 
310
  /**
22
  function quads_admin_messages() {
23
  global $quads_options;
24
 
25
+ if( !current_user_can( 'update_plugins' ) ) {
26
  return;
27
  }
28
+
29
  quads_theme_notice();
30
+
31
  quads_update_notice();
32
+
33
+ if( !quads_is_any_ad_activated() && quads_is_admin_page() ) {
34
+ echo '<div class="notice notice-warning">' . sprintf( __( '<strong>No ads are activated!</strong> You need to assign at least 1 ad to an ad spot. Fix this in <a href="%s">General Settings</a>! Alternatively you need to use a shortcode in your posts or no ads are shown at all.', 'quick-adsense-reloaded' ), admin_url() . 'admin.php?page=quads-settings#quads_settingsgeneral_header' ) . '</div>';
35
  }
36
+
37
+ if( quads_get_active_ads() === 0 && quads_is_admin_page() ) {
38
+ echo '<div class="notice notice-warning">' . sprintf( __( '<strong>No ads defined!</strong> You need to create at least one ad code. Fix this in <a href="%s">ADSENSE CODE</a>.', 'quick-adsense-reloaded' ), admin_url() . 'admin.php?page=quads-settings#quads_settingsadsense_header' ) . '</div>';
39
  }
40
+
41
+ if( !quads_is_post_type_activated() && quads_is_admin_page() ) {
42
+ echo '<div class="notice notice-warning">' . sprintf( __( '<strong>No ads are shown - No post types selected</strong> You need to select at least 1 post type like <i>blog</i> or <i>page</i>. Fix this in <a href="%s">General Settings</a> or no ads are shown at all.', 'quick-adsense-reloaded' ), admin_url() . 'admin.php?page=quads-settings#quads_settingsgeneral_header' ) . '</div>';
43
  }
44
+
45
+ if( isset( $_GET['quads-action'] ) && $_GET['quads-action'] === 'validate' && quads_is_admin_page() && quads_is_any_ad_activated() && quads_is_post_type_activated() && quads_get_active_ads() > 0 ) {
46
+ echo '<div class="notice notice-success">' . sprintf( __( '<strong>No errors detected in WP QUADS settings.</strong> If ads are still not shown read the <a href="%s" target="_blank">troubleshooting guide</a>' ), 'http://wpquads.com/docs/adsense-ads-are-not-showing/?utm_source=plugin&utm_campaign=wpquads-settings&utm_medium=website&utm_term=toplink' ) . '</div>';
47
  }
48
 
49
  //quads_plugin_deactivated_notice();
50
+
51
  $install_date = get_option( 'quads_install_date' );
52
  $display_date = date( 'Y-m-d h:i:s' );
53
  $datetime1 = new DateTime( $install_date );
54
  $datetime2 = new DateTime( $display_date );
55
  $diff_intrval = round( ($datetime2->format( 'U' ) - $datetime1->format( 'U' )) / (60 * 60 * 24) );
56
+
57
+
58
  if( $diff_intrval >= 7 && get_option( 'quads_rating_div' ) == "no" || false === get_option( 'quads_rating_div' ) || quads_rate_again() ) {
59
  echo '<div class="quads_fivestar updated " style="box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);background-color:white;">
60
  <p>Awesome, you\'ve been using <strong>WP QUADS</strong> for more than 1 week. <br> May i ask you to give it a <strong>5-star rating</strong> on Wordpress? </br>
139
  echo json_encode( array("success") );
140
  exit;
141
  }
142
+
143
  add_action( 'wp_ajax_quads_hide_rating', 'quads_hide_rating_div' );
144
 
145
  /**
148
  function quads_hide_rating_notice_week() {
149
  $nextweek = time() + (7 * 24 * 60 * 60);
150
  $human_date = date( 'Y-m-d h:i:s', $nextweek );
151
+ update_option( 'quads_date_next_notice', $human_date );
152
+ update_option( 'quads_rating_div', 'yes' );
153
  echo json_encode( array("success") );
154
  exit;
155
  }
156
+
157
  add_action( 'wp_ajax_quads_hide_rating_week', 'quads_hide_rating_notice_week' );
158
 
159
  /**
160
  * Check if admin notice will open again after one week of closing
161
  * @return boolean
162
  */
163
+ function quads_rate_again() {
164
+
165
  $rate_again_date = get_option( 'quads_date_next_notice' );
166
 
167
+ if( false === $rate_again_date ) {
168
  return false;
169
  }
170
 
173
  $datetime2 = new DateTime( $current_date );
174
  $diff_intrval = round( ($datetime2->format( 'U' ) - $datetime1->format( 'U' )) / (60 * 60 * 24) );
175
 
176
+ if( $diff_intrval >= 0 ) {
177
  return true;
178
  }
179
  }
180
 
 
181
  /**
182
  * Show a message when pro or free plugin gets disabled
183
  *
204
  *
205
  * Not used at the moment
206
  */
207
+ function quads_theme_notice() {
208
+
209
+ $show_notice = get_option( 'quads_show_theme_notice' );
210
+
211
+ if( false !== $show_notice && 'no' !== $show_notice && quads_is_commercial_theme() ) {
212
+ $message = __( '<strong>Extend the' . quads_is_commercial_theme() . '</strong> theme with <strong>WP QUADS PRO!</strong><br>Save time and earn more - Bring your AdSense earnings to next level. <a href="http://wpquads.com?utm_campaign=adminnotice&utm_source=admin_notice&utm_medium=admin&utm_content=bimber_upgrade_notice" target="_blank"> Purchase Now</a> or <a href="http://wpquads.com?utm_campaign=free_plugin&utm_source=admin_notice&utm_medium=admin&utm_content=bimber_upgrade_notice" target="_blank">Get Details</a> <p> <a href="' . admin_url() . 'admin.php?page=quads-settings&quads-action=close_upgrade_notice" class="button">Close Notice</a>', 'quick-adsense-reloaded' );
213
  ?>
214
  <div class="updated notice" style="border-left: 4px solid #ffba00;">
215
  <p><?php echo $message; ?></p>
234
  if( (version_compare( QUADS_VERSION, '1.3.9', '>=' ) ) && quads_is_advanced() && (version_compare( QUADS_PRO_VERSION, '1.3.0', '<' ) ) ) {
235
  $message = sprintf( __( '<strong>WP QUADS ' . QUADS_VERSION . ': </strong> Update WP QUADS PRO to get custom post type support from <a href="%s">General Settings</a>.', 'quick-adsense-reloaded' ), admin_url() . 'admin.php?page=quads-settings' );
236
  $message .= '<br><br><a href="' . admin_url() . 'admin.php?page=quads-settings&quads-action=hide_update_notice" class="button-primary thankyou" target="_self" title="Close Notice" style="font-weight:bold;">Close Notice</a>';
237
+ ?>
238
+ <div class="updated notice" style="border-left: 4px solid #ffba00;">
239
+ <p><?php echo $message; ?></p>
240
+ </div> <?php
241
  //update_option ('quads_show_update_notice', 'no');
242
  } else
243
+ if( !quads_is_advanced() ) {
244
  $message = sprintf( __( '<strong>WP QUADS ' . QUADS_VERSION . ': </strong> Install <a href="%1s" target="_blank">WP QUADS PRO</a> to get custom post type support in <a href="%2s">General Settings</a>.', 'quick-adsense-reloaded' ), 'http://wpquads.com?utm_campaign=admin_notice&utm_source=admin_notice&utm_medium=admin&utm_content=custom_post_type', admin_url() . 'admin.php?page=quads-settings' );
245
  $message .= '<br><br><a href="' . admin_url() . 'admin.php?page=quads-settings&quads-action=hide_update_notice" class="button-primary thankyou" target="_self" title="Close Notice" style="font-weight:bold;">Close Notice</a>';
246
+ ?>
247
+ <div class="updated notice" style="border-left: 4px solid #ffba00;">
248
+ <p><?php echo $message; ?></p>
249
+ </div>
250
  <?php
251
  }
252
  }
253
+
254
  /**
255
  * Hide Notice and update db option quads_hide_notice
256
  */
257
+ function quads_hide_notice() {
258
+ update_option( 'quads_show_update_notice', 'no' );
259
  }
260
+
261
+ add_action( 'quads_hide_update_notice', 'quads_hide_notice', 10 );
262
 
263
  /**
264
  * Check if any ad is activated and assigned in general settings
278
  }
279
  }
280
  }
281
+
282
+ // ad activated with api (custom position)
283
+ if( count( $check ) > 0 ) {
284
+ return true;
 
 
 
 
 
 
 
 
 
285
  }
286
+ // check if any other ad is assigned and activated
287
+ if( isset( $quads_options['pos1']['BegnAds'] ) ||
288
+ isset( $quads_options['pos2']['MiddAds'] ) ||
289
+ isset( $quads_options['pos3']['EndiAds'] ) ||
290
+ isset( $quads_options['pos4']['MoreAds'] ) ||
291
+ isset( $quads_options['pos5']['LapaAds'] ) ||
292
+ isset( $quads_options['pos6']['Par1Ads'] ) ||
293
+ isset( $quads_options['pos7']['Par2Ads'] ) ||
294
+ isset( $quads_options['pos8']['Par3Ads'] ) ||
295
+ isset( $quads_options['pos9']['Img1Ads'] )
296
+ ) {
297
+ return true;
298
+ }
299
+ // no ad is activated
300
+ return false;
301
  }
302
 
303
  /**
306
  * @global array $quads_options
307
  * @return boolean
308
  */
309
+ function quads_is_post_type_activated() {
310
+ global $quads_options;
311
 
312
+ if( empty( $quads_options['post_types'] ) ) {
313
+ return false;
314
+ }
315
+ return true;
316
  }
317
 
318
  /**
includes/admin/admin-pages.php CHANGED
@@ -30,7 +30,9 @@ function quads_add_options_link() {
30
  if ($create_settings){
31
  $quads_settings_page = add_submenu_page( 'options-general.php', __( 'WP QUADS Settings', 'quick-adsense-reloaded' ), __( 'WPQUADS', 'quick-adsense-reloaded' ), 'manage_options', 'quads-settings', 'quads_options_page' );
32
  }else{
33
- $quads_parent_page = add_menu_page( 'Quick AdSense Reloaded Settings', $label, 'manage_options', 'quads-settings', 'quads_options_page' );
 
 
34
  //if (quads_is_installed_clickfraud() ){
35
  //$quads_add_ons_page = add_submenu_page('quads-settings', __('Click Fraud Monitor'), __('Click Fraud Monitor'), 'manage_options', 'cfmonitor-config', 'cfmonitor_conf');
36
  //} else {
30
  if ($create_settings){
31
  $quads_settings_page = add_submenu_page( 'options-general.php', __( 'WP QUADS Settings', 'quick-adsense-reloaded' ), __( 'WPQUADS', 'quick-adsense-reloaded' ), 'manage_options', 'quads-settings', 'quads_options_page' );
32
  }else{
33
+ $wpquads_logo ="<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 width="611.68px" height="545px" viewBox="0 0 611.68 545" enable-background="new 0 0 611.68 545" xml:space="preserve">
	 <style>.style0{fill:#fff;}</style>
<g id="Ebene_0_xA0_Image_1_">
</g>
<g id="WPQUADS">
	<g>
		<path class="style0" d="M25.709,535.42L3.32,451.044h11.454l12.834,55.311c1.381,5.794,2.57,11.55,3.568,17.267
			c2.148-9.017,3.415-14.216,3.799-15.598l16.058-56.979h13.468l12.086,42.706c3.031,10.59,5.218,20.547,6.562,29.871
			c1.074-5.333,2.475-11.453,4.202-18.36l13.237-54.217h11.224L88.675,535.42H77.912l-17.784-64.289
			c-1.497-5.372-2.38-8.671-2.648-9.899c-0.883,3.876-1.708,7.175-2.475,9.899l-17.9,64.289H25.709z"/>
		<path class="style0" d="M122.229,535.42v-84.376h31.828c5.602,0,9.879,0.269,12.835,0.806c4.144,0.69,7.616,2.006,10.417,3.942
			c2.8,1.938,5.055,4.653,6.763,8.145c1.707,3.492,2.561,7.329,2.561,11.511c0,7.176-2.283,13.248-6.849,18.217
			c-4.566,4.969-12.816,7.453-24.749,7.453h-21.641v34.303H122.229z M133.395,491.16h21.813c7.213,0,12.336-1.343,15.367-4.029
			c3.031-2.686,4.547-6.465,4.547-11.338c0-3.53-0.892-6.552-2.676-9.065c-1.784-2.513-4.135-4.173-7.05-4.979
			c-1.88-0.498-5.353-0.748-10.417-0.748h-21.583V491.16z"/>
		<path class="style0" d="M268.247,524.715c4.182,2.992,8.729,5.372,13.641,7.137l-6.273,12.029
			c-2.571-0.769-5.084-1.823-7.54-3.166c-0.538-0.269-4.317-2.763-11.338-7.482c-5.525,2.418-11.646,3.626-18.36,3.626
			c-12.97,0-23.128-3.817-30.476-11.453c-7.348-7.635-11.021-18.36-11.021-32.174c0-13.774,3.684-24.489,11.05-32.145
			c7.367-7.654,17.362-11.481,29.986-11.481c12.508,0,22.427,3.827,29.756,11.481c7.328,7.655,10.993,18.37,10.993,32.145
			c0,7.291-1.017,13.698-3.05,19.224C274.079,516.677,271.623,520.763,268.247,524.715z M254.549,515.103
			c2.187-2.569,3.827-5.678,4.921-9.323c1.093-3.646,1.64-7.828,1.64-12.548c0-9.745-2.149-17.026-6.446-21.842
			c-4.297-4.814-9.919-7.223-16.863-7.223c-6.945,0-12.576,2.417-16.893,7.252c-4.317,4.834-6.475,12.105-6.475,21.813
			c0,9.862,2.158,17.238,6.475,22.131c4.316,4.892,9.774,7.338,16.375,7.338c2.455,0,4.777-0.403,6.964-1.209
			c-3.453-2.264-6.964-4.028-10.532-5.295l4.777-9.727C244.092,508.389,249.445,511.267,254.549,515.103z"/>
		<path class="style0" d="M291.902,451.044h17.037v45.699c0,7.252,0.21,11.952,0.633,14.101c0.729,3.453,2.466,6.226,5.209,8.316
			c2.743,2.092,6.494,3.137,11.253,3.137c4.834,0,8.479-0.987,10.936-2.964c2.455-1.976,3.933-4.402,4.432-7.28
			c0.498-2.878,0.748-7.655,0.748-14.331v-46.678h17.036v44.317c0,10.13-0.46,17.286-1.381,21.468
			c-0.921,4.184-2.619,7.713-5.094,10.591c-2.476,2.878-5.784,5.171-9.929,6.878c-4.144,1.707-9.554,2.561-16.23,2.561
			c-8.058,0-14.169-0.931-18.332-2.791c-4.164-1.86-7.453-4.278-9.871-7.252c-2.417-2.973-4.01-6.091-4.777-9.353
			c-1.113-4.835-1.669-11.972-1.669-21.411V451.044z"/>
		<path class="style0" d="M453.23,535.42h-18.533l-7.367-19.166h-33.728l-6.964,19.166h-18.072l32.864-84.376h18.015L453.23,535.42z
			 M421.862,502.038l-11.626-31.311l-11.396,31.311H421.862z"/>
		<path class="style0" d="M462.209,451.044h31.137c7.022,0,12.375,0.538,16.059,1.611c4.949,1.459,9.188,4.049,12.72,7.771
			c3.529,3.722,6.216,8.278,8.058,13.669c1.842,5.392,2.763,12.039,2.763,19.943c0,6.945-0.863,12.931-2.59,17.957
			c-2.111,6.14-5.123,11.108-9.037,14.906c-2.955,2.878-6.945,5.123-11.971,6.734c-3.761,1.189-8.787,1.784-15.08,1.784h-32.058
			V451.044z M479.245,465.317v55.887h12.72c4.757,0,8.191-0.269,10.302-0.806c2.763-0.691,5.056-1.861,6.878-3.512
			c1.822-1.648,3.31-4.364,4.461-8.144s1.727-8.93,1.727-15.454c0-6.522-0.575-11.529-1.727-15.021
			c-1.151-3.491-2.763-6.216-4.835-8.173c-2.071-1.957-4.7-3.28-7.885-3.972c-2.38-0.536-7.042-0.806-13.986-0.806H479.245z"/>
		<path class="style0" d="M543.073,507.966l16.576-1.611c0.997,5.564,3.021,9.65,6.072,12.26c3.05,2.609,7.165,3.913,12.346,3.913
			c5.486,0,9.62-1.16,12.403-3.481c2.781-2.321,4.172-5.036,4.172-8.145c0-1.994-0.585-3.692-1.755-5.094
			c-1.171-1.4-3.214-2.618-6.13-3.654c-1.995-0.691-6.542-1.919-13.641-3.684c-9.132-2.264-15.54-5.045-19.224-8.346
			c-5.18-4.643-7.77-10.303-7.77-16.979c0-4.297,1.218-8.317,3.654-12.059c2.437-3.74,5.947-6.59,10.533-8.547
			c4.584-1.957,10.12-2.935,16.604-2.935c10.59,0,18.562,2.321,23.914,6.964s8.163,10.84,8.432,18.59l-17.036,0.749
			c-0.729-4.336-2.293-7.454-4.69-9.354c-2.398-1.899-5.996-2.849-10.792-2.849c-4.949,0-8.825,1.018-11.626,3.051
			c-1.804,1.305-2.705,3.05-2.705,5.237c0,1.995,0.844,3.703,2.532,5.122c2.148,1.805,7.367,3.684,15.655,5.641
			s14.418,3.981,18.389,6.072c3.972,2.092,7.079,4.949,9.324,8.575c2.244,3.626,3.367,8.106,3.367,13.439
			c0,4.835-1.344,9.362-4.029,13.583c-2.687,4.222-6.484,7.358-11.396,9.41c-4.912,2.053-11.032,3.079-18.36,3.079
			c-10.668,0-18.859-2.465-24.576-7.396C547.601,524.591,544.186,517.405,543.073,507.966z"/>
	</g>
</g>
<g id="Ebene_4_Kopie_xA0_Image_1_">
	
		<image overflow="visible" width="72" height="28" id="Ebene_4_Kopie_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAAAcCAIAAABNkG7xAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADZJREFUeNrszwENAAAIAyDfP/TN
oYMGpO18FDExMTExMTExMTExMTExMTExMTExMbGbVgABBgBuY1PJHAlIVwAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 4 392)">
	</image>
</g>
<g id="Ebene_3_Kopie_6_xA0_Image_1_">
	
		<image overflow="visible" width="76" height="108" id="Ebene_3_Kopie_6_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAABsCAIAAABPWcNKAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIBJREFUeNrszwEBADAIAyC1f+e9
gAk8NKCT1HVTH5CUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSU
lJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJTcPQEGAOHlA9Xq
5i0QAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 215 312)">
	</image>
</g>
<g id="Ebene_3_Kopie_7_xA0_Image_1_">
	
		<image overflow="visible" width="80" height="172" id="Ebene_3_Kopie_7_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAACsCAIAAABjI7yYAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAL5JREFUeNrszwEBAAAEAzD073w9
2Bqsk9QnU88ICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
CwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
CwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLC9+yAgwA
Z30EVTulpNQAAAAASUVORK5CYII=" transform="matrix(1 0 0 1 319 248)">
	</image>
</g>
<g id="Ebene_3_Kopie_8_xA0_Image_1_">
	
		<image overflow="visible" width="80" height="72" id="Ebene_3_Kopie_8_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABICAIAAADu9uUMAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAGFJREFUeNrszzEBAAAIAyDXP/Qs
4Sc0IG3nkwgLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
CwsLCwsLCwsLCwsLCwsLC99bAQYA/ybXcd3sYU8AAAAASUVORK5CYII=" transform="matrix(1 0 0 1 106 348)">
	</image>
</g>
<g id="Ebene_3_Kopie_9_xA0_Image_1_">
	
		<image overflow="visible" width="72" height="280" id="Ebene_3_Kopie_9_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAAEYCAIAAABwdidTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQlJREFUeNrszwENAAAIAyC1f+fb
44MGbJJpdFNKTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExM
TExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExM
TExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExM
TExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExM
TExMTExMTExMTExMTKzRCzAA+F0FLUt96F8AAAAASUVORK5CYII=" transform="matrix(1 0 0 1 430 140)">
	</image>
</g>
<g id="Ebene_3_Kopie_10_xA0_Image_1_">
	
		<image overflow="visible" width="72" height="420" id="Ebene_3_Kopie_10_xA0_Image" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAAGkCAIAAAAdfvRdAAAACXBIWXMAAAsSAAALEgHS3X78AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAX9JREFUeNrsz0ERAAAIAyDXP/Rs
4cODBqTtfBQxMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEx
MTExMTExMTExMTExMTExMTGxOyvAAE6/6PXKomtfAAAAAElFTkSuQmCC" transform="matrix(1 0 0 1 536 0)">
	</image>
</g>
</svg>

34
+ ";
35
+ $quads_parent_page = add_menu_page( 'Quick AdSense Reloaded Settings', $label, 'manage_options', 'quads-settings', 'quads_options_page', 'data:image/svg+xml;base64,' . $wpquads_logo );
36
  //if (quads_is_installed_clickfraud() ){
37
  //$quads_add_ons_page = add_submenu_page('quads-settings', __('Click Fraud Monitor'), __('Click Fraud Monitor'), 'manage_options', 'cfmonitor-config', 'cfmonitor_conf');
38
  //} else {
includes/api.php CHANGED
@@ -147,7 +147,7 @@ function quads_ad( $args ) {
147
 
148
  $location_settings = quads_get_ad_location_settings( $args['location'] );
149
  $code .= "\n".'<!-- WP QUADS Custom Ad v. ' . QUADS_VERSION .' -->'."\n";
150
- $code .= '<div class="quads-location quads-ad' .$location_settings['ad']. '" id="quads-ad' .$location_settings['ad']. '">'."\n";
151
  $code .= quads_render_ad( 'ad' . $location_settings['ad'], $quads_options[ 'ad' . $location_settings['ad'] ]['code'] );
152
  $code .= '</div>';
153
  }
147
 
148
  $location_settings = quads_get_ad_location_settings( $args['location'] );
149
  $code .= "\n".'<!-- WP QUADS Custom Ad v. ' . QUADS_VERSION .' -->'."\n";
150
+ $code .= '<div class="quads-location quads-ad' .$location_settings['ad']. '" id="quads-ad' .$location_settings['ad']. '" style="'. quads_get_inline_ad_style( $location_settings['ad'] ).'">'."\n";
151
  $code .= quads_render_ad( 'ad' . $location_settings['ad'], $quads_options[ 'ad' . $location_settings['ad'] ]['code'] );
152
  $code .= '</div>';
153
  }
includes/template-functions.php CHANGED
@@ -677,26 +677,28 @@ function quads_replace_ads($content, $quicktag, $id) {
677
  if( strpos($content,'<!--'.$quicktag.'-->')===false ) {
678
  return $content;
679
  }
 
680
 
681
  if ($id != -1) {
682
- $paragraphsArray = array(
683
- 'float:left;margin:%1$dpx %1$dpx %1$dpx 0;',
684
- 'float:none;margin:%1$dpx 0 %1$dpx 0;text-align:center;',
685
- 'float:right;margin:%1$dpx 0 %1$dpx %1$dpx;',
686
- 'float:none;margin:0px;');
687
-
688
- $adsalign = $quads_options['ad' . $id]['align'];
689
- $adsmargin = isset($quads_options['ad' . $id]['margin']) ? $quads_options['ad' . $id]['margin'] : '3'; // default
690
- $margin = sprintf($paragraphsArray[(int)$adsalign], $adsmargin);
691
-
692
- // Do not create any inline style on AMP site
693
- $style = !quads_is_amp_endpoint() ? apply_filters ('quads_filter_margins', $margin, 'ad'.$id ) : '';
694
- $adscode = $quads_options['ad' . $id ]['code'];
695
 
 
 
696
  $adscode =
697
  "\n".'<!-- WP QUADS Content Ad Plugin v. ' . QUADS_VERSION .' -->'."\n".
698
  '<div class="quads-location quads-ad' .$id. '" id="quads-ad' .$id. '" style="'.$style.'">'."\n".
699
- quads_render_ad('ad'.$id, $adscode)."\n".
700
  '</div>'. "\n";
701
 
702
  } else {
@@ -707,6 +709,40 @@ function quads_replace_ads($content, $quicktag, $id) {
707
  return $cont[0].$adscode.$cont[1];
708
  }
709
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
710
  /**
711
  * Revert content to original content any remove any processing helper strings
712
  *
677
  if( strpos($content,'<!--'.$quicktag.'-->')===false ) {
678
  return $content;
679
  }
680
+
681
 
682
  if ($id != -1) {
683
+ // $styleArray = array(
684
+ // 'float:left;margin:%1$dpx %1$dpx %1$dpx 0;',
685
+ // 'float:none;margin:%1$dpx 0 %1$dpx 0;text-align:center;',
686
+ // 'float:right;margin:%1$dpx 0 %1$dpx %1$dpx;',
687
+ // 'float:none;margin:0px;');
688
+ //
689
+ // $adsalign = $quads_options['ad' . $id]['align'];
690
+ // $adsmargin = isset($quads_options['ad' . $id]['margin']) ? $quads_options['ad' . $id]['margin'] : '3'; // default
691
+ // $margin = sprintf($styleArray[(int)$adsalign], $adsmargin);
692
+ //
693
+ // // Do not create any inline style on AMP site
694
+ // $style = !quads_is_amp_endpoint() ? apply_filters ('quads_filter_margins', $margin, 'ad'.$id ) : '';
 
695
 
696
+ $code = !empty($quads_options['ad' . $id ]['code']) ? $quads_options['ad' . $id ]['code'] : '';
697
+ $style = quads_get_inline_ad_style($id);
698
  $adscode =
699
  "\n".'<!-- WP QUADS Content Ad Plugin v. ' . QUADS_VERSION .' -->'."\n".
700
  '<div class="quads-location quads-ad' .$id. '" id="quads-ad' .$id. '" style="'.$style.'">'."\n".
701
+ quads_render_ad('ad'.$id, $code)."\n".
702
  '</div>'. "\n";
703
 
704
  } else {
709
  return $cont[0].$adscode.$cont[1];
710
  }
711
 
712
+ /**
713
+ * Get ad inline style
714
+ *
715
+ * @global arr $quads_options
716
+ * @param int $id id of the ad
717
+ * @return string
718
+ */
719
+ function quads_get_inline_ad_style( $id ) {
720
+ global $quads_options;
721
+
722
+ if( empty($id) ) {
723
+ return '';
724
+ }
725
+
726
+ // Basic style
727
+ $styleArray = array(
728
+ 'float:left;margin:%1$dpx %1$dpx %1$dpx 0;',
729
+ 'float:none;margin:%1$dpx 0 %1$dpx 0;text-align:center;',
730
+ 'float:right;margin:%1$dpx 0 %1$dpx %1$dpx;',
731
+ 'float:none;margin:0px;');
732
+
733
+ // Alignment
734
+ $adsalign = $quads_options['ad' . $id]['align'];
735
+
736
+ // Margin
737
+ $adsmargin = isset( $quads_options['ad' . $id]['margin'] ) ? $quads_options['ad' . $id]['margin'] : '3'; // default optin = 3
738
+ $margin = sprintf( $styleArray[( int ) $adsalign], $adsmargin );
739
+
740
+ // Do not create any inline style on AMP site
741
+ $style = !quads_is_amp_endpoint() ? apply_filters( 'quads_filter_margins', $margin, 'ad' . $id ) : '';
742
+
743
+ return $style;
744
+ }
745
+
746
  /**
747
  * Revert content to original content any remove any processing helper strings
748
  *
quick-adsense-reloaded.php CHANGED
@@ -6,7 +6,7 @@
6
  * Description: Insert Google AdSense or any Ads code into your website. A fork of Quick AdSense
7
  * Author: Rene Hermenau, WP-Staging
8
  * Author URI: https://wordpress.org/plugins/quick-adsense-reloaded/
9
- * Version: 1.4.5
10
  * Text Domain: quick-adsense-reloaded
11
  * Domain Path: languages
12
  * Credits: WP QUADS - Quick AdSense Reloaded is a fork of Quick AdSense
@@ -35,7 +35,7 @@ if( !defined( 'ABSPATH' ) )
35
 
36
  // Plugin version
37
  if( !defined( 'QUADS_VERSION' ) ) {
38
- define( 'QUADS_VERSION', '1.4.5' );
39
  }
40
 
41
  // Plugin name
6
  * Description: Insert Google AdSense or any Ads code into your website. A fork of Quick AdSense
7
  * Author: Rene Hermenau, WP-Staging
8
  * Author URI: https://wordpress.org/plugins/quick-adsense-reloaded/
9
+ * Version: 1.4.6
10
  * Text Domain: quick-adsense-reloaded
11
  * Domain Path: languages
12
  * Credits: WP QUADS - Quick AdSense Reloaded is a fork of Quick AdSense
35
 
36
  // Plugin version
37
  if( !defined( 'QUADS_VERSION' ) ) {
38
+ define( 'QUADS_VERSION', '1.4.6' );
39
  }
40
 
41
  // Plugin name
readme.txt CHANGED
@@ -9,7 +9,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
  Tags: adsense, ads, ad, google adsense, advertising, amp, ad injection, ad inserter, ad manager
10
  Requires at least: 3.6+
11
  Tested up to: 4.7.2
12
- Stable tag: 1.4.5
13
 
14
  Quick Adsense Reloaded! Quickest way to insert Google AdSense & other ads into your website. Google AdSense integration with Google AMP support
15
 
@@ -129,6 +129,11 @@ Alternative Installation:
129
 
130
  == Changelog ==
131
 
 
 
 
 
 
132
  = 1.4.5 =
133
  * New: Add new option to hide AMP ads on certain posts with WP QUADS PRO
134
 
9
  Tags: adsense, ads, ad, google adsense, advertising, amp, ad injection, ad inserter, ad manager
10
  Requires at least: 3.6+
11
  Tested up to: 4.7.2
12
+ Stable tag: 1.4.6
13
 
14
  Quick Adsense Reloaded! Quickest way to insert Google AdSense & other ads into your website. Google AdSense integration with Google AMP support
15
 
129
 
130
  == Changelog ==
131
 
132
+ = 1.4.6 =
133
+ * New: Theme API for custom theme integration of AdSense ads supports margin and alignment options now
134
+ * New: Create WP QUADS admin menue logo
135
+ * Fix: Admin warning if no adsense spots are activated is not working properly
136
+
137
  = 1.4.5 =
138
  * New: Add new option to hide AMP ads on certain posts with WP QUADS PRO
139