All in One SEO Pack - Version 1.6.15

	@@ -2,7 +2,7 @@
2
3	class All_in_One_SEO_Pack {
4
5	- var $version = "1.6.~~14.6~~";
6
7	/** Max numbers of chars in auto-generated description */
8	var $maximum_description_length = 160;
	@@ -259,7 +259,8 @@ class All_in_One_SEO_Pack {
259	}
260	echo "[$this->title_start,$this->title_end] ";
261	echo "-->\n";
262	- if ((is_home() && $aioseop_options['aiosp_home_keywords'] && !$this->is_static_posts_page()) \|\| $this->is_static_front_page()) {

263	$keywords = trim($this->internationalize($aioseop_options['aiosp_home_keywords']));
264	} elseif($this->is_static_posts_page() && !$aioseop_options['aiosp_dynamic_postspage_keywords']){ // and if option = use page set keywords instead of keywords from recent posts
265	//$keywords = "posts keyyysss" . stripcslashes(get_post_meta($post->ID,'keywords',true));
	@@ -342,11 +343,11 @@ class All_in_One_SEO_Pack {
342	$page_meta = stripcslashes($aioseop_options['aiosp_page_meta_tags']);
343	$post_meta = stripcslashes($aioseop_options['aiosp_post_meta_tags']);
344	$home_meta = stripcslashes($aioseop_options['aiosp_home_meta_tags']);
345	- ~~if (is_page() && isset(~~$~~page_meta)~~ && ~~!empty~~($~~page_meta~~) ~~\|\| $this->is_static_posts_page()) {~~
346	- ~~if (isset($meta_string)) {~~
347	- $~~meta_string~~ .= ~~"\n";~~
348	- }
349	- ~~echo~~ ~~"\n~~$page_meta";
350	}
351
352	if (is_single() && isset($post_meta) && !empty($post_meta)) {
	@@ -371,11 +372,14 @@ class All_in_One_SEO_Pack {
371	if ( is_home() && !empty( $aioseop_options['aiosp_google_publisher'] ) )
372	$meta_string = '<link rel="publisher" href="' . $aioseop_options['aiosp_google_publisher'] . '" />' . "\n" . $meta_string;
373
374	- if (~~is_home()~~ && !empty($~~home_meta~~)) {
375	- if (isset($meta_string)) {
376	- $meta_string .= ~~"\n"~~;




377	}
378	- $meta_string .= "$home_meta";
379	}
380
381	if ($meta_string != null) {
	@@ -389,8 +393,6 @@ class All_in_One_SEO_Pack {
389
390	echo "".'<link rel="canonical" href="'.$url.'" />'."\n";
391	}
392	-
393	-
394
395	}
396
	@@ -544,9 +546,11 @@ function aiosp_google_analytics(){
544	$term = get_query_var( 'term' );
545	$link = get_term_link( $term, $taxonomy );
546	$link = $this->yoast_get_paged( $link );
547	- } ~~else~~ {
548	- ~~return~~ ~~false~~;
549	- }


550
551	return $link;
552
	@@ -1426,6 +1430,7 @@ function aiosp_google_analytics(){
1426	"aiosp_enablecpost"=>'0',
1427	"aiosp_page_meta_tags"=>'',
1428	"aiosp_home_meta_tags"=>'',

1429	"aiosp_enabled" =>0,
1430	"aiosp_use_tags_as_keywords" =>1,
1431	"aiosp_seopostcol" => 1,
	@@ -1449,7 +1454,7 @@ function aiosp_google_analytics(){
1449	"aiosp_404_title_format", "aiosp_paged_format", "aiosp_google_publisher", "aiosp_google_analytics_id", "aiosp_ga_domain", "aiosp_ga_track_outbound_links",
1450	"aiosp_use_categories", "aiosp_dynamic_postspage_keywords", "aiosp_category_noindex", "aiosp_archive_noindex",
1451	"aiosp_tags_noindex", "aiosp_generate_descriptions", "aiosp_cap_cats", "aiosp_enablecpost", "aiosp_debug_info",
1452	- "aiosp_post_meta_tags", "aiosp_page_meta_tags", "aiosp_home_meta_tags", "aiosp_ex_pages", "aiosp_do_log",
1453	"aiosp_enabled", "aiosp_use_tags_as_keywords", "aiosp_seopostcol", "aiosp_seocustptcol", "aiosp_posttypecolumns");
1454
1455	$esc_options = Array( "aiosp_home_title", "aiosp_home_description", "aiosp_google_analytics_id", "aiosp_ga_domain", "aiosp_google_publisher", "aiosp_google_analytics_id" );
	@@ -1540,16 +1545,6 @@ href="http://semperplugins.com/plugins/all-in-one-seo-pack-pro-version/"><?php _
1540	</div>
1541	<a href="http://semperfiwebdesign.com/headwayaio/" target="_blank"><img src="<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>headwaybanner.png"></a>
1542	</div>
1543	-
1544	- <div style="clear:both;float:left;background-color:white;padding:10px;border:1px solid #ddd;margin-top:2px;">
1545	- <div style="width:423px;height:130px">
1546	- <h3>Secure your WordPress Blog with WebsiteDefender.com</h3>
1547	- <p><a href="http://www.websitedefender.com">WebsiteDefender.com</a> is an online service that checks your WordPress blog by checking for malware, security vulnerabilities and hacker activity. Don’t take the risk of getting blacklisted by Google.
1548	- <strong><a href="https://dashboard.websitedefender.com/register-for-free-website-scan.php">Sign up for FREE</a> and keep your blog safe!</strong></p>
1549	- </div>
1550	- <a href="http://www.websitedefender.com/wordpress-security-with-websitedefender/" target="_blank"><img src="<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>WD_wordpress_450x50.gif" alt="Sign up for a free WebsiteDefender account and secure your WordPress blog"></a>
1551	- </div>
1552	-
1553	</div>
1554
1555	<!--
	@@ -2377,6 +2372,22 @@ _e('What you enter here will be copied verbatim to your header on the home page.
2377	</td>
2378	</tr>
2379
















2380	<tr>
2381	<th scope="row" style="text-align:right; vertical-align:top;">
2382	<a style="cursor:pointer;" title="<?php _e('Click for Help!', 'auto_social')?>" onclick="toggleVisibility('aiosp_do_log_tip');">


2
3	class All_in_One_SEO_Pack {
4
5	+ var $version = "1.6.15";
6
7	/** Max numbers of chars in auto-generated description */
8	var $maximum_description_length = 160;

259	}
260	echo "[$this->title_start,$this->title_end] ";
261	echo "-->\n";
262	+ $is_front_page = ( ( is_home() && $aioseop_options['aiosp_home_keywords'] && !$this->is_static_posts_page() ) \|\| $this->is_static_front_page() );
263	+ if ( $is_front_page ) {
264	$keywords = trim($this->internationalize($aioseop_options['aiosp_home_keywords']));
265	} elseif($this->is_static_posts_page() && !$aioseop_options['aiosp_dynamic_postspage_keywords']){ // and if option = use page set keywords instead of keywords from recent posts
266	//$keywords = "posts keyyysss" . stripcslashes(get_post_meta($post->ID,'keywords',true));

343	$page_meta = stripcslashes($aioseop_options['aiosp_page_meta_tags']);
344	$post_meta = stripcslashes($aioseop_options['aiosp_post_meta_tags']);
345	$home_meta = stripcslashes($aioseop_options['aiosp_home_meta_tags']);
346	+ $front_meta = stripcslashes($aioseop_options['aiosp_front_meta_tags']);
347	+
348	+ if ( is_page() && isset($page_meta) && !empty( $page_meta ) && !$is_front_page ) {
349	+ if ( isset( $meta_string ) ) $meta_string .= "\n";
350	+ $meta_string .= $page_meta;
351	}
352
353	if (is_single() && isset($post_meta) && !empty($post_meta)) {

372	if ( is_home() && !empty( $aioseop_options['aiosp_google_publisher'] ) )
373	$meta_string = '<link rel="publisher" href="' . $aioseop_options['aiosp_google_publisher'] . '" />' . "\n" . $meta_string;
374
375	+ if ( $is_front_page && !empty( $front_meta ) ) {
376	+ if ( isset( $meta_string ) ) $meta_string .= "\n";
377	+ $meta_string .= $front_meta;
378	+ } else {
379	+ if ( is_home() && !empty( $home_meta ) ) {
380	+ if ( isset( $meta_string ) ) $meta_string .= "\n";
381	+ $meta_string .= $home_meta;
382	}

383	}
384
385	if ($meta_string != null) {

393
394	echo "".'<link rel="canonical" href="'.$url.'" />'."\n";
395	}


396
397	}
398

546	$term = get_query_var( 'term' );
547	$link = get_term_link( $term, $taxonomy );
548	$link = $this->yoast_get_paged( $link );
549	+ } elseif ( $query->is_archive && function_exists( 'get_post_type_archive_link' ) && ( $post_type = get_query_var( 'post_type' ) ) ) {
550	+ $link = get_post_type_archive_link( $post_type );
551	+ } else {
552	+ return false;
553	+ }
554
555	return $link;
556

1430	"aiosp_enablecpost"=>'0',
1431	"aiosp_page_meta_tags"=>'',
1432	"aiosp_home_meta_tags"=>'',
1433	+ "aiosp_front_meta_tags"=>'',
1434	"aiosp_enabled" =>0,
1435	"aiosp_use_tags_as_keywords" =>1,
1436	"aiosp_seopostcol" => 1,

1454	"aiosp_404_title_format", "aiosp_paged_format", "aiosp_google_publisher", "aiosp_google_analytics_id", "aiosp_ga_domain", "aiosp_ga_track_outbound_links",
1455	"aiosp_use_categories", "aiosp_dynamic_postspage_keywords", "aiosp_category_noindex", "aiosp_archive_noindex",
1456	"aiosp_tags_noindex", "aiosp_generate_descriptions", "aiosp_cap_cats", "aiosp_enablecpost", "aiosp_debug_info",
1457	+ "aiosp_post_meta_tags", "aiosp_page_meta_tags", "aiosp_home_meta_tags", "aiosp_front_meta_tags", "aiosp_ex_pages", "aiosp_do_log",
1458	"aiosp_enabled", "aiosp_use_tags_as_keywords", "aiosp_seopostcol", "aiosp_seocustptcol", "aiosp_posttypecolumns");
1459
1460	$esc_options = Array( "aiosp_home_title", "aiosp_home_description", "aiosp_google_analytics_id", "aiosp_ga_domain", "aiosp_google_publisher", "aiosp_google_analytics_id" );

1545	</div>
1546	<a href="http://semperfiwebdesign.com/headwayaio/" target="_blank"><img src="<?php echo AIOSEOP_PLUGIN_IMAGES_URL; ?>headwaybanner.png"></a>
1547	</div>










1548	</div>
1549
1550	<!--

2372	</td>
2373	</tr>
2374
2375	+ <tr>
2376	+ <th scope="row" style="text-align:right; vertical-align:top;">
2377	+ <a style="cursor:pointer;" title="<?php _e('Click for Help!', 'all_in_one_seo_pack')?>" onclick="toggleVisibility('aiosp_front_meta_tags_tip');">
2378	+ <?php _e('Additional Front Page Headers:', 'all_in_one_seo_pack')?>
2379	+ </a>
2380	+ </td>
2381	+ <td>
2382	+ <textarea cols="57" rows="2" name="aiosp_front_meta_tags"><?php echo stripcslashes($aioseop_options['aiosp_front_meta_tags']); ?></textarea>
2383	+ <div style="max-width:500px; text-align:left; display:none" id="aiosp_front_meta_tags_tip">
2384	+ <?php
2385	+ _e('What you enter here will be copied verbatim to your header on the front page. You can enter whatever additional headers you want here, even references to stylesheets.', 'all_in_one_seo_pack');
2386	+ ?>
2387	+ </div>
2388	+ </td>
2389	+ </tr>
2390	+
2391	<tr>
2392	<th scope="row" style="text-align:right; vertical-align:top;">
2393	<a style="cursor:pointer;" title="<?php _e('Click for Help!', 'auto_social')?>" onclick="toggleVisibility('aiosp_do_log_tip');">

Developer	pbaylies
Plugin	All in One SEO Pack
Version	1.6.15
Comparing to
See all releases

All in One SEO Pack - Version 1.6.15

Version Description

Release Info

Code changes from version 1.6.14.6 to 1.6.15

	@@ -3,7 +3,7 @@
3	Plugin Name: All in One SEO Pack
4	Plugin URI: http://semperfiwebdesign.com
5	Description: Out-of-the-box SEO for your WordPress blog. <a href="options-general.php?page=all-in-one-seo-pack/aioseop.class.php">Options configuration panel</a> \| <a href="http://wpplugins.com/plugin/50/all-in-one-seo-pack-pro-version">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://semperfiwebdesign.com/forum/" >Support</a> \| <a href="https://www.amazon.com/wishlist/1NFQ133FNCOOA/ref=wl_web" target="_blank" title="Amazon Wish List">Amazon Wishlist</a>
6	- Version: 1.6.~~14.6~~
7	Author: Michael Torbert
8	Author URI: http://michaeltorbert.com
9	*/
	@@ -30,11 +30,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30
31	/**
32	* @package All-in-One-SEO-Pack
33	- * @version 1.6.~~14.6~~
34	*/
35
36	if ( ! defined( 'AIOSEOP_VERSION' ) )
37	- define( 'AIOSEOP_VERSION', '1.6.~~14.6~~' );
38
39	if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) )
40	define( 'AIOSEOP_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );