Changeset 752 for branches

Timestamp:

May 20, 2011, 1:55:21 PM (14 years ago)

Author:

toemon

Message:

Xoops3 の　moduleデータベースのmid が　id に変更されたため直接DBアクセスでdirnameからmidを取得できないので
$xoopsModule->getVar('mid')で取得するように変更。

Location:

branches/Ver3.0/xpressme_integration_kit/include

Files:

• memory_limit.php (modified) (1 diff)
• onuninstall.php (modified) (2 diffs)

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

@@ -3 +3 @@
         function xpress_set_memory_limmit(){
                 global $xoops_config;
-                global $xoopsDB;
+                global $xoopsDB,$xoopsModule,$xoopsModuleConfig;
                 
-                $module_id = '';
-                $memory = '';
-                
-                if (!is_object($xoops_config)){
-                        require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
-                        $xoops_config = new ConfigFromXoops;
-                }
-                
-                $has_xoops_db = (!empty($xoopsDB));
-                if (!$has_xoops_db) {
-                        $cn = mysql_connect($xoops_config->xoops_db_host, $xoops_config->xoops_db_user, $xoops_config->xoops_db_pass);
-                        if ($cn){
-                                $db_selected = mysql_select_db($xoops_config->xoops_db_name, $cn);
-                        }
-                }
-
-                // get module ID
-                $module_table = $xoops_config->xoops_db_prefix . '_modules';
-                $module_sql = "SELECT mid FROM $module_table WHERE `dirname` = '$xoops_config->module_name'";
-                if ($has_xoops_db) {
-                        if ($result = $xoopsDB->query($module_sql, 0, 0)){
-                                $row = $xoopsDB->fetchArray($result);
-                                $module_id = $row['mid'];
-                        }       
-                } else {
-                        if ($db_selected){
-                                if($result = mysql_query($module_sql)){
-                                        $row = mysql_fetch_assoc($result);
-                                        $module_id = $row['mid'];
-                                }
-                        }
-                }
-                if (!empty($module_id)){
-                        // get memory_limit
-                        $config_table = $xoops_config->xoops_db_prefix . '_config';
-                        $config_sql = "SELECT conf_value FROM $config_table WHERE `conf_modid` = $module_id AND `conf_name` = 'memory_limit'";
-                        if ($has_xoops_db) {
-                                if ($result = $xoopsDB->query($config_sql, 0, 0)){
-                                        $row = $xoopsDB->fetchArray($result);
-                                        $memory = $row['conf_value'];
-                                }
-                        } else {
-                                if ($db_selected){
-                                        if($result = mysql_query($config_sql)){
-                                                $row = mysql_fetch_assoc($result);
-                                                $memory = $row['conf_value'];
-                                        }
-                                }
-                        }
-                }
-                if (!$has_xoops_db) {
-                        mysql_close($cn);
-                }
+                $memory = ! empty($xoopsModuleConfig) ? $xoopsModuleConfig['memory_limit'] : 0;
                 
                 if (empty($memory)) return;

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

@@ -9 +9 @@
 function xpress_onuninstall_base( $module , $mydirname )
 {
-        global $xoopsDB;
+        global $xoopsDB,$xoopsModule;
         // transations on module uninstall
 
@@ -23 +23 @@
         }
 
-        $mid = $module->getVar('mid') ;
+        $mid = $xoopsModule->getVar('mid') ;
         
         $xp_prefix = preg_replace('/wordpress/','wp',$mydirname);