From eb2ef6dec43391631e2989b55bc4d762336680ca Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 22 Aug 2011 18:52:02 -0700
Subject: diaspora admin toggle, update install guide

---
 include/network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index d4f0d8aa7..f0dd828d1 100644
--- a/include/network.php
+++ b/include/network.php
@@ -508,7 +508,7 @@ function fetch_xrd_links($url) {
 
 	$xrd_timeout = intval(get_config('system','xrd_timeout'));
 	$redirects = 0;
-	$xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 30));
+	$xml = fetch_url($url,false,$redirects,(($xrd_timeout) ? $xrd_timeout : 20));
 
 	logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
 
-- 
cgit v1.2.3


From 1b33ba6587766d939ac37c1ca60aa5c012e4da9d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 25 Aug 2011 06:01:40 -0700
Subject: third attempt to get rid of this stupid warning

---
 include/network.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index f0dd828d1..691a8c9f9 100644
--- a/include/network.php
+++ b/include/network.php
@@ -536,7 +536,7 @@ function fetch_xrd_links($url) {
 			$aliases = array($alias);
 		else
 			$aliases = $alias;
-		if($aliases && count($aliases)) {
+		if(is_array($aliases) && count($aliases)) {
 			foreach($aliases as $alias) {
 				$links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
 			}
-- 
cgit v1.2.3


From 0f1bc6e9571e367b37246e43ce08921bf317fa7c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 29 Aug 2011 22:50:41 -0700
Subject: log every possible diaspora return for posts and comments

---
 include/network.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index 691a8c9f9..2832ae2d3 100644
--- a/include/network.php
+++ b/include/network.php
@@ -9,37 +9,37 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
 
 	$a = get_app();
 
-	$ch = curl_init($url);
+	$ch = @curl_init($url);
 	if(($redirects > 8) || (! $ch)) 
 		return false;
 
-	curl_setopt($ch, CURLOPT_HEADER, true);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
-	curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
+	@curl_setopt($ch, CURLOPT_HEADER, true);
+	@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
+	@curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
 
 	if(intval($timeout)) {
-		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		@curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 	}
 	else {
 		$curl_time = intval(get_config('system','curl_timeout'));
-		curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
+		@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 	}
 	// by default we will allow self-signed certs
 	// but you can override this
 
 	$check_cert = get_config('system','verifyssl');
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+	@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
 
 	$prx = get_config('system','proxy');
 	if(strlen($prx)) {
-		curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
-		curl_setopt($ch, CURLOPT_PROXY, $prx);
-		$prxusr = get_config('system','proxyuser');
+		@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
+		@curl_setopt($ch, CURLOPT_PROXY, $prx);
+		$prxusr = @get_config('system','proxyuser');
 		if(strlen($prxusr))
-			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
+			@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
 	}
 	if($binary)
-		curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
+		@curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
 
 	$a->set_curl_code(0);
 
@@ -49,7 +49,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
 	$s = @curl_exec($ch);
 
 	$base = $s;
-	$curl_info = curl_getinfo($ch);
+	$curl_info = @curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
 
 	$header = '';
@@ -80,7 +80,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
 
 	$a->set_curl_headers($header);
 
-	curl_close($ch);
+	@curl_close($ch);
 	return($body);
 }}
 
-- 
cgit v1.2.3