Changeset 970845

Timestamp:

08/22/2014 05:39:25 PM (10 years ago)

Author:

pbaylies

Message:

Released 2.2.3, updated tags; improved description format, tax descriptions, title sanitization; global noodp, noydir options; option to run shortcodes for autogenerated descriptions.

Location:

all-in-one-seo-pack

Files:

• tags/2.2.3 (added)
• tags/2.2.3/JSON.php (copied) (copied from all-in-one-seo-pack/trunk/JSON.php)
• tags/2.2.3/OAuth.php (copied) (copied from all-in-one-seo-pack/trunk/OAuth.php)
• tags/2.2.3/aioseop_class.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_class.php) (17 diffs)
• tags/2.2.3/aioseop_feature_manager.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_feature_manager.php)
• tags/2.2.3/aioseop_file_editor.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_file_editor.php)
• tags/2.2.3/aioseop_functions.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_functions.php)
• tags/2.2.3/aioseop_importer_exporter.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_importer_exporter.php)
• tags/2.2.3/aioseop_module-rtl.css (copied) (copied from all-in-one-seo-pack/trunk/aioseop_module-rtl.css)
• tags/2.2.3/aioseop_module.css (copied) (copied from all-in-one-seo-pack/trunk/aioseop_module.css)
• tags/2.2.3/aioseop_module.js (copied) (copied from all-in-one-seo-pack/trunk/aioseop_module.js)
• tags/2.2.3/aioseop_module_class.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_module_class.php)
• tags/2.2.3/aioseop_module_manager.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_module_manager.php) (1 diff)
• tags/2.2.3/aioseop_opengraph.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_opengraph.php) (17 diffs)
• tags/2.2.3/aioseop_options.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_options.php)
• tags/2.2.3/aioseop_performance.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_performance.php)
• tags/2.2.3/aioseop_robots.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_robots.php)
• tags/2.2.3/aioseop_sitemap.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_sitemap.php)
• tags/2.2.3/aioseop_utility.php (copied) (copied from all-in-one-seo-pack/trunk/aioseop_utility.php)
• tags/2.2.3/all_in_one_seo_pack-bg_BG.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-bg_BG.mo)
• tags/2.2.3/all_in_one_seo_pack-bg_NO.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-bg_NO.mo)
• tags/2.2.3/all_in_one_seo_pack-cs_CZ.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-cs_CZ.mo)
• tags/2.2.3/all_in_one_seo_pack-da_DK.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-da_DK.mo)
• tags/2.2.3/all_in_one_seo_pack-de_DE.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-de_DE.mo)
• tags/2.2.3/all_in_one_seo_pack-es_ES.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-es_ES.mo)
• tags/2.2.3/all_in_one_seo_pack-fa_IR.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-fa_IR.mo)
• tags/2.2.3/all_in_one_seo_pack-fr_FR.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-fr_FR.mo)
• tags/2.2.3/all_in_one_seo_pack-he_IL.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-he_IL.mo)
• tags/2.2.3/all_in_one_seo_pack-hu_HU.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-hu_HU.mo)
• tags/2.2.3/all_in_one_seo_pack-it_IT.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-it_IT.mo)
• tags/2.2.3/all_in_one_seo_pack-ja.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-ja.mo)
• tags/2.2.3/all_in_one_seo_pack-ko_KR.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-ko_KR.mo)
• tags/2.2.3/all_in_one_seo_pack-nl_NL.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-nl_NL.mo)
• tags/2.2.3/all_in_one_seo_pack-pl_PL.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-pl_PL.mo)
• tags/2.2.3/all_in_one_seo_pack-pt_BR.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-pt_BR.mo)
• tags/2.2.3/all_in_one_seo_pack-ru_RU.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-ru_RU.mo)
• tags/2.2.3/all_in_one_seo_pack-sk_SK.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-sk_SK.mo)
• tags/2.2.3/all_in_one_seo_pack-tr_TR.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-tr_TR.mo)
• tags/2.2.3/all_in_one_seo_pack-uk.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-uk.mo)
• tags/2.2.3/all_in_one_seo_pack-zh_CN.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-zh_CN.mo)
• tags/2.2.3/all_in_one_seo_pack-zh_TW.mo (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack-zh_TW.mo)
• tags/2.2.3/all_in_one_seo_pack.php (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack.php) (2 diffs)
• tags/2.2.3/all_in_one_seo_pack.pot (copied) (copied from all-in-one-seo-pack/trunk/all_in_one_seo_pack.pot)
• tags/2.2.3/images (copied) (copied from all-in-one-seo-pack/trunk/images)
• tags/2.2.3/images/FileEditor-BW-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/FileEditor-BW-Retina.png)
• tags/2.2.3/images/FileEditor-BW-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/FileEditor-BW-Standard.png)
• tags/2.2.3/images/FileEditor-Color-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/FileEditor-Color-Retina.png)
• tags/2.2.3/images/FileEditor-Color-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/FileEditor-Color-Standard.png)
• tags/2.2.3/images/ImporterExporter-BW-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/ImporterExporter-BW-Retina.png)
• tags/2.2.3/images/ImporterExporter-BW-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/ImporterExporter-BW-Standard.png)
• tags/2.2.3/images/ImporterExporter-Color-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/ImporterExporter-Color-Retina.png)
• tags/2.2.3/images/ImporterExporter-Color-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/ImporterExporter-Color-Standard.png)
• tags/2.2.3/images/Robots-BW-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/Robots-BW-Retina.png)
• tags/2.2.3/images/Robots-BW-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/Robots-BW-Standard.png)
• tags/2.2.3/images/Robots-Color-Retina.png (copied) (copied from all-in-one-seo-pack/trunk/images/Robots-Color-Retina.png)
• tags/2.2.3/images/Robots-Color-Standard.png (copied) (copied from all-in-one-seo-pack/trunk/images/Robots-Color-Standard.png)
• tags/2.2.3/quickedit_functions.js (copied) (copied from all-in-one-seo-pack/trunk/quickedit_functions.js)
• tags/2.2.3/readme.txt (copied) (copied from all-in-one-seo-pack/trunk/readme.txt) (1 diff)
• tags/2.2.3/sitemap.xsl (copied) (copied from all-in-one-seo-pack/trunk/sitemap.xsl)
• tags/2.2.3/wpml-config.xml (copied) (copied from all-in-one-seo-pack/trunk/wpml-config.xml)
• trunk/aioseop_class.php (modified) (17 diffs)
• trunk/aioseop_module_manager.php (modified) (1 diff)
• trunk/aioseop_opengraph.php (modified) (17 diffs)
• trunk/all_in_one_seo_pack-pl_PL.mo (modified) (previous)
• trunk/all_in_one_seo_pack.php (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)

all-in-one-seo-pack/tags/2.2.3/aioseop_class.php

