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 744)
+++ branches/Ver3.0/xpressme_integration_kit/admin/help/wp_install_help.php	(revision 744)
@@ -0,0 +1,43 @@
+<?php
+	function wp_install_guide(){
+		$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()){
+			//Download
+			echo $wp_info->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 '<br />';
+			echo $wp_info->text_indent(_AM_XP2_WP_STEP_1,1,'font-weight:bold;');
+			echo $wp_info->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 '<br />';
+			echo '<div style="padding-left:60px;">'.$wp_info->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 '<br />';
+			echo '<div style="padding-left:60px;">'.$wp_info->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);			
+
+		} else {
+			echo $wp_info->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 740)
+++ branches/Ver3.0/xpressme_integration_kit/admin/index.php	(revision 744)
@@ -774,5 +774,5 @@
 $mydirpath = dirname( dirname( __FILE__ ) ) ;
 //require_once($mydirpath.'/wp-config.php');
-	
+
 require_once '../../../include/cp_header.php' ;
 //require_once '../include/gtickets.php' ;
@@ -795,41 +795,66 @@
 	exit ;
 }
+include_once $mydirpath .'/include/wp_check.php' ;
 
 // beggining of Output
 xoops_cp_header();
-include( './mymenu.php' ) ;
-
-echo "
-	<style type=\"text/css\">
-	label,text {
-		display: block;
-		float: left;
-		margin-bottom: 2px;
-	}
-	label {
-		text-align: right;
-		width: 200px;
-		padding-right: 20px;
-	}
-	br {
-		clear: left;
-	}
-	</style>
-";
-
-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);
-xpress_block_options($report);
-xpress_group_role_state($report);
-admin_check_user_meta_prefix($report);
-xpress_state($report);
-echo '<form method="POST">'."\n";
-echo '<input type="submit" name="submit_report" value="' . _AM_XP2_SYS_REPORT .' " />'.'&emsp;';
-echo '<input type="submit" name="submit_normal" value="' . _AM_XP2_SYS_NORMAL .' " />'."<br />\n";
-echo "</form>\n";
-
+if(is_wpdb_installed()){
+	include( './mymenu.php' ) ;
+
+	echo "
+		<style type=\"text/css\">
+		label,text {
+			display: block;
+			float: left;
+			margin-bottom: 2px;
+		}
+		label {
+			text-align: right;
+			width: 200px;
+			padding-right: 20px;
+		}
+		br {
+			clear: left;
+		}
+		</style>
+	";
+	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);
+	xpress_block_options($report);
+	xpress_group_role_state($report);
+	admin_check_user_meta_prefix($report);
+	xpress_state($report);
+	echo '<form method="POST">'."\n";
+	echo '<input type="submit" name="submit_report" value="' . _AM_XP2_SYS_REPORT .' " />'.'&emsp;';
+	echo '<input type="submit" name="submit_normal" value="' . _AM_XP2_SYS_NORMAL .' " />'."<br />\n";
+	echo "</form>\n";
+} else {
+
+	include_once $mydirpath .'/include/wp_installer.php' ;
+	if (!empty($_POST['submit_install'])) {
+		$i_mess = wp_installer($mydirname);
+		foreach( $i_mess as $message ) {
+			echo $message ;
+		}
+
+	} else {
+		echo '<font size="5" color="#ff0000">'. _AM_XP2_NO_WP. '</font><br /><br />';
+
+		if (xp_permission_check($mydirname , $mydirpath)){
+			echo '<form method="POST">'."\n";
+			echo '<input type="submit" name="submit_install" value="' . _AM_XP2_WP_INSTALL .' " />'.'&emsp;';
+			echo "</form>\n";
+		} else {
+			include_once $mydirpath .'/admin/help/wp_install_help.php' ;
+			wp_install_guide();
+			echo '<form method="POST">'."\n";
+			echo '<input type="submit" name="submit_recheck" value="' . _AM_XP2_WP_RE_CHK .' " />'.'&emsp;';
+			echo "</form>\n";
+		}
+	}
+}
 xoops_cp_footer();
 
Index: branches/Ver3.0/xpressme_integration_kit/admin/menu.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/admin/menu.php	(revision 740)
+++ branches/Ver3.0/xpressme_integration_kit/admin/menu.php	(revision 744)
@@ -40,9 +40,9 @@
 }
 
-
-
 $i=0;
+include_once $dir_path .'/include/wp_check.php' ;
 $adminmenu[$i]['title'] = _MI_XP2_MENU_SYS_INFO ;
 $adminmenu[$i++]['link'] = "admin/index.php";
+if(is_wpdb_installed()){
 
 //$adminmenu[$i]['title'] = _MI_XP2_MENU_BLOCK_ADMIN ;
@@ -60,4 +60,4 @@
 $adminmenu[$i]['title'] = _MI_XP2_TO_UPDATE ;
 $adminmenu[$i++]['link'] = "admin/update.php";
-
+}
 ?>