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

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

diff --cc include/items.php
index 1e68787d2435416d2aa1638c177862ecbde7d9e8,1e68787d2435416d2aa1638c177862ecbde7d9e8..2ac494ba275ce4569838ecd548fd1a1746beff8f
--- 1/include/items.php
--- 2/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 ebd5741e5157a44977a4f6452857c2f509199191,ebd5741e5157a44977a4f6452857c2f509199191..07eaec85d50f4b962a3b281507e84606ade94ce9
--- 1/include/ostatus.php
--- 2/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 f1537d50868aefbfeac24ef3b351ced4b11b6fdb,f1829a1830f036021779cc819fffe535f9aacd15..cff68abc65facc03a799495c024c3a3f5cc96060
--- 1/mod/contacts.php
--- 2/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 99a039b379579982a0d0d63beb9b9697bf5bdf9c,98202ae0b006310cddf8d697d6030054c23ceb95..6f951bdf6eade2dcd2321e63f250455892fe152c
--- 1/mod/crepair.php
--- 2/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(