@@ -195 +195 @@
             "paginated_noindex"     =>  __( "Check this to ask search engines not to index paginated pages/posts. Useful for avoiding duplicate content.<br /><a href='http://semperplugins.com/documentation/noindex-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
             "paginated_nofollow"        =>  __( "Check this to ask search engines not to follow links from paginated pages/posts. Useful for avoiding duplicate content.<br /><a href='http://semperplugins.com/documentation/noindex-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
+
             "generate_descriptions" => __( "Check this and your Meta Descriptions will be auto-generated from your excerpt or content.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
             "hide_paginated_descriptions"=> __( "Check this and your Meta Descriptions will be removed from page 2 or later of paginated content.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
             "dont_truncate_descriptions"=> __( "Check this to prevent your Description from being truncated regardless of its length.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -467 +470 @@
                 'name' => __( 'Use nofollow for paginated pages/posts:', 'all_in_one_seo_pack' ),
                 'default' => 0),
+
+
+
+
+
+
             "generate_descriptions"=> Array(
                 'name' => __( 'Autogenerate Descriptions:', 'all_in_one_seo_pack' ),
                 'default' => 1),
+
+
+
+
             "hide_paginated_descriptions"=> Array(
                 'name' => __( 'Remove Descriptions For Paginated Pages:', 'all_in_one_seo_pack' ),
@@ -595 +608 @@
                         'name' => __( 'Noindex Settings', 'all_in_one_seo_pack' ),
                         'help_link' => 'http://semperplugins.com/documentation/noindex-settings/',
-                        'options' => Array( 'cpostnoindex', 'cpostnofollow', 'category_noindex', 'archive_date_noindex', 'archive_author_noindex', 'tags_noindex', 'search_noindex', 'paginated_noindex', 'paginated_nofollow' )
+                        'options' => Array( 'cpostnoindex', 'cpostnofollow', 'category_noindex', 'archive_date_noindex', 'archive_author_noindex', 'tags_noindex', 'search_noindex', 'paginated_noindex', 'paginated_nofollow' )
                     ),
                 'advanced' => Array(
                         'name' => __( 'Advanced Settings', 'all_in_one_seo_pack' ),
                         'help_link' => 'http://semperplugins.com/documentation/advanced-settings/',
-                        'options' => Array( 'generate_descriptions', 'hide_paginated_descriptions', 'dont_truncate_descriptions', 'unprotect_meta', 'ex_pages', 'post_meta_tags', 'page_meta_tags', 'front_meta_tags', 'home_meta_tags' )
+                        'options' => Array( 'generate_descriptions', 'hide_paginated_descriptions', 'dont_truncate_descriptions', 'unprotect_meta', 'ex_pages', 'post_meta_tags', 'page_meta_tags', 'front_meta_tags', 'home_meta_tags' )
                     )
                 );
@@ -701 +714 @@
             $extra_title_len = 0;
             if ( empty( $title_format ) ) {
-                $title = '<span id="aioseop_snippet_title">' . esc_attr( strip_tags( $title ) ) . '</span>';
+                $title = '<span id="aioseop_snippet_title">' . esc_attr( _tags( $title ) ) . '</span>';
             } else {
                 if ( strpos( $title_format, '%blog_title%' ) !== false ) $title_format = str_replace( '%blog_title%', get_bloginfo( 'name' ), $title_format );
                 $title_format = $this->apply_cf_fields( $title_format );
-                $replace_title = '<span id="aioseop_snippet_title">' . esc_attr( strip_tags( $title ) ) . '</span>';
+                $replace_title = '<span id="aioseop_snippet_title">' . esc_attr( _tags( $title ) ) . '</span>';
                 if ( strpos( $title_format, '%post_title%' ) !== false ) $title_format = str_replace( '%post_title%', $replace_title, $title_format );
                 if ( strpos( $title_format, '%page_title%' ) !== false ) $title_format = str_replace( '%page_title%', $replace_title, $title_format );
@@ -715 +728 @@
             }
             
-            $args['value'] = sprintf( $args['value'], $title, esc_url( $url ), esc_attr( strip_tags( $description ) ) );
+            $args['value'] = sprintf( $args['value'], $title, esc_url( $url ), esc_attr( _tags( $description ) ) );
             $extra_title_len = (int)$extra_title_len;
             $args['value'] .= "<script>var aiosp_title_extra = {$extra_title_len};</script>";
@@ -1309 +1322 @@
             
             if ( isset($description) && ( $this->strlen($description) > $this->minimum_description_length ) && !( $is_front_page && is_paged() ) ) {
-                $description = trim( strip_tags( $description ) );
-                $description = str_replace( '"', '&quot;', $description );
-
-                // replace newlines on mac / windows?
-                $description = str_replace( "\r\n", ' ', $description );
-
-                // maybe linux uses this alone
-                $description = str_replace( "\n", ' ', $description );
-
-                if ( !isset( $meta_string) ) {
-                    $meta_string = '';
-                }
-
                 // description format
                 $description_format = $aioseop_options['aiosp_description_format'];
@@ -1327 +1327 @@
                     $description_format = "%description%";
                 }
+
                 $description = str_replace( '%description%', apply_filters( 'aioseop_description_override', $description ), $description_format );
                 if ( strpos( $description, '%blog_title%'       ) !== false ) $description = str_replace( '%blog_title%',       get_bloginfo( 'name' ), $description );
@@ -1332 +1333 @@
                 if ( strpos( $description, '%wp_title%'         ) !== false ) $description = str_replace( '%wp_title%',         $this->get_original_title(), $description );
                 if ( strpos( $description, '%post_title%'       ) !== false ) $description = str_replace( '%post_title%',       $this->get_aioseop_title( $post ), $description );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 if( $aioseop_options['aiosp_can'] && is_attachment() ) {
                     $url = $this->aiosp_mrt_get_url( $wp_query );
@@ -1373 +1388 @@
 
             $robots_meta = '';
+
+
+
+
             if ( ( is_category() && !empty( $aioseop_options['aiosp_category_noindex'] ) ) || ( !is_category() && is_archive() && !is_tag() && !is_tax()
                 && ( ( is_date() && !empty( $aioseop_options['aiosp_archive_date_noindex'] ) ) || ( is_author() && !empty( $aioseop_options['aiosp_archive_author_noindex'] ) ) ) ) 
-                || ( is_tag() && !empty( $aioseop_options['aiosp_tags_noindex'] ) ) || ( is_search() && !empty( $aioseop_options['aiosp_search_noindex'] ) ) )
-                $robots_meta = 'noindex,follow';
-            elseif ( ( is_single() || is_page() || $this->is_static_posts_page() || is_attachment() ) && !empty( $opts ) ) {
+                || ( is_tag() && !empty( $aioseop_options['aiosp_tags_noindex'] ) ) || ( is_search() && !empty( $aioseop_options['aiosp_search_noindex'] ) ) )
+                ';
+             ) ) {
                 $post_type = get_post_type();
-                $aiosp_noindex = htmlspecialchars( stripslashes( $opts['aiosp_noindex'] ) );
-                $aiosp_nofollow = htmlspecialchars( stripslashes( $opts['aiosp_nofollow'] ) );
-                $aiosp_noodp = htmlspecialchars( stripslashes( $opts['aiosp_noodp'] ) );
-                $aiosp_noydir = htmlspecialchars( stripslashes( $opts['aiosp_noydir'] ) );
+                if ( !empty( $opts ) ) {
+                    $aiosp_noindex = htmlspecialchars( stripslashes( $opts['aiosp_noindex'] ) );
+                    $aiosp_nofollow = htmlspecialchars( stripslashes( $opts['aiosp_nofollow'] ) );
+                    $aiosp_noodp = htmlspecialchars( stripslashes( $opts['aiosp_noodp'] ) );
+                    $aiosp_noydir = htmlspecialchars( stripslashes( $opts['aiosp_noydir'] ) );                  
+                }
                 if ( $aiosp_noindex || $aiosp_nofollow || $aiosp_noodp || $aiosp_noydir || !empty( $aioseop_options['aiosp_cpostnoindex'] ) || !empty( $aioseop_options['aiosp_cpostnofollow'] ) || !empty( $aioseop_options['aiosp_paginated_noindex'] ) || !empty( $aioseop_options['aiosp_paginated_nofollow'] ) ) {
-                
-                    $noindex = "index";
-                    $nofollow = "follow";
-                    $noodp = $noydir = '';
                     if ( ( $aiosp_noindex == 'on' ) || ( ( !empty( $aioseop_options['aiosp_paginated_noindex'] ) ) && ( ( $page > 1 ) ) ) ||
                          ( ( $aiosp_noindex == '' ) && ( !empty( $aioseop_options['aiosp_cpostnoindex'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnoindex'] ) ) ) )
@@ -1394 +1411 @@
                          ( ( $aiosp_nofollow == '' ) && ( !empty( $aioseop_options['aiosp_cpostnofollow'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnofollow'] ) ) ) )
                         $nofollow = "no" . $nofollow;
-                    if ( $aiosp_noodp ) $nofollow .= ',noodp';
-                    if ( $aiosp_noydir ) $nofollow .= ',noydir';
-                    $robots_meta = $noindex . ',' . $nofollow;
-                }
-            }
-            
+                }
+            }
+            if ( !empty( $aioseop_options['aiosp_noodp'] ) && $aioseop_options['aiosp_noodp'] )   $aiosp_noodp = true;
+            if ( !empty( $aioseop_options['aiosp_noydir'] ) && $aioseop_options['aiosp_noydir'] ) $aiosp_noydir = true;
+            if ( $aiosp_noodp ) $nofollow .= ',noodp';
+            if ( $aiosp_noydir ) $nofollow .= ',noydir';
+            $robots_meta = $noindex . ',' . $nofollow;
             if ( $robots_meta == 'index,follow' ) $robots_meta = '';
             
@@ -2070 +2088 @@
             $description = $this->trim_excerpt_without_filters_full_length( $this->internationalize( $post->post_excerpt ) );
             if ( !$description && $aioseop_options["aiosp_generate_descriptions"] ) {
-                $description = $this->trim_excerpt_without_filters( $this->internationalize( $post->post_content ) );               
+                $content = $post->post_content;
+                if ( !empty( $aioseop_options["aiosp_run_shortcodes"] ) ) $content = do_shortcode( $content );
+                $content = wp_strip_all_tags( $content );
+                $description = $this->trim_excerpt_without_filters( $this->internationalize( $content ) );
             }
         }
@@ -2231 +2252 @@
     function get_tax_title_format( $tax = '' ) {
         global $aioseop_options;
-        if ( is_category() )
+        $title_format = '%category_title% | %blog_title%';
+        if ( !empty( $aioseop_options['aiosp_category_title_format'] ) )
             $title_format = $aioseop_options['aiosp_category_title_format'];
-        if ( empty( $title_format ) )
-            $title_format = '%category_title% | %blog_title%';
         return $title_format;
     }
@@ -2247 +2267 @@
         if ( strpos( $title, '%blog_title%'           ) !== false ) $title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $title );
         if ( strpos( $title, '%blog_description%'     ) !== false ) $title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description' ) ), $title );
-        $title = $this->paged_title( $title );
-        return $title;
+        $title = trim( wp_strip_all_tags( $title ) );
+        $title = str_replace( Array( '"', "\r\n", "\n" ), Array( '&quot;', ' ', ' ' ), $title );
+        return $this->paged_title( $title );
     }
     
@@ -2450 +2471 @@
                 if ( strpos( $title, '%blog_description%' ) !== false ) $title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description') ), $title );
                 if ( strpos( $title, '%tag%'              ) !== false ) $title = str_replace( '%tag%', $tag, $title );
+
+
+
+
                 $title = $this->paged_title( $title );
                 return $title;
@@ -2491 +2516 @@
                 if ( strpos( $new_title, '%year%' ) !== false ) $new_title = str_replace( '%year%', get_query_var( 'year' ), $new_title );
             } else if ( is_post_type_archive() ) {
-                $title = apply_filters( 'aioseop_archive_title', $this->apply_archive_title_format( $title ) );
+                if ( empty( $title ) ) $title = $this->get_original_title( '', false );
+                $new_title = apply_filters( 'aioseop_archive_title', $this->apply_archive_title_format( $title ) );
             } else return false;
             $new_title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $new_title );
@@ -2571 +2597 @@
         $text = str_replace( ']]>', ']]&gt;', $text );
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
-        $text = strip_tags( $text );
+        $text = _tags( $text );
         if ( !$max ) $max = $this->maximum_description_length;
         $len = $this->strlen( $text );
@@ -2596 +2622 @@
         $text = str_replace( ']]>', ']]&gt;', $text );
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
-        $text = strip_tags( $text );
+        $text = _tags( $text );
         return trim( stripslashes( $text ) );
     }

all-in-one-seo-pack/tags/2.2.3/aioseop_module_manager.php

@@ -84 +84 @@
             if ( $v !== null ) return false;    // already loaded
             if ( $mod == 'performance' && !is_super_admin() ) return false;
-            if ( $mod == 'file_editor' && ( ( ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) 
-                                           || ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-                                           || !is_super_admin() ) ) )
+            if ( ( $mod == 'file_editor' || $mod == 'robots' )
+                                         && ( ( ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) 
+                                         || ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+                                         || !is_super_admin() ) ) )
                 return false;
             $mod_enable = false;

all-in-one-seo-pack/tags/2.2.3/aioseop_opengraph.php

@@ -92 +92 @@
                 "imagewidth"            => __( "Enter the width for your Open Graph image in pixels (i.e. 600).<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "imageheight"           => __( "Enter the height for your Open Graph image in pixels (i.e. 600).<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
+
+
+
                 "defcard"               => __( "Select the default type of Twitter card to display.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "setcard"               => __( "Select the default type of Twitter card to display.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -101 +105 @@
                 "desc"                  => __( "This is the Open Graph description of this Page or Post.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "category"              => __( "Select the Open Graph type that best describes the content of this Page or Post.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
                 "tag"                   => __( "This Open Graph meta allows you to add a list of keywords that best describe this content.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "facebook_publisher"    => __( "Link articles to the Facebook page associated with your website.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -120 +125 @@
                     'generate_descriptions' => Array( 'name'    => __( 'Autogenerate OG Descriptions', 'all_in_one_seo_pack' ), 'default' => 1 ),
                     'disable_jetpack'       => Array( 'name'    => __( 'Disable Jetpack Tags', 'all_in_one_seo_pack' ), 'default' => 0 ),
-                    'defimg'        => Array(   'name'          => __( 'Select OG:Image Source', 'all_in_one_seo_pack' ), 'type' => 'select', 'initial_options' => Array( '' => __( 'Default Image' ), 'featured' => __( 'Featured Image' ), 'attach' => __( 'First Attached Image' ), 'content' => __( 'First Image In Content' ), 'custom' => __( 'Image From Custom Field' ), 'auto' => __( 'First Available Image' ) ) ),
+                    'defimg'        => Array(   'name'          => __( 'Select OG:Image Source', 'all_in_one_seo_pack' ), 'type' => 'select', 'initial_options' => Array( '' => __( 'Default Image' ), 'featured' => __( 'Featured Image' ), 'attach' => __( 'First Attached Image' ), 'content' => __( 'First Image In Content' ), 'custom' => __( 'Image From Custom Field' ), 'auto' => __( 'First Available Image' ) ) ),
                     'fallback'      => Array(   'name'          => __( 'Use Default If No Image Found', 'all_in_one_seo_pack' ), 'type' => 'checkbox' ),
                     'dimg'          => Array(   'name'          => __( 'Default OG:Image',  'all_in_one_seo_pack' ), 'default' => AIOSEOP_PLUGIN_IMAGES_URL . 'default-user-image.png', 'type' => 'image' ),
@@ -134 +139 @@
                     'imageheight'   => Array(   'name'          => __( 'Specify Image Height', 'all_in_one_seo_pack' ),
                                                 'type'          => 'text', 'default' => '' ),
+
+
+
+
+
+
                     'defcard'       => Array(   'name'          => __( 'Default Twitter Card', 'all_in_one_seo_pack' ),
                                                 'type'          => 'select', 'initial_options' => Array( 'summary' => __( 'Summary', 'all_in_one_seo_pack' ), 'summary_large_image' => __( 'Summary Large Image', 'all_in_one_seo_pack' ), 'photo' => __( 'Photo', 'all_in_one_seo_pack' ) ), 'default' => 'summary' ),
@@ -155 +166 @@
                                                 'default'       => ''
                                         ),
+
+
                     'tag'           => Array(   'name'          => __( 'Article Tags', 'all_in_one_seo_pack' ),
                                                 'type'          => 'text', 'default' => '',  'condshow' => Array( 'aioseop_opengraph_settings_category' => 'article' ) ),
@@ -177 +190 @@
                 'settings'  =>  Array(  'name'      => __('Social Settings', 'all_in_one_seo_pack'),
                                                           'type'        => 'metabox', 'help_link' => 'http://semperplugins.com/documentation/social-meta-module/#pagepost_settings',
-                                                          'options' => Array( 'title', 'desc', 'image', 'customimg', 'imagewidth', 'imageheight', 'category', 'tag', 'setcard' ),
+                                                          'options' => Array( 'title', 'desc', 'image', 'customimg', 'imagewidth', 'imageheight', '', 'tag', 'setcard' ),
                                                           'display' => $display, 'prefix' => 'aioseop_opengraph_'
                                     )
@@ -346 +359 @@
                 add_filter( 'jetpack_disable_twitter_cards', '__return_false', 100 );
             }
-            $attributes = apply_filters( $this->prefix . 'attributes', Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) );
+            $attributes = apply_filters( $this->prefix . 'attributes', Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) );
             foreach( $attributes as $attr ) {
                 if ( strpos( $output, $attr ) === false ) {
@@ -361 +374 @@
             $dimg = $this->options['aiosp_opengraph_dimg'];
             $current_post_type = get_post_type();
-            $title = $description = $image = '';
+            $title = $description = $image = '';
             $type = 'article';
             
@@ -396 +409 @@
                 if( empty($sitename) ) $sitename = get_bloginfo('name');
                 
-                if ( empty( $description ) && $first_page && ( !empty( $this->options['aiosp_opengraph_generate_descriptions'] ) ) )
+                if ( empty( $description ) && $first_page && ( !empty( $this->options['aiosp_opengraph_generate_descriptions'] ) ) )
                     $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $post->post_content ) ), 1000 );
                 
