Index: trunk/admin/index.php
===================================================================
--- trunk/admin/index.php	(revision 158)
+++ trunk/admin/index.php	(revision 159)
@@ -117,4 +117,113 @@
 echo "</fieldset><br />";
 
+require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
+$xoops_config = new ConfigFromXoops;
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XOOPS_CONFIG_INFO . "</legend>";
+echo "<div style='padding: 8px;'>";
+echo '<table width="400" cellspacing="1" cellpadding="1" border="1">';
+echo '<tbody>';
+echo '<tr>';
+echo '<td>Define</td>';
+echo '<td>XOOPS</td>';
+echo '<td>xoops_config</td>';
+echo '</tr>';
+echo '<tr>';
+if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_ROOT_PATH</span></strong></td>';
+else
+	echo '<td>XOOPS_ROOT_PATH</td>';	
+echo '<td>' . XOOPS_ROOT_PATH . '</td>';
+echo '<td>' . $xoops_config->xoops_root_path . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_TRUST_PATH</span></strong></td>';
+else
+	echo '<td>XOOPS_TRUST_PATH</td>';	
+echo '<td>' . XOOPS_TRUST_PATH . '</td>';
+echo '<td>' . $xoops_config->xoops_trust_path . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_URL !== $xoops_config->xoops_url)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_URL</span></strong></td>';
+else
+	echo '<td>XOOPS_URL</td>';	
+echo '<td>' . XOOPS_URL . '</td>';
+echo '<td>' . $xoops_config->xoops_url . '</td>';
+echo '</tr>';
+
+if (defined('XOOPS_SALT')){
+	echo '<tr>';
+	if(XOOPS_SALT !== $xoops_config->xoops_salt)
+		echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_SALT</span></strong></td>';
+	else
+		echo '<td>XOOPS_SALT</td>';
+	echo '<td>' . XOOPS_SALT . '</td>';
+	echo '<td>' . $xoops_config->xoops_salt . '</td>';
+	echo '</tr>';
+}
+
+if (defined('XOOPS_DB_SALT')){
+	echo '<tr>';
+	if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt)
+		echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_SALT</span></strong></td>';
+	else
+		echo '<td>XOOPS_DB_SALT</td>';
+	echo '<td>' . XOOPS_DB_SALT . '</td>';
+	echo '<td>' . $xoops_config->xoops_db_salt . '</td>';
+	echo '</tr>';
+}
+
+echo '<tr>';
+if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_HOST</span></strong></td>';
+else
+	echo '<td>XOOPS_DB_HOST</td>';
+echo '<td>' . XOOPS_DB_HOST . '</td>';
+echo '<td>' . $xoops_config->xoops_db_host . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_DB_USER !== $xoops_config->xoops_db_user)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_USER</span></strong></td>';
+else
+	echo '<td>XOOPS_DB_USER</td>';
+echo '<td>' . XOOPS_DB_USER . '</td>';
+echo '<td>' . $xoops_config->xoops_db_user . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_PASS</span></strong></td>';
+else
+	echo '<td>XOOPS_DB_PASS</td>';
+echo '<td>' . XOOPS_DB_PASS . '</td>';
+echo '<td>' . $xoops_config->xoops_db_pass . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_NAME</span></strong></td>';
+else
+	echo '<td>XOOPS_DB_NAME</td>';
+echo '<td>' . XOOPS_DB_NAME . '</td>';
+echo '<td>' . $xoops_config->xoops_db_name . '</td>';
+echo '</tr>';
+
+echo '<tr>';
+if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix)
+	echo '<td><strong><span style="color: rgb(255, 0, 0);">XOOPS_DB_PREFIX</span></strong></td>';
+else
+	echo '<td>XOOPS_DB_PREFIX</td>';
+echo '<td>' . XOOPS_DB_PREFIX . '</td>';
+echo '<td>' . $xoops_config->xoops_db_prefix . '</td>';
+echo '</tr>';
+echo '</tbody>';
+echo '</table>';
+echo "</div>";
+echo "</fieldset><br />";
+
 $xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
 if ($xp_prefix == 'wordpress'){
Index: trunk/class/config_from_xoops.class.php
===================================================================
--- trunk/class/config_from_xoops.class.php	(revision 158)
+++ trunk/class/config_from_xoops.class.php	(revision 159)
@@ -32,4 +32,5 @@
 	var $xoops_upload_url;
 	var $xoops_db_salt;
+	var $xoops_salt;
 	var $is_impress;
 	var $impress_db_config_file;
@@ -41,4 +42,10 @@
        
     }
+    
+    function xpress_eval($str){
+    	$eval_str = '$ret = ' . $str . ' ;';
+    	eval($eval_str);
+    	return $ret;
+    }
 
     function ConfigFromXoops()	//for PHP4 constructor
