Changeset 488 for branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php

Timestamp:

Dec 15, 2009, 4:52:57 PM (15 years ago)

Author:

toemon

Message:

開発ベースにVer2.2をマージ

File:

• branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php (modified) (8 diffs)

branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php

@@ -29 +29 @@
                         $ret = @xpress_XML_unserialize($xml_data);
                         if (strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false){
-                                $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret);
+                                if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+                                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //xpress_XML_unserialize() Return UTF-8 at PHP5
+                                }
                         }
                         return $ret;
@@ -52 +54 @@
                         }
                         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;
         }
 
@@ -160 +176 @@
         function xpress_block_render($mydirname,$block_function_name,$options)
         {
-                global $wpdb;
+                global $wpdb,$xoops_config;
                 $func_file = $block_function_name;
                 $call_theme_function_name = str_replace(".php", "", $block_function_name);
@@ -167 +183 @@
                 $blockID =get_block_id($mydirname,$func_file,$options);         
 
-                $this_url = '/modules/'. $mydirname;
+                $this_block_url = '/' . $mydirname . '/';
                 $call_url = $_SERVER['REQUEST_URI'];
                 
                 xpress_block_css_set($mydirname);
-                if (strstr($call_url,$this_url)){                       
+                if (strstr($call_url , $this_block_url) !== false){
                         $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
                         require_once $block_theme_file['file_path'];
@@ -185 +201 @@
                         }
                 }
-
-                $templates_file = 'db:'.$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                $temp_option = explode(':' , $options[1]);
+                
+                if (isset($temp_option[1])) {
+                        $templates_file = $temp_option[1];
+                } 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);
+                        $templates_file = 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);
+                                }
+                        }
+                        return  'file:' . $filename;
+                }
+                return $templates;
         }
         
@@ -243 +296 @@
         {
                 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";
@@ -260 +314 @@
         if ($dh = opendir($cache_dir)) {
             while (($file = readdir($dh)) !== false) {
-                if (preg_match('/^' . preg_quote($mydirname) . '/', $file)) {
+                if (preg_match('/^' . preg_quote($mydirname) . '_/', $file)) {
                         if(! preg_match('/' . $pattern . '/', $file)) {
                         unlink($cache_dir.$file);
@@ -287 +341 @@
                         return $xu_row['conf_value'];
                 }
-        }
-        
+        }       
 }       
 ?>