@@ -409 +422 @@
                     $type = $this->options["aiosp_opengraph_{$current_post_type}_fb_object_type"];
                 }
+
+
+
                 if ( $type == 'article' && ( !empty( $metabox['aioseop_opengraph_settings_tag'] ) ) ) {
                     $tag = $metabox['aioseop_opengraph_settings_tag'];
@@ -418 +434 @@
                 if ( !empty( $this->options['aiosp_opengraph_twitter_domain'] ) )
                     $domain = $this->options['aiosp_opengraph_twitter_domain'];
+
+
+
+
+
+
+
+
 
-                if ( $type == 'article' && !empty( $post ) && isset( $post->post_author ) && !empty( $this->options['aiosp_opengraph_facebook_author'] ) )
-                    $author = get_the_author_meta( 'facebook', $post->post_author );
+                    if ( isset( $post->post_modified ) )
+                        $modified_time = date( 'Y-m-d\TH:i:s\Z', mysql2date( 'U', $post->post_modified ) );
+                }
+
                 
                 $image = $metabox['aioseop_opengraph_settings_image'];
+
                 $title = $metabox['aioseop_opengraph_settings_title'];
                 $description = $metabox['aioseop_opengraph_settings_desc'];
@@ -477 +504 @@
                         case 'auto'     :   $thumbnail = $this->get_the_image();
                                             break;
