Changeset 757 for branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.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/wp-content/plugins/xpressme/include/xpress_common_functions.php (modified) (9 diffs)

branches/Ver3.0/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -1 +1 @@
 <?php
-global $xoops_config;
-if (!is_object($xoops_config)){ // is call other modules
-        require_once dirname(dirname(dirname(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(dirname(dirname(dirname( __FILE__ ))))) .'/class/modInfoClass.php' ;
+        $modInfo = new ConfigFromXoops;
 }
 
@@ -14 +14 @@
         global $xoops_db;
         
-        $modules_db = get_xoops_prefix() . 'modules';
+        $module_handler =& xoops_gethandler('module');
+        $module =& $module_handler->getByDirname($mydirname);
+        $moduleID = $module->getVar('mid');
+
         $config_db = get_xoops_prefix() . 'config';
-
-        $moduleID = $xoops_db->get_var("SELECT mid FROM $modules_db WHERE dirname = '$module_dir'");
         if (empty($moduleID)) return null;
         $conf_value = $xoops_db->get_var("SELECT conf_value FROM $config_db WHERE (conf_modid = $moduleID) AND (conf_name = '$config_name')");
@@ -46 +47 @@
 function get_xoops_prefix()
 {
-        global $xoops_config;
-        $ret =$xoops_config->xoops_db_prefix . '_';
+        global $modInfo;
+        $ret = $modInfo->get_xoops_db_prefix();
         return $ret;
 }
@@ -53 +54 @@
 function get_xoops_trust_path()
 {
-        global $xoops_config;
-        $ret =$xoops_config->xoops_trust_path;
+        global $modInfo;
+        $ret =$modInfo->get_xoops_trust_path();
         return $ret;
 }
@@ -60 +61 @@
 function get_xoops_root_path()
 {
-        global $xoops_config;
-        $ret =$xoops_config->xoops_root_path;
+        global $modInfo;
+        $ret =$modInfo->get_xoops_root_path();
         return $ret;
 }
@@ -72 +73 @@
 function get_xoops_url()
 {
-        global $xoops_config;
-        $ret =$xoops_config->xoops_url ;
+        global $modInfo;
+        $ret =$modInfo->get_xoops_url() ;
         return $ret;
 }
@@ -79 +80 @@
 function get_xpress_url()
 {
-        global $xoops_config;
-        $ret =$xoops_config->module_url ;
+        global $modInfo;
+        $ret =$modInfo->get_module_url() ;
         return $ret;
 }
@@ -86 +87 @@
 function get_xpress_modid()
 {
-        global $xoops_db;
-        
-        $modulename = get_xpress_dir_name();    
-        $sql = "SELECT mid FROM " . get_xoops_prefix() . "modules WHERE dirname = '$modulename'";
-        $mid = $xoops_db->get_var($sql);
-        return $mid;    
+        global $modInfo;
+        
+        $modulename = get_xpress_dir_name();
+        $mid = $modInfo->get_moduleID_ByDirname($modulename);
+        return $mid;
 }
 
@@ -369 +369 @@
 function get_block_file_path($mydirname,$file_name)
 {
-        global $xoops_config, $xpress_config;
-        $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
+        global $modInfo, $xpress_config;
+        $mydirpath = $modInfo->get_xoops_root_path() . '/modules/' . $mydirname;
         $select_theme = xpress_ThemeTemplate(get_xpress_theme_name($mydirname));
         $xpress_default_theme = 'xpress_default';