Changeset 1043541

Timestamp:

12/12/2014 03:53:40 PM (10 years ago)

Author:

benohead

Message:

tagging version 0.9

Location:

wp-advertize-it

Files:

• tags/0.9 (added)
• tags/0.9/ace (copied) (copied from wp-advertize-it/trunk/ace)
• tags/0.9/bootstrap.php (copied) (copied from wp-advertize-it/trunk/bootstrap.php) (1 diff)
• tags/0.9/classes (copied) (copied from wp-advertize-it/trunk/classes)
• tags/0.9/classes/wp-advertize-it.php (modified) (8 diffs)
• tags/0.9/classes/wpai-settings.php (modified) (3 diffs)
• tags/0.9/css (copied) (copied from wp-advertize-it/trunk/css)
• tags/0.9/images (copied) (copied from wp-advertize-it/trunk/images)
• tags/0.9/includes (copied) (copied from wp-advertize-it/trunk/includes)
• tags/0.9/javascript (copied) (copied from wp-advertize-it/trunk/javascript)
• tags/0.9/readme.txt (copied) (copied from wp-advertize-it/trunk/readme.txt) (2 diffs)
• tags/0.9/screenshot-1.png (copied) (copied from wp-advertize-it/trunk/screenshot-1.png)
• tags/0.9/screenshot-2.png (copied) (copied from wp-advertize-it/trunk/screenshot-2.png)
• tags/0.9/screenshot-3.png (copied) (copied from wp-advertize-it/trunk/screenshot-3.png)
• tags/0.9/screenshot-4.png (copied) (copied from wp-advertize-it/trunk/screenshot-4.png)
• tags/0.9/screenshot-5.png (copied) (copied from wp-advertize-it/trunk/screenshot-5.png)
• tags/0.9/views (copied) (copied from wp-advertize-it/trunk/views)
• tags/0.9/views/wpai-settings/page-settings-fields.php (modified) (1 diff)
• tags/0.9/views/wpai-settings/page-settings.php (modified) (1 diff)
• trunk/bootstrap.php (modified) (1 diff)
• trunk/classes/wp-advertize-it.php (modified) (8 diffs)
• trunk/classes/wpai-settings.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/views/wpai-settings/page-settings-fields.php (modified) (1 diff)
• trunk/views/wpai-settings/page-settings.php (modified) (1 diff)

wp-advertize-it/tags/0.9/bootstrap.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/wp-advertize-it/
 Description: A plugin to place adsense blocks on your site
-Version:     0.8.2
+Version:     0.9
 Author:      Henri Benoit
 Author URI:  http://benohead.com

wp-advertize-it/tags/0.9/classes/wp-advertize-it.php

@@ -18 +18 @@
         protected $modules;
 
-        const VERSION = '0.8.2';
+        const VERSION = '0.9';
         const PREFIX = 'wpai_';
         const DEBUG_MODE = false;
@@ -207 +207 @@
 
             add_filter('the_content', array($this, 'show_ad_in_content'));
-            add_action('wp_footer', array($this, 'show_ad_below_footer'));
+            add_action('wp_head', array($this, 'buffer_start'));
+            add_action('wp_footer', array($this, 'buffer_end'));
+            add_action('wp_footer', array($this, 'show_ad_below_footer'));
             add_action('comment_form', array($this, 'show_ad_below_comments'));
             add_action('the_post', array($this, 'show_ad_between_posts'));
@@ -214 +216 @@
             add_action('wp_ajax_get_ad_list', array($this, 'get_ad_list'));
         }