+
+
                         default         :   $thumbnail = $this->options['aiosp_opengraph_dimg'];
                     }
@@ -491 +520 @@
                 if ( !empty( $metabox['aioseop_opengraph_settings_imageheight'] ) )
                     $height = $metabox['aioseop_opengraph_settings_imageheight'];
+
+
+
+
+
+
+
             }
             
@@ -523 +559 @@
                         'width'         => 'og:image:width',
                         'height'        => 'og:image:height',
+
+
+
                         'sitename'      => 'og:site_name',
                         'key'           => 'fb:admins',
                         'description'   => 'og:description',
+
                         'tag'           => 'article:tag',
                         'publisher'     => 'article:publisher',
-                        'author'        => 'article:author'
+                        'author'        => 'article:author',
+                        'published_time'=> 'article:published_time',
+                        'modified_time' => 'article:modified_time',
                     ),
                 'twitter'   => Array(
@@ -536 +578 @@
                         'domain'        => 'twitter:domain',
                         'description'   => 'twitter:description',
-                    )
+                    ),
+                'google+'   => Array(
+                        'thumbnail'     => 'image',
+                    ),
             );
             
@@ -635 +680 @@
 
             if ( !empty( $options ) && !empty( $options['aioseop_opengraph_settings_customimg'] ) ) {
-                $img[$options['aioseop_opengraph_settings_customimg']] = 'customimg';               
+                $img[$options['aioseop_opengraph_settings_customimg']] = 'customimg';       
+            }
+            if ( $author_img = $this->get_the_image_by_author( $p ) ) {
+                $image["author"] = $author_img;             
             }
             $image = array_flip( $img );
