Changeset 792 for branches/Ver2.4/xpressme_integration_kit/blocks

Timestamp:

Oct 7, 2011, 8:59:37 AM (13 years ago)

Author:

toemon

Message:

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

Location:

branches/Ver2.4/xpressme_integration_kit/blocks

Files:

• block_common.php (modified) (1 diff)
• global_recent_comments_block.php (modified) (1 diff)
• global_recent_posts_list_block.php (modified) (3 diffs)

branches/Ver2.4/xpressme_integration_kit/blocks/block_common.php

@@ -91 +91 @@
 }
 endif;
+if(!function_exists("blog_select")):
+function blog_select($option_name = '',$value='',$exclusion=false ,$row_num=0)
+{
+    $mydirpath = dirname(dirname(__FILE__));
+        $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+        $wp_prefix = preg_replace('/wordpress/','wp',$mydirname) . '_';
+        $xoopsDB =& Database::getInstance();
+        $myts =& MyTextSanitizer::getInstance();
+    $selected = explode(',' , $value);
+        $isAll = (count($selected)==0||empty($selected[0]))?true:false;
+    
+    if (empty($row_num)) $size = ''; else $size = 'size="' . $row_num . '"';
+        include $mydirpath.'/wp-includes/version.php';
+        
+        $option = "\t<option value=\"0\" ";
+        if ($isAll) $option .= " selected=\"selected\"";
+        if ($exclusion){
+                $option .= ">"._MB_XP2_NONE ."</option>\n";
+    } else {
+                $option .= ">"._MB_XP2_ALL ."</option>\n";
+        }
+
+        if ($wp_db_version > 6124) {
+                $db_xpress_blogs = $xoopsDB->prefix($wp_prefix . 'blogs');
+                $query = "
+                SELECT blog_id 
+                FROM $db_xpress_blogs 
+                ORDER BY blog_id
+                ";
+                
+            if ($res =  $xoopsDB->query($query, 0, 0)){
+                        while($row = $xoopsDB->fetchArray($res)){
+                                
+                    $blog_id = $row['blog_id'];
+                    if ($blog_id == 1) {
+                        $blog_selector = '';
+                    } else {
+                        $blog_selector = $blog_id . '_';
+                    }
+                                $db_xpress_options = $xoopsDB->prefix($wp_prefix . $blog_selector . 'options');
+                    $options_query = "
+                                SELECT option_value 
+                                FROM $db_xpress_options 
+                                WHERE option_name = 'blogname'
+                                ";
+                        if ($options_res =  $xoopsDB->query($options_query, 0, 0)){
+                                $options_row = $xoopsDB->fetchArray($options_res);
+                                $blog_name = $options_row['option_value'];
+                        } else {
+                                $blog_name = 'Blog_' . $blog_id ;
+                        }
+                        
+                    $option .= "\t<option value=\"".$blog_id."\"";
+                    if (in_array($blog_id, $selected))
+                                $option .= ' selected="selected"';
+                                $option .= '>';
+                                $option .= $myts->htmlspecialchars($blog_name);
+                                $option .= "</option>\n";
+                }
+            }
+    }
+        if ($exclusion){
+                $output = _MB_XP2_EXCLUSION_BLOGS_SELECT ."<br />\n";
+    } else {
+                $output = _MB_XP2_SHOW_BLOGS_SELECT ."<br />\n";
+        }
+    $output .= '&nbsp;&nbsp;<select name="blogs" id="blog_sel" '.$size.' multiple="multiple" onclick="BlogSelect()">' ."\n";
+    $output .= $option;
+    $output .= '</select>';
+    $output .=  '&emsp;' .  _MB_XP2_BLOGS_DIRECT_SELECT . " <input type='text' name='$option_name' id='blog_csv' value='$value' /><br />\n";
+    $output .= '
+<script type="text/javascript">
+    function BlogSelect(){
+        var idx=new Array();
+        var sel = document.getElementById("blog_sel").options;
+        for(var i=0, n=0; i<sel.length; i++){
+            if(sel[i].selected){ idx[n++]=sel[i].value; }
+        }
+        if(idx.length>0){
+                document.getElementById("blog_csv").value = idx;
+                }
+    }
+</script>
+';
+    
+    return $output;
+
+}
+endif;
 
 if(!function_exists("comment_type_select")):

branches/Ver2.4/xpressme_integration_kit/blocks/global_recent_comments_block.php

@@ -18 +18 @@
         {
                 $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.4/xpressme_integration_kit/blocks/global_recent_posts_list_block.php

@@ -17 +17 @@
         {
                 $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] ;
@@ -23 +23 @@
                 $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 = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -37 +39 @@
                 $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
                 $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";
+                $form .= yes_no_radio_option('options[7]', _MB_XP2_SHOWN_FOR_EACH_BLOG , $Shown_for_each_blog) . "<br />\n";
+            $form .= blog_select('options[8]' , $exclusion_blog,true);
 
                 return $form;