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);