@@ -644 +692 @@
             return Array( $image, $images );
         }
-                
+        
+        function get_the_image_by_author( $options = null, $p = null ) {
+            if ( $p === null ) {
+                global $post;
+            } else {
+                $post = $p;
+            }
+            if ( !empty( $post ) && !empty( $post->post_author ) ) {
+                $matches = Array();
+                $get_avatar = get_avatar( $post->post_author, 300 );
+                if ( preg_match("/src='(.*?)'/i", $get_avatar, $matches) ) {
+                    return $matches[1];
+                }
+            }
+            return false;
+        }
+        
         function get_the_image( $options = null, $p = null ) {
             $meta_key = $this->options['aiosp_opengraph_meta_key'];

all-in-one-seo-pack/tags/2.2.3/all_in_one_seo_pack.php

@@ -4 +4 @@
 Plugin URI: http://semperfiwebdesign.com
 Description: 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>
-Version: 2.2.2
+Version: 2.2.
 Author: Michael Torbert
 Author URI: http://michaeltorbert.com
@@ -31 +31 @@
 /**
  * @package All-in-One-SEO-Pack
- * @version 2.2.2
+ * @version 2.2.
  */
 
 if ( ! defined( 'AIOSEOP_VERSION' ) )
-    define( 'AIOSEOP_VERSION', '2.2.2' );
+    define( 'AIOSEOP_VERSION', '2.2.' );
 
 if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {

all-in-one-seo-pack/tags/2.2.3/readme.txt

@@ -4 +4 @@
 Tags: all in one, all in one seo, all in one seo pack, seo, search engine optimization, google
 Requires at least: 3.3
-Tested up to: 3.9.1
+Tested up to: 3.9.
 Stable tag: trunk
 

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

@@ -195 +195 @@
             "paginated_noindex"     =>  __( "Check this to ask search engines not to index paginated pages/posts. Useful for avoiding duplicate content.<br /><a href='http://semperplugins.com/documentation/noindex-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
             "paginated_nofollow"        =>  __( "Check this to ask search engines not to follow links from paginated pages/posts. Useful for avoiding duplicate content.<br /><a href='http://semperplugins.com/documentation/noindex-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
+
             "generate_descriptions" => __( "Check this and your Meta Descriptions will be auto-generated from your excerpt or content.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
             "hide_paginated_descriptions"=> __( "Check this and your Meta Descriptions will be removed from page 2 or later of paginated content.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
             "dont_truncate_descriptions"=> __( "Check this to prevent your Description from being truncated regardless of its length.<br /><a href='http://semperplugins.com/documentation/advanced-settings/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -467 +470 @@
                 'name' => __( 'Use nofollow for paginated pages/posts:', 'all_in_one_seo_pack' ),
                 'default' => 0),
+
+
+
+
+
+
             "generate_descriptions"=> Array(
                 'name' => __( 'Autogenerate Descriptions:', 'all_in_one_seo_pack' ),
                 'default' => 1),
+
+
+
+
             "hide_paginated_descriptions"=> Array(
                 'name' => __( 'Remove Descriptions For Paginated Pages:', 'all_in_one_seo_pack' ),
@@ -595 +608 @@
                         'name' => __( 'Noindex Settings', 'all_in_one_seo_pack' ),
                         'help_link' => 'http://semperplugins.com/documentation/noindex-settings/',
-                        'options' => Array( 'cpostnoindex', 'cpostnofollow', 'category_noindex', 'archive_date_noindex', 'archive_author_noindex', 'tags_noindex', 'search_noindex', 'paginated_noindex', 'paginated_nofollow' )
+                        'options' => Array( 'cpostnoindex', 'cpostnofollow', 'category_noindex', 'archive_date_noindex', 'archive_author_noindex', 'tags_noindex', 'search_noindex', 'paginated_noindex', 'paginated_nofollow' )
                     ),
                 'advanced' => Array(
                         'name' => __( 'Advanced Settings', 'all_in_one_seo_pack' ),
                         'help_link' => 'http://semperplugins.com/documentation/advanced-settings/',
-                        'options' => Array( 'generate_descriptions', 'hide_paginated_descriptions', 'dont_truncate_descriptions', 'unprotect_meta', 'ex_pages', 'post_meta_tags', 'page_meta_tags', 'front_meta_tags', 'home_meta_tags' )
+                        'options' => Array( 'generate_descriptions', 'hide_paginated_descriptions', 'dont_truncate_descriptions', 'unprotect_meta', 'ex_pages', 'post_meta_tags', 'page_meta_tags', 'front_meta_tags', 'home_meta_tags' )
                     )
                 );
@@ -701 +714 @@
             $extra_title_len = 0;
             if ( empty( $title_format ) ) {
-                $title = '<span id="aioseop_snippet_title">' . esc_attr( strip_tags( $title ) ) . '</span>';
+                $title = '<span id="aioseop_snippet_title">' . esc_attr( _tags( $title ) ) . '</span>';
             } else {
                 if ( strpos( $title_format, '%blog_title%' ) !== false ) $title_format = str_replace( '%blog_title%', get_bloginfo( 'name' ), $title_format );
                 $title_format = $this->apply_cf_fields( $title_format );
-                $replace_title = '<span id="aioseop_snippet_title">' . esc_attr( strip_tags( $title ) ) . '</span>';
+                $replace_title = '<span id="aioseop_snippet_title">' . esc_attr( _tags( $title ) ) . '</span>';
                 if ( strpos( $title_format, '%post_title%' ) !== false ) $title_format = str_replace( '%post_title%', $replace_title, $title_format );
                 if ( strpos( $title_format, '%page_title%' ) !== false ) $title_format = str_replace( '%page_title%', $replace_title, $title_format );
@@ -715 +728 @@
             }
             
-            $args['value'] = sprintf( $args['value'], $title, esc_url( $url ), esc_attr( strip_tags( $description ) ) );
+            $args['value'] = sprintf( $args['value'], $title, esc_url( $url ), esc_attr( _tags( $description ) ) );
             $extra_title_len = (int)$extra_title_len;
             $args['value'] .= "<script>var aiosp_title_extra = {$extra_title_len};</script>";
@@ -1309 +1322 @@
             
             if ( isset($description) && ( $this->strlen($description) > $this->minimum_description_length ) && !( $is_front_page && is_paged() ) ) {
-                $description = trim( strip_tags( $description ) );
-                $description = str_replace( '"', '&quot;', $description );
-
-                // replace newlines on mac / windows?
-                $description = str_replace( "\r\n", ' ', $description );
-
-                // maybe linux uses this alone
-                $description = str_replace( "\n", ' ', $description );
-
-                if ( !isset( $meta_string) ) {
-                    $meta_string = '';
-                }
-
                 // description format
                 $description_format = $aioseop_options['aiosp_description_format'];
@@ -1327 +1327 @@
                     $description_format = "%description%";
                 }
+
                 $description = str_replace( '%description%', apply_filters( 'aioseop_description_override', $description ), $description_format );
                 if ( strpos( $description, '%blog_title%'       ) !== false ) $description = str_replace( '%blog_title%',       get_bloginfo( 'name' ), $description );
@@ -1332 +1333 @@
                 if ( strpos( $description, '%wp_title%'         ) !== false ) $description = str_replace( '%wp_title%',         $this->get_original_title(), $description );
                 if ( strpos( $description, '%post_title%'       ) !== false ) $description = str_replace( '%post_title%',       $this->get_aioseop_title( $post ), $description );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 if( $aioseop_options['aiosp_can'] && is_attachment() ) {
                     $url = $this->aiosp_mrt_get_url( $wp_query );
@@ -1373 +1388 @@
 
             $robots_meta = '';
+
+
+
+
             if ( ( is_category() && !empty( $aioseop_options['aiosp_category_noindex'] ) ) || ( !is_category() && is_archive() && !is_tag() && !is_tax()
                 && ( ( is_date() && !empty( $aioseop_options['aiosp_archive_date_noindex'] ) ) || ( is_author() && !empty( $aioseop_options['aiosp_archive_author_noindex'] ) ) ) ) 
-                || ( is_tag() && !empty( $aioseop_options['aiosp_tags_noindex'] ) ) || ( is_search() && !empty( $aioseop_options['aiosp_search_noindex'] ) ) )
-                $robots_meta = 'noindex,follow';
-            elseif ( ( is_single() || is_page() || $this->is_static_posts_page() || is_attachment() ) && !empty( $opts ) ) {
+                || ( is_tag() && !empty( $aioseop_options['aiosp_tags_noindex'] ) ) || ( is_search() && !empty( $aioseop_options['aiosp_search_noindex'] ) ) )
+                ';
+             ) ) {
                 $post_type = get_post_type();
-                $aiosp_noindex = htmlspecialchars( stripslashes( $opts['aiosp_noindex'] ) );
-                $aiosp_nofollow = htmlspecialchars( stripslashes( $opts['aiosp_nofollow'] ) );
-                $aiosp_noodp = htmlspecialchars( stripslashes( $opts['aiosp_noodp'] ) );
-                $aiosp_noydir = htmlspecialchars( stripslashes( $opts['aiosp_noydir'] ) );
+                if ( !empty( $opts ) ) {
+                    $aiosp_noindex = htmlspecialchars( stripslashes( $opts['aiosp_noindex'] ) );
+                    $aiosp_nofollow = htmlspecialchars( stripslashes( $opts['aiosp_nofollow'] ) );
+                    $aiosp_noodp = htmlspecialchars( stripslashes( $opts['aiosp_noodp'] ) );
+                    $aiosp_noydir = htmlspecialchars( stripslashes( $opts['aiosp_noydir'] ) );                  
+                }
                 if ( $aiosp_noindex || $aiosp_nofollow || $aiosp_noodp || $aiosp_noydir || !empty( $aioseop_options['aiosp_cpostnoindex'] ) || !empty( $aioseop_options['aiosp_cpostnofollow'] ) || !empty( $aioseop_options['aiosp_paginated_noindex'] ) || !empty( $aioseop_options['aiosp_paginated_nofollow'] ) ) {
-                
-                    $noindex = "index";
-                    $nofollow = "follow";
-                    $noodp = $noydir = '';
                     if ( ( $aiosp_noindex == 'on' ) || ( ( !empty( $aioseop_options['aiosp_paginated_noindex'] ) ) && ( ( $page > 1 ) ) ) ||
                          ( ( $aiosp_noindex == '' ) && ( !empty( $aioseop_options['aiosp_cpostnoindex'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnoindex'] ) ) ) )
@@ -1394 +1411 @@
                          ( ( $aiosp_nofollow == '' ) && ( !empty( $aioseop_options['aiosp_cpostnofollow'] ) ) && ( in_array( $post_type, $aioseop_options['aiosp_cpostnofollow'] ) ) ) )
                         $nofollow = "no" . $nofollow;
-                    if ( $aiosp_noodp ) $nofollow .= ',noodp';
-                    if ( $aiosp_noydir ) $nofollow .= ',noydir';
-                    $robots_meta = $noindex . ',' . $nofollow;
-                }
-            }
-            
+                }
+            }
+            if ( !empty( $aioseop_options['aiosp_noodp'] ) && $aioseop_options['aiosp_noodp'] )   $aiosp_noodp = true;
+            if ( !empty( $aioseop_options['aiosp_noydir'] ) && $aioseop_options['aiosp_noydir'] ) $aiosp_noydir = true;
+            if ( $aiosp_noodp ) $nofollow .= ',noodp';
+            if ( $aiosp_noydir ) $nofollow .= ',noydir';
+            $robots_meta = $noindex . ',' . $nofollow;
             if ( $robots_meta == 'index,follow' ) $robots_meta = '';
             
@@ -2070 +2088 @@
             $description = $this->trim_excerpt_without_filters_full_length( $this->internationalize( $post->post_excerpt ) );
             if ( !$description && $aioseop_options["aiosp_generate_descriptions"] ) {
-                $description = $this->trim_excerpt_without_filters( $this->internationalize( $post->post_content ) );               
+                $content = $post->post_content;
+                if ( !empty( $aioseop_options["aiosp_run_shortcodes"] ) ) $content = do_shortcode( $content );
+                $content = wp_strip_all_tags( $content );
+                $description = $this->trim_excerpt_without_filters( $this->internationalize( $content ) );
             }
         }
@@ -2231 +2252 @@
     function get_tax_title_format( $tax = '' ) {
         global $aioseop_options;
-        if ( is_category() )
+        $title_format = '%category_title% | %blog_title%';
+        if ( !empty( $aioseop_options['aiosp_category_title_format'] ) )
             $title_format = $aioseop_options['aiosp_category_title_format'];
-        if ( empty( $title_format ) )
-            $title_format = '%category_title% | %blog_title%';
         return $title_format;
     }
@@ -2247 +2267 @@
         if ( strpos( $title, '%blog_title%'           ) !== false ) $title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $title );
         if ( strpos( $title, '%blog_description%'     ) !== false ) $title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description' ) ), $title );
-        $title = $this->paged_title( $title );
-        return $title;
+        $title = trim( wp_strip_all_tags( $title ) );
+        $title = str_replace( Array( '"', "\r\n", "\n" ), Array( '&quot;', ' ', ' ' ), $title );
+        return $this->paged_title( $title );
     }
     
@@ -2450 +2471 @@
                 if ( strpos( $title, '%blog_description%' ) !== false ) $title = str_replace( '%blog_description%', $this->internationalize( get_bloginfo( 'description') ), $title );
                 if ( strpos( $title, '%tag%'              ) !== false ) $title = str_replace( '%tag%', $tag, $title );
+
+
+
+
                 $title = $this->paged_title( $title );
                 return $title;
@@ -2491 +2516 @@
                 if ( strpos( $new_title, '%year%' ) !== false ) $new_title = str_replace( '%year%', get_query_var( 'year' ), $new_title );
             } else if ( is_post_type_archive() ) {
-                $title = apply_filters( 'aioseop_archive_title', $this->apply_archive_title_format( $title ) );
+                if ( empty( $title ) ) $title = $this->get_original_title( '', false );
+                $new_title = apply_filters( 'aioseop_archive_title', $this->apply_archive_title_format( $title ) );
             } else return false;
             $new_title = str_replace( '%blog_title%', $this->internationalize( get_bloginfo( 'name' ) ), $new_title );
@@ -2571 +2597 @@
         $text = str_replace( ']]>', ']]&gt;', $text );
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
-        $text = strip_tags( $text );
+        $text = _tags( $text );
         if ( !$max ) $max = $this->maximum_description_length;
         $len = $this->strlen( $text );
@@ -2596 +2622 @@
         $text = str_replace( ']]>', ']]&gt;', $text );
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
-        $text = strip_tags( $text );
+        $text = _tags( $text );
         return trim( stripslashes( $text ) );
     }

all-in-one-seo-pack/trunk/aioseop_module_manager.php

@@ -84 +84 @@
             if ( $v !== null ) return false;    // already loaded
             if ( $mod == 'performance' && !is_super_admin() ) return false;
-            if ( $mod == 'file_editor' && ( ( ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) 
-                                           || ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-                                           || !is_super_admin() ) ) )
+            if ( ( $mod == 'file_editor' || $mod == 'robots' )
+                                         && ( ( ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) 
+                                         || ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+                                         || !is_super_admin() ) ) )
                 return false;
             $mod_enable = false;

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

