From: Michael Vogel <icarus@dabo.de>
Date: Thu, 3 Dec 2015 13:38:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1a170c874368e3ce77eb569702462e54c96239a2;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework

Conflicts:
	mod/contacts.php
	mod/crepair.php
---

1a170c874368e3ce77eb569702462e54c96239a2
diff --cc include/items.php
index 1e68787d24,1e68787d24..2ac494ba27
--- a/include/items.php
+++ b/include/items.php
@@@ -1250,8 -1250,8 +1250,10 @@@ function item_store($arr,$force_parent 
  
  	if ($notify)
  		$guid_prefix = "";
--	else
--		$guid_prefix = $arr['network'];
++	else {
++		$parsed = parse_url($arr["author-link"]);
++		$guid_prefix = hash("crc32", $parsed["host"]);
++	}
  
  	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
  	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid(32, $guid_prefix));
@@@ -2320,6 -2320,6 +2322,9 @@@ function edited_timestamp_is_newer($exi
  function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
  	if ($contact['network'] === NETWORK_OSTATUS) {
  		if ($pass < 2) {
++			// Test - remove before flight
++			//$tempfile = tempnam(get_temppath(), "ostatus2");
++			//file_put_contents($tempfile, $xml);
  			logger("Consume OStatus messages ", LOGGER_DEBUG);
  			ostatus_import($xml,$importer,$contact, $hub);
  		}
diff --cc include/ostatus.php
index ebd5741e51,ebd5741e51..07eaec85d5
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@@ -1282,6 -1282,6 +1282,14 @@@ function ostatus_add_author($doc, $owne
  	return $author;
  }
  
++/*
++To-Do: Picture attachments should look like this:
++
++<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
++class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
++
++*/
++
  function ostatus_entry($doc, $item, $owner, $toplevel = false) {
  	$a = get_app();
  
diff --cc mod/contacts.php
index f1537d5086,f1829a1830..cff68abc65
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@@ -922,23 -905,8 +924,8 @@@ function contact_posts($a, $contact_id
  		intval($a->pager['itemspage'])
  	);
  
- 	if (!$r)
- 		$o = $contact["url"]." - ".$contact_id;
- 
 -	$tab_str = contact_tabs($a, $contact_id, 1);
 +	$tab_str = contacts_tab($a, $contact_id, 1);
  
- 	$header = $contact["name"];
- 
- 	if ($contact["addr"] != "")
- 		$header .= " <".$contact["addr"].">";
- 
- 	$header .= " (".network_to_name($contact['network'], $contact['url']).")";
- 
- 	//$tpl = get_markup_template("section_title.tpl");
- 	//$o = replace_macros($tpl,array(
-         //        '$title' => htmlentities($header)
-         //));
- 
  	$o .= $tab_str;
  
  	$o .= conversation($a,$r,'community',false);
diff --cc mod/crepair.php
index 99a039b379,98202ae0b0..6f951bdf6e
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@@ -23,14 -23,25 +23,9 @@@ function crepair_init(&$a) 
  		$a->page['aside'] = '';
  
  	if($contact_id) {
--			$a->data['contact'] = $r[0];
-                         $tpl = get_markup_template("vcard-widget.tpl");
-                         $vcard_widget .= replace_macros($tpl, array(
-                                 '$name' => htmlentities($a->data['contact']['name']),
-                                 '$photo' => $a->data['contact']['photo']
-                         ));
 -
 -			if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
 -				$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
 -			} else 
 -				$networkname = '';
 -
 -			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
 -				'$name' => htmlentities($a->data['contact']['name']),
 -				'$photo' => $a->data['contact']['photo'],
 -				'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
 -				'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
 -				'$network_name' => $networkname,
 -				'$network' => t('Network:'),
 -				'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
 -			));
 -
--			$a->page['aside'] .= $vcard_widget;
--
++		$a->data['contact'] = $r[0];
++                $contact = $r[0];
++		profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
  	}
  }
  
@@@ -159,14 -170,8 +154,8 @@@ function crepair_content(&$a) 
  
  	$update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
  
 -	$tab_str = contact_tabs($a, $contact['id'], 3);
 +	$tab_str = contacts_tab($a, $contact['id'], 5);
  
- 	$header = $contact["name"];
- 
-        if ($contact["addr"] != "")
-                 $header .= " <".$contact["addr"].">";
- 
-         $header .= " (".network_to_name($contact['network'], $contact['url']).")";
  
  	$tpl = get_markup_template('crepair.tpl');
  	$o .= replace_macros($tpl, array(