Changeset 757 for branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php

Timestamp:

May 23, 2011, 3:03:57 PM (13 years ago)

Author:

toemon

Message:

ConfigFromXoopsクラスを廃止し、modInfoクラスを使用するように変更
WP2.2以下で使用するテンプレートold_templateの廃止

File:

• branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php (modified) (9 diffs)

branches/Ver3.0/xpressme_integration_kit/include/xpress_block_render.php

@@ -4 +4 @@
         require_once dirname( __FILE__ ) .'/xml.php' ;
         require_once dirname( __FILE__ ) .'/xpress_cache.php' ;
-        global $xoops_config;
-        
-        if (!is_object($xoops_config)){ // is call other modules
-                require_once dirname(dirname( __FILE__ )) .'/class/config_from_xoops.class.php' ;
-                $xoops_config = new ConfigFromXoops;
+        global $modInfo;
+        
+        if (!is_object($modInfo)){ // is call other modules
+                require_once dirname(dirname( __FILE__ )) .'/class/modInfo_class.php' ;
+                $modInfo = new modInfoClass;
         }
         
@@ -68 +68 @@
         {
                 global $xoopsDB;
-                        $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;
+                $module_handler =& xoops_gethandler('module');
+                $module =& $module_handler->getByDirname($mydirname);
+                $module_id = $module->getVar('mid');
+                return $module_id;
         }
 
@@ -121 +116 @@
     function xpress_block_cache_found($mydirname,$block_name)
     {
-        global $xoops_config;
+        global $modInfo;
         
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
         $xml_name = $block_name . '.xml';
 
@@ -138 +133 @@
         function xpress_block_render($mydirname,$block_function_name,$options)
         {
-                global $wpdb,$xoops_config,$xoopsUserIsAdmin;
+                global $wpdb,$modInfo,$xoopsUserIsAdmin;
                 $func_file = $block_function_name;
                 $call_theme_function_name = str_replace(".php", "", $block_function_name);
@@ -183 +178 @@
                 
                 $tpl =& new XoopsTpl() ;
-                $tpl->template_dir = $xoops_config->module_path . '/templates';
+                $tpl->template_dir = $modInfo->get_module_templates_path();
                 if (!$tpl->template_exists($templates_file)){
-                        $src_file_path = $xoops_config->module_path . '/templates/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                        $src_file_path = $modInfo->get_module_templates_path() . '/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
                         $templates_file = add_xpress_tpl($mydirname,$templates_file,$src_file_path);
                 }
@@ -198 +193 @@
         
         function add_xpress_tpl($mydirname,$templates='',$src_file_path){
-                global $wpdb,$xoops_config , $xoops_db;
+                global $wpdb,$modInfo , $xoops_db;
                 
                 $mid = get_block_mid($mydirname);
@@ -210 +205 @@
                         $type = $temp_parm[0];
                 }
-                $temp_file_path = $xoops_config->module_path . '/templates/'. $filename;
+                $temp_file_path = $modInfo->get_module_templates_path() . '/'. $filename;
                 $pattern = '^' . $mydirname . '_';
                 if (preg_match('/' . $pattern . '/' , $filename, $match)){ // file prefix check
@@ -274 +269 @@
         function xpress_unnecessary_block_cache_delete($mydirname)
         {
-                global $xoops_db,$xoops_config;
+                global $xoops_db,$modInfo;
                 
                 $mid = get_xpress_modid();
@@ -289 +284 @@
                 $pattern = '(' . $pattern . ')';
                 
-                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                $cache_dir = $modInfo->get_xoops_cache_path() . '/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {