Index: branches/Ver3.0/xpressme_integration_kit/admin/index.php
===================================================================
--- branches/Ver3.0/xpressme_integration_kit/admin/index.php	(revision 744)
+++ branches/Ver3.0/xpressme_integration_kit/admin/index.php	(revision 749)
@@ -31,6 +31,5 @@
 
 function admin_check_user_meta_prefix($is_report = false){
-	global $xoopsModule;
-	$xoopsDB =& Database::getInstance();
+	global $xoopsModule,$xoopsDB;
 	
 	$mydirname = basename(dirname(dirname(__FILE__)));
@@ -114,6 +113,5 @@
 function get_xpress_active_plugin_list($before_str = '')
 {
-	global $xoopsModule;
-	$xoopsDB =& Database::getInstance();
+	global $xoopsModule,$xoopsDB;
 	
 	$mydirname = basename(dirname(dirname(__FILE__)));
@@ -537,9 +535,8 @@
 function xpress_state($is_report = false)
 {
-	global $xoopsModule;
+	global $xoopsModule,$xoopsDB;
 	include(dirname(__FILE__) . '/../wp-includes/version.php');
 	include_once(dirname(__FILE__) . '/../include/general_functions.php');
 
-	$xoopsDB =& Database::getInstance();
 	
 	$xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
@@ -613,6 +610,5 @@
 function xpress_group_role_state($is_report = false)
 {
-	global $xoopsModule;
-	$xoopsDB =& Database::getInstance();
+	global $xoopsModule,$xoopsDB;
 	$xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname');
 	$xp_prefix = preg_replace('/wordpress/','wp',$xp_prefix);
@@ -692,11 +688,12 @@
 function xpress_block_options($is_report = false)
 {
+	global $xoopsModule;
 	$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
 	$module_objs = & get_module_objects($mydirname);
 	$module_obj = $module_objs[0];
-	$mod_id = $module_obj->getVar('mid', 'n');
+	$mod_id = $xoopsModule->getVar('mid', 'n');
 	$blocks = & get_block_object_orber_num_bymodule_id( $mod_id );
-	$infos    =& $module_obj->getInfo('blocks');
+	$infos    = $xoopsModule->getInfo('blocks');
 	if ($is_report){
 		echo "******** " . _AM_XP2_BLOCK_OPTIONS . "********" . "<br />\n";