Changeset 793 for branches/Ver2.5/xpressme_integration_kit/wp-content

Timestamp:

Oct 7, 2011, 9:03:08 AM (13 years ago)

Author:

toemon

Message:

マルチサイト用、最近の投稿（全ブログ）ブロックのオプションに「対象ブログの除外」、「ブログ毎に抽出」を追加、ブロックオプションのデフォルトテンプレートの誤りを修正

Location:

branches/Ver2.5/xpressme_integration_kit/wp-content

Files:

• plugins/xpressme/include/custom_functions.php (modified) (5 diffs)
• themes/xpress_default/blocks/global_popular_posts_block_theme.php (modified) (1 diff)
• themes/xpress_default/blocks/global_recent_comments_block_theme.php (modified) (1 diff)
• themes/xpress_default/blocks/global_recent_posts_list_block_theme.php (modified) (4 diffs)

branches/Ver2.5/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -891 +891 @@
 }
 
-function xpress_grobal_recent_posts($num = 10,$post_list='')
+function xpress_grobal_recent_posts($num = 10,$exclusion_blog = 0, $shown_for_each_blog = false)
 {
         global $wpdb, $wp_rewrite , $switched , $blog_id;
         if (empty($date_format)) $date_format = get_settings('date_format');
         if (empty($time_format)) $time_format = get_settings('time_format');
+        $exclusion = explode(',' , $exclusion_blog);
+
 
         $first_blogid = $blog_id;
@@ -904 +906 @@
                 $blogs = get_blog_list(0,'all');
                 foreach ($blogs AS $blog) {
+                        if (!in_array(0, $exclusion) && in_array($blog['blog_id'], $exclusion)) continue;
                         switch_to_blog($blog['blog_id']);
                         $wp_rewrite->init();  // http://core.trac.wordpress.org/ticket/12040 is solved, it is unnecessary.
@@ -922 +925 @@
                                                 ob_end_clean();
                                                 
-                                                $data->brog_id = $blog['blog_id'];
+                                                $data->blog_id = $blog['blog_id'];
                                                 $data->blog_name = get_bloginfo('name');
                                                 $data->blog_url = get_bloginfo('url');
@@ -995 +998 @@
                                                 
                                                 $data->post_views = xpress_post_views_count('post_id=' . $data->post_id . '&blogid=' . $data->brog_id . '&format=' . __('Views :%d', 'xpress'). '&echo=0');
+                                                if (function_exists('the_qf_get_thumb_one')){
+                                                        $data->post_thumbnail = the_qf_get_thumb_one("num=0&width=120&tag=1","",$data->the_full_content);
+                                                } else {
+                                                        $data->post_thumbnail = get_the_post_thumbnail(null,'thumbnail');
+                                                }
+                                                $data->author_avatar =get_avatar(get_the_author_meta('ID'),$size = '32');
 
                                                 $data_array[] = $data;
@@ -1006 +1015 @@
 
                 restore_current_blog();
+        }
+        if (!$shown_for_each_blog){
                 usort($data_array, "the_time_cmp");
-        }
-        
-        if (!empty($num)){
-                $data_array = array_slice($data_array,0,$num);
+                if (!empty($num)){
+                        $data_array = array_slice($data_array,0,$num);
+                }
         }
         return $data_array;

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_popular_posts_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_grobal_popular_posts_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $show_month_range = empty( $options[3] ) ? '0' : $options[3] ;

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_comments_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_global_recent_comments_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $disp_length = empty( $options[3] ) ? '30' : $options[3] ;

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_posts_list_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_global_recent_posts_list_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $disp_red = empty( $options[3] ) ? '1' : $options[3] ;
@@ -10 +10 @@
         $date_format = empty( $options[5] ) ? '' : $options[5] ;
         $time_format = empty( $options[6] ) ? '' : $options[6] ;
+        $shown_for_each_blog = empty( $options[7] ) ? false : true ;            
+        $exclusion_blog = empty( $options[8] ) ? '0' : $options[8] ;
+        
         $mydirpath = get_xpress_dir_path();
         
@@ -20 +23 @@
                 $block = array();
                 
-                $data_array = xpress_grobal_recent_posts($disp_count);
+                $data_array = xpress_grobal_recent_posts($disp_count,$exclusion_blog,$shown_for_each_blog);
                 $item_no = 0;
                 $red_sec = $disp_red *60*60*24;
@@ -41 +44 @@
                 }
                 $block['data_count'] = $item_no;  //xml unserialise error
+                $block['shown_for_each_blog'] = $shown_for_each_blog;
         } else {
                 $block['err_message'] = __('This blog is not set to the multi blog.', 'xpress');