X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnetwork.php;h=551d5e1d0f7ee87ef39b0f817bec9659b90de91c;hb=7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b;hp=deb257ff3d877720f1a866c1614b0d6bedf0f99b;hpb=d284f8017cefb79571fe51c4ae3f85b9b4e517c9;p=friendica.git

diff --git a/include/network.php b/include/network.php
index deb257ff3d..551d5e1d0f 100644
--- a/include/network.php
+++ b/include/network.php
@@ -5,7 +5,7 @@
 // results. 
 
 if(! function_exists('fetch_url')) {
-function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
+function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_content=Null) {
 
 	$a = get_app();
 
@@ -14,8 +14,16 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0) {
 		return false;
 
 	@curl_setopt($ch, CURLOPT_HEADER, true);
+	
+	if (!is_null($accept_content)){
+		curl_setopt($ch,CURLOPT_HTTPHEADER, array (
+			"Accept: "+$accept_content
+		));
+	}
+	
 	@curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
-	@curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
+	@curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
+
 
 	if(intval($timeout)) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
@@ -97,7 +105,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
 	curl_setopt($ch, CURLOPT_POST,1);
 	curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
-	curl_setopt($ch, CURLOPT_USERAGENT, "Friendika");
+	curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
 
 	if(intval($timeout)) {
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
@@ -429,7 +437,12 @@ function lrdd($uri) {
 	// don't try and parse raw xml as html
 	if(! strstr($html,'<?xml')) {
 		require_once('library/HTML5/Parser.php');
-		$dom = @HTML5_Parser::parse($html);
+
+		try {
+			$dom = HTML5_Parser::parse($html);
+		} catch (DOMException $e) {
+			logger('lrdd: parse error: ' . $e);
+		}
 
 		if($dom) {
 			$items = $dom->getElementsByTagName('link');
@@ -522,6 +535,9 @@ function fetch_xrd_links($url) {
 	if ((! $xml) || (! stristr($xml,'<xrd')))
 		return array();
 
+	// fix diaspora's bad xml
+	$xml = str_replace(array('href=&quot;','&quot;/>'),array('href="','"/>'),$xml);
+
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();
@@ -701,24 +717,59 @@ function parse_xml_string($s,$strict = true) {
 	return $x;
 }}
 
-function add_fcontact($arr) {
-
-	$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
-		`notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
-		values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
-		dbesc($arr['url']),
-		dbesc($arr['name']),
-		dbesc($arr['photo']),
-		dbesc($arr['request']),
-		dbesc($arr['nick']),
-		dbesc($arr['addr']),
-		dbesc($arr['notify']),
-		dbesc($arr['poll']),
-		dbesc($arr['confirm']),
-		dbesc($arr['network']),
-		dbesc($arr['alias']),
-		dbesc($arr['pubkey']),
-		dbesc(datetime_convert())
-	);
+function add_fcontact($arr,$update = false) {
+
+	if($update) {
+		$r = q("UPDATE `fcontact` SET
+			`name` = '%s',
+			`photo` = '%s',
+			`request` = '%s',
+			`nick` = '%s',
+			`addr` = '%s',
+			`batch` = '%s',
+			`notify` = '%s',
+			`poll` = '%s',
+			`confirm` = '%s',
+			`alias` = '%s',
+			`pubkey` = '%s',
+			`updated` = '%s'
+			WHERE `url` = '%s' AND `network` = '%s' LIMIT 1", 
+			dbesc($arr['name']),
+			dbesc($arr['photo']),
+			dbesc($arr['request']),
+			dbesc($arr['nick']),
+			dbesc($arr['addr']),
+			dbesc($arr['batch']),
+			dbesc($arr['notify']),
+			dbesc($arr['poll']),
+			dbesc($arr['confirm']),
+			dbesc($arr['alias']),
+			dbesc($arr['pubkey']),
+			dbesc(datetime_convert()),
+			dbesc($arr['url']),
+			dbesc($arr['network'])
+		);
+	}
+	else {
+		$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
+			`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
+			values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+			dbesc($arr['url']),
+			dbesc($arr['name']),
+			dbesc($arr['photo']),
+			dbesc($arr['request']),
+			dbesc($arr['nick']),
+			dbesc($arr['addr']),
+			dbesc($arr['batch']),
+			dbesc($arr['notify']),
+			dbesc($arr['poll']),
+			dbesc($arr['confirm']),
+			dbesc($arr['network']),
+			dbesc($arr['alias']),
+			dbesc($arr['pubkey']),
+			dbesc(datetime_convert())
+		);
+	}
+
 	return $r;
 }