@@ -92 +92 @@
                 "imagewidth"            => __( "Enter the width for your Open Graph image in pixels (i.e. 600).<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "imageheight"           => __( "Enter the height for your Open Graph image in pixels (i.e. 600).<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
+
+
+
                 "defcard"               => __( "Select the default type of Twitter card to display.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "setcard"               => __( "Select the default type of Twitter card to display.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -101 +105 @@
                 "desc"                  => __( "This is the Open Graph description of this Page or Post.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "category"              => __( "Select the Open Graph type that best describes the content of this Page or Post.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
+
                 "tag"                   => __( "This Open Graph meta allows you to add a list of keywords that best describe this content.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
                 "facebook_publisher"    => __( "Link articles to the Facebook page associated with your website.<br /><a href='http://semperplugins.com/documentation/social-meta-module/' target='_blank'>Click here for documentation on this setting</a>", 'all_in_one_seo_pack' ),
@@ -120 +125 @@
                     'generate_descriptions' => Array( 'name'    => __( 'Autogenerate OG Descriptions', 'all_in_one_seo_pack' ), 'default' => 1 ),
                     'disable_jetpack'       => Array( 'name'    => __( 'Disable Jetpack Tags', 'all_in_one_seo_pack' ), 'default' => 0 ),
-                    'defimg'        => Array(   'name'          => __( 'Select OG:Image Source', 'all_in_one_seo_pack' ), 'type' => 'select', 'initial_options' => Array( '' => __( 'Default Image' ), 'featured' => __( 'Featured Image' ), 'attach' => __( 'First Attached Image' ), 'content' => __( 'First Image In Content' ), 'custom' => __( 'Image From Custom Field' ), 'auto' => __( 'First Available Image' ) ) ),
+                    'defimg'        => Array(   'name'          => __( 'Select OG:Image Source', 'all_in_one_seo_pack' ), 'type' => 'select', 'initial_options' => Array( '' => __( 'Default Image' ), 'featured' => __( 'Featured Image' ), 'attach' => __( 'First Attached Image' ), 'content' => __( 'First Image In Content' ), 'custom' => __( 'Image From Custom Field' ), 'auto' => __( 'First Available Image' ) ) ),
                     'fallback'      => Array(   'name'          => __( 'Use Default If No Image Found', 'all_in_one_seo_pack' ), 'type' => 'checkbox' ),
                     'dimg'          => Array(   'name'          => __( 'Default OG:Image',  'all_in_one_seo_pack' ), 'default' => AIOSEOP_PLUGIN_IMAGES_URL . 'default-user-image.png', 'type' => 'image' ),
@@ -134 +139 @@
                     'imageheight'   => Array(   'name'          => __( 'Specify Image Height', 'all_in_one_seo_pack' ),
                                                 'type'          => 'text', 'default' => '' ),
+
+
+
+
+
+
                     'defcard'       => Array(   'name'          => __( 'Default Twitter Card', 'all_in_one_seo_pack' ),
                                                 'type'          => 'select', 'initial_options' => Array( 'summary' => __( 'Summary', 'all_in_one_seo_pack' ), 'summary_large_image' => __( 'Summary Large Image', 'all_in_one_seo_pack' ), 'photo' => __( 'Photo', 'all_in_one_seo_pack' ) ), 'default' => 'summary' ),
@@ -155 +166 @@
                                                 'default'       => ''
                                         ),
+
+
                     'tag'           => Array(   'name'          => __( 'Article Tags', 'all_in_one_seo_pack' ),
                                                 'type'          => 'text', 'default' => '',  'condshow' => Array( 'aioseop_opengraph_settings_category' => 'article' ) ),
@@ -177 +190 @@
                 'settings'  =>  Array(  'name'      => __('Social Settings', 'all_in_one_seo_pack'),
                                                           'type'        => 'metabox', 'help_link' => 'http://semperplugins.com/documentation/social-meta-module/#pagepost_settings',
-                                                          'options' => Array( 'title', 'desc', 'image', 'customimg', 'imagewidth', 'imageheight', 'category', 'tag', 'setcard' ),
+                                                          'options' => Array( 'title', 'desc', 'image', 'customimg', 'imagewidth', 'imageheight', '', 'tag', 'setcard' ),
                                                           'display' => $display, 'prefix' => 'aioseop_opengraph_'
                                     )
@@ -346 +359 @@
                 add_filter( 'jetpack_disable_twitter_cards', '__return_false', 100 );
             }
-            $attributes = apply_filters( $this->prefix . 'attributes', Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) );
+            $attributes = apply_filters( $this->prefix . 'attributes', Array( 'xmlns="http://www.w3.org/1999/xhtml"', 'xmlns:og="http://ogp.me/ns#"', 'xmlns:fb="http://www.facebook.com/2008/fbml"' ) );
             foreach( $attributes as $attr ) {
                 if ( strpos( $output, $attr ) === false ) {
@@ -361 +374 @@
             $dimg = $this->options['aiosp_opengraph_dimg'];
             $current_post_type = get_post_type();
-            $title = $description = $image = '';
+            $title = $description = $image = '';
             $type = 'article';
             
@@ -396 +409 @@
                 if( empty($sitename) ) $sitename = get_bloginfo('name');
                 
-                if ( empty( $description ) && $first_page && ( !empty( $this->options['aiosp_opengraph_generate_descriptions'] ) ) )
+                if ( empty( $description ) && $first_page && ( !empty( $this->options['aiosp_opengraph_generate_descriptions'] ) ) )
                     $description = $aiosp->trim_excerpt_without_filters( $aiosp->internationalize( preg_replace( '/\s+/', ' ', $post->post_content ) ), 1000 );
                 
@@ -409 +422 @@
                     $type = $this->options["aiosp_opengraph_{$current_post_type}_fb_object_type"];
                 }
+
+
+
                 if ( $type == 'article' && ( !empty( $metabox['aioseop_opengraph_settings_tag'] ) ) ) {
                     $tag = $metabox['aioseop_opengraph_settings_tag'];
@@ -418 +434 @@
                 if ( !empty( $this->options['aiosp_opengraph_twitter_domain'] ) )
                     $domain = $this->options['aiosp_opengraph_twitter_domain'];
+
+
+
+
+
+
+
+
 
-                if ( $type == 'article' && !empty( $post ) && isset( $post->post_author ) && !empty( $this->options['aiosp_opengraph_facebook_author'] ) )
-                    $author = get_the_author_meta( 'facebook', $post->post_author );
+                    if ( isset( $post->post_modified ) )
+                        $modified_time = date( 'Y-m-d\TH:i:s\Z', mysql2date( 'U', $post->post_modified ) );
+                }
+
                 
                 $image = $metabox['aioseop_opengraph_settings_image'];
+
                 $title = $metabox['aioseop_opengraph_settings_title'];
                 $description = $metabox['aioseop_opengraph_settings_desc'];
@@ -477 +504 @@
                         case 'auto'     :   $thumbnail = $this->get_the_image();
                                             break;
+
+
                         default         :   $thumbnail = $this->options['aiosp_opengraph_dimg'];
                     }
@@ -491 +520 @@
                 if ( !empty( $metabox['aioseop_opengraph_settings_imageheight'] ) )
                     $height = $metabox['aioseop_opengraph_settings_imageheight'];
+
+
+
+
+
+
+
             }
             