+
+        function buffering_callback($buffer) {
+            $above_everything = "";
+
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
+            $above_everything_block = $this->modules['WPAI_Settings']->settings['placements']['above-everything'];
+
+            $options = $this->modules['WPAI_Settings']->settings['options'];
+
+            if ($this->is_suppress_specific($options, $content)) {
+                return $buffer;
+            }
+
+            if ($above_everything_block != "") {
+                $above_everything = WPAI_Settings::get_ad_block($blocks, $above_everything_block);
+            }
+
+            $matches = preg_split('/(<body.*?>)/i', $buffer, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            $buffer = $matches[0] . $matches[1] . $above_everything . $matches[2];
+            return $buffer;
+        }
+
+        function buffer_start() {
+            ob_start(array($this, 'buffering_callback'));
+        }
+
+        function buffer_end() {
+            ob_end_flush();
+        }
 
         function editor_buttons()
@@ -458 +490 @@
             $paragraph_count = $this->get_paragraph_count($content);
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
-            $homepage_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['homepage-below-title'];
+            $options = $this->modules['WPAI_Settings']->settings['options'];
+
+            if ($this->is_suppress_specific($options, $content)) {
+                return $content;
+            }
+
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
+
+            $homepage_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['homepage-below-title'];
             $post_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-title'];
             $post_below_content_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-content'];
@@ -471 +510 @@
             $after_first_page_paragraph_block = $this->modules['WPAI_Settings']->settings['placements']['after-first-page-paragraph'];
 
-            $options = $this->modules['WPAI_Settings']->settings['options'];
-
-            if ($this->is_suppress_specific($options, $content)) {
-                return $content;
-            }
             if (!is_feed() && strpos($content, '<!--NoHomePageAds-->') !== false) {
                 $homepage_below_title_block = "";
@@ -632 +666 @@
             $all_below_footer = "";
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
             $all_below_footer_block = $this->modules['WPAI_Settings']->settings['placements']['all-below-footer'];
-
-            $content = get_the_content();
 
             $options = $this->modules['WPAI_Settings']->settings['options'];
@@ -655 +688 @@
             $page_below_comments = "";
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
             $post_below_comments_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-comments'];
             $page_below_comments_block = $this->modules['WPAI_Settings']->settings['placements']['page-below-comments'];
-
-            $content = get_the_content();
 
             $options = $this->modules['WPAI_Settings']->settings['options'];
@@ -717 +749 @@
         }
 
-        /**
+        /**
+         * @param $blocks
+         * @param $content
+         *
+         * @return mixed
+         */
+        public function RemoveSuppressBlocks( $blocks, $content ) {
+            foreach ( $blocks as $number => $code ) {
+                if ( strpos( $content, '<!--NoAdBlock' . ( $number + 1 ) . '-->' ) !== false ) {
+                    $blocks[ $number ] = "";
+                }
+            }
+
+            return $blocks;
+        }
+
+        /**
          * Checks that the object is in a correct state
          *

wp-advertize-it/tags/0.9/classes/wpai-settings.php

@@ -162 +162 @@
                 "after-first-post-paragraph" => "",
                 "after-first-page-paragraph" => "",
-                "between-posts" => ""
+                "between-posts" => "",
+                "above-everything" => ""
             );
 
@@ -342 +343 @@
             $this->add_settings_field_placements('wpai_all-below-footer', 'Below footer');
             $this->add_settings_field_placements('wpai_between-posts', 'Between posts');
+            $this->add_settings_field_placements('wpai_above-everything', 'Above everything');
 
             /*
@@ -484 +486 @@
             $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-post-paragraph');
             $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-page-paragraph');
-            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'between-posts');
+            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'between-posts');
+            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'above-everything');
 
             /*

wp-advertize-it/tags/0.9/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.0.1
-Stable tag: 0.8.2
+Stable tag: 0.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -109 +109 @@
 == Changelog ==
 
+= 0.9 =
+
+* New ad placement shown above everything in the page (as the first element in the <body> tag).
+* Specific ads can be suppressed on a post adding a comment in the post contents
+
 = 0.8.2 =
 

wp-advertize-it/tags/0.9/views/wpai-settings/page-settings-fields.php

@@ -323 +323 @@
     </select>
 <?php
+elseif ('wpai_above-everything' == $field['label_for']) : ?>
+    <select class="placement-block-select" id="wpai_settings[placements][above-everything]"
+            name="wpai_settings[placements][above-everything]">
+        <?php
+        foreach ($settings['blocks'] as $i => $block) :
+            $label = 'Ad Block ' . ($i + 1);
+            $selected = '';
+            if ($settings['placements']['above-everything'] == $i)
+                $selected = 'selected="selected"';
+            echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>';
+        endforeach;
+        $i = "";
+        $label = 'None';
+        $selected = '';
+        if ($settings['placements']['above-everything'] == $i)
+            $selected = 'selected="selected"';
+        echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>';
+        ?>
+    </select>
+<?php
 elseif ('wpai_suppress-on-posts' == $field['label_for']) : ?>
     <input type="checkbox" name="wpai_settings[options][suppress-on-posts]"

wp-advertize-it/tags/0.9/views/wpai-settings/page-settings.php

@@ -45 +45 @@
             <li>&lt;!--NoWidgetAds--&gt; : suppresses the ad widget</li>
             <li>&lt;!--NoBelowFooterAds--&gt; : suppresses the footer</li>
+            <li>&lt;!--NoAdBlockX--&gt; : suppresses ad block X on this post or page e.g. &lt;!--NoAdBlock1--&gt;</li>
         </ul>
         Just add it to your post in the text editor. These will be present on the page but not visible and will

wp-advertize-it/trunk/bootstrap.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/wp-advertize-it/
 Description: A plugin to place adsense blocks on your site
-Version:     0.8.2
+Version:     0.9
 Author:      Henri Benoit
 Author URI:  http://benohead.com

wp-advertize-it/trunk/classes/wp-advertize-it.php

@@ -18 +18 @@
         protected $modules;
 
-        const VERSION = '0.8.2';
+        const VERSION = '0.9';
         const PREFIX = 'wpai_';
         const DEBUG_MODE = false;
@@ -207 +207 @@
 
             add_filter('the_content', array($this, 'show_ad_in_content'));
-            add_action('wp_footer', array($this, 'show_ad_below_footer'));
+            add_action('wp_head', array($this, 'buffer_start'));
+            add_action('wp_footer', array($this, 'buffer_end'));
+            add_action('wp_footer', array($this, 'show_ad_below_footer'));
             add_action('comment_form', array($this, 'show_ad_below_comments'));
             add_action('the_post', array($this, 'show_ad_between_posts'));
@@ -214 +216 @@
             add_action('wp_ajax_get_ad_list', array($this, 'get_ad_list'));
         }
+
+        function buffering_callback($buffer) {
+            $above_everything = "";
+
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
+            $above_everything_block = $this->modules['WPAI_Settings']->settings['placements']['above-everything'];
+
+            $options = $this->modules['WPAI_Settings']->settings['options'];
+
+            if ($this->is_suppress_specific($options, $content)) {
+                return $buffer;
+            }
+
+            if ($above_everything_block != "") {
+                $above_everything = WPAI_Settings::get_ad_block($blocks, $above_everything_block);
+            }
+
+            $matches = preg_split('/(<body.*?>)/i', $buffer, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            $buffer = $matches[0] . $matches[1] . $above_everything . $matches[2];
+            return $buffer;
+        }
+
+        function buffer_start() {
+            ob_start(array($this, 'buffering_callback'));
+        }
+
+        function buffer_end() {
+            ob_end_flush();
+        }
 
         function editor_buttons()
@@ -458 +490 @@
             $paragraph_count = $this->get_paragraph_count($content);
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
-            $homepage_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['homepage-below-title'];
+            $options = $this->modules['WPAI_Settings']->settings['options'];
+
+            if ($this->is_suppress_specific($options, $content)) {
+                return $content;
+            }
+
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
+
+            $homepage_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['homepage-below-title'];
             $post_below_title_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-title'];
             $post_below_content_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-content'];
@@ -471 +510 @@
             $after_first_page_paragraph_block = $this->modules['WPAI_Settings']->settings['placements']['after-first-page-paragraph'];
 
-            $options = $this->modules['WPAI_Settings']->settings['options'];
-
-            if ($this->is_suppress_specific($options, $content)) {
-                return $content;
-            }
             if (!is_feed() && strpos($content, '<!--NoHomePageAds-->') !== false) {
                 $homepage_below_title_block = "";
@@ -632 +666 @@
             $all_below_footer = "";
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
             $all_below_footer_block = $this->modules['WPAI_Settings']->settings['placements']['all-below-footer'];
-
-            $content = get_the_content();
 
             $options = $this->modules['WPAI_Settings']->settings['options'];
@@ -655 +688 @@
             $page_below_comments = "";
 
-            $blocks = $this->modules['WPAI_Settings']->settings['blocks'];
+            $content = get_the_content();
+            $blocks = $this->RemoveSuppressBlocks( $this->modules['WPAI_Settings']->settings['blocks'], $content );
             $post_below_comments_block = $this->modules['WPAI_Settings']->settings['placements']['post-below-comments'];
             $page_below_comments_block = $this->modules['WPAI_Settings']->settings['placements']['page-below-comments'];
-
-            $content = get_the_content();
 
             $options = $this->modules['WPAI_Settings']->settings['options'];
@@ -717 +749 @@
         }
 
-        /**
+        /**
+         * @param $blocks
+         * @param $content
+         *
+         * @return mixed
+         */
+        public function RemoveSuppressBlocks( $blocks, $content ) {
+            foreach ( $blocks as $number => $code ) {
+                if ( strpos( $content, '<!--NoAdBlock' . ( $number + 1 ) . '-->' ) !== false ) {
+                    $blocks[ $number ] = "";
+                }
+            }
+
+            return $blocks;
+        }
+
+        /**
          * Checks that the object is in a correct state
          *

wp-advertize-it/trunk/classes/wpai-settings.php

@@ -162 +162 @@
                 "after-first-post-paragraph" => "",
                 "after-first-page-paragraph" => "",
-                "between-posts" => ""
+                "between-posts" => "",
+                "above-everything" => ""
             );
 
@@ -342 +343 @@
             $this->add_settings_field_placements('wpai_all-below-footer', 'Below footer');
             $this->add_settings_field_placements('wpai_between-posts', 'Between posts');
+            $this->add_settings_field_placements('wpai_above-everything', 'Above everything');
 
             /*
@@ -484 +486 @@
             $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-post-paragraph');
             $this->setting_empty_string_if_not_set($new_settings, 'placements', 'after-first-page-paragraph');
-            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'between-posts');
+            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'between-posts');
+            $this->setting_empty_string_if_not_set($new_settings, 'placements', 'above-everything');
 
             /*

wp-advertize-it/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.0.1
-Stable tag: 0.8.2
+Stable tag: 0.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -109 +109 @@
 == Changelog ==
 
+= 0.9 =
+
+* New ad placement shown above everything in the page (as the first element in the <body> tag).
+* Specific ads can be suppressed on a post adding a comment in the post contents
+
 = 0.8.2 =
 

wp-advertize-it/trunk/views/wpai-settings/page-settings-fields.php

@@ -323 +323 @@
     </select>
 <?php
+elseif ('wpai_above-everything' == $field['label_for']) : ?>
+    <select class="placement-block-select" id="wpai_settings[placements][above-everything]"
+            name="wpai_settings[placements][above-everything]">
+        <?php
+        foreach ($settings['blocks'] as $i => $block) :
+            $label = 'Ad Block ' . ($i + 1);
+            $selected = '';
+            if ($settings['placements']['above-everything'] == $i)
+                $selected = 'selected="selected"';
+            echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>';
+        endforeach;
+        $i = "";
+        $label = 'None';
+        $selected = '';
+        if ($settings['placements']['above-everything'] == $i)
+            $selected = 'selected="selected"';
+        echo '<option data-block-id="wpai_block-' . esc_attr($i + 1) . '" style="padding-right: 10px;" value="' . esc_attr($i) . '" ' . $selected . '>' . $label . '</option>';
+        ?>
+    </select>
+<?php
 elseif ('wpai_suppress-on-posts' == $field['label_for']) : ?>
     <input type="checkbox" name="wpai_settings[options][suppress-on-posts]"

wp-advertize-it/trunk/views/wpai-settings/page-settings.php

@@ -45 +45 @@
             <li>&lt;!--NoWidgetAds--&gt; : suppresses the ad widget</li>
             <li>&lt;!--NoBelowFooterAds--&gt; : suppresses the footer</li>
+            <li>&lt;!--NoAdBlockX--&gt; : suppresses ad block X on this post or page e.g. &lt;!--NoAdBlock1--&gt;</li>
         </ul>
         Just add it to your post in the text editor. These will be present on the page but not visible and will