X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=d4398a11a6b8bfcf5067124875dbf6b0a92fa7bc;hb=5f2f64406407839d0a9d906e0ad165067d90d130;hp=7fbd2a6fbde635a9c153d5b7bae1c0845542b8b3;hpb=98db8bc015970ce2ca03d53c710aaa8cf40cce87;p=friendica.git

diff --git a/boot.php b/boot.php
index 7fbd2a6fbd..d4398a11a6 100644
--- a/boot.php
+++ b/boot.php
@@ -2,8 +2,8 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1037   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0905' );
+define ( 'BUILD_ID',               1039   );
+define ( 'FRIENDIKA_VERSION',      '2.10.0907' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
@@ -195,7 +195,8 @@ class App {
 	public  $hooks;
 	public  $timezone;
 	public  $interactive = true;
-
+	public  $plugins;
+	public  $apps;
 
 	private $scheme;
 	private $hostname;
@@ -266,9 +267,11 @@ class App {
 		 * Just spit out the contents and exit.
 		 */
 
-		if($this->cmd === '.well-known/host-meta')
+		if($this->cmd === '.well-known/host-meta') {
 			require_once('include/hostxrd.php');
-
+			hostxrd($this->hostname);
+			// NOTREACHED
+		}
 
 		/**
 		 * See if there is any page number information, and initialise 
@@ -305,9 +308,9 @@ class App {
 			$this->scheme = $parsed['scheme'];
 
 			$this->hostname = $parsed['host'];
-			if($parsed['port'])
+			if(x($parsed,'port'))
 				$this->hostname .= ':' . $parsed['port'];
-			if($parsed['path'])
+			if(x($parsed,'path'))
 				$this->path = trim($parsed['path'],'\\/');
 		}
 
@@ -409,6 +412,7 @@ function x($s,$k = NULL) {
 if(! function_exists('system_unavailable')) {
 function system_unavailable() {
 	include('system_unavailable.php');
+	system_down();
 	killme();
 }}
 
@@ -478,6 +482,8 @@ function check_config(&$a) {
 	if($plugins)
 		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
 
+	$a->plugins = $plugins_arr;
+
 	$installed_arr = array();
 
 	if(count($installed)) {
@@ -514,6 +520,7 @@ function check_config(&$a) {
 			}
 		}
 	}
+	load_hooks();
 
 	return;
 }}
@@ -1377,11 +1384,13 @@ function webfinger($s) {
 		$tpl = fetch_lrdd_template($host);
 		logger('webfinger: lrdd template: ' . $tpl);
 		if(strlen($tpl)) {
-			$pxrd = str_replace('{uri}', urlencode('acct:'.$s), $tpl);
+			$pxrd = str_replace('{uri}', urlencode('acct:' . $s), $tpl);
+			logger('webfinger: pxrd: ' . $pxrd);
 			$links = fetch_xrd_links($pxrd);
 			if(! count($links)) {
 				// try with double slashes
-				$pxrd = str_replace('{uri}', urlencode('acct://'.$s), $tpl);
+				$pxrd = str_replace('{uri}', urlencode('acct://' . $s), $tpl);
+				logger('webfinger: pxrd: ' . $pxrd);
 				$links = fetch_xrd_links($pxrd);
 			}
 			return $links;
@@ -1395,51 +1404,154 @@ function lrdd($uri) {
 
 	$a = get_app();
 
+	// default priority is host priority, host-meta first
+
+	$priority = 'host';
+
+	// All we have is an email address. Resource-priority is irrelevant
+	// because our URI isn't directly resolvable.
+
 	if(strstr($uri,'@')) {	
 		return(webfinger($uri));
 	}
-	else {
-		$html = fetch_url($uri);
-		$headers = $a->get_curl_headers();
-		logger('lrdd: headers=' . $headers, LOGGER_DEBUG);
+
+	// get the host meta file
+
+	$host = parse_url($uri);
+
+	if($host) {
+		$url  = ((x($host,'scheme')) ? $host['scheme'] : 'http') . '://';
+		$url .= $host['host'] . '/.well-known/host-meta' ;
+	}
+	else
+		return array();
+
+	logger('lrdd: constructed url: ' . $url);
+
+	$xml = fetch_url($url);
+	$headers = $a->get_curl_headers();
+
+	if (! $xml)
+		return array();
+
+	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
+	$h = simplexml_load_string($xml);
+	$arr = convert_xml_element_to_array($h);
+
+	if(isset($arr['xrd']['property'])) {
+		$property = $arr['crd']['property'];
+		if(! isset($property[0]))
+			$properties = array($property);
+		else
+			$properties = $property;
+		foreach($properties as $prop)
+			if((string) $prop['@attributes'] === 'http://lrdd.net/priority/resource')
+				$priority = 'resource';
+	} 
+
+	// save the links in case we need them
+
+	$links = array();
+
+	if(isset($arr['xrd']['link'])) {
+		$link = $arr['xrd']['link'];
+		if(! isset($link[0]))
+			$links = array($link);
+		else
+			$links = $link;
+	}
+
+	// do we have a template or href?
+
+	if(count($links)) {
+		foreach($links as $link) {
+			if($link['@attributes']['rel'] && attribute_contains($link['@attributes']['rel'],'lrdd')) {
+				if(x($link['@attributes'],'template'))
+					$tpl = $link['@attributes']['template'];
+				elseif(x($link['@attributes'],'href'))
+					$href = $link['@attributes']['href'];
+			}
+		}		
+	}
+
+	if((! isset($tpl)) || (! strpos($tpl,'{uri}')))
+		$tpl = '';
+
+	if($priority === 'host') {
+		if(strlen($tpl)) 
+			$pxrd = str_replace('{uri}', urlencode($uri), $tpl);
+		elseif(isset($href))
+			$pxrd = $href;
+		if(isset($pxrd)) {
+			logger('lrdd: (host priority) pxrd: ' . $pxrd);
+			$links = fetch_xrd_links($pxrd);
+			return $links;
+		}
+
 		$lines = explode("\n",$headers);
 		if(count($lines)) {
 			foreach($lines as $line) {				
-				// TODO alter the following regex to support multiple relations (space separated)
 				if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
-					$link = $matches[1];
+					return(fetch_xrd_links($matches[1]));
 					break;
 				}
-				// don't try and run feeds through the html5 parser
-				if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
-					return array();
-				if(stristr($html,'<rss') || stristr($html,'<feed'))
-					return array();
 			}
 		}
-		if(! isset($link)) {
-			// parse the page of the supplied URL looking for rel links
+	}
 
-			require_once('library/HTML5/Parser.php');
-			$dom = HTML5_Parser::parse($html);
 
-			if($dom) {
-				$items = $dom->getElementsByTagName('link');
+	// priority 'resource'
 
-				foreach($items as $item) {
-					$x = $item->getAttribute('rel');
-					if($x == "lrdd") {
-						$link = $item->getAttribute('href');
-						break;
-					}
-				}
+
+	$html = fetch_url($uri);
+	$headers = $a->get_curl_headers();
+	logger('lrdd: headers=' . $headers, LOGGER_DEBUG);
+
+	require_once('library/HTML5/Parser.php');
+	$dom = @HTML5_Parser::parse($html);
+
+	if($dom) {
+		$items = $dom->getElementsByTagName('link');
+		foreach($items as $item) {
+			$x = $item->getAttribute('rel');
+			if($x == "lrdd") {
+				$pagelink = $item->getAttribute('href');
+				break;
 			}
 		}
+	}
 
-		if(isset($link))
-			return(fetch_xrd_links($link));
+	if(isset($pagelink))
+		return(fetch_xrd_links($pagelink));
+
+	// next look in HTTP headers
+
+	$lines = explode("\n",$headers);
+	if(count($lines)) {
+		foreach($lines as $line) {				
+			// TODO alter the following regex to support multiple relations (space separated)
+			if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
+				$pagelink = $matches[1];
+				break;
+			}
+			// don't try and run feeds through the html5 parser
+			if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
+				return array();
+			if(stristr($html,'<rss') || stristr($html,'<feed'))
+				return array();
+		}
 	}
+
+	if(isset($pagelink))
+		return(fetch_xrd_links($pagelink));
+
+	// If we haven't found any links, return the host xrd links (which we have already fetched)
+
+	if(isset($links))
+		return $links;
+
 	return array();
+
 }}
 
 
@@ -1453,6 +1565,7 @@ function fetch_lrdd_template($host) {
 	$tpl = '';
 	$url = 'http://' . $host . '/.well-known/host-meta' ;
 	$links = fetch_xrd_links($url);
+logger('template: ' . print_r($links,true));
 	if(count($links)) {
 		foreach($links as $link)
 			if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd')
@@ -1479,15 +1592,30 @@ function fetch_xrd_links($url) {
 	$h = simplexml_load_string($xml);
 	$arr = convert_xml_element_to_array($h);
 
+	$links = array();
+
 	if(isset($arr['xrd']['link'])) {
 		$link = $arr['xrd']['link'];
 		if(! isset($link[0]))
 			$links = array($link);
 		else
 			$links = $link;
-		return $links;
 	}
-	return array();
+	if(isset($arr['xrd']['alias'])) {
+		$alias = $arr['xrd']['alias'];
+		if(! isset($alias[0]))
+			$aliases = array($alias);
+		else
+			$aliases = $alias;
+		foreach($aliases as $alias) {
+			$links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
+		}
+	}
+
+	logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA);
+
+	return $links;
+
 }}
 
 // Convert an ACL array to a storable string
@@ -1783,7 +1911,7 @@ function like_puller($a,$item,&$arr,$mode) {
 
 	if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
 		$url = $item['author-link'];
-		if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) {
+		if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
 			$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
 			$sparkle = ' class="sparkle" ';
 		}
@@ -1935,7 +2063,7 @@ function aes_encrypt($val,$ky)
 
 if(! function_exists('linkify')) {
 function linkify($s) {
-	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
+	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="external-link">$1</a>', $s);
 	return($s);
 }}
 
@@ -1957,8 +2085,11 @@ function smilies($s) {
 	$a = get_app();
 
 	return str_replace(
-	array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
 	array(
+		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
@@ -2079,7 +2210,7 @@ function profile_sidebar($profile) {
 
 	$tabs = '';
 
-	$photo = '<div id="profile=photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
+	$photo = '<div id="profile-photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
 
 	$connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : '');
  
@@ -2169,6 +2300,7 @@ function unregister_hook($hook,$file,$function) {
 if(! function_exists('load_hooks')) {
 function load_hooks() {
 	$a = get_app();
+	$a->hooks = array();
 	$r = q("SELECT * FROM `hook` WHERE 1");
 	if(count($r)) {
 		foreach($r as $rr) {
@@ -2424,3 +2556,16 @@ function feed_salmonlinks($nick) {
 	return $salmon;
 }}
 
+if(! function_exists('get_plink')) {
+function get_plink($item) {
+	$a = get_app();	
+	$plink = (((x($item,'plink')) && (! $item['private'])) ? '<div class="wall-item-links-wrapper"><a href="' 
+			. $item['plink'] . '" title="' . t('link to source') . '" target="external-link" ><img src="' . $a->get_baseurl() . '/images/remote-link.gif" alt="' . t('link to source') . '" /></a></div>' : '');
+	return $plink;
+}}
+
+if(! function_exists('unamp')) {
+function unamp($s) {
+	return str_replace('&amp;', '&', $s);
+}}
+