X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=5d604599b75d682e50a1d93f502d6402fc5fc7e9;hb=b8479cc2f98bdd3b144cfda127c799ba4740fc83;hp=72ec81c1111f666d309035b53e075992e81bf35d;hpb=067626380db6d5ed71d68bd91481ff51cfa76915;p=friendica.git

diff --git a/boot.php b/boot.php
index 72ec81c111..5d604599b7 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.927' );
-define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
-define ( 'DB_UPDATE_VERSION',      1045   );
+define ( 'FRIENDIKA_VERSION',      '2.1.942' );
+define ( 'DFRN_PROTOCOL_VERSION',  '2.2'  );
+define ( 'DB_UPDATE_VERSION',      1047   );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -352,10 +352,12 @@ class App {
 
 	function init_pagehead() {
 		$this->page['title'] = $this->config['sitename'];
-		$tpl = load_view_file("view/head.tpl");
+		$tpl = load_view_file('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl() . '/',
-			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION
+			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
+			'$delitem' => t('Delete this item?'),
+			'$comment' => t('Comment')
 		));
 	}
 
@@ -435,15 +437,18 @@ function check_config(&$a) {
 
 	load_config('system');
 
-	if(! x($_SERVER,'SERVER_NAME'))
-		return;
-
 	$build = get_config('system','build');
 	if(! x($build))
 		$build = set_config('system','build',DB_UPDATE_VERSION);
 
 	$url = get_config('system','url');
-	if(! x($url))
+
+	// if the url isn't set or the stored url is radically different 
+	// than the currently visited url, store the current value accordingly.
+	// "Radically different" ignores common variations such as http vs https 
+	// and www.example.com vs example.com.
+
+	if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
 		$url = set_config('system','url',$a->get_baseurl());
 
 	if($build != DB_UPDATE_VERSION) {
@@ -1068,6 +1073,7 @@ function paginate(&$a) {
 	$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
 	$stripped = str_replace('q=','',$stripped);
 	$stripped = trim($stripped,'/');
+	$pagenum = $a->pager['page'];
 	$url = $a->get_baseurl() . '/' . $stripped;
 
 
@@ -1080,7 +1086,7 @@ function paginate(&$a) {
 
     		$numpages = $a->pager['total'] / $a->pager['itemspage'];
 
-		$numstart = 1;
+			$numstart = 1;
     		$numstop = $numpages;
 
     		if($numpages > 14) {
@@ -1475,7 +1481,9 @@ function lrdd($uri) {
 		return array();
 
 	logger('lrdd: host_meta: ' . $xml, LOGGER_DATA);
-	$h = simplexml_load_string($xml);
+
+	$h = parse_xml_string($xml);
+
 	$arr = convert_xml_element_to_array($h);
 
 	if(isset($arr['xrd']['property'])) {
@@ -1547,16 +1555,19 @@ function lrdd($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;
+	// don't try and parse raw xml as html
+	if(! strstr($html,'<?xml')) {
+		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;
+				}
 			}
 		}
 	}
@@ -1635,7 +1646,7 @@ function fetch_xrd_links($url) {
 		return array();
 
 	logger('fetch_xrd_links: ' . $xml, LOGGER_DATA);
-	$h = simplexml_load_string($xml);
+	$h = parse_xml_string($xml);
 	$arr = convert_xml_element_to_array($h);
 
 	$links = array();
@@ -2019,7 +2030,7 @@ function contact_block() {
 			intval($shown)
 	);
 	if(count($r)) {
-		$o .= '<h4 class="contact-h4">' .  sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
+		$o .= '<h4 class="contact-h4">' .  sprintf( tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
 		foreach($r as $rr) {
 			$redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
 			if(local_user() && ($rr['uid'] == local_user())
@@ -2402,9 +2413,7 @@ function get_birthdays() {
 	if(! local_user())
 		return $o;
 
-	$bd_format = get_config('system','birthday_format');
-	if(! $bd_format)
-		$bd_format = 'g A l F d' ; // 8 AM Friday January 18
+	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 
 	$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` 
 		LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid` 
@@ -2666,3 +2675,107 @@ function extract_item_authors($arr,$uid) {
 	}
 	return array();		
 }}
+
+if(! function_exists('item_photo_menu')){
+function item_photo_menu($item){
+	$a = get_app();
+	
+	if (!isset($a->authors)){
+		$rr = q("SELECT id, network, url FROM contact WHERE uid=%d AND self!=1", intval(local_user()));
+		$authors = array();
+		foreach($rr as $r) $authors[$r['url']]= $r;
+		$a->authors = $authors;
+	}
+	
+	$contact_url="";
+	$pm_url="";
+
+	$status_link="";
+	$photo_link="";
+	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
+	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
+
+	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
+
+	// So we are checking that this is a logged in user on some page that *isn't* a profile page
+	// OR a profile page where the viewer owns the profile. 
+	// Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
+	// or a friend's contact that we both have a connection to. 
+
+	if((local_user() && ($profile_owner == 0)) 
+		|| ($profile_owner && $profile_owner == local_user())) {
+
+		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
+			$redir = $redirect_url;
+		elseif(isset($a->authors[$item['author-link']])) {
+			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
+			$cid = $a->authors[$item['author-link']]['id'];
+		}
+
+		if($item['network'] === 'dfrn' && (! $item['self'])) {
+			$status_link = $redir . "?url=status";
+			$profile_link = $redir . "?url=profile";
+			$photos_link = $redir . "?url=photos";
+			$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+		}
+
+		$contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
+	}
+
+
+	$menu = Array(
+		t("View status") => $status_link,
+		t("View profile") => $profile_link,
+		t("View photos") => $photos_link,		
+		t("Edit contact") => $contact_url,
+		t("Send PM") => $pm_url,
+	);
+	
+	
+	$args = array($item, &$menu);
+	
+	call_hooks('item_photo_menu', $args);
+	
+	$o = "";
+	foreach($menu as $k=>$v){
+		if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+	}
+	return $o;
+}}
+
+if(! function_exists('lang_selector')) {
+function lang_selector() {
+	global $lang;
+	$o .= '<div id="language-selector" style="display: none;" >';
+	$o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >';
+	$langs = glob('view/*/strings.php');
+	if(is_array($langs) && count($langs)) {
+		if(! in_array('view/en/strings.php',$langs))
+			$langs[] = 'view/en/';
+		foreach($langs as $l) {
+			$ll = substr($l,5);
+			$ll = substr($ll,0,strrpos($ll,'/'));
+			$selected = (($ll === $lang) ? ' selected="selected" ' : '');
+			$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
+		}
+	}
+	$o .= '</select></form></div>';
+	return $o;
+}}
+
+
+if(! function_exists('parse_xml_string')) {
+function parse_xml_string($s) {
+	if(! strstr($s,'<?xml'))
+		return false;
+	$s2 = substr($s,strpos($s,'<?xml'));
+	libxml_use_internal_errors(true);
+	$x = @simplexml_load_string($s2);
+	if(count(libxml_get_errors()))
+		foreach(libxml_get_errors() as $err)
+			logger('libxml: parse: ' . $err, LOGGER_DATA);
+	libxml_clear_errors();
+	return $x;
+}}