Get WordPress

Plugin Directory

Changeset 825760

Timestamp:
12/19/2013 09:02:47 PM (11 years ago)
Author:
pbaylies
Message:

Bugfix release; added Google Display Advertising tracking option; tagged release.

Location:
all-in-one-seo-pack
Files:
1 added
5 edited
44 copied

Legend:

Unmodified
Added
Removed

  • all-in-one-seo-pack/tags/2.1.1/aioseop_class.php

    r825759 r825760  
    169169            "ga_domain"             => __( "Enter your domain name if you have enabled tracking of Subdomains in Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    170170            "ga_multi_domain"       => __( "Check this if you have enabled tracking of Multiple top-level domains in Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     171
    171172            "ga_exclude_users"      => __( "Exclude logged-in users from Google Analytics tracking by role.", 'all_in_one_seo_pack' ),
    172173            "ga_track_outbound_links"=> __( "Check this if you want to track outbound links with Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    … …  
    369370                'default' => 0,
    370371                'condshow' => Array( 'aiosp_google_analytics_id' => Array( 'lhs' => 'aiosp_google_analytics_id', 'op' => '!=', 'rhs' => '' ) ) ),
     372
     373
     374
     375
     376
    371377            "ga_exclude_users"=> Array(
    372378                'name' => __( 'Exclude Users From Tracking:', 'all_in_one_seo_pack' ),
    … …  
    520526                        'name' => __( 'Google Settings', 'all_in_one_seo_pack' ),
    521527                        'help_link' => 'http://semperplugins.com/documentation/google-settings/',
    522                         'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_exclude_users", "ga_track_outbound_links" )
     528                        'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_exclude_users", "ga_track_outbound_links" )
    523529                    ),
    524530                'noindex' => Array(
    … …  
    604610        <style>
    605611            #toplevel_page_all-in-one-seo-pack-aioseop_class .wp-menu-image {
    606                 background: url(<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>shield-sprite-16.png) no-repeat 6px 6px !important;
     612                background: url(<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>shield-sprite-16.png) no-repeat px 6px !important;
    607613            }
    608614            #toplevel_page_all-in-one-seo-pack-aioseop_class .wp-menu-image:before {
    … …  
    613619            }
    614620            #toplevel_page_all-in-one-seo-pack-aioseop_class:hover .wp-menu-image, #toplevel_page_all-in-one-seo-pack-aioseop_class.wp-has-current-submenu .wp-menu-image {
    615                 background-position: 6px -26px !important;
     621                background-position: px -26px !important;
    616622            }
    617623            #icon-aioseop.icon32 {
    … …  
    761767   
    762768    function add_admin_pointers() {
    763         $this->pointers['aioseop_menu_210'] = Array( 'pointer_target' => '#toplevel_page_all-in-one-seo-pack-aioseop_class',
     769        $this->pointers['aioseop_menu_21'] = Array( 'pointer_target' => '#toplevel_page_all-in-one-seo-pack-aioseop_class',
    764770                                                 'pointer_text' =>  '<h3>' . sprintf( __( 'Welcome to Version %s!', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
    765771                                                    . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! Please review your settings, as we\'re always adding new features for you!', 'all_in_one_seo_pack' ) . '</p>',
    … …  
    768774                                                 'pointer_scope' => 'global'
    769775                                            );
    770         $this->pointers['aioseop_welcome_210'] = Array( 'pointer_target' => '#aioseop_top_button',
     776        $this->pointers['aioseop_welcome_21'] = Array( 'pointer_target' => '#aioseop_top_button',
    771777                                                    'pointer_text' => '<h3>' . sprintf( __( 'Review Your Settings', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
    772                                                     . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! NEW: Manage how your site appears on Facebook, Google+, and Twitter with our Social Meta module.  Enable it from the Feature Manager.  Remember to review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>',
     778                                                    . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! N: Manage how your site appears on Facebook, Google+, and Twitter with our Social Meta module.  Enable it from the Feature Manager.  Remember to review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>',
    773779                                                     'pointer_edge' => 'bottom',
    774780                                                     'pointer_align' => 'left',
    … …  
    836842                unset( $settings["{$prefix}$opt"] );
    837843           
     844
     845
     846
    838847        } elseif ( $location == 'aiosp' ) {
    839848            global $post, $aioseop_sitemap;
    … …  
    14011410   
    14021411    function override_options( $options, $location, $settings ) {
    1403         $opts = Array();
    1404         $options['aiosp_google_connect'] = $settings['aiosp_google_connect']['default'];
     1412        if ( class_exists( 'DOMDocument' ) ) {
     1413            $options['aiosp_google_connect'] = $settings['aiosp_google_connect']['default'];           
     1414        }
    14051415        return $options;
    14061416    }
    … …  
    17051715          (function() {
    17061716            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
    1707             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
    1708             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     1717<?php
     1718        if (!empty( $aioseop_options['aiosp_ga_display_advertising'] ) ) {
     1719?>          ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
     1720<?php
     1721        } else {
     1722?>          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     1723<?php
     1724        }
     1725?>          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
    17091726          })();
    17101727        </script>
    … …  
    17771794            return false;
    17781795       
     1796
    17791797        $haspost = count( $query->posts ) > 0;
    17801798
    … …  
    18241842            $taxonomy = get_query_var( 'taxonomy' );
    18251843            $term = get_query_var( 'term' );
    1826             $link = get_term_link( $term, $taxonomy );
     1844            if ( !empty( $term ) )
     1845                $link = get_term_link( $term, $taxonomy );
    18271846        } elseif ( $query->is_archive && function_exists( 'get_post_type_archive_link' ) && ( $post_type = get_query_var( 'post_type' ) ) ) {
    18281847            $link = get_post_type_archive_link( $post_type );
    … …  
    18301849            return false;
    18311850        }
     1851
    18321852        return $this->yoast_get_paged( $link );
    18331853    }
    … …  
    25882608        add_meta_box('aioseop-list', __( "Join Our Mailing List", 'all_in_one_seo_pack' ), array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'normal', 'core');
    25892609        add_meta_box('aioseop-about', "About <span style='float:right;'>Version <b>" . AIOSEOP_VERSION . "</b></span>", array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'side', 'core');
     2610
    25902611       
    25912612        add_action( 'aioseop_modules_add_menus', Array( $this, 'add_menu' ), 5 );

  • all-in-one-seo-pack/tags/2.1.1/aioseop_module_class.php

    r825759 r825760  
    231231        */
    232232        function html_string_to_array( $xmlstr ) {
    233           $doc = new DOMDocument();
    234           $doc->loadHTML( $xmlstr );
    235           return $this->domnode_to_array( $doc->documentElement );
     233          if ( !class_exists( 'DOMDocument' ) ) {
     234            return Array();
     235          } else {
     236              $doc = new DOMDocument();
     237              $doc->loadHTML( $xmlstr );
     238              return $this->domnode_to_array( $doc->documentElement );         
     239          }
    236240        }
    237241
    238242        function xml_string_to_array( $xmlstr ) {
    239           $doc = new DOMDocument();
    240           $doc->loadXML( $xmlstr );
    241           return $this->domnode_to_array( $doc->documentElement );
     243          if ( !class_exists( 'DOMDocument' ) ) {
     244              return Array();
     245          } else {
     246              $doc = new DOMDocument();
     247              $doc->loadXML( $xmlstr );
     248              return $this->domnode_to_array( $doc->documentElement );         
     249          }
    242250        }
    243251

  • all-in-one-seo-pack/tags/2.1.1/aioseop_sitemap.php

    r825759 r825760  
    14451445                'no_found_rows' => true
    14461446            );
    1447             if ( defined( 'WPML_TM_VERSION' ) ) $defaults['suppress_filters'] = false;
     1447            if ( defined( '_VERSION' ) ) $defaults['suppress_filters'] = false;
    14481448            $args = wp_parse_args( $args, $defaults );
    14491449            if ( empty( $args['post_type'] ) )

  • all-in-one-seo-pack/tags/2.1.1/all_in_one_seo_pack.php

    r825759 r825760  
    44Plugin URI: http://semperfiwebdesign.com
    55Description: Out-of-the-box SEO for your WordPress blog. <a href="admin.php?page=all-in-one-seo-pack/aioseop_class.php">Options configuration panel</a> | <a href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/?loc=plugins" target="_blank">Upgrade to Pro Version</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtorbert%40gmail%2ecom&item_name=All%20In%20One%20SEO%20Pack&item_number=Support%20Open%20Source&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8">Donate</a> | <a href="http://semperplugins.com/support/" >Support</a> |  <a href="https://www.amazon.com/wishlist/1NFQ133FNCOOA/ref=wl_web" target="_blank" title="Amazon Wish List">Amazon Wishlist</a>
    6 Version: 2.1
     6Version: 2.1
    77Author: Michael Torbert
    88Author URI: http://michaeltorbert.com
    … …  
    3131/**
    3232 * @package All-in-One-SEO-Pack
    33  * @version 2.1
     33 * @version 2.1
    3434 */
    3535
    3636if ( ! defined( 'AIOSEOP_VERSION' ) )
    37     define( 'AIOSEOP_VERSION', '2.1' );
     37    define( 'AIOSEOP_VERSION', '2.1' );
    3838
    3939if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {

  • all-in-one-seo-pack/tags/2.1.1/readme.txt

    r825759 r825760  
    44Tags: all in one, all in one seo, all in one seo pack, seo, search engine optimization, google
    55Requires at least: 3.3
    6 Tested up to: 3.7.1
     6Tested up to: 3.
    77Stable tag: trunk
    88

  • all-in-one-seo-pack/trunk/aioseop_class.php

    r807614 r825760  
    169169            "ga_domain"             => __( "Enter your domain name if you have enabled tracking of Subdomains in Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    170170            "ga_multi_domain"       => __( "Check this if you have enabled tracking of Multiple top-level domains in Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     171
    171172            "ga_exclude_users"      => __( "Exclude logged-in users from Google Analytics tracking by role.", 'all_in_one_seo_pack' ),
    172173            "ga_track_outbound_links"=> __( "Check this if you want to track outbound links with Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    … …  
    369370                'default' => 0,
    370371                'condshow' => Array( 'aiosp_google_analytics_id' => Array( 'lhs' => 'aiosp_google_analytics_id', 'op' => '!=', 'rhs' => '' ) ) ),
     372
     373
     374
     375
     376
    371377            "ga_exclude_users"=> Array(
    372378                'name' => __( 'Exclude Users From Tracking:', 'all_in_one_seo_pack' ),
    … …  
    520526                        'name' => __( 'Google Settings', 'all_in_one_seo_pack' ),
    521527                        'help_link' => 'http://semperplugins.com/documentation/google-settings/',
    522                         'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_exclude_users", "ga_track_outbound_links" )
     528                        'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_exclude_users", "ga_track_outbound_links" )
    523529                    ),
    524530                'noindex' => Array(
    … …  
    604610        <style>
    605611            #toplevel_page_all-in-one-seo-pack-aioseop_class .wp-menu-image {
    606                 background: url(<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>shield-sprite-16.png) no-repeat 6px 6px !important;
     612                background: url(<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>shield-sprite-16.png) no-repeat px 6px !important;
    607613            }
    608614            #toplevel_page_all-in-one-seo-pack-aioseop_class .wp-menu-image:before {
    … …  
    613619            }
    614620            #toplevel_page_all-in-one-seo-pack-aioseop_class:hover .wp-menu-image, #toplevel_page_all-in-one-seo-pack-aioseop_class.wp-has-current-submenu .wp-menu-image {
    615                 background-position: 6px -26px !important;
     621                background-position: px -26px !important;
    616622            }
    617623            #icon-aioseop.icon32 {
    … …  
    761767   
    762768    function add_admin_pointers() {
    763         $this->pointers['aioseop_menu_210'] = Array( 'pointer_target' => '#toplevel_page_all-in-one-seo-pack-aioseop_class',
     769        $this->pointers['aioseop_menu_21'] = Array( 'pointer_target' => '#toplevel_page_all-in-one-seo-pack-aioseop_class',
    764770                                                 'pointer_text' =>  '<h3>' . sprintf( __( 'Welcome to Version %s!', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
    765771                                                    . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! Please review your settings, as we\'re always adding new features for you!', 'all_in_one_seo_pack' ) . '</p>',
    … …  
    768774                                                 'pointer_scope' => 'global'
    769775                                            );
    770         $this->pointers['aioseop_welcome_210'] = Array( 'pointer_target' => '#aioseop_top_button',
     776        $this->pointers['aioseop_welcome_21'] = Array( 'pointer_target' => '#aioseop_top_button',
    771777                                                    'pointer_text' => '<h3>' . sprintf( __( 'Review Your Settings', 'all_in_one_seo_pack' ), AIOSEOP_VERSION )
    772                                                     . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! NEW: Manage how your site appears on Facebook, Google+, and Twitter with our Social Meta module.  Enable it from the Feature Manager.  Remember to review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>',
     778                                                    . '</h3><p>' . __( 'Thank you for running the latest and greatest All in One SEO Pack ever! N: Manage how your site appears on Facebook, Google+, and Twitter with our Social Meta module.  Enable it from the Feature Manager.  Remember to review your settings, we have added some new ones!', 'all_in_one_seo_pack' ) . '</p>',
    773779                                                     'pointer_edge' => 'bottom',
    774780                                                     'pointer_align' => 'left',
    … …  
    836842                unset( $settings["{$prefix}$opt"] );
    837843           
     844
     845
     846
    838847        } elseif ( $location == 'aiosp' ) {
    839848            global $post, $aioseop_sitemap;
    … …  
    14011410   
    14021411    function override_options( $options, $location, $settings ) {
    1403         $opts = Array();
    1404         $options['aiosp_google_connect'] = $settings['aiosp_google_connect']['default'];
     1412        if ( class_exists( 'DOMDocument' ) ) {
     1413            $options['aiosp_google_connect'] = $settings['aiosp_google_connect']['default'];           
     1414        }
    14051415        return $options;
    14061416    }
    … …  
    17051715          (function() {
    17061716            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
    1707             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
    1708             var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     1717<?php
     1718        if (!empty( $aioseop_options['aiosp_ga_display_advertising'] ) ) {
     1719?>          ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
     1720<?php
     1721        } else {
     1722?>          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     1723<?php
     1724        }
     1725?>          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
    17091726          })();
    17101727        </script>
    … …  
    17771794            return false;
    17781795       
     1796
    17791797        $haspost = count( $query->posts ) > 0;
    17801798
    … …  
    18241842            $taxonomy = get_query_var( 'taxonomy' );
    18251843            $term = get_query_var( 'term' );
    1826             $link = get_term_link( $term, $taxonomy );
     1844            if ( !empty( $term ) )
     1845                $link = get_term_link( $term, $taxonomy );
    18271846        } elseif ( $query->is_archive && function_exists( 'get_post_type_archive_link' ) && ( $post_type = get_query_var( 'post_type' ) ) ) {
    18281847            $link = get_post_type_archive_link( $post_type );
    … …  
    18301849            return false;
    18311850        }
     1851
    18321852        return $this->yoast_get_paged( $link );
    18331853    }
    … …  
    25882608        add_meta_box('aioseop-list', __( "Join Our Mailing List", 'all_in_one_seo_pack' ), array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'normal', 'core');
    25892609        add_meta_box('aioseop-about', "About <span style='float:right;'>Version <b>" . AIOSEOP_VERSION . "</b></span>", array( $this, 'display_extra_metaboxes'), 'aioseop_metaboxes', 'side', 'core');
     2610
    25902611       
    25912612        add_action( 'aioseop_modules_add_menus', Array( $this, 'add_menu' ), 5 );

  • all-in-one-seo-pack/trunk/aioseop_module_class.php

    r797370 r825760  
    231231        */
    232232        function html_string_to_array( $xmlstr ) {
    233           $doc = new DOMDocument();
    234           $doc->loadHTML( $xmlstr );
    235           return $this->domnode_to_array( $doc->documentElement );
     233          if ( !class_exists( 'DOMDocument' ) ) {
     234            return Array();
     235          } else {
     236              $doc = new DOMDocument();
     237              $doc->loadHTML( $xmlstr );
     238              return $this->domnode_to_array( $doc->documentElement );         
     239          }
    236240        }
    237241
    238242        function xml_string_to_array( $xmlstr ) {
    239           $doc = new DOMDocument();
    240           $doc->loadXML( $xmlstr );
    241           return $this->domnode_to_array( $doc->documentElement );
     243          if ( !class_exists( 'DOMDocument' ) ) {
     244              return Array();
     245          } else {
     246              $doc = new DOMDocument();
     247              $doc->loadXML( $xmlstr );
     248              return $this->domnode_to_array( $doc->documentElement );         
     249          }
    242250        }
    243251

  • all-in-one-seo-pack/trunk/aioseop_sitemap.php

    r805127 r825760  
    14451445                'no_found_rows' => true
    14461446            );
    1447             if ( defined( 'WPML_TM_VERSION' ) ) $defaults['suppress_filters'] = false;
     1447            if ( defined( '_VERSION' ) ) $defaults['suppress_filters'] = false;
    14481448            $args = wp_parse_args( $args, $defaults );
    14491449            if ( empty( $args['post_type'] ) )

  • all-in-one-seo-pack/trunk/all_in_one_seo_pack.php

    r805127 r825760  
    44Plugin URI: http://semperfiwebdesign.com
    55Description: Out-of-the-box SEO for your WordPress blog. <a href="admin.php?page=all-in-one-seo-pack/aioseop_class.php">Options configuration panel</a> | <a href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/?loc=plugins" target="_blank">Upgrade to Pro Version</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mrtorbert%40gmail%2ecom&item_name=All%20In%20One%20SEO%20Pack&item_number=Support%20Open%20Source&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8">Donate</a> | <a href="http://semperplugins.com/support/" >Support</a> |  <a href="https://www.amazon.com/wishlist/1NFQ133FNCOOA/ref=wl_web" target="_blank" title="Amazon Wish List">Amazon Wishlist</a>
    6 Version: 2.1
     6Version: 2.1
    77Author: Michael Torbert
    88Author URI: http://michaeltorbert.com
    … …  
    3131/**
    3232 * @package All-in-One-SEO-Pack
    33  * @version 2.1
     33 * @version 2.1
    3434 */
    3535
    3636if ( ! defined( 'AIOSEOP_VERSION' ) )
    37     define( 'AIOSEOP_VERSION', '2.1' );
     37    define( 'AIOSEOP_VERSION', '2.1' );
    3838
    3939if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {

  • all-in-one-seo-pack/trunk/readme.txt

    r796767 r825760  
    44Tags: all in one, all in one seo, all in one seo pack, seo, search engine optimization, google
    55Requires at least: 3.3
    6 Tested up to: 3.7.1
     6Tested up to: 3.
    77Stable tag: trunk
    88
Note: See TracChangeset for help on using the changeset viewer.