Changeset 551

Timestamp:

Mar 17, 2010, 11:38:11 AM (14 years ago)

Author:

toemon

Message:

mySQL接続上限警告 対策 Fixes#315

Location:

trunk/xpressme_integration_kit

Files:

• admin/index.php (modified) (3 diffs)
• class/config_from_xoops.class.php (modified) (2 diffs)
• include/add_xpress_config.php (modified) (1 diff)
• include/add_xpress_process.php (modified) (3 diffs)
• include/memory_limit.php (added)

trunk/xpressme_integration_kit/admin/index.php

@@ -166 +166 @@
         global $xoopsModule;
         include(dirname(__FILE__) . '/../wp-includes/version.php');
-        require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
+        require_once dirname(dirname( __FILE__ )).'/include/memory_limit.php' ;
 
         if ($is_report) {
@@ -196 +196 @@
                 echo  ini_get( 'memory_limit' );
                 echo "<br />\n";
-                $xoops_config = new ConfigFromXoops;
-                $xoops_config->xpress_set_memory_limmit();
+                xpress_set_memory_limmit();
                 echo "change memory_limit:   " ;
                 echo  ini_get( 'memory_limit' );
@@ -270 +269 @@
                 echo  ini_get( 'memory_limit' );
                 echo "</text><br />";
-                $xoops_config = new ConfigFromXoops;
-                $xoops_config->xpress_set_memory_limmit();
+                xpress_set_memory_limmit();
                 echo "<label>change memory_limit:</label><text>";
                 echo  ini_get( 'memory_limit' );

trunk/xpressme_integration_kit/class/config_from_xoops.class.php

@@ -101 +101 @@
                 $this->set_module_version();
                 $this->set_wp_version();
-                $this->xpress_get_module_id();
-                $this->xoops_language = $this->xpress_get_xoops_config('language');
-                $this->xpress_get_module_config();
     }
 
@@ -300 +297 @@
     }
     
-        function xpress_get_xoops_config($config_name = '',$mid = 0){
-                $ret = '';
-                $cn = mysql_connect($this->xoops_db_host, $this->xoops_db_user, $this->xoops_db_pass);
-                if (!$cn) return $ret;
-                
-                $db_selected = mysql_select_db($this->xoops_db_name, $cn);
-                if ($db_selected){
-                        $table_name = $this->xoops_db_prefix . '_config';
-                        $sql = "SELECT conf_value AS value FROM $table_name WHERE `conf_modid` = $mid AND `conf_name` = '$config_name'";
-                        if($result = mysql_query($sql)){
-                                $row = mysql_fetch_assoc($result);
-                                $ret = $row['value'];
-                        } else {
-                                $ret = $sql;
-                        }
-                }
-                if( ! defined( 'XOOPS_ROOT_PATH' ) ) mysql_close($cn);
-                return $ret;
-        }
-
-        function xpress_get_module_config(){
-                $this->module_config= array();
-                $cn = mysql_connect($this->xoops_db_host, $this->xoops_db_user, $this->xoops_db_pass);
-                if (!$cn) return $ret;
-                
-                $db_selected = mysql_select_db($this->xoops_db_name, $cn);
-                if ($db_selected){
-                        $table_name = $this->xoops_db_prefix . '_config';
-                        $sql = "SELECT conf_name AS name, conf_value AS value FROM $table_name WHERE `conf_modid` = $this->module_id";
-                        if($result = mysql_query($sql)){
-                                while ($row = mysql_fetch_assoc($result)) {
-                                $this->module_config[$row['name']] = $row['value'];
-                                }
-                        }
-                }
-                if( ! defined( 'XOOPS_ROOT_PATH' ) ) mysql_close($cn);
-                return $this->module_config;
-        }
-
-        function xpress_get_module_id(){
-                $this->module_id = '';
-                $cn = mysql_connect($this->xoops_db_host, $this->xoops_db_user, $this->xoops_db_pass);
-                if ($cn){
-                        $db_selected = mysql_select_db($this->xoops_db_name, $cn);
-                        if ($db_selected){
-                                $table_name = $this->xoops_db_prefix . '_modules';
-                                $sql = "SELECT mid FROM $table_name WHERE `dirname` = '$this->module_name'";
-                                if($result = mysql_query($sql)){
-                                        $row = mysql_fetch_assoc($result);
-                                        $this->module_id = $row['mid'];
-                                }
-                        }
-                        if( ! defined( 'XOOPS_ROOT_PATH' ) ) mysql_close($cn);
-                }
-                return $this->module_id;
-        }
-        
-        
-        // Set XPressME memory limit
-        function xpress_set_memory_limmit(){
-                $memory = $this->module_config['memory_limit'];
-                if (empty($memory)) return;
-                if ( !defined('WP_MEMORY_LIMIT') )
-                        define('WP_MEMORY_LIMIT', $memory . 'M');
-                if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
-                        @ini_set('memory_limit', WP_MEMORY_LIMIT);
-        }
-
-
-
 }
 ?>

trunk/xpressme_integration_kit/include/add_xpress_config.php

@@ -3 +3 @@
 require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
 $xoops_config = new ConfigFromXoops;
-$xoops_config->xpress_set_memory_limmit();
 require_once dirname( __FILE__ ).'/set_cash_cookie_path.php' ;
 ?>

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -107 +107 @@
 
 require_once( dirname( __FILE__ ).'/request_url.php');
+require_once( dirname( __FILE__ ).'/memory_limit.php');
 if (is_xpress_index_page_call()){
         //$_SERVER['REQUEST_METHOD'] = 'POST' is
@@ -115 +116 @@
         require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
         $_SERVER['REQUEST_METHOD'] = $request_method;
-        
+        xpress_set_memory_limmit(); // Set memory limmit.(Limmit Value from XPressMe modele config.)
         unset($offset);         //This Trap is provides the case where $offset is defined on the XOOPS side.
         require_once(ABSPATH.'wp-settings.php');
@@ -181 +182 @@
 if (is_admin_post_call()) require_once $xoops_config->xoops_mainfile_path;              // for Notification_triggerEvent
 if (is_xpress_comments_post_call()) require_once $xoops_config->xoops_mainfile_path;    // for Notification_triggerEvent
+xpress_set_memory_limmit(); // Set memory limmit.(Limmit Value from XPressMe modele config.)
 ?>