Changeset 1041516
- Timestamp:
- 12/09/2014 09:30:49 PM (11 years ago)
- Location:
- wp-advertize-it/trunk
- Files:
-
- 3 edited
-
classes/wp-advertize-it.php (modified) (5 diffs)
-
classes/wpai-settings.php (modified) (6 diffs)
-
views/wpai-settings/page-settings-fields.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wp-advertize-it/trunk/classes/wp-advertize-it.php
r1040579 r1041516 8 8 class WordPress_Advertize_It extends WPAI_Module 9 9 { 10 /** 11 * @var array 12 */ 10 13 protected static $readable_properties = array(); // These should really be constants, but PHP doesn't allow class constants to be arrays 14 /** 15 * @var array 16 */ 11 17 protected static $writeable_properties = array(); 12 18 protected $modules; … … 34 40 ); 35 41 } 36 37 42 38 43 /* … … 113 118 } 114 119 115 116 120 /* 117 121 * Instance methods … … 205 209 add_action('wp_footer', array($this, 'show_ad_below_footer')); 206 210 add_action('comment_form', array($this, 'show_ad_below_comments')); 211 add_action('the_post', array($this, 'show_ad_between_posts')); 207 212 208 213 add_shortcode('showad', array($this, 'handle_short_code')); … … 600 605 } 601 606 607 public function show_ad_between_posts($post) 608 { 609 global $wp_query; 610 611 error_log("post->id=".$post->ID); 612 error_log("wp_query->post->id=".$wp_query->post->ID); 613 614 if (((! is_home()) && (! is_archive())) || $wp_query->post != $post || 0 == $wp_query->current_post ) { 615 error_log("is_home or is_archive=".(((! is_home()) && (! is_archive())) ? "false" : "true")); 616 error_log("wp_query->post is post=".($wp_query->post != $post ? "false" : "true")); 617 error_log("wp_query->current_post=".$wp_query->current_post); 618 return; 619 } 620 621 $options = $this->modules['WPAI_Settings']->settings['options']; 622 $every = isset($options['between-posts-every']) ? intval($options['between-posts-every']) : 0; 623 624 error_log("every=".$every); 625 error_log("wp_query->current_post % every=".($wp_query->current_post % $every )); 626 627 if ($every > 0 && $wp_query->current_post % $every == 0) { 628 $blocks = $this->modules['WPAI_Settings']->settings['blocks']; 629 $between_posts_block = $this->modules['WPAI_Settings']->settings['placements']['between-posts']; 630 echo WPAI_Settings::get_ad_block($blocks, $between_posts_block); 631 } 632 } 633 602 634 public function show_ad_below_footer() 603 635 { -
wp-advertize-it/trunk/classes/wpai-settings.php
r1012957 r1041516 149 149 150 150 $placements = array( 151 "homepage_below_title" => "", 152 "post_below_title" => "", 153 "post_below_content" => "", 154 "post_below_comments" => "", 155 "page_below_title" => "", 156 "page_below_content" => "", 157 "page_below_comments" => "", 158 "all_below_footer" => "", 159 "middle_of_post" => "", 160 "before_last_post_paragraph" => "", 161 "before_last_page_paragraph" => "", 162 "after_first_post_paragraph" => "", 163 "after_first_page_paragraph" => "" 151 "homepage-below-title" => "", 152 "post-below-title" => "", 153 "post-below-content" => "", 154 "post-below-comments" => "", 155 "page-below-title" => "", 156 "page-below-content" => "", 157 "page-below-comments" => "", 158 "all-below-footer" => "", 159 "middle-of-post" => "", 160 "before-last-post-paragraph" => "", 161 "before-last-page-paragraph" => "", 162 "after-first-post-paragraph" => "", 163 "after-first-page-paragraph" => "", 164 "between-posts" => "" 164 165 ); 165 166 … … 189 190 "min-char-count" => 0, 190 191 "min-word-count" => 0, 191 "min-paragraph-count" => 0 192 "min-paragraph-count" => 0, 193 "between-posts-every" => 0 192 194 ); 193 195 … … 338 340 $this->add_settings_field_placements('wpai_page-below-comments', 'Pages below comments'); 339 341 $this->add_settings_field_placements('wpai_all-below-footer', 'Below footer'); 342 $this->add_settings_field_placements('wpai_between-posts', 'Between posts'); 340 343 341 344 /* … … 371 374 $this->add_settings_field_options('wpai_min-word-count', 'Min. word count for inline ads'); 372 375 $this->add_settings_field_options('wpai_min-paragraph-count', 'Min. paragraph count for inline ads'); 376 $this->add_settings_field_options('wpai_between-posts-every', 'After every N posts'); 373 377 374 378 // The settings container … … 478 482 $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-post-paragraph'); 479 483 $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-page-paragraph'); 484 $this->setting_empty_string_if_not_set($new_settings, 'placements', 'between-posts'); 480 485 481 486 /* … … 512 517 $this->setting_zero_if_not_set($new_settings, 'options', 'min-word-count'); 513 518 $this->setting_zero_if_not_set($new_settings, 'options', 'min-paragraph-count'); 519 $this->setting_zero_if_not_set($new_settings, 'options', 'between-posts-every'); 514 520 515 521 return $new_settings; -
wp-advertize-it/trunk/views/wpai-settings/page-settings-fields.php
r1014329 r1041516 303 303 </select> 304 304 <?php 305 elseif ('wpai_between-posts' == $field['label_for']) : ?> 306 <select class="placement-block-select" id="wpai_settings[placements][between-posts]" 307 name="wpai_settings[placements][between-posts]"> 308 <?php 309 foreach ($settings['blocks'] as $i => $block) : 310 $label = 'Ad Block ' . ($i + 1); 311 $selected = ''; 312 if ($settings['placements']['between-posts'] == $i) 313 $selected = 'selected="selected"'; 314 echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>'; 315 endforeach; 316 $i = ""; 317 $label = 'None'; 318 $selected = ''; 319 if ($settings['placements']['between-posts'] == $i) 320 $selected = 'selected="selected"'; 321 echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>'; 322 ?> 323 </select> 324 <?php 305 325 elseif ('wpai_suppress-on-posts' == $field['label_for']) : ?> 306 326 <input type="checkbox" name="wpai_settings[options][suppress-on-posts]" … … 502 522 value="<?php echo $settings['options']['min-paragraph-count']; ?>"> 503 523 <?php 524 elseif ('wpai_between-posts-every' == $field['label_for']) : ?> 525 <input type="text" name="wpai_settings[options][between-posts-every]" 526 id="wpai_settings[options][between-posts-every]" 527 value="<?php echo isset($settings['options']['between-posts-every']) ? $settings['options']['between-posts-every'] : ''; ?>"> 528 <?php 504 529 elseif ('wpai_suppress-url' == $field['label_for']) : ?> 505 530 <input type="text" name="wpai_settings[options][suppress-url]"
Note: See TracChangeset
for help on using the changeset viewer.