Index: branches/Ver3.0/xpressme_integration_kit/admin/help/wp_install_help.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/admin/help/wp_install_help.php	(revision 749)
+++ branches/Ver3.0/xpressme_integration_kit/admin/help/wp_install_help.php	(revision 757)
@@ -1,40 +1,112 @@
 <?php
+	function text_indent($text,$num = 1,$css_option='')
+	{
+		$ret = '';
+		$px = 24 * $num;
+		$ret = '<div style="padding-left:' .$px .'px;'.$css_option.'">';
+		$ret .= $text . '</div>';
+		return $ret;
+	}
+
+	function get_download_info($locale='')
+	{
+		global $modInfo;
+		$local_package = '';
+		$mysql_version = preg_replace('/[^0-9.].*/', '', $modInfo->get_mysql_version());
+		$php_version = $modInfo->get_php_version();
+
+		if (empty($locale)) $locale = $modInfo->get_wpLang();
+
+/* test		
+		$mysql_version='4.0.27';
+		$php_version = '4.1.1';
+*/
+		// wprdpress original option
+		// ?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package";
+		$option = "?php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package";
+		$url = "http://api.wordpress.org/core/version-check/1.5/" .$option;
+		$handle = @fopen($url,'r');
+		if ($handle) {
+			$ans = array();
+			$num = 0;
+			$pos = 0;
+	    	while (($buffer = fgets($handle, 4096)) !== false) {
+	    		$buffer = trim($buffer);
+	    		if (strlen($buffer) == 0) {
+	    			$num++;
+	    			$pos=0;
+	    		} else {
+	    			$ans[$num][$pos] = $buffer;
+	    			$pos++;
+	    		}
+	    	}
+	    	if (!feof($handle)) {
+	        	echo "Error: unexpected fgets() fail\n";
+	    	}
+	    	fclose($handle);
+		}
+		$ressponce = $ans[0][0];
+		$site_url = $ans[0][1];
+		$download_url = $ans[0][2];
+		$wp_version = $ans[0][3];
+		$download_lang = $ans[0][4];
+//		print_r($ans);
+		if (isset($ans[1])){
+			$en_download_url = $ans[1][2];
+		}
+		$ret = text_indent('(Check URL: '.$url.')',3);
+		if ($locale == $download_lang){
+			$ret .= text_indent(sprintf(_AM_XP2_WP_INFO_1,$locale),2);
+			$ret .= text_indent('<a href="'.$download_url.'">' . $download_url .'</a>' ,3);
+			if (!empty($en_download_url)){
+				$ret .= text_indent(_AM_XP2_WP_INFO_4,2);
+				$ret .= text_indent('<a href="'.$en_download_url .'">' . $en_download_url .'</a>' ,3);
+			}
+		} else {
+			$ret .= text_indent(sprintf(_AM_XP2_WP_INFO_2,$locale));
+			$ret .= text_indent(_AM_XP2_WP_INFO_3,2);
+			$ret .= text_indent('<a href="http://codex.wordpress.org/WordPress_in_Your_Language" target="	_blank">WordPress_in_Your_Language</a>' ,3);
+			$ret .= text_indent(_AM_XP2_WP_INFO_4,2);
+			$ret .= text_indent('<a href="'.$download_url.'">' . $download_url .'</a>' ,3);
+		}
+		echo $ret;
+	}
+}
+	
 	function wp_install_guide(){
+		global $modInfo;
 		$mydirpath = dirname( dirname( dirname( __FILE__ ) ) ) ;
 		$mydirname = basename(dirname( dirname( dirname( __FILE__ ) ) )) ;
-		include_once $mydirpath . '/class/wpInfo_class.php';
 		$xoops_lang = @$GLOBALS["xoopsConfig"]['language'];
-		$wp_info = new wpInfo;
-		$wp_lang = $wp_info->get_wpLang($xoops_lang);
-		if (!$wp_info->is_wp_file_found()){
+		if (!$modInfo->is_wp_file_found()){
 			//Download
-			echo $wp_info->get_mod_image_link('check_bad_s.png');
+			echo $modInfo->get_mod_image_link('check_bad_s.png');
 			echo '<font size="4" >'._AM_XP2_WP_CHK_0 .'</font><br />';
 			echo '<br />';
-			echo $wp_info->text_indent(_AM_XP2_WP_CHK_1 . _AM_XP2_WP_CHK_2);
+			echo text_indent(_AM_XP2_WP_CHK_1 . _AM_XP2_WP_CHK_2);
 			echo '<br />';
-			echo $wp_info->text_indent(_AM_XP2_WP_STEP_1,1,'font-weight:bold;');
-			echo $wp_info->get_download_info('ja');
+			echo text_indent(_AM_XP2_WP_STEP_1,1,'font-weight:bold;');
+			echo get_download_info('ja');
 			echo '<br />';
 			// Uncompress
-			echo $wp_info->text_indent(_AM_XP2_WP_STEP_2,1,'font-weight:bold;');
-			echo $wp_info->text_indent(_AM_XP2_WP_INFO_5,2);			
+			echo text_indent(_AM_XP2_WP_STEP_2,1,'font-weight:bold;');
+			echo text_indent(_AM_XP2_WP_INFO_5,2);			
 			echo '<br />';
-			echo '<div style="padding-left:60px;">'.$wp_info->get_mod_image_link('wp_uncompless.png') . '</div>';
+			echo '<div style="padding-left:60px;">'.$modInfo->get_mod_image_link('wp_uncompless.png') . '</div>';
 			echo '<br />';
 			// Upload Wordpress
-			echo $wp_info->text_indent(_AM_XP2_WP_STEP_3,1,'font-weight:bold;');
-			printf($wp_info->text_indent(_AM_XP2_WP_INFO_6,2),$mydirname);			
-			printf($wp_info->text_indent(_AM_XP2_WP_INFO_7,3),$mydirpath);			
-			echo $wp_info->text_indent(_AM_XP2_WP_INFO_8,2);
+			echo text_indent(_AM_XP2_WP_STEP_3,1,'font-weight:bold;');
+			printf(text_indent(_AM_XP2_WP_INFO_6,2),$mydirname);			
+			printf(text_indent(_AM_XP2_WP_INFO_7,3),$mydirpath);			
+			echo text_indent(_AM_XP2_WP_INFO_8,2);
 			echo '<br />';
-			echo '<div style="padding-left:60px;">'.$wp_info->get_mod_image_link('wp_upload.png') . '</div>';
+			echo '<div style="padding-left:60px;">'.$modInfo->get_mod_image_link('wp_upload.png') . '</div>';
 			echo '<br />';
 			//Install
-			echo $wp_info->text_indent(_AM_XP2_WP_STEP_4,1,'font-weight:bold;');
-			echo $wp_info->text_indent(_AM_XP2_WP_INFO_9,2);			
+			echo text_indent(_AM_XP2_WP_STEP_4,1,'font-weight:bold;');
+			echo text_indent(_AM_XP2_WP_INFO_9,2);			
 
 		} else {
-			echo $wp_info->get_mod_image_link('check_good_s.png');
+			echo $modInfo->get_mod_image_link('check_good_s.png');
 			echo '<font size="4" >'._AM_XP2_WP_CHK_0 .'</font><br />';
 			echo '<br />';
Index: branches/Ver3.0/xpressme_integration_kit/admin/index.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/admin/index.php	(revision 749)
+++ branches/Ver3.0/xpressme_integration_kit/admin/index.php	(revision 757)
@@ -319,217 +319,4 @@
 
 
-function xpress_config_report_view()
-{
-	require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
-	$xoops_config = new ConfigFromXoops;
-	echo 'XOOPS_ROOT_PATH:  ' ; 
-	if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_TRUST_PATH:  ' ; 
-	if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_URL:  ' ; 
-	if(XOOPS_URL !== $xoops_config->xoops_url)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	if (defined('XOOPS_SALT')){
-		echo 'XOOPS_SALT:  ' ; 
-		if(XOOPS_SALT !== $xoops_config->xoops_salt)
-			echo 'ERROR ';
-		else
-			echo 'OK ';	
-		echo "<br />\n";
-	}
-
-	if (defined('XOOPS_DB_SALT')){
-		echo 'XOOPS_DB_SALT:  ' ; 
-		if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt)
-			echo 'ERROR ';
-		else
-			echo 'OK ';	
-		echo "<br />\n";
-	}
-
-	echo 'XOOPS_DB_HOST:  ' ; 
-	if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_DB_USER:  ' ; 
-	if(XOOPS_DB_USER !== $xoops_config->xoops_db_user)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_DB_PASS:  ' ; 
-	if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_DB_NAME:  ' ; 
-	if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-
-	echo 'XOOPS_DB_PREFIX:  ' ; 
-	if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix)
-		echo 'ERROR ';
-	else
-		echo 'OK ';	
-	echo "<br />\n";
-}
-
-function xpress_config_nomal_view()
-{
-	require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
-	$xoops_config = new ConfigFromXoops;
-	
-	echo '<table width="400" cellspacing="1" cellpadding="1" border="1">';
-	echo '<tbody>';
-	echo '<tr>';
-	echo '<td>Define item</td>';
-	echo '<td>XOOPS setting value</td>';
-	echo '<td>xoops_config get value</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>';
-}
-function xpress_config_from_xoops_view($is_report = false)
-{
-	global $xoopsUserIsAdmin,$xoopsUser;
-
-	$user_groups = $xoopsUser->getGroups();
-	$is_admin_group = in_array('1',$user_groups);
-	
-	require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ;
-	$xoops_config = new ConfigFromXoops;
-	if ($is_report) {
-		echo "******** "  . _AM_XP2_XOOPS_CONFIG_INFO . "********" . "<br />\n";
-		xpress_config_report_view();
-		echo "<br />\n";
-	} else {
-		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_XP2_XOOPS_CONFIG_INFO . "</legend>";
-		echo "<div style='padding: 8px;'>";
-		if ($xoopsUserIsAdmin && $is_admin_group){
-			xpress_config_nomal_view();
-		} else {
-			xpress_config_report_view();
-		}
-		echo "</div>";
-		echo '</legend>';
-		echo "</fieldset><br />";
-	}
-}
 
 function xpress_state($is_report = false)
@@ -818,5 +605,4 @@
 	if (!empty($_POST['submit_report'])) $report = true; else $report = false;
 	xpress_sys_info($report);
-	xpress_config_from_xoops_view($report);
 	xpress_active_plugin_list($report);
 	xpress_block_state($report);