diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php
index 4743e0fa..7bcc6724 100755
--- a/src/includes/functions.inc.php
+++ b/src/includes/functions.inc.php
@@ -197,15 +197,25 @@ function psm_parse_msg($status, $type, $vars) {
  * Shortcut to curl_init(), curl_exec and curl_close()
  *
  * @param string $href
+ * @param boolean $header return headers?
+ * @param boolean $body return body?
+ * @param int $timeout connection timeout in seconds
+ * @param boolean $add_agent add user agent?
  * @return string cURL result
  */
-function psm_curl_get($href) {
+function psm_curl_get($href, $header = false, $body = true, $timeout = 10, $add_agent = true) {
 	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_HEADER, 0);
+	curl_setopt($ch, CURLOPT_HEADER, $header);
+	curl_setopt($ch, CURLOPT_NOBODY, (!$body));
 	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
+	curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+	curl_setopt ($ch, CURLOPT_TIMEOUT, $timeout);
 	curl_setopt($ch, CURLOPT_URL, $href);
+	if($add_agent) {
+		curl_setopt ($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11');
+	}
+
 	$result = curl_exec($ch);
 	curl_close($ch);
 
diff --git a/src/psm/Util/Updater/Status.class.php b/src/psm/Util/Updater/Status.class.php
index f248b826..dbd39cca 100755
--- a/src/psm/Util/Updater/Status.class.php
+++ b/src/psm/Util/Updater/Status.class.php
@@ -122,20 +122,13 @@ class Status {
 		$time = explode(' ', microtime());
 		$starttime = $time[1] + $time[0];
 
-		$ch = curl_init();
-		curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt ($ch, CURLOPT_URL, $this->server['ip']);
-		curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, 10);
-		curl_setopt ($ch, CURLOPT_TIMEOUT, 10);
-		curl_setopt ($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11');
-
 		// We're only interested in the header, because that should tell us plenty!
 		// unless we have a pattern to search for!
-		curl_setopt($ch, CURLOPT_HEADER, true);
-		curl_setopt($ch, CURLOPT_NOBODY, ($this->server['pattern'] != '' ? false : true));
-
-		$curl_result = curl_exec ($ch);
-		curl_close ($ch);
+		$curl_result = psm_curl_get(
+			$this->server['ip'],
+			true,
+			($this->server['pattern'] == '' ? false : true)
+		);
 
 		$time = explode(" ", microtime());
 		$endtime = $time[1] + $time[0];