@@ -49,5 +56,5 @@
 		if(file_exists($this->xoops_mainfile_path)){
 			$array_file = file($this->xoops_mainfile_path);
-			$pattern = '^\s*define\s*\(\s*(\'[^\']+\'|"[^"]+")\s*,\s*(\'[^\']*\'|"[^"]*"|[^\'"])\s*\)\s*;';
+			$pattern = '^\s*define\s*\(\s*(\'[^\']+\'|"[^"]+")\s*,\s*(\'.*\'|".*"|[^\'"]*)\s*\)\s*;';
 			$impress_include_pattern = '^\s*(include_once|include)\s*\(\s*XOOPS_TRUST_PATH\s*.\s*[\'"]([^\'"]+)[\'"]\s*\)';
 			for ($i = 0 ; $i <count($array_file) ; $i++){
@@ -57,35 +64,37 @@
 					if (preg_match('/^"[^"]*"$/',$keys)) $keys = preg_replace('/"/', '', $keys);
 					$key_value = $matchs[2];
-					if (preg_match('/^\'[^\']*\'$/',$key_value)) $key_value = preg_replace('/\'/', '', $key_value);
-					if (preg_match('/^"[^"]*"$/',$key_value)) $key_value = preg_replace('/"/', '', $key_value);
+
 					switch ($keys){
 						case  'XOOPS_ROOT_PATH':
-							$this->xoops_root_path = $key_value;
+							$this->xoops_root_path = $this->xpress_eval($key_value);
 							$this->xoops_url . '/modules/' . $this->module_name;
 							break;
 						case  'XOOPS_URL':
-							$this->xoops_url = $key_value;
+							$this->xoops_url = $this->xpress_eval($key_value);
 							$this->module_url = $this->xoops_url . '/modules/' . $this->module_name;
 							break;
 						case  'XOOPS_TRUST_PATH':
-							$this->xoops_trust_path = $key_value;
+							$this->xoops_trust_path = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_PREFIX':
-							$this->xoops_db_prefix = $key_value;
+							$this->xoops_db_prefix = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_NAME':
-							$this->xoops_db_name = $key_value;
+							$this->xoops_db_name = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_USER':
-							$this->xoops_db_user = $key_value;
+							$this->xoops_db_user = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_PASS':
-							$this->xoops_db_pass = $key_value;
+							$this->xoops_db_pass = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_HOST':
-							$this->xoops_db_host = $key_value;
+							$this->xoops_db_host = $this->xpress_eval($key_value);
 							break;
 						case  'XOOPS_DB_SALT':
-							$this->xoops_db_salt = $key_value;
+							$this->xoops_db_salt = $this->xpress_eval($key_value);
+							break;
+						case  'XOOPS_SALT':
+							$this->xoops_salt = $this->xpress_eval($key_value);
 							break;
 						default :
@@ -113,24 +122,23 @@
 						if (preg_match('/^"[^"]*"$/',$keys)) $keys = preg_replace('/"/', '', $keys);
 						$key_value = $matchs[2];
-						if (preg_match('/^\'[^\']*\'$/',$key_value)) $key_value = preg_replace('/\'/', '', $key_value);
-						if (preg_match('/^"[^"]*"$/',$key_value)) $key_value = preg_replace('/"/', '', $key_value);
+
 						switch ($keys){
 							case  'SDATA_DB_SALT':
-								$this->xoops_db_salt = $key_value;
+								$this->xoops_db_salt = $this->xpress_eval($key_value);
 								break;
 							case  'SDATA_DB_PREFIX':
-								$this->xoops_db_prefix = $key_value;
+								$this->xoops_db_prefix = $this->xpress_eval($key_value);
 								break;
 							case  'SDATA_DB_NAME':
-								$this->xoops_db_name = $key_value;
+								$this->xoops_db_name = $this->xpress_eval($key_value);
 								break;
 							case  'SDATA_DB_USER':
-								$this->xoops_db_user = $key_value;
+								$this->xoops_db_user = $this->xpress_eval($key_value);
 								break;
 							case  'SDATA_DB_PASS':
-								$this->xoops_db_pass = $key_value;
+								$this->xoops_db_pass = $this->xpress_eval($key_value);
 								break;
 							case  'SDATA_DB_HOST':
-								$this->xoops_db_host = $key_value;
+								$this->xoops_db_host = $this->xpress_eval($key_value);
 								break;
 							default :
Index: trunk/language/ja_utf8/admin.php
===================================================================
--- trunk/language/ja_utf8/admin.php	(revision 158)
+++ trunk/language/ja_utf8/admin.php	(revision 159)
@@ -4,4 +4,5 @@
 	
 	define("_AM_SYSTEM_INFO","システム情報");
+	define("_AM_XOOPS_CONFIG_INFO","XPressMEがXOOPSより取得した設定値");
 	define("_AM_XPRESS_STATS","統計");
 	define("_AM_XPRESS_CATEGORIES","カテゴリー数");
Index: trunk/xoops_version.php
===================================================================
--- trunk/xoops_version.php	(revision 158)
+++ trunk/xoops_version.php	(revision 159)
@@ -31,5 +31,5 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.24";
+$modversion['version'] = "0.25";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
@@ -40,5 +40,5 @@
 
 // status
-$modversion['codename'] = "r156";
+$modversion['codename'] = "r159";
 
 // onInstall, onUpdate, onUninstall