Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 369)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 370)
@@ -34,5 +34,5 @@
 	add_submenu_page(__FILE__, __('Integration Settings', 'xpressme'), __('Integration Settings', 'xpressme'), 8, 'integration_option_page', 'integration_option_page');
 	add_submenu_page(__FILE__, __('Other Settings', 'xpressme'), __('Other Settings', 'xpressme'), 8, 'other_option_page', 'other_option_page');
-	if (function_exists('wp_remote_get'))
+//	if (function_exists('wp_remote_get'))
 		add_submenu_page(__FILE__, __('Upgrade', 'xpressme'), __('Upgrade', 'xpressme'), 8, 'upgrade_page', 'upgrade_page');
 	add_submenu_page(__FILE__, __('to XOOPS Admin', 'xpressme'), __('to XOOPS Admin', 'xpressme'), 8,  'redirect_xoops_admin', 'redirect_xoops_admin');
@@ -308,4 +308,26 @@
 }
 
+function xp_remote_get($url, $headers = ""){
+	global $xoops_config;
+	$xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+
+	require_once( $xoops_config->module_path . '/wp-includes/class-snoopy.php');
+
+	// Snoopy is an HTTP client in PHP
+	$client = new Snoopy();
+	$client->agent = 'XPressME/' . $xpress_version;
+	$client->read_timeout = 2;
+	if (is_array($headers) ) {
+		$client->rawheaders = $headers;
+	}
+
+	@$client->fetch($url);
+	$response['response']['code'] = $client->status;
+	$response['body'] = $client->results;
+	return $response;
+	return $client;
+
+}
+
 function get_xpress_latest_version(){
 	global $wp_version, $wpdb, $wp_local_package;
@@ -320,23 +342,27 @@
 	);
 
-	if (! function_exists('wp_remote_get')) return false;
-	
-	$response = wp_remote_get($check_url, $request_options);
-	if ( is_wp_error( $response ) )
-		return false;
-
+	if (! function_exists('wp_remote_get')) {
+		$response = xp_remote_get($check_url);
+		
+		if (empty($response['body'])) return false;
+	} else {
+	
+		$response = wp_remote_get($check_url, $request_options);
+		
+		if ( is_wp_error( $response ) )
+			return false;
+	}
 	if ( 200 != $response['response']['code'] )
 		return false;
-
 	$body = trim( $response['body'] );
 	$body = str_replace(array("\r\n", "\r"), "\n", $body);
 	$returns = explode("\n", $body);
-	$response = esc_attr( $returns[0] );
+	$response = $returns[0];
 	if ( isset( $returns[1] ) )
-		$url = esc_url( $returns[1] );
+		$url = clean_url( $returns[1] );
 	if ( isset( $returns[2] ) )
-		$package = esc_url( $returns[2] );
+		$package = clean_url( $returns[2] );
 	if ( isset( $returns[3] ) )
-		$latest_version = esc_attr( $returns[3] );
+		$latest_version = $returns[3];
 
 	$write_options = array (