@@ -523 +559 @@
                         'width'         => 'og:image:width',
                         'height'        => 'og:image:height',
+
+
+
                         'sitename'      => 'og:site_name',
                         'key'           => 'fb:admins',
                         'description'   => 'og:description',
+
                         'tag'           => 'article:tag',
                         'publisher'     => 'article:publisher',
-                        'author'        => 'article:author'
+                        'author'        => 'article:author',
+                        'published_time'=> 'article:published_time',
+                        'modified_time' => 'article:modified_time',
                     ),
                 'twitter'   => Array(
@@ -536 +578 @@
                         'domain'        => 'twitter:domain',
                         'description'   => 'twitter:description',
-                    )
+                    ),
+                'google+'   => Array(
+                        'thumbnail'     => 'image',
+                    ),
             );
             
@@ -635 +680 @@
 
             if ( !empty( $options ) && !empty( $options['aioseop_opengraph_settings_customimg'] ) ) {
-                $img[$options['aioseop_opengraph_settings_customimg']] = 'customimg';               
+                $img[$options['aioseop_opengraph_settings_customimg']] = 'customimg';       
+            }
+            if ( $author_img = $this->get_the_image_by_author( $p ) ) {
+                $image["author"] = $author_img;             
             }
             $image = array_flip( $img );
