Get WordPress

Plugin Directory

Changeset 861972

Timestamp:
02/20/2014 11:53:57 PM (10 years ago)
Author:
pbaylies
Message:

Bugfixes; added new options for managing Google+ authorship meta; bumped version to 2.1.4.

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

Legend:

Unmodified
Added
Removed

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

    r861970 r861972  
    162162            "bing_verify"           => __( "Enter your verification code here to verify your site with Bing Webmaster Tools.<br /><a href='http://semperplugins.com/documentation/bing-webmaster-verification/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    163163            "pinterest_verify"      => __( "Enter your verification code here to verify your site with Pinterest.<br /><a href='http://semperplugins.com/documentation/pinterest-site-verification/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    164             "google_publisher"      => __( "Enter your Google Plus Profile URL here to link your site to your Google Plus account for authorship.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     164            "google_publisher"      => __( "Enter your Google authorship.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    165165            "google_disable_profile"=> __( "Check this to remove the Google Plus field from the user profile screen.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     166
     167
     168
     169
    166170            "google_connect"        => __( "Press the connect button to connect with Google Analytics; or if already connected, press the disconnect button to disable and remove any stored analytics credentials.", 'all_in_one_seo_pack' ),
    167171            "google_analytics_id"   => __( "Enter your Google Analytics ID here to track visitor behavior on your site using Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-analytics/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    … …  
    353357                'name' => __( 'Disable Google Plus Profile:', 'all_in_one_seo_pack' ), 'default' => 0, 'type' => 'checkbox'
    354358                ),
     359
     360
     361
     362
     363
     364
     365
     366
     367
     368
     369
     370
     371
     372
     373
     374
     375
     376
     377
     378
     379
     380
    355381            "google_connect"=>Array( 'name' => __( 'Connect With Google Analytics', 'all_in_one_seo_pack' ),
    356382                ),
    … …  
    526552                        'name' => __( 'Google Settings', 'all_in_one_seo_pack' ),
    527553                        'help_link' => 'http://semperplugins.com/documentation/google-settings/',
    528                         'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_display_advertising", "ga_exclude_users", "ga_track_outbound_links" )
     554                        'options' => Array( "google_publisher", "google_disable_profile", "google_author_advanced", "google_author_location", "google_enable_publisher" , "google_specify_publisher",                       
     555                                            "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_display_advertising", "ga_exclude_users", "ga_track_outbound_links" )
    529556                    ),
    530557                'noindex' => Array(
    … …  
    728755        $this->default_options["cpostnoindex"]['initial_options'] = $post_types;
    729756        $this->default_options["cpostnofollow"]['initial_options'] = $post_types;
     757
     758
     759
     760
    730761        foreach ( $post_types as $p => $pt ) {
    731762            $field = $p . "_title_format";
    … …  
    903934            if ( ( isset( $options["{$prefix}use_original_title"] ) ) && ( $options["{$prefix}use_original_title"] === '' ) )
    904935                $options["{$prefix}use_original_title"] = 0;
     936
     937
    905938        }
    906939        return $options;
    … …  
    11741207                $description = $this->get_aioseop_description( $post );
    11751208           
     1209
     1210
    11761211            $description = apply_filters( 'aioseop_description', $description );
    11771212           
    … …  
    13031338                $googleplus = $aioseop_options['aiosp_google_publisher'];
    13041339
    1305             if ( $is_front_page && !empty( $aioseop_options['aiosp_google_publisher'] ) )
    1306                 $publisher = $aioseop_options['aiosp_google_publisher'];
     1340
     1341            if ( $is_front_page ) {
     1342                if ( !empty( $aioseop_options['aiosp_google_publisher'] ) )
     1343                    $publisher = $aioseop_options['aiosp_google_publisher'];
     1344
     1345                if ( !empty( $aioseop_options["aiosp_google_author_advanced"] ) ) {
     1346                    if ( empty( $aioseop_options["aiosp_google_enable_publisher"] ) ) {
     1347                        $publisher = '';
     1348                    } elseif ( !empty( $aioseop_options["aiosp_google_specify_publisher"] ) ) {
     1349                        $publisher = $aioseop_options["aiosp_google_specify_publisher"];
     1350                    }
     1351                }               
     1352            }
    13071353           
    13081354            $publisher = apply_filters( 'aioseop_google_publisher', $publisher );
    … …  
    13151361            else if ( !empty( $aioseop_options['aiosp_google_publisher'] ) )
    13161362                $author = $aioseop_options['aiosp_google_publisher'];
     1363
     1364
     1365
     1366
     1367
     1368
     1369
     1370
     1371
     1372
     1373
     1374
     1375
     1376
    13171377           
    13181378            $author = apply_filters( 'aioseop_google_author', $author );

  • all-in-one-seo-pack/tags/2.1.4/aioseop_functions.php

    r861970 r861972  
    171171        var aioseopadmin = {
    172172            blogUrl: "<?php print get_bloginfo( 'url'); ?>",
    173             pluginPath: "<?php print AIOSEOP_PLUGIN_DIR; ?>",
    174173            pluginUrl: "<?php print AIOSEOP_PLUGIN_URL; ?>",
    175174            requestUrl: "<?php print WP_ADMIN_URL . '/admin-ajax.php' ?>",

  • all-in-one-seo-pack/tags/2.1.4/aioseop_module.css

    r861970 r861972  
    679679.aioseop_tabs {
    680680    padding-top: 6px;
     681
     682
     683
    681684}
    682685.aioseop_header_tabs li {

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

    r861970 r861972  
    4747            $this->plugin_name = AIOSEOP_PLUGIN_NAME;
    4848            $this->plugin_path = Array();
    49             $this->plugin_path['dir'] = plugin_dir_path( $this->file );
     49          $this->plugin_path['dir'] = plugin_dir_path( $this->file );
    5050            $this->plugin_path['basename'] = plugin_basename( $this->file );
    5151            $this->plugin_path['dirname'] = dirname( $this->plugin_path['basename'] );

  • all-in-one-seo-pack/tags/2.1.4/aioseop_opengraph.php

    r861970 r861972  
    277277
    278278        function add_attributes( $output ) { // avoid having duplicate meta tags
    279             if ( !empty( $this->options[ 'aiosp_opengraph_disable_jetpack' ] ) )
     279            if ( !empty( $this->options[ 'aiosp_opengraph_disable_jetpack' ] ) )
    280280                remove_action( 'wp_head', 'jetpack_og_tags' );
     281
     282
    281283            foreach( Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) as $xmlns ) {
    282284                if ( strpos( $output, $xmlns ) === false ) {
    … …  
    304306            }
    305307            $url = $aiosp->aiosp_mrt_get_url( $wp_query );
    306             $url = apply_filters( 'aioseop_canonical_url',$url );           
     308            $home_url = get_option( 'home' );
     309            if ( $url == $home_url ) $url = trailingslashit( $url );
     310            $url = apply_filters( 'aioseop_canonical_url',$url );       
    307311            $setmeta = $this->options['aiosp_opengraph_setmeta'];
    308312            if ( is_home( ) || $aiosp->is_static_front_page() ) {
    … …  
    357361           
    358362            if ( !empty( $description ) )
    359                 $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $post->post_content ) ), 1000 );
     363                $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $ ) ), 1000 );
    360364           
    361365            /* Data Validation */

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

    r861970 r861972  
    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.3
     6Version: 2.1.
    77Author: Michael Torbert
    88Author URI: http://michaeltorbert.com
    … …  
    3131/**
    3232 * @package All-in-One-SEO-Pack
    33  * @version 2.1.3
     33 * @version 2.1.
    3434 */
    3535
    3636if ( ! defined( 'AIOSEOP_VERSION' ) )
    37     define( 'AIOSEOP_VERSION', '2.1.3' );
     37    define( 'AIOSEOP_VERSION', '2.1.' );
    3838
    3939if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {

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

    r844829 r861972  
    162162            "bing_verify"           => __( "Enter your verification code here to verify your site with Bing Webmaster Tools.<br /><a href='http://semperplugins.com/documentation/bing-webmaster-verification/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    163163            "pinterest_verify"      => __( "Enter your verification code here to verify your site with Pinterest.<br /><a href='http://semperplugins.com/documentation/pinterest-site-verification/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    164             "google_publisher"      => __( "Enter your Google Plus Profile URL here to link your site to your Google Plus account for authorship.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     164            "google_publisher"      => __( "Enter your Google authorship.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    165165            "google_disable_profile"=> __( "Check this to remove the Google Plus field from the user profile screen.<br /><a href='http://semperplugins.com/documentation/google-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
     166
     167
     168
     169
    166170            "google_connect"        => __( "Press the connect button to connect with Google Analytics; or if already connected, press the disconnect button to disable and remove any stored analytics credentials.", 'all_in_one_seo_pack' ),
    167171            "google_analytics_id"   => __( "Enter your Google Analytics ID here to track visitor behavior on your site using Google Analytics.<br /><a href='http://semperplugins.com/documentation/google-analytics/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
    … …  
    353357                'name' => __( 'Disable Google Plus Profile:', 'all_in_one_seo_pack' ), 'default' => 0, 'type' => 'checkbox'
    354358                ),
     359
     360
     361
     362
     363
     364
     365
     366
     367
     368
     369
     370
     371
     372
     373
     374
     375
     376
     377
     378
     379
     380
    355381            "google_connect"=>Array( 'name' => __( 'Connect With Google Analytics', 'all_in_one_seo_pack' ),
    356382                ),
    … …  
    526552                        'name' => __( 'Google Settings', 'all_in_one_seo_pack' ),
    527553                        'help_link' => 'http://semperplugins.com/documentation/google-settings/',
    528                         'options' => Array( "google_publisher", "google_disable_profile", "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_display_advertising", "ga_exclude_users", "ga_track_outbound_links" )
     554                        'options' => Array( "google_publisher", "google_disable_profile", "google_author_advanced", "google_author_location", "google_enable_publisher" , "google_specify_publisher",                       
     555                                            "google_connect", "google_analytics_id", "ga_use_universal_analytics", "ga_domain", "ga_multi_domain", "ga_display_advertising", "ga_exclude_users", "ga_track_outbound_links" )
    529556                    ),
    530557                'noindex' => Array(
    … …  
    728755        $this->default_options["cpostnoindex"]['initial_options'] = $post_types;
    729756        $this->default_options["cpostnofollow"]['initial_options'] = $post_types;
     757
     758
     759
     760
    730761        foreach ( $post_types as $p => $pt ) {
    731762            $field = $p . "_title_format";
    … …  
    903934            if ( ( isset( $options["{$prefix}use_original_title"] ) ) && ( $options["{$prefix}use_original_title"] === '' ) )
    904935                $options["{$prefix}use_original_title"] = 0;
     936
     937
    905938        }
    906939        return $options;
    … …  
    11741207                $description = $this->get_aioseop_description( $post );
    11751208           
     1209
     1210
    11761211            $description = apply_filters( 'aioseop_description', $description );
    11771212           
    … …  
    13031338                $googleplus = $aioseop_options['aiosp_google_publisher'];
    13041339
    1305             if ( $is_front_page && !empty( $aioseop_options['aiosp_google_publisher'] ) )
    1306                 $publisher = $aioseop_options['aiosp_google_publisher'];
     1340
     1341            if ( $is_front_page ) {
     1342                if ( !empty( $aioseop_options['aiosp_google_publisher'] ) )
     1343                    $publisher = $aioseop_options['aiosp_google_publisher'];
     1344
     1345                if ( !empty( $aioseop_options["aiosp_google_author_advanced"] ) ) {
     1346                    if ( empty( $aioseop_options["aiosp_google_enable_publisher"] ) ) {
     1347                        $publisher = '';
     1348                    } elseif ( !empty( $aioseop_options["aiosp_google_specify_publisher"] ) ) {
     1349                        $publisher = $aioseop_options["aiosp_google_specify_publisher"];
     1350                    }
     1351                }               
     1352            }
    13071353           
    13081354            $publisher = apply_filters( 'aioseop_google_publisher', $publisher );
    … …  
    13151361            else if ( !empty( $aioseop_options['aiosp_google_publisher'] ) )
    13161362                $author = $aioseop_options['aiosp_google_publisher'];
     1363
     1364
     1365
     1366
     1367
     1368
     1369
     1370
     1371
     1372
     1373
     1374
     1375
     1376
    13171377           
    13181378            $author = apply_filters( 'aioseop_google_author', $author );

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

    r805127 r861972  
    171171        var aioseopadmin = {
    172172            blogUrl: "<?php print get_bloginfo( 'url'); ?>",
    173             pluginPath: "<?php print AIOSEOP_PLUGIN_DIR; ?>",
    174173            pluginUrl: "<?php print AIOSEOP_PLUGIN_URL; ?>",
    175174            requestUrl: "<?php print WP_ADMIN_URL . '/admin-ajax.php' ?>",

  • all-in-one-seo-pack/trunk/aioseop_module.css

    r805127 r861972  
    679679.aioseop_tabs {
    680680    padding-top: 6px;
     681
     682
     683
    681684}
    682685.aioseop_header_tabs li {

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

    r825760 r861972  
    4747            $this->plugin_name = AIOSEOP_PLUGIN_NAME;
    4848            $this->plugin_path = Array();
    49             $this->plugin_path['dir'] = plugin_dir_path( $this->file );
     49          $this->plugin_path['dir'] = plugin_dir_path( $this->file );
    5050            $this->plugin_path['basename'] = plugin_basename( $this->file );
    5151            $this->plugin_path['dirname'] = dirname( $this->plugin_path['basename'] );

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

    r844829 r861972  
    277277
    278278        function add_attributes( $output ) { // avoid having duplicate meta tags
    279             if ( !empty( $this->options[ 'aiosp_opengraph_disable_jetpack' ] ) )
     279            if ( !empty( $this->options[ 'aiosp_opengraph_disable_jetpack' ] ) )
    280280                remove_action( 'wp_head', 'jetpack_og_tags' );
     281
     282
    281283            foreach( Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) as $xmlns ) {
    282284                if ( strpos( $output, $xmlns ) === false ) {
    … …  
    304306            }
    305307            $url = $aiosp->aiosp_mrt_get_url( $wp_query );
    306             $url = apply_filters( 'aioseop_canonical_url',$url );           
     308            $home_url = get_option( 'home' );
     309            if ( $url == $home_url ) $url = trailingslashit( $url );
     310            $url = apply_filters( 'aioseop_canonical_url',$url );       
    307311            $setmeta = $this->options['aiosp_opengraph_setmeta'];
    308312            if ( is_home( ) || $aiosp->is_static_front_page() ) {
    … …  
    357361           
    358362            if ( !empty( $description ) )
    359                 $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $post->post_content ) ), 1000 );
     363                $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $ ) ), 1000 );
    360364           
    361365            /* Data Validation */

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

    r844829 r861972  
    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.3
     6Version: 2.1.
    77Author: Michael Torbert
    88Author URI: http://michaeltorbert.com
    … …  
    3131/**
    3232 * @package All-in-One-SEO-Pack
    33  * @version 2.1.3
     33 * @version 2.1.
    3434 */
    3535
    3636if ( ! defined( 'AIOSEOP_VERSION' ) )
    37     define( 'AIOSEOP_VERSION', '2.1.3' );
     37    define( 'AIOSEOP_VERSION', '2.1.' );
    3838
    3939if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {
Note: See TracChangeset for help on using the changeset viewer.