Changeset 92 for trunk

Timestamp:

Feb 22, 2009, 12:09:14 AM (16 years ago)

Author:

toemon

Message:

#60 への対応　第一段階
XOOPS管理下でなく、WordPressが必要なときにXOOPSシステムを使うというスタンスに変更するために
まず、XOOPSシステムを呼び込まなくても、mainfile.phpよりXOOPSのDB設定内容を読み込めるようにした。

Location:

trunk

Files:

• include/config_from_xoops.class.php (added)
• include/set_cash_cookie_path.php (modified) (1 diff)
• wp-config.php (modified) (4 diffs)

trunk/include/set_cash_cookie_path.php

@@ -1 +1 @@
 <?php
-$modname=basename(dirname(dirname(__FILE__)));
-$modurl = XOOPS_URL . '/modules/' . $modname;
+$modname= $xoops_config->module_name;
+$modurl = $xoops_config->module_url;
 $hash = md5($modurl);
 /**

trunk/wp-config.php

@@ -1 +1 @@
 <?php
-require dirname( __FILE__ ).'/include/include_xoops_define.php' ;
+require_once dirname( __FILE__ ).'/include/xpress_debug_log.php' ;
+require_once dirname( __FILE__ ).'/include/config_from_xoops.class.php' ;
+$xoops_config = new ConfigFromXoops;
 require_once dirname( __FILE__ ).'/include/set_cash_cookie_path.php' ;
 
@@ -7 +9 @@
 
 // ** MySQL settings ** //
-define('DB_NAME', XOOPS_DB_NAME);    // The name of the database
-define('DB_USER', XOOPS_DB_USER);     // Your MySQL username
-define('DB_PASSWORD', XOOPS_DB_PASS); // ...and password
-define('DB_HOST', XOOPS_DB_HOST);    // 99% chance you won't need to change this value
+define('DB_NAME', $xoops_config->xoops_db_name);    // The name of the database
+define('DB_USER', $xoops_config->xoops_db_user);     // Your MySQL username
+define('DB_PASSWORD', $xoops_config->xoops_db_pass); // ...and password
+define('DB_HOST', $xoops_config->xoops_db_host);    // 99% chance you won't need to change this value
 define('DB_CHARSET', 'utf8');
 define('DB_COLLATE', '');
@@ -26 +28 @@
         $xp_prefix = 'wp';
 }
-$table_prefix  = XOOPS_DB_PREFIX . '_' . $xp_prefix . '_';   // Only numbers, letters, and underscores please!
+$table_prefix  = $xoops_config->xoops_db_prefix . '_' . $xp_prefix . '_';   // Only numbers, letters, and underscores please!
 
 // Change this to localize WordPress.  A corresponding MO file for the
@@ -38 +40 @@
 if ( !defined('ABSPATH') )
         define('ABSPATH', dirname(__FILE__).'/');
-
 require_once(ABSPATH.'wp-settings.php');
-
+require dirname( __FILE__ ).'/include/include_xoops_define.php' ;
 if (is_xpress_index_page_call()){
         // The return to wp-blog-header.php is stolen here