@@ -644 +692 @@
             return Array( $image, $images );
         }
-                
+        
+        function get_the_image_by_author( $options = null, $p = null ) {
+            if ( $p === null ) {
+                global $post;
+            } else {
+                $post = $p;
+            }
+            if ( !empty( $post ) && !empty( $post->post_author ) ) {
+                $matches = Array();
+                $get_avatar = get_avatar( $post->post_author, 300 );
+                if ( preg_match("/src='(.*?)'/i", $get_avatar, $matches) ) {
+                    return $matches[1];
+                }
+            }
+            return false;
+        }
+        
         function get_the_image( $options = null, $p = null ) {
             $meta_key = $this->options['aiosp_opengraph_meta_key'];

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

@@ -4 +4 @@
 Plugin URI: http://semperfiwebdesign.com
 Description: 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>
-Version: 2.2.2
+Version: 2.2.
 Author: Michael Torbert
 Author URI: http://michaeltorbert.com
@@ -31 +31 @@
 /**
  * @package All-in-One-SEO-Pack
- * @version 2.2.2
+ * @version 2.2.
  */
 
 if ( ! defined( 'AIOSEOP_VERSION' ) )
-    define( 'AIOSEOP_VERSION', '2.2.2' );
+    define( 'AIOSEOP_VERSION', '2.2.' );
 
 if ( ! defined( 'AIOSEOP_PLUGIN_DIR' ) ) {

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

@@ -4 +4 @@
 Tags: all in one, all in one seo, all in one seo pack, seo, search engine optimization, google
 Requires at least: 3.3
-Tested up to: 3.9.1
+Tested up to: 3.9.
 Stable tag: trunk