Changeset 463

Timestamp:

Nov 27, 2009, 3:27:01 PM (14 years ago)

Author:

toemon

Message:

ブロックオプションでテンプレートの指定が行えるようにし、ブロック複製時別テンプレートが使えるようにする。 Fixes #247

Location:

trunk

Files:

• extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (modified) (1 diff)
• extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (modified) (1 diff)
• extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php (modified) (1 diff)
• xpressme_integration_kit/blocks/archives_block.php (modified) (2 diffs)
• xpressme_integration_kit/blocks/authors_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/calender_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/category_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/enhanced_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/meta_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/page_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/popular_posts_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_comments_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_posts_content_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_posts_list_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/search_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/tag_cloud_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/widget_block.php (modified) (1 diff)
• xpressme_integration_kit/include/xpress_block_render.php (modified) (4 diffs)
• xpressme_integration_kit/language/english/blocks.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/blocks.php (modified) (1 diff)

trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","¥ê¥¹¥È");
         define("_MB_XP2_FILE_NAME","¥Õ¥¡¥¤¥ë̾");
+        define("_MB_XP2_THISTEMPLATE","¤³¤Î¥Ö¥í¥Ã¥¯¤Î¥Æ¥ó¥×¥ì¡¼¥È");
         
 // recent comment block 

trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","リスト");
         define("_MB_XP2_FILE_NAME","ファイル名");
+        define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート");
         
 // recent comment block 

trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","Lista");
         define("_MB_XP2_FILE_NAME","Nome do arquivo");
+        define("_MB_XP2_THISTEMPLATE","Modelo");
         
 // recent comment block 

trunk/xpressme_integration_kit/blocks/archives_block.php

@@ -28 +28 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $a_month = _MB_XP2_ARC_MONTH ;
@@ -62 +62 @@
                 $form .=  "</select><br/>";
                 
-                $form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+                $form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' size='3' name='options[3]' value='" . $limit . "' />";
                 $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_NUM_OF_POST , $show_post_count);
                 $form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_SHOW_DROP_DOWN , $drop_down);

trunk/xpressme_integration_kit/blocks/authors_block.php

@@ -28 +28 @@
                         
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= yes_no_radio_option('options[2]', _MB_XP2_SHOW_NUM_OF_POST , $optioncount);

trunk/xpressme_integration_kit/blocks/calender_block.php

@@ -26 +26 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= _MB_XP2_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";

trunk/xpressme_integration_kit/blocks/category_block.php

@@ -35 +35 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= _MB_XP2_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";

trunk/xpressme_integration_kit/blocks/enhanced_block.php

@@ -19 +19 @@
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
                 $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_enhanced_block.html' : trim( $options[1] );
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $include_file = empty( $options[2] ) ? '' : $options[2] ;
                 

trunk/xpressme_integration_kit/blocks/meta_block.php

@@ -31 +31 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= yes_no_radio_option('options[2]', _MB_XP2_META_WP_LINK , $wp_link) . "<br />\n";

trunk/xpressme_integration_kit/blocks/page_block.php

@@ -35 +35 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= _MB_XP2_PAGE_ORDERBY .": ";

trunk/xpressme_integration_kit/blocks/popular_posts_block.php

@@ -30 +30 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />\n";
                 $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";

trunk/xpressme_integration_kit/blocks/recent_comments_block.php

@@ -30 +30 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_XP2_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_XP2_LENGTH .": <input type='text' size='3' name='options[3]' value='" . $disp_length . "' /><br />\n";
                 $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
                 $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";

trunk/xpressme_integration_kit/blocks/recent_posts_content_block.php

