Advanced Ads - Version 1.6.12

Version Description

  • added filters to ad list
  • display expired date in ad list
  • display ad dates in ads list on group page
  • hide unrelated columns in ad list
  • fix saving adsense ad unit as non-superadmin
  • error message for possible jQueryUI library conflicts
  • fix widget_title override
Download this release

Release Info

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

Code changes from version 1.6.11.1 to 1.6.12

Files changed (18) hide show
  1. admin/assets/css/admin.css +8 -1
  2. admin/assets/js/admin.js +82 -0
  3. admin/class-advanced-ads-admin.php +41 -9
  4. admin/includes/class-ad-groups-list.php +19 -17
  5. admin/views/ad-list-details-column.php +10 -9
  6. admin/views/ad-list-filters.php +15 -0
  7. admin/views/ad-list-timing-column.php +15 -12
  8. admin/views/setting-license.php +1 -1
  9. admin/views/support.php +1 -1
  10. advanced-ads.php +2 -2
  11. classes/checks.php +18 -0
  12. classes/widget.php +0 -1
  13. languages/advanced-ads-de_DE.mo +0 -0
  14. languages/advanced-ads-de_DE.po +106 -80
  15. languages/advanced-ads.pot +33 -12
  16. modules/gadsense/admin/admin.php +1 -1
  17. modules/gadsense/includes/class-ad-type-adsense.php +4 -4
  18. readme.txt +11 -1
admin/assets/css/admin.css CHANGED
@@ -160,6 +160,7 @@
160
  .advads-ad-group-form label { display: inline-block; margin-bottom: 1em; }
161
  .advads-ad-group-form strong { float: left; width: 180px; }
162
  .advads-ad-group-form ul { float: left; }
 
163
 
164
  /**
165
  AD PLACEMENTS
@@ -226,6 +227,7 @@ tr:hover .on-hover { display: block; }
226
  - GENERAL
227
  -*/
228
  .advads-error-message { color: red !important; }
 
229
 
230
  /* Image Ad */
231
  #advads_type_image_wp_media .media-sidebar .setting:not([data-setting="title"]):not([data-setting="alt"]),
@@ -236,4 +238,9 @@ tr:hover .on-hover { display: block; }
236
  #advads-shortcode-modal-container-body .spinner { background: url(../../../../../../wp-admin/images/spinner.gif) no-repeat; -webkit-background-size: 20px 20px; background-size: 20px 20px; vertical-align: middle; width: 20px; height: 20px; }
237
  #advads-select-for-shortcode { box-sizing: border-box; }
238
  #advads-select-for-shortcode optgroup { font-weight: 700; font-family: Tahoma, sans-serif; }
239
- #advads-select-for-shortcode optgroup option { padding-left: 20px; }
 
 
 
 
 
160
  .advads-ad-group-form label { display: inline-block; margin-bottom: 1em; }
161
  .advads-ad-group-form strong { float: left; width: 180px; }
162
  .advads-ad-group-form ul { float: left; }
163
+ .advads-ad-group-list-ads li { padding-bottom: 10px; }
164
 
165
  /**
166
  AD PLACEMENTS
227
  - GENERAL
228
  -*/
229
  .advads-error-message { color: red !important; }
230
+ .advads-hidden { display: none; }
231
 
232
  /* Image Ad */
233
  #advads_type_image_wp_media .media-sidebar .setting:not([data-setting="title"]):not([data-setting="alt"]),
238
  #advads-shortcode-modal-container-body .spinner { background: url(../../../../../../wp-admin/images/spinner.gif) no-repeat; -webkit-background-size: 20px 20px; background-size: 20px 20px; vertical-align: middle; width: 20px; height: 20px; }
239
  #advads-select-for-shortcode { box-sizing: border-box; }
240
  #advads-select-for-shortcode optgroup { font-weight: 700; font-family: Tahoma, sans-serif; }
241
+ #advads-select-for-shortcode optgroup option { padding-left: 20px; }
242
+
243
+ /* Filter dropdowns on the ad list table */
244
+ .advads-ad-list-even { background-color: #f9f9f9 !important; }
245
+ .advads-ad-list-odd { background-color: #fff !important; }
246
+ .edit-php.post-type-advanced_ads #filter-by-date, .edit-php.post-type-advanced_ads label[for=filter-by-date], .edit-php.post-type-advanced_ads #post-query-submit { display: none; }
admin/assets/js/admin.js CHANGED
@@ -345,6 +345,8 @@ jQuery( document ).ready(function ($) {
345
  // WP 3.5+ uploader
346
  var file_frame;
347
  window.formfield = '';
 
 
348
  });
349
 
350
  /**
@@ -577,4 +579,84 @@ function advads_maybe_textarea_to_tinymce( ad_type ) {
577
  tinymce_id_ws.prop('name', textarea.prop( 'name' ) );
578
  tinymce_wrapper_div.show();
579
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
580
  }
345
  // WP 3.5+ uploader
346
  var file_frame;
347
  window.formfield = '';
348
+
349
+ advads_ad_list_build_filters();
350
  });
351
 
352
  /**
579
  tinymce_id_ws.prop('name', textarea.prop( 'name' ) );
580
  tinymce_wrapper_div.show();
581
  }
582
+ }
583
+
584
+ /**
585
+ * adds <option> tags to <select> dropdowns before the 'Filter' button on the ad list table
586
+ * @param {string} jQuery wrapped set where to find value/text for <option>
587
+ * @param {string} jQuery wrapped set with <select> tag
588
+ */
589
+ function advads_ad_list_add_items_to_dropdowns( $input, $select ) {
590
+ var all_unique_rows = [];
591
+
592
+ $input.each( function() {
593
+ var one_row = jQuery( this ).text();
594
+
595
+ if ( jQuery.inArray( one_row, all_unique_rows ) === -1 ) {
596
+ all_unique_rows.push( one_row );
597
+ $select.append(
598
+ jQuery("<option/>", {
599
+ value: one_row,
600
+ text: one_row
601
+ })
602
+ );
603
+ }
604
+ });
605
+ }
606
+
607
+ /**
608
+ * adds filter dropdowns before the 'Filter' button on the ad list table
609
+ */
610
+ function advads_ad_list_build_filters() {
611
+ var $filter_type = jQuery( '#advads-filter-type' ),
612
+ $filter_size = jQuery( '#advads-filter-size' ),
613
+ $filter_group = jQuery( '#advads-filter-group' ),
614
+ $filter_date = jQuery( '#advads-filter-date' ),
615
+ $ad_planning_col = jQuery( '.advads-filter-timing' );
616
+
617
+ advads_ad_list_add_items_to_dropdowns( jQuery( '.advads-ad-type' ), $filter_type );
618
+ advads_ad_list_add_items_to_dropdowns( jQuery( '.advads-ad-size' ), $filter_size );
619
+ advads_ad_list_add_items_to_dropdowns( jQuery( '.taxonomy-advanced_ads_groups a' ), $filter_group );
620
+ // if such classes exist on the page - show related <option>s
621
+ jQuery.each( ['advads-filter-future', 'advads-filter-any-exp-date', 'advads-filter-expired' ], function( i, v ) {
622
+ if ( $ad_planning_col.hasClass( v ) ) {
623
+ $filter_date.children( 'option[value="' + v + '"] ' ).show();
624
+ }
625
+ });
626
+
627
+ jQuery( "#advads-filter-type, #advads-filter-size, #advads-filter-group, #advads-filter-date" ).change( function() {
628
+ var $the_list_tr = jQuery( '#the-list tr' ).removeClass( 'advads-hidden' );
629
+
630
+ if ( $filter_type.val() ) {
631
+ $the_list_tr.filter( function() {
632
+ return jQuery( this ).find( '.advads-ad-type' ).text() !== $filter_type.val();
633
+ }).addClass( 'advads-hidden' );
634
+ }
635
+ if ( $filter_size.val() ) {
636
+ $the_list_tr.not( '.advads-hidden' ).filter ( function() {
637
+ return jQuery( this ).find( '.advads-ad-size' ).text() !== $filter_size.val();
638
+ }).addClass( 'advads-hidden' );
639
+ }
640
+ if ( $filter_date.val() ) {
641
+ $the_list_tr.not( '.advads-hidden' ).filter( function() {
642
+ return jQuery( this ).find( '.' + $filter_date.val() ).length === 0;
643
+ }).addClass( 'advads-hidden' );
644
+ }
645
+ if ( $filter_group.val() ) {
646
+ $the_list_tr.not( '.advads-hidden' ).filter( function() {
647
+ var ret = false;
648
+ //iterate through each group within current tr
649
+ jQuery( this ).find( '.taxonomy-advanced_ads_groups a' ).each( function() {
650
+ if ( jQuery( this ).text() === $filter_group.val() ) {
651
+ ret = true;
652
+ return false; //break the loop
653
+ }
654
+ });
655
+ return ret === false;
656
+ }).addClass( 'advads-hidden' );
657
+ }
658
+ // create stripped table, because css nth-child does not counts hidden rows
659
+ $the_list_tr.not( '.advads-hidden' ).filter( ':odd' ).addClass( 'advads-ad-list-odd' ).removeClass( 'advads-ad-list-even' ).end()
660
+ .filter( ':even' ).addClass( 'advads-ad-list-even' ).removeClass( 'advads-ad-list-odd' );
661
+ });
662
  }
admin/class-advanced-ads-admin.php CHANGED
@@ -85,7 +85,7 @@ class Advanced_Ads_Admin {
85
  add_filter( 'manage_advanced_ads_posts_columns', array($this, 'ad_list_columns_head') ); // extra column
86
  add_filter( 'manage_advanced_ads_posts_custom_column', array($this, 'ad_list_columns_content'), 10, 2 ); // extra column
87
  add_filter( 'manage_advanced_ads_posts_custom_column', array($this, 'ad_list_columns_timing'), 10, 2 ); // extra column
88
-
89
  }
90
 
91
  public function wp_plugins_loaded() {
@@ -268,11 +268,11 @@ class Advanced_Ads_Admin {
268
  $this->plugin_slug, __( 'Advanced Ads Settings', 'advanced-ads' ), __( 'Settings', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-settings', array($this, 'display_plugin_settings_page')
269
  );
270
  add_submenu_page(
271
- null, __( 'Advanced Ads Debugging', 'advanced-ads' ), __( 'Debug', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-debug', array($this, 'display_plugin_debug_page')
272
  );
273
  // intro page
274
  add_submenu_page(
275
- null, __( 'Advanced Ads Intro', 'advanced-ads' ), __( 'Advanced Ads Intro', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-intro', array($this, 'display_plugin_intro_page')
276
  );
277
  // add support page
278
  add_submenu_page(
@@ -1147,9 +1147,22 @@ class Advanced_Ads_Admin {
1147
  $new_columns[ 'ad_timing' ] = __( 'Ad Planning', 'advanced-ads' );
1148
  }
1149
  }
1150
-
1151
- // remove the date
1152
- unset( $new_columns[ 'date' ] );
 
 
 
 
 
 
 
 
 
 
 
 
 
1153
 
1154
  return $new_columns;
1155
  }
@@ -1208,26 +1221,45 @@ class Advanced_Ads_Admin {
1208
  * @param int $ad_id id of the ad
1209
  */
1210
  public function ad_list_columns_timing($column_name, $ad_id) {
 
1211
  if ( $column_name == 'ad_timing' ) {
1212
  $ad = new Advanced_Ads_Ad( $ad_id );
1213
 
1214
  $expiry = false;
1215
  $post_future = false;
1216
  $post_start = get_the_date('U', $ad->id );
1217
-
 
 
1218
  if( isset( $ad->expiry_date ) && $ad->expiry_date ){
1219
- if( $ad->expiry_date > time() ){
1220
- $expiry = $ad->expiry_date;
 
 
 
1221
  }
1222
  }
1223
  if( $post_start > time() ){
1224
  $post_future = $post_start;
 
1225
  }
1226
 
1227
  include ADVADS_BASE_PATH . 'admin/views/ad-list-timing-column.php';
1228
  }
1229
  }
1230
 
 
 
 
 
 
 
 
 
 
 
 
 
1231
  /**
1232
  * add a meta box to post type edit screens with ad settings
1233
  *
85
  add_filter( 'manage_advanced_ads_posts_columns', array($this, 'ad_list_columns_head') ); // extra column
86
  add_filter( 'manage_advanced_ads_posts_custom_column', array($this, 'ad_list_columns_content'), 10, 2 ); // extra column
87
  add_filter( 'manage_advanced_ads_posts_custom_column', array($this, 'ad_list_columns_timing'), 10, 2 ); // extra column
88
+ add_action( 'restrict_manage_posts', array( $this, 'ad_list_add_filters') );
89
  }
90
 
91
  public function wp_plugins_loaded() {
268
  $this->plugin_slug, __( 'Advanced Ads Settings', 'advanced-ads' ), __( 'Settings', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-settings', array($this, 'display_plugin_settings_page')
269
  );
270
  add_submenu_page(
271
+ 'options.php', __( 'Advanced Ads Debugging', 'advanced-ads' ), __( 'Debug', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-debug', array($this, 'display_plugin_debug_page')
272
  );
273
  // intro page
274
  add_submenu_page(
275
+ 'options.php', __( 'Advanced Ads Intro', 'advanced-ads' ), __( 'Advanced Ads Intro', 'advanced-ads' ), 'manage_options', $this->plugin_slug . '-intro', array($this, 'display_plugin_intro_page')
276
  );
277
  // add support page
278
  add_submenu_page(
1147
  $new_columns[ 'ad_timing' ] = __( 'Ad Planning', 'advanced-ads' );
1148
  }
1149
  }
1150
+
1151
+ // white-listed columns
1152
+ $whitelist = apply_filters( 'advanced-ads-ad-list-allowed-columns', array(
1153
+ 'cb', // checkbox
1154
+ 'title',
1155
+ 'ad_details',
1156
+ 'ad_timing',
1157
+ 'taxonomy-advanced_ads_groups',
1158
+ ) );
1159
+
1160
+ // remove non-white-listed columns
1161
+ foreach( $new_columns as $_key => $_value ){
1162
+ if( ! in_array( $_key, $whitelist ) ){
1163
+ unset( $new_columns[ $_key ] );
1164
+ }
1165
+ }
1166
 
1167
  return $new_columns;
1168
  }
1221
  * @param int $ad_id id of the ad
1222
  */
1223
  public function ad_list_columns_timing($column_name, $ad_id) {
1224
+
1225
  if ( $column_name == 'ad_timing' ) {
1226
  $ad = new Advanced_Ads_Ad( $ad_id );
1227
 
1228
  $expiry = false;
1229
  $post_future = false;
1230
  $post_start = get_the_date('U', $ad->id );
1231
+ $html_classes = 'advads-filter-timing';
1232
+ $expiry_date_format = get_option( 'date_format' ). ', ' . get_option( 'time_format' );
1233
+
1234
  if( isset( $ad->expiry_date ) && $ad->expiry_date ){
1235
+ $html_classes .= ' advads-filter-any-exp-date';
1236
+
1237
+ $expiry = $ad->expiry_date;
1238
+ if( $ad->expiry_date < time() ){
1239
+ $html_classes .= ' advads-filter-expired';
1240
  }
1241
  }
1242
  if( $post_start > time() ){
1243
  $post_future = $post_start;
1244
+ $html_classes .= ' advads-filter-future';
1245
  }
1246
 
1247
  include ADVADS_BASE_PATH . 'admin/views/ad-list-timing-column.php';
1248
  }
1249
  }
1250
 
1251
+ /**
1252
+ * adds filter dropdowns before the 'Filter' button on the ad list table
1253
+ */
1254
+ function ad_list_add_filters() {
1255
+ $screen = get_current_screen();
1256
+ if ( ! isset( $screen->id ) || $screen->id !== 'edit-advanced_ads' ) {
1257
+ return;
1258
+ }
1259
+
1260
+ include ADVADS_BASE_PATH . 'admin/views/ad-list-filters.php';
1261
+ }
1262
+
1263
  /**
1264
  * add a meta box to post type edit screens with ad settings
1265
  *
admin/includes/class-ad-groups-list.php CHANGED
@@ -121,9 +121,8 @@ class Advanced_Ads_Groups_List {
121
  $row .= '</select></td></tr>';
122
  $ad_form_rows[$_ad->ID] = $row;
123
  }
124
-
125
- $ad_form_rows = $this->remove_empty_weights( $ad_form_rows );
126
  }
 
127
  // Restore original Post Data
128
  wp_reset_postdata();
129
 
@@ -152,25 +151,28 @@ class Advanced_Ads_Groups_List {
152
  $ads->the_post();
153
  $line_output = '<li><a href="' . get_edit_post_link( get_the_ID() ) . '">' . get_the_title() . '</a>';
154
 
155
- $status = get_post_status();
156
- switch ( $status ){
157
- case 'future' :
158
- $line_output .= '<i>(' . __( 'scheduled', 'advanced-ads' ) . ')</i>';
159
- break;
160
- case 'pending' :
161
- $line_output .= '<i>(' . __( 'pending', 'advanced-ads' ) . ')</i>';
162
- break;
163
  }
164
- // check expiry date
165
  $ad = new Advanced_Ads_Ad( get_the_ID() );
166
- if( ! $ad->can_display_by_expiry_date() ) {
167
- $line_output .= '<i>(' . __( 'expired', 'advanced-ads' ) . ')</i>';
 
 
 
168
  }
169
-
170
- $_weight = (isset($weights[get_the_ID()])) ? $weights[get_the_ID()] : Advanced_Ads_Group::MAX_AD_GROUP_WEIGHT;
171
- if ( $group->type == 'default' && $weight_sum ) {
172
- $line_output .= '<span class="ad-weight" title="'.__( 'Ad weight', 'advanced-ads' ).'">' . number_format( ($_weight / $weight_sum) * 100 ) .'%</span></li>';
 
 
 
173
  }
 
 
174
  $ads_output[get_the_ID()] = $line_output;
175
  }
176
 
121
  $row .= '</select></td></tr>';
122
  $ad_form_rows[$_ad->ID] = $row;
123
  }
 
 
124
  }
125
+ $ad_form_rows = $this->remove_empty_weights( $ad_form_rows );
126
  // Restore original Post Data
127
  wp_reset_postdata();
128
 
151
  $ads->the_post();
152
  $line_output = '<li><a href="' . get_edit_post_link( get_the_ID() ) . '">' . get_the_title() . '</a>';
153
 
154
+ $_weight = (isset($weights[get_the_ID()])) ? $weights[get_the_ID()] : Advanced_Ads_Group::MAX_AD_GROUP_WEIGHT;
155
+ if ( $group->type == 'default' && $weight_sum ) {
156
+ $line_output .= '<span class="ad-weight" title="'.__( 'Ad weight', 'advanced-ads' ).'">' . number_format( ($_weight / $weight_sum) * 100 ) .'%</span>';
 
 
 
 
 
157
  }
158
+
159
  $ad = new Advanced_Ads_Ad( get_the_ID() );
160
+ $expiry_date_format = get_option( 'date_format' ). ', ' . get_option( 'time_format' );
161
+ $post_start = get_the_date('U', $ad->id );
162
+
163
+ if ( $post_start > time() ) {
164
+ $line_output .= '<br />' . sprintf( __( 'starts %s', 'advanced-ads' ), date( $expiry_date_format, $post_start ) );
165
  }
166
+ if ( isset( $ad->expiry_date ) && $ad->expiry_date ) {
167
+ $expiry = $ad->expiry_date;
168
+ if ( $expiry > time() ) {
169
+ $line_output .= '<br />' . sprintf( __( 'expires %s', 'advanced-ads' ), date( $expiry_date_format, $expiry ) );
170
+ } elseif ( $expiry <= time() ) {
171
+ $line_output .= '<br />' . sprintf( __( '<strong>expired</strong> %s', 'advanced-ads' ), date( $expiry_date_format, $expiry ) );
172
+ }
173
  }
174
+ $line_output .= '</li>';
175
+
176
  $ads_output[get_the_ID()] = $line_output;
177
  }
178
 
admin/views/ad-list-details-column.php CHANGED
@@ -1,10 +1,11 @@
1
  <fieldset class="inline-edit-col-left">
2
- <div class="inline-edit-col"><?php
3
- if ( ! empty($type) ) :
4
- ?><p><strong><?php echo $type; ?></strong></p><?php
5
- endif;
6
- if ( ! empty($size) ) :
7
- ?><p><?php echo $size; ?></p><?php
8
- endif;
9
- do_action( 'advanced-ads-ad-list-details-column-after', $ad );
10
- ?></div></fieldset>
 
1
  <fieldset class="inline-edit-col-left">
2
+ <div class="inline-edit-col">
3
+ <?php if ( ! empty( $type ) ) : ?>
4
+ <p><strong class="advads-ad-type"><?php echo $type; ?></strong></p>
5
+ <?php endif;
6
+ if ( ! empty( $size) ) : ?>
7
+ <p class="advads-ad-size"><?php echo $size; ?></p><?php
8
+ endif;
9
+ do_action( 'advanced-ads-ad-list-details-column-after', $ad ); ?>
10
+ </div>
11
+ </fieldset>
admin/views/ad-list-filters.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <select id="advads-filter-type">
2
+ <option value="">- <?php _e( 'all ad types', 'advanced-ads' ); ?> -</option>
3
+ </select>
4
+ <select id="advads-filter-size">
5
+ <option value="">- <?php _e( 'all ad sizes', 'advanced-ads' ); ?> -</option>
6
+ </select>
7
+ <select id="advads-filter-date">
8
+ <option value="">- <?php _e( 'all ad dates', 'advanced-ads' ); ?> -</option>
9
+ <option value="advads-filter-expired" style="display:none;"><?php _e( 'expired', 'advanced-ads' ); ?></option>
10
+ <option value="advads-filter-any-exp-date" style="display:none;"><?php _e( 'any expiry date', 'advanced-ads' ); ?></option>
11
+ <option value="advads-filter-future" style="display:none;"><?php _e( 'planned', 'advanced-ads' ); ?></option>
12
+ </select>
13
+ <select id="advads-filter-group">
14
+ <option value="">- <?php _e( 'all ad groups', 'advanced-ads' ); ?> -</option>
15
+ </select>
admin/views/ad-list-timing-column.php CHANGED
@@ -1,13 +1,16 @@
1
  <fieldset class="inline-edit-col-left">
2
- <div class="inline-edit-col"><?php
3
- if( $post_future ) :
4
- ?><p><?php printf(__( 'starts %s', 'advanced-ads' ), date( 'd.m.Y, H:i', $post_future ) ); ?></p><?php
5
- endif;
6
- if( $expiry ) :
7
- ?><p><?php printf(__( 'expires %s', 'advanced-ads' ), date( 'd.m.Y, H:i', $expiry ) ); ?></p><?php
8
- endif;
9
- if ( ! empty($size) ) :
10
- ?><p><?php echo $size; ?></p><?php
11
- endif;
12
- do_action( 'advanced-ads-ad-list-timing-column-after', $ad );
13
- ?></div></fieldset>
 
 
 
1
  <fieldset class="inline-edit-col-left">
2
+ <div class="inline-edit-col <?php echo $html_classes; ?>">
3
+ <?php if ( $post_future ) : ?>
4
+ <p><?php printf( __( 'starts %s', 'advanced-ads' ), date( $expiry_date_format, $post_future ) ); ?></p>
5
+ <?php endif;
6
+ if ( $expiry && $expiry > time() ) : ?>
7
+ <p><?php printf( __( 'expires %s', 'advanced-ads' ), date( $expiry_date_format, $expiry ) ); ?></p>
8
+ <?php elseif( $expiry && $expiry <= time() ) : ?>
9
+ <p><?php printf( __( '<strong>expired</strong> %s', 'advanced-ads' ), date( $expiry_date_format, $expiry ) ); ?></p>
10
+ <?php endif;
11
+ /* if ( ! empty( $size) ) : ?>
12
+ <p><?php echo $size; ?></p>
13
+ <?php endif; */
14
+ do_action( 'advanced-ads-ad-list-timing-column-after', $ad ); ?>
15
+ </div>
16
+ </fieldset>
admin/views/setting-license.php CHANGED
@@ -39,7 +39,7 @@ else :
39
  endif;
40
  ?><span class="advads-license-activate-error" <?php if( ! $errortext ) echo 'style="display: none;"'; ?>><?php echo $errortext; ?></span>
41
  <span class="advads-license-activate-active" <?php if( ! $show_active ) echo 'style="display: none;"'; ?>><?php _e( 'active', 'advanced-ads' );
42
- ?>&nbsp;<?php if( isset( $days_left ) && $days_left > 0 ) echo sprintf( __('(%d days left)', 'advanced-ads' ), $days_left );
43
  ?></span><?php
44
  if($license_key === '') :
45
  ?><p class="description"><?php _e( '1. enter the key and save options; 2. click the activate button behind the field', 'advanced-ads' ); ?></p><?php
39
  endif;
40
  ?><span class="advads-license-activate-error" <?php if( ! $errortext ) echo 'style="display: none;"'; ?>><?php echo $errortext; ?></span>
41
  <span class="advads-license-activate-active" <?php if( ! $show_active ) echo 'style="display: none;"'; ?>><?php _e( 'active', 'advanced-ads' );
42
+ if( isset( $days_left ) && 0 < $days_left && 91 > $days_left ) { echo '&nbsp;' . sprintf( __('(%d days left)', 'advanced-ads' ), $days_left ); }
43
  ?></span><?php
44
  if($license_key === '') :
45
  ?><p class="description"><?php _e( '1. enter the key and save options; 2. click the activate button behind the field', 'advanced-ads' ); ?></p><?php
admin/views/support.php CHANGED
@@ -47,7 +47,7 @@
47
  if( isset( $options['disabled-ads']) ){
48
  $messages[] = sprintf(__( 'Ads are disabled for all or some pages. See "disabled ads" in <a href="%s">settings</a>.', 'advanced-ads' ), admin_url('admin.php?page=advanced-ads-settings#top#general') );
49
  }
50
-
51
 
52
  if( count( $messages )) :
53
  foreach( $messages as $_message ) :
47
  if( isset( $options['disabled-ads']) ){
48
  $messages[] = sprintf(__( 'Ads are disabled for all or some pages. See "disabled ads" in <a href="%s">settings</a>.', 'advanced-ads' ), admin_url('admin.php?page=advanced-ads-settings#top#general') );
49
  }
50
+ Advanced_Ads_Checks::jquery_ui_conflict();
51
 
52
  if( count( $messages )) :
53
  foreach( $messages as $_message ) :
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.6.11.1
16
  * Author: Thomas Maier
17
  * Author URI: http://webgilde.com
18
  * Text Domain: advanced-ads
@@ -38,7 +38,7 @@ define( 'ADVADS_BASE_DIR', dirname( plugin_basename( __FILE__ ) ) ); // director
38
  // general and global slug, e.g. to store options in WP, textdomain
39
  define( 'ADVADS_SLUG', 'advanced-ads' );
40
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
41
- define( 'ADVADS_VERSION', '1.6.11.1' );
42
 
43
  /*----------------------------------------------------------------------------*
44
  * 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.6.12
16
  * Author: Thomas Maier
17
  * Author URI: http://webgilde.com
18
  * Text Domain: advanced-ads
38
  // general and global slug, e.g. to store options in WP, textdomain
39
  define( 'ADVADS_SLUG', 'advanced-ads' );
40
  define( 'ADVADS_URL', 'https://wpadvancedads.com/' );
41
+ define( 'ADVADS_VERSION', '1.6.12' );
42
 
43
  /*----------------------------------------------------------------------------*
44
  * Autoloading, modules and functions
classes/checks.php CHANGED
@@ -212,4 +212,22 @@ class Advanced_Ads_Checks {
212
 
213
  return $conflicting_plugins;
214
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
215
  }
212
 
213
  return $conflicting_plugins;
214
  }
215
+
216
+ /**
217
+ * check for potential jQuery errors
218
+ * only script, so no return, but direct output
219
+ *
220
+ */
221
+ public static function jquery_ui_conflict(){
222
+ ?>
223
+ <div id="advads-jqueryui-conflict-message" style="display:none;" class="message error"><p><?php printf( __( 'Possible conflict between jQueryUI library, used by Advanced Ads and other libraries (probably <a href="%s">Twitter Bootstrap</a>). This might lead to misfortunate formats in forms, but should not damage features.', 'advanced-ads' ), 'http://getbootstrap.com/javascript/#js-noconflict' ); ?></p></div>
224
+ <script>// string from jquery-ui source code
225
+ jQuery(document).ready(function(){
226
+ var needle = 'var g="string"==typeof f,h=c.call(arguments,1)';
227
+ if ( jQuery.fn.button.toString().indexOf( needle ) === -1 || jQuery.fn.tooltip.toString().indexOf( needle ) === -1 ) {
228
+ jQuery( '#advads-jqueryui-conflict-message' ).show();
229
+ }
230
+ });
231
+ </script><?php
232
+ }
233
  }
classes/widget.php CHANGED
@@ -38,7 +38,6 @@ class Advanced_Ads_Widget extends WP_Widget {
38
 
39
  extract( $args );
40
  $item_id = empty($instance['item_id']) ? '' : $instance['item_id'];
41
- $title = empty($instance['title']) ? '' : $instance['title'];
42
 
43
  $output = self::output( $item_id );
44
  if( $output == '' ){
38
 
39
  extract( $args );
40
  $item_id = empty($instance['item_id']) ? '' : $instance['item_id'];
 
41
 
42
  $output = self::output( $item_id );
43
  if( $output == '' ){
languages/advanced-ads-de_DE.mo CHANGED
Binary file
languages/advanced-ads-de_DE.po CHANGED
@@ -3,7 +3,7 @@ msgstr ""
3
  "Project-Id-Version: Advanved Ads\n"
4
  "Report-Msgid-Bugs-To: http://wordpress.org/plugins/plugin-name\n"
5
  "POT-Creation-Date: 2015-01-27 16:47+0100\n"
6
- "PO-Revision-Date: Thu Oct 29 2015 21:40:08 GMT+0100 (CET)\n"
7
  "Last-Translator: admin <post@webzunft.de>\n"
8
  "Language-Team: webgilde <thomas.maier@webgilde.com>\n"
9
  "Language: German\n"
@@ -26,77 +26,41 @@ msgstr ""
26
  "X-Textdomain-Support: yes\n"
27
  "X-Loco-Target-Locale: de_DE"
28
 
29
- #: ../admin/class-advanced-ads-admin.php:1020
30
- msgid ""
31
- "Please check your post content. A priority of 10 and below might cause "
32
- "issues (wpautop function might run twice)."
33
- msgstr ""
34
- "Bitte überprüfen Sie die Anzeigen im Beitrag. Eine Priorität von 10 und "
35
- "darunter könnte Probleme verursachen (wg. wpautop)"
36
 
37
- #: ../admin/class-advanced-ads-admin.php:1147
38
- msgid "Ad Planning"
39
- msgstr "Planung"
40
-
41
- #: ../admin/includes/shortcode-creator-l10n.php:10
42
- msgctxt "shortcode creator"
43
- msgid "Add an ad"
44
- msgstr "Anzeige einfügen"
45
-
46
- #: ../admin/includes/shortcode-creator-l10n.php:11
47
- msgctxt "shortcode creator"
48
- msgid "Add shortcode"
49
- msgstr "Shortcode einfügen"
50
-
51
- #: ../admin/includes/shortcode-creator-l10n.php:12
52
- msgctxt "shortcode creator"
53
- msgid "Cancel"
54
- msgstr "Abbruch"
55
-
56
- #: ../admin/views/ad-list-timing-column.php:4
57
- #, php-format
58
- msgid "starts %s"
59
- msgstr "Start %s"
60
-
61
- #: ../admin/views/ad-list-timing-column.php:7
62
- #, php-format
63
- msgid "expires %s"
64
- msgstr "Ende %s"
65
-
66
- #: ../admin/views/setting-license.php:29
67
- msgid "Please enter a valid license key"
68
- msgstr "Bitte geben Sie eine gültige Lizenz ein"
69
 
70
- #: ../admin/views/setting-license.php:31
71
- msgid "License key invalid"
72
- msgstr "Der Lizenzschlüssel ist ungültig"
73
 
74
- #: ../admin/views/support.php:48
75
  #, php-format
76
  msgid ""
77
- "Ads are disabled for all or some pages. See \"disabled ads\" in <a "
78
- "href=\"%s\">settings</a>."
 
79
  msgstr ""
80
- "Anzeigen sind für alle oder einige Seiten deaktiviert. Vgl. <a "
81
- "href=\"%s\">Einstellungen</a>."
82
-
83
- #: ../classes/ad_placements.php:61
84
- msgid "Sidebar Widget"
85
- msgstr "Sidebar Widget"
86
-
87
- #: ../classes/ad_placements.php:62
88
- msgid ""
89
- "Create a sidebar widget with an ad. Can be placed and used like any other "
90
- "widget."
91
- msgstr "Diese Platzierung kann in einem Widget verwendet werden."
92
 
93
- #: ../modules/gadsense/admin/admin.php:205
94
  msgid ""
95
- "Due to technical restrictions, the limit does not work on placements with "
96
- "cache-busting enabled."
 
 
97
  msgstr ""
98
- "Aufgrund technischer Einschränkungen ist das Limit in Platzierungen mit "
99
- "Cache-Busting nicht verfügbar."
 
100
 
101
  #. Name of the plugin
102
  msgid "Advanced Ads"
@@ -393,6 +357,14 @@ msgstr ""
393
  "werden überall dort, wo Beiträge geladen werden, angezeigt (z.B. auch auf "
394
  "Archiv-Seiten)."
395
 
 
 
 
 
 
 
 
 
396
  #: ../admin/class-advanced-ads-admin.php:1022
397
  msgid ""
398
  "Play with this value in order to change the priority of the injected ads "
@@ -453,6 +425,10 @@ msgstr ""
453
  msgid "Ad Details"
454
  msgstr "Anzeigeneinstellungen"
455
 
 
 
 
 
456
  #: ../admin/class-advanced-ads-admin.php:1249
457
  msgid "Ad Settings"
458
  msgstr "Anzeigen-Einstellungen"
@@ -496,7 +472,7 @@ msgstr ""
496
  msgid "Please enter and save a valid license key first."
497
  msgstr "Bitte speichern Sie zunächst einen gültigen Lizenzschlüssel."
498
 
499
- #: ../admin/class-advanced-ads-admin.php:1490
500
  #, php-format
501
  msgid "License is invalid. Reason: %s"
502
  msgstr "Die Lizenz ist ungültig. Grund: %s"
@@ -1090,6 +1066,21 @@ msgstr ""
1090
  "Ads</strong> sind abgelaufen. Support und Updates sind deaktiviert. Bitte "
1091
  "besuchen Sie die <a href=\"%s\">Lizenz-Übersicht</a> für weitere Informationen."
1092
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1093
  #: ../admin/views/ad-display-metabox.php:8
1094
  msgid "Choose where to display the ad and where to hide it."
1095
  msgstr "Wählen Sie, wo die Anzeige sichtbar und wo sie versteckt ist."
@@ -1402,6 +1393,16 @@ msgstr "Beschreibung angeben"
1402
  msgid "Internal description or your own notes about this ad."
1403
  msgstr "Eigene Beschreibung und Notizen zu dieser Anzeige."
1404
 
 
 
 
 
 
 
 
 
 
 
1405
  #: ../admin/views/ad-main-metabox.php:3
1406
  msgid "No ad types defined"
1407
  msgstr "Keine Anzeigentypen definiert"
@@ -1486,15 +1487,15 @@ msgid ""
1486
  "with a space"
1487
  msgstr "Eine oder mehrere, durch Leerzeichen festgelegte Class-Attribute."
1488
 
1489
- #: ../admin/views/ad-parameters-metabox.php:25 ../classes/ad_ajax_callbacks.php:51
1490
  msgid "size:"
1491
  msgstr "Größe:"
1492
 
1493
- #: ../admin/views/ad-parameters-metabox.php:26 ../classes/ad_ajax_callbacks.php:52
1494
  msgid "width"
1495
  msgstr "Breite"
1496
 
1497
- #: ../admin/views/ad-parameters-metabox.php:27 ../classes/ad_ajax_callbacks.php:53
1498
  msgid "height"
1499
  msgstr "Höhe"
1500
 
@@ -1909,20 +1910,28 @@ msgstr ""
1909
  msgid "License key"
1910
  msgstr "Lizenzschlüssel"
1911
 
1912
- #: ../admin/views/setting-license.php:26
1913
  msgid "Activate License"
1914
  msgstr "Lizenz aktivieren"
1915
 
 
 
 
 
1916
  #: ../admin/views/setting-license.php:37
 
 
 
 
1917
  msgid "active"
1918
  msgstr "aktiv"
1919
 
1920
- #: ../admin/views/setting-license.php:38
1921
  #, php-format
1922
  msgid "(%d days left)"
1923
  msgstr "(noch %d Tage)"
1924
 
1925
- #: ../admin/views/setting-license.php:41
1926
  msgid ""
1927
  "1. enter the key and save options; 2. click the activate button behind the "
1928
  "field"
@@ -2078,6 +2087,15 @@ msgstr ""
2078
  "Plugins die (teilweise) Probleme verursachen können: <strong>%1$s</strong>. "
2079
  "<a href=\"%2$s\" target=\"_blank\">Mehr erfahren</a>."
2080
 
 
 
 
 
 
 
 
 
 
2081
  #: ../admin/views/support.php:57
2082
  msgid "Contact"
2083
  msgstr "Kontakt aufnehmen"
@@ -2172,6 +2190,16 @@ msgstr ""
2172
  "Injiziert in den Beitrags-Inhalt. Sie können den Absatz oder die Überschrift "
2173
  "wählen, nach dem die Anzeige eingebunden wird."
2174
 
 
 
 
 
 
 
 
 
 
 
2175
  #: ../classes/ad_placements.php:204
2176
  #, php-format
2177
  msgid "paragraph (%s)"
@@ -2527,20 +2555,18 @@ msgstr ""
2527
  msgid "Notice: Advanced Ads only considers the AdSense ad type for this limit."
2528
  msgstr "Hinweis: Advanced Ads zählt nur die AdSense-Anzeigentypen für dieses Limit."
2529
 
 
 
 
 
 
 
 
 
2530
  #: ../modules/gadsense/admin/admin.php:219
2531
  msgid "Insert Page-Level ads code on all pages."
2532
  msgstr "Code für Anzeigen auf Seitenebene auf allen Seiten einbinden."
2533
 
2534
- #: ../modules/gadsense/admin/admin.php:221
2535
- msgid ""
2536
- "You still need to enable Page-Level ads in your AdSense account. See <a "
2537
- "href=\"https://support.google.com/adsense/answer/6245304\" "
2538
- "target=\"_blank\">AdSense Help</a> for more information"
2539
- msgstr ""
2540
- "Sie müssen die Anzeigen auf Seitenebene auch in Ihrem AdSense-Account "
2541
- "aktivieren. Vgl. <a href=\"https://support.google.com/adsense/answer/6245304\" "
2542
- "target=\"_blank\">AdSense-Hilfe</a>."
2543
-
2544
  #: ../modules/gadsense/admin/admin.php:240 ../modules/gadsense/includes/class-ad-
2545
  #: type-adsense.php:73
2546
  msgid "The Publisher ID has an incorrect format. (must start with \"pub-\")"
3
  "Project-Id-Version: Advanved Ads\n"
4
  "Report-Msgid-Bugs-To: http://wordpress.org/plugins/plugin-name\n"
5
  "POT-Creation-Date: 2015-01-27 16:47+0100\n"
6
+ "PO-Revision-Date: Wed Nov 11 2015 11:47:33 GMT+0100 (CET)\n"
7
  "Last-Translator: admin <post@webzunft.de>\n"
8
  "Language-Team: webgilde <thomas.maier@webgilde.com>\n"
9
  "Language: German\n"
26
  "X-Textdomain-Support: yes\n"
27
  "X-Loco-Target-Locale: de_DE"
28
 
29
+ #: ../admin/class-advanced-ads-admin.php:1514
30
+ msgid "Error while trying to disable the license. Please contact support."
31
+ msgstr "Fehler beim Deaktivieren der Lizenz. Bitte kontaktieren Sie den Support."
 
 
 
 
32
 
33
+ #: ../admin/class-advanced-ads-admin.php:1545
34
+ msgid "License couldn’t be deactivated. Please try again later or contact support."
35
+ msgstr ""
36
+ "Die Lizenz konnte nicht deaktiviert werden. Bitte versuchen Sie es später "
37
+ "oder kontaktieren Sie den Support."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
38
 
39
+ #: ../admin/views/setting-license.php:24
40
+ msgid "Deactivate License"
41
+ msgstr "Lizenz deaktivieren"
42
 
43
+ #: ../classes/checks.php:223
44
  #, php-format
45
  msgid ""
46
+ "Possible conflict between jQueryUI library, used by Advanced Ads and other "
47
+ "libraries (probably <a href=\"%s\">Twitter Bootstrap</a>). This might lead to "
48
+ "misfortunate formats in forms, but should not damage features."
49
  msgstr ""
50
+ "Möglicher Konflikt zwischen jQueryUI Bibliotheken von Advanced Ads und "
51
+ "anderen Plugins/Themes. Es kann zu ungünstigen Formatierungen, jedoch nicht "
52
+ "zu Problemen mit Funktionen führen."
 
 
 
 
 
 
 
 
 
53
 
54
+ #: ../modules/gadsense/admin/admin.php:221
55
  msgid ""
56
+ "You still need to enable Page-Level ads in your AdSense account. See <a "
57
+ "href=\"https://support.google.com/adsense/answer/6245304\" "
58
+ "target=\"_blank\">AdSense Help</a> (requires AdSense-login) for more "
59
+ "information"
60
  msgstr ""
61
+ "Sie müssen die Anzeigen auf Seitenebene auch in Ihrem AdSense-Account "
62
+ "aktivieren. Vgl. <a href=\"https://support.google.com/adsense/answer/6245304\" "
63
+ "target=\"_blank\">AdSense-Hilfe</a> (wenn in AdSense eingeloggt)."
64
 
65
  #. Name of the plugin
66
  msgid "Advanced Ads"
357
  "werden überall dort, wo Beiträge geladen werden, angezeigt (z.B. auch auf "
358
  "Archiv-Seiten)."
359
 
360
+ #: ../admin/class-advanced-ads-admin.php:1020
361
+ msgid ""
362
+ "Please check your post content. A priority of 10 and below might cause "
363
+ "issues (wpautop function might run twice)."
364
+ msgstr ""
365
+ "Bitte überprüfen Sie die Anzeigen im Beitrag. Eine Priorität von 10 und "
366
+ "darunter könnte Probleme verursachen (wg. wpautop)"
367
+
368
  #: ../admin/class-advanced-ads-admin.php:1022
369
  msgid ""
370
  "Play with this value in order to change the priority of the injected ads "
425
  msgid "Ad Details"
426
  msgstr "Anzeigeneinstellungen"
427
 
428
+ #: ../admin/class-advanced-ads-admin.php:1147
429
+ msgid "Ad Planning"
430
+ msgstr "Planung"
431
+
432
  #: ../admin/class-advanced-ads-admin.php:1249
433
  msgid "Ad Settings"
434
  msgstr "Anzeigen-Einstellungen"
472
  msgid "Please enter and save a valid license key first."
473
  msgstr "Bitte speichern Sie zunächst einen gültigen Lizenzschlüssel."
474
 
475
+ #: ../admin/class-advanced-ads-admin.php:1496
476
  #, php-format
477
  msgid "License is invalid. Reason: %s"
478
  msgstr "Die Lizenz ist ungültig. Grund: %s"
1066
  "Ads</strong> sind abgelaufen. Support und Updates sind deaktiviert. Bitte "
1067
  "besuchen Sie die <a href=\"%s\">Lizenz-Übersicht</a> für weitere Informationen."
1068
 
1069
+ #: ../admin/includes/shortcode-creator-l10n.php:10
1070
+ msgctxt "shortcode creator"
1071
+ msgid "Add an ad"
1072
+ msgstr "Anzeige einfügen"
1073
+
1074
+ #: ../admin/includes/shortcode-creator-l10n.php:11
1075
+ msgctxt "shortcode creator"
1076
+ msgid "Add shortcode"
1077
+ msgstr "Shortcode einfügen"
1078
+
1079
+ #: ../admin/includes/shortcode-creator-l10n.php:12
1080
+ msgctxt "shortcode creator"
1081
+ msgid "Cancel"
1082
+ msgstr "Abbruch"
1083
+
1084
  #: ../admin/views/ad-display-metabox.php:8
1085
  msgid "Choose where to display the ad and where to hide it."
1086
  msgstr "Wählen Sie, wo die Anzeige sichtbar und wo sie versteckt ist."
1393
  msgid "Internal description or your own notes about this ad."
1394
  msgstr "Eigene Beschreibung und Notizen zu dieser Anzeige."
1395
 
1396
+ #: ../admin/views/ad-list-timing-column.php:4
1397
+ #, php-format
1398
+ msgid "starts %s"
1399
+ msgstr "Start %s"
1400
+
1401
+ #: ../admin/views/ad-list-timing-column.php:7
1402
+ #, php-format
1403
+ msgid "expires %s"
1404
+ msgstr "Ende %s"
1405
+
1406
  #: ../admin/views/ad-main-metabox.php:3
1407
  msgid "No ad types defined"
1408
  msgstr "Keine Anzeigentypen definiert"
1487
  "with a space"
1488
  msgstr "Eine oder mehrere, durch Leerzeichen festgelegte Class-Attribute."
1489
 
1490
+ #: ../admin/views/ad-parameters-metabox.php:25 ../classes/ad_ajax_callbacks.php:52
1491
  msgid "size:"
1492
  msgstr "Größe:"
1493
 
1494
+ #: ../admin/views/ad-parameters-metabox.php:26 ../classes/ad_ajax_callbacks.php:53
1495
  msgid "width"
1496
  msgstr "Breite"
1497
 
1498
+ #: ../admin/views/ad-parameters-metabox.php:27 ../classes/ad_ajax_callbacks.php:54
1499
  msgid "height"
1500
  msgstr "Höhe"
1501
 
1910
  msgid "License key"
1911
  msgstr "Lizenzschlüssel"
1912
 
1913
+ #: ../admin/views/setting-license.php:32
1914
  msgid "Activate License"
1915
  msgstr "Lizenz aktivieren"
1916
 
1917
+ #: ../admin/views/setting-license.php:35
1918
+ msgid "Please enter a valid license key"
1919
+ msgstr "Bitte geben Sie eine gültige Lizenz ein"
1920
+
1921
  #: ../admin/views/setting-license.php:37
1922
+ msgid "License key invalid"
1923
+ msgstr "Der Lizenzschlüssel ist ungültig"
1924
+
1925
+ #: ../admin/views/setting-license.php:41
1926
  msgid "active"
1927
  msgstr "aktiv"
1928
 
1929
+ #: ../admin/views/setting-license.php:42
1930
  #, php-format
1931
  msgid "(%d days left)"
1932
  msgstr "(noch %d Tage)"
1933
 
1934
+ #: ../admin/views/setting-license.php:45
1935
  msgid ""
1936
  "1. enter the key and save options; 2. click the activate button behind the "
1937
  "field"
2087
  "Plugins die (teilweise) Probleme verursachen können: <strong>%1$s</strong>. "
2088
  "<a href=\"%2$s\" target=\"_blank\">Mehr erfahren</a>."
2089
 
2090
+ #: ../admin/views/support.php:48
2091
+ #, php-format
2092
+ msgid ""
2093
+ "Ads are disabled for all or some pages. See \"disabled ads\" in <a "
2094
+ "href=\"%s\">settings</a>."
2095
+ msgstr ""
2096
+ "Anzeigen sind für alle oder einige Seiten deaktiviert. Vgl. <a "
2097
+ "href=\"%s\">Einstellungen</a>."
2098
+
2099
  #: ../admin/views/support.php:57
2100
  msgid "Contact"
2101
  msgstr "Kontakt aufnehmen"
2190
  "Injiziert in den Beitrags-Inhalt. Sie können den Absatz oder die Überschrift "
2191
  "wählen, nach dem die Anzeige eingebunden wird."
2192
 
2193
+ #: ../classes/ad_placements.php:61
2194
+ msgid "Sidebar Widget"
2195
+ msgstr "Sidebar Widget"
2196
+
2197
+ #: ../classes/ad_placements.php:62
2198
+ msgid ""
2199
+ "Create a sidebar widget with an ad. Can be placed and used like any other "
2200
+ "widget."
2201
+ msgstr "Diese Platzierung kann in einem Widget verwendet werden."
2202
+
2203
  #: ../classes/ad_placements.php:204
2204
  #, php-format
2205
  msgid "paragraph (%s)"
2555
  msgid "Notice: Advanced Ads only considers the AdSense ad type for this limit."
2556
  msgstr "Hinweis: Advanced Ads zählt nur die AdSense-Anzeigentypen für dieses Limit."
2557
 
2558
+ #: ../modules/gadsense/admin/admin.php:205
2559
+ msgid ""
2560
+ "Due to technical restrictions, the limit does not work on placements with "
2561
+ "cache-busting enabled."
2562
+ msgstr ""
2563
+ "Aufgrund technischer Einschränkungen ist das Limit in Platzierungen mit "
2564
+ "Cache-Busting nicht verfügbar."
2565
+
2566
  #: ../modules/gadsense/admin/admin.php:219
2567
  msgid "Insert Page-Level ads code on all pages."
2568
  msgstr "Code für Anzeigen auf Seitenebene auf allen Seiten einbinden."
2569
 
 
 
 
 
 
 
 
 
 
 
2570
  #: ../modules/gadsense/admin/admin.php:240 ../modules/gadsense/includes/class-ad-
2571
  #: type-adsense.php:73
2572
  msgid "The Publisher ID has an incorrect format. (must start with \"pub-\")"
languages/advanced-ads.pot CHANGED
@@ -5,7 +5,7 @@ msgstr ""
5
  "Project-Id-Version: Advanved Ads\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/plugins/plugin-name\n"
7
  "POT-Creation-Date: 2015-01-27 16:47+0100\n"
8
- "POT-Revision-Date: Thu Oct 29 2015 21:36:22 GMT+0100 (CET)\n"
9
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
10
  "Last-Translator: Thomas Maier <post@webzunft.de>\n"
11
  "Language-Team: webgilde <thomas.maier@webgilde.com>\n"
@@ -397,11 +397,19 @@ msgstr ""
397
  msgid "Please enter and save a valid license key first."
398
  msgstr ""
399
 
400
- #: ../admin/class-advanced-ads-admin.php:1490
401
  #, php-format
402
  msgid "License is invalid. Reason: %s"
403
  msgstr ""
404
 
 
 
 
 
 
 
 
 
405
  #: ../admin/includes/class-ad-groups-list.php:158
406
  msgid "scheduled"
407
  msgstr ""
@@ -1316,15 +1324,15 @@ msgid ""
1316
  "with a space"
1317
  msgstr ""
1318
 
1319
- #: ../admin/views/ad-parameters-metabox.php:25 ../classes/ad_ajax_callbacks.php:51
1320
  msgid "size:"
1321
  msgstr ""
1322
 
1323
- #: ../admin/views/ad-parameters-metabox.php:26 ../classes/ad_ajax_callbacks.php:52
1324
  msgid "width"
1325
  msgstr ""
1326
 
1327
- #: ../admin/views/ad-parameters-metabox.php:27 ../classes/ad_ajax_callbacks.php:53
1328
  msgid "height"
1329
  msgstr ""
1330
 
@@ -1688,28 +1696,32 @@ msgstr ""
1688
  msgid "License key"
1689
  msgstr ""
1690
 
1691
- #: ../admin/views/setting-license.php:26
 
 
 
 
1692
  msgid "Activate License"
1693
  msgstr ""
1694
 
1695
- #: ../admin/views/setting-license.php:29
1696
  msgid "Please enter a valid license key"
1697
  msgstr ""
1698
 
1699
- #: ../admin/views/setting-license.php:31
1700
  msgid "License key invalid"
1701
  msgstr ""
1702
 
1703
- #: ../admin/views/setting-license.php:37
1704
  msgid "active"
1705
  msgstr ""
1706
 
1707
- #: ../admin/views/setting-license.php:38
1708
  #, php-format
1709
  msgid "(%d days left)"
1710
  msgstr ""
1711
 
1712
- #: ../admin/views/setting-license.php:41
1713
  msgid ""
1714
  "1. enter the key and save options; 2. click the activate button behind the "
1715
  "field"
@@ -2014,6 +2026,14 @@ msgstr ""
2014
  msgid "Execute PHP code (wrapped in <code>&lt;?php ?&gt;</code>)"
2015
  msgstr ""
2016
 
 
 
 
 
 
 
 
 
2017
  #: ../classes/EDD_SL_Plugin_Updater.php:177
2018
  #, php-format
2019
  msgid ""
@@ -2281,7 +2301,8 @@ msgstr ""
2281
  msgid ""
2282
  "You still need to enable Page-Level ads in your AdSense account. See <a "
2283
  "href=\"https://support.google.com/adsense/answer/6245304\" "
2284
- "target=\"_blank\">AdSense Help</a> for more information"
 
2285
  msgstr ""
2286
 
2287
  #: ../modules/gadsense/admin/admin.php:240 ../modules/gadsense/includes/class-ad-
5
  "Project-Id-Version: Advanved Ads\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/plugins/plugin-name\n"
7
  "POT-Creation-Date: 2015-01-27 16:47+0100\n"
8
+ "POT-Revision-Date: Wed Nov 11 2015 11:44:39 GMT+0100 (CET)\n"
9
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
10
  "Last-Translator: Thomas Maier <post@webzunft.de>\n"
11
  "Language-Team: webgilde <thomas.maier@webgilde.com>\n"
397
  msgid "Please enter and save a valid license key first."
398
  msgstr ""
399
 
400
+ #: ../admin/class-advanced-ads-admin.php:1496
401
  #, php-format
402
  msgid "License is invalid. Reason: %s"
403
  msgstr ""
404
 
405
+ #: ../admin/class-advanced-ads-admin.php:1514
406
+ msgid "Error while trying to disable the license. Please contact support."
407
+ msgstr ""
408
+
409
+ #: ../admin/class-advanced-ads-admin.php:1545
410
+ msgid "License couldn’t be deactivated. Please try again later or contact support."
411
+ msgstr ""
412
+
413
  #: ../admin/includes/class-ad-groups-list.php:158
414
  msgid "scheduled"
415
  msgstr ""
1324
  "with a space"
1325
  msgstr ""
1326
 
1327
+ #: ../admin/views/ad-parameters-metabox.php:25 ../classes/ad_ajax_callbacks.php:52
1328
  msgid "size:"
1329
  msgstr ""
1330
 
1331
+ #: ../admin/views/ad-parameters-metabox.php:26 ../classes/ad_ajax_callbacks.php:53
1332
  msgid "width"
1333
  msgstr ""
1334
 
1335
+ #: ../admin/views/ad-parameters-metabox.php:27 ../classes/ad_ajax_callbacks.php:54
1336
  msgid "height"
1337
  msgstr ""
1338
 
1696
  msgid "License key"
1697
  msgstr ""
1698
 
1699
+ #: ../admin/views/setting-license.php:24
1700
+ msgid "Deactivate License"
1701
+ msgstr ""
1702
+
1703
+ #: ../admin/views/setting-license.php:32
1704
  msgid "Activate License"
1705
  msgstr ""
1706
 
1707
+ #: ../admin/views/setting-license.php:35
1708
  msgid "Please enter a valid license key"
1709
  msgstr ""
1710
 
1711
+ #: ../admin/views/setting-license.php:37
1712
  msgid "License key invalid"
1713
  msgstr ""
1714
 
1715
+ #: ../admin/views/setting-license.php:41
1716
  msgid "active"
1717
  msgstr ""
1718
 
1719
+ #: ../admin/views/setting-license.php:42
1720
  #, php-format
1721
  msgid "(%d days left)"
1722
  msgstr ""
1723
 
1724
+ #: ../admin/views/setting-license.php:45
1725
  msgid ""
1726
  "1. enter the key and save options; 2. click the activate button behind the "
1727
  "field"
2026
  msgid "Execute PHP code (wrapped in <code>&lt;?php ?&gt;</code>)"
2027
  msgstr ""
2028
 
2029
+ #: ../classes/checks.php:223
2030
+ #, php-format
2031
+ msgid ""
2032
+ "Possible conflict between jQueryUI library, used by Advanced Ads and other "
2033
+ "libraries (probably <a href=\"%s\">Twitter Bootstrap</a>). This might lead to "
2034
+ "misfortunate formats in forms, but should not damage features."
2035
+ msgstr ""
2036
+
2037
  #: ../classes/EDD_SL_Plugin_Updater.php:177
2038
  #, php-format
2039
  msgid ""
2301
  msgid ""
2302
  "You still need to enable Page-Level ads in your AdSense account. See <a "
2303
  "href=\"https://support.google.com/adsense/answer/6245304\" "
2304
+ "target=\"_blank\">AdSense Help</a> (requires AdSense-login) for more "
2305
+ "information"
2306
  msgstr ""
2307
 
2308
  #: ../modules/gadsense/admin/admin.php:240 ../modules/gadsense/includes/class-ad-
modules/gadsense/admin/admin.php CHANGED
@@ -218,7 +218,7 @@ class Advanced_Ads_AdSense_Admin {
218
  ?><label><input type="checkbox" name="<?php echo GADSENSE_OPT_NAME; ?>[page-level-enabled]" value="1" <?php checked( $page_level ); ?> />
219
  <?php _e( 'Insert Page-Level ads code on all pages.', 'advanced-ads' ); ?></label>
220
  <p class="description">
221
- <?php _e( 'You still need to enable Page-Level ads in your AdSense account. See <a href="https://support.google.com/adsense/answer/6245304" target="_blank">AdSense Help</a> for more information', 'advanced-ads' ); ?>
222
  </p><?php
223
  }
224
 
218
  ?><label><input type="checkbox" name="<?php echo GADSENSE_OPT_NAME; ?>[page-level-enabled]" value="1" <?php checked( $page_level ); ?> />
219
  <?php _e( 'Insert Page-Level ads code on all pages.', 'advanced-ads' ); ?></label>
220
  <p class="description">
221
+ <?php _e( 'You still need to enable Page-Level ads in your AdSense account. See <a href="https://support.google.com/adsense/answer/6245304" target="_blank">AdSense Help</a> (requires AdSense-login) for more information', 'advanced-ads' ); ?>
222
  </p><?php
223
  }
224
 
modules/gadsense/includes/class-ad-type-adsense.php CHANGED
@@ -74,7 +74,8 @@ class Advanced_Ads_Ad_Type_Adsense extends Advanced_Ads_Ad_Type_Abstract {
74
  }
75
 
76
  if ( ! empty($content) ) {
77
- $json_content = $content;
 
78
 
79
  // get json content striped by slashes
80
  $content = json_decode( stripslashes( $content ) );
@@ -126,8 +127,7 @@ class Advanced_Ads_Ad_Type_Adsense extends Advanced_Ads_Ad_Type_Abstract {
126
  * @since 1.0.0
127
  */
128
  public function sanitize_content($content = '') {
129
- $content = wp_unslash( $content );
130
- return $content = apply_filters( 'content_save_pre', $content );
131
  }
132
 
133
  /**
@@ -140,7 +140,7 @@ class Advanced_Ads_Ad_Type_Adsense extends Advanced_Ads_Ad_Type_Abstract {
140
  public function prepare_output($ad) {
141
  global $gadsense;
142
 
143
- $content = json_decode( $ad->content );
144
  $output = '';
145
  $db = Advanced_Ads_AdSense_Data::get_instance();
146
  $pub_id = $db->get_adsense_id();
74
  }
75
 
76
  if ( ! empty($content) ) {
77
+
78
+ $json_content = stripslashes( $content );
79
 
80
  // get json content striped by slashes
81
  $content = json_decode( stripslashes( $content ) );
127
  * @since 1.0.0
128
  */
129
  public function sanitize_content($content = '') {
130
+ return $content = wp_unslash( $content );
 
131
  }
132
 
133
  /**
140
  public function prepare_output($ad) {
141
  global $gadsense;
142
 
143
+ $content = json_decode( stripslashes( $ad->content ) );
144
  $output = '';
145
  $db = Advanced_Ads_AdSense_Data::get_instance();
146
  $pub_id = $db->get_adsense_id();
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, adsense, display, banner, advertisements, adverts, advert, monetization
5
  Requires at least: WP 4.2, PHP 5.3
6
  Tested up to: 4.3.1
7
- Stable tag: 1.6.11.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -185,6 +185,16 @@ There is no revenue share. Advanced Ads doesn’t alter your ad codes in a way t
185
 
186
  == Changelog ==
187
 
 
 
 
 
 
 
 
 
 
 
188
  = 1.6.11.1 =
189
 
190
  * hotfix for widgets
4
  Tags: ads, ad, adsense, display, banner, advertisements, adverts, advert, monetization
5
  Requires at least: WP 4.2, PHP 5.3
6
  Tested up to: 4.3.1
7
+ Stable tag: 1.6.12
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
185
 
186
  == Changelog ==
187
 
188
+ = 1.6.12 =
189
+
190
+ * added filters to ad list
191
+ * display expired date in ad list
192
+ * display ad dates in ads list on group page
193
+ * hide unrelated columns in ad list
194
+ * fix saving adsense ad unit as non-superadmin
195
+ * error message for possible jQueryUI library conflicts
196
+ * fix widget_title override
197
+
198
  = 1.6.11.1 =
199
 
200
  * hotfix for widgets