@@ -34 +34 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
                 $form .= yes_no_radio_option('options[3]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
                 $form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";

trunk/xpressme_integration_kit/blocks/recent_posts_list_block.php

@@ -31 +31 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />\n";    
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_XP2_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
-                $form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_XP2_REDNEW_DAYS .": <input type='text' size='3' name='options[3]' value='" . $disp_red . "' /><br />\n";
+                $form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' size='3' name='options[4]' value='" . $disp_green . "' /><br />\n";
                 $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";

trunk/xpressme_integration_kit/blocks/search_block.php

@@ -25 +25 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";              
-                $form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
+                $form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />";
 //          $form .="<br /><input type='text' size='60' name='options[2]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 

trunk/xpressme_integration_kit/blocks/tag_cloud_block.php

@@ -32 +32 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />";
                 $form .= _MB_XP2_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";

trunk/xpressme_integration_kit/blocks/widget_block.php

@@ -46 +46 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $form .= "<br />" . yes_no_radio_option('options[2]', _MB_XP2_WIDGET_TITLE_SHOW , $title_show);
                 $form .= "<br />";

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -52 +52 @@
                         }
                         return $block_id;
+        }
+
+        function get_block_mid($mydirname)
+        {
+                        $xoopsDB =& Database::getInstance();
+                        $modules_tbl = $xoopsDB->prefix('modules');     
+
+                        $sql = "SELECT mid FROM $modules_tbl WHERE dirname = '$mydirname'";
+                        $result =  $xoopsDB->query($sql, 0, 0);
+                        if ($xoopsDB->getRowsNum($result)  > 0){
+                                $row = $xoopsDB->fetchArray($result);
+                                $mid = $row['mid'];
+                        }
+                        return $mid;
         }
 
@@ -190 +204 @@
                 $option = explode('|' , $block['options']);
                 
-                if (isset($option[1]))
+                if (isset($option[1])) {
                         $templates_file = $option[1];
-                else
+                } else {
                         $templates_file = 'db:'.$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                }
+                
                 $tpl =& new XoopsTpl() ;
+                $tpl->template_dir = $xoops_config->module_path . '/templates';
+                if (!$tpl->template_exists($templates_file)){
+                        $src_file_path = $xoops_config->module_path . '/templates/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                        add_xpress_tpl($mydirname,$templates_file,$src_file_path);
+                }
                 $tpl->assign( 'block' , $block ) ;
                 $ret['content'] = $tpl->fetch( $templates_file ) ;
                 return $ret ;
+        }
+        
+        function add_xpress_tpl($mydirname,$templates='',$src_file_path){
+                global $wpdb,$xoops_config , $xoops_db;
+                
+                $mid = get_block_mid($mydirname);
+
+                $temp_parm = explode(':' , $templates);
+                if (empty($temp_parm[1])) {
+                        $filename=$temp_parm[0];
+                        $type = 'db';
+                } else  {
+                        $filename=$temp_parm[1];
+                        $type = $temp_parm[0];
+                }
+                $temp_file_path = $xoops_config->module_path . '/templates/'. $filename;
+                $pattern = '^' . $mydirname . '_';
+                if (preg_match('/' . $pattern . '/' , $filename, $match)){ // file prefix check
+                        if (!file_exists($temp_file_path)){             // Repetition check
+                                if (file_exists($src_file_path)){       // source file check
+                                        $rcd = copy($src_file_path, $temp_file_path);
+                                }
+                        }
+                }
         }
         
@@ -250 +295 @@
         {
                 global $xoops_db,$xoops_config;
+                
                 $mid = get_xpress_modid();
                 $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid AND visible = 1";
@@ -294 +340 @@
                         return $xu_row['conf_value'];
                 }
-        }
-        
+        }       
 }       
 ?>

trunk/xpressme_integration_kit/language/english/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","List");
         define("_MB_XP2_FILE_NAME","Files Name");
+        define("_MB_XP2_THISTEMPLATE","Template");
         
 // recent comment block 

trunk/xpressme_integration_kit/language/ja_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","リスト");
         define("_MB_XP2_FILE_NAME","ファイル名");
+        define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート");
         
 // recent comment block