Merge pull request #2425 from annando/1603-ostatus

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 98202ae0b006310cddf8d697d6030054c23ceb95..5b4db09dac1f16ab7a0500ccf6b8e90e9cd90dc5 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -23,25 +23,9 @@ function crepair_init(&$a) {
                $a->page['aside'] = '';
 
        if($contact_id) {
-                       $a->data['contact'] = $r[0];
-
-                       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"]));
        }
 }
 
@@ -96,24 +80,7 @@ function crepair_post(&$a) {
                logger('mod-crepair: updating photo from ' . $photo);
                require_once("include/Photo.php");
 
-               $photos = import_profile_photo($photo,local_user(),$contact['id']);
-
-               $x = q("UPDATE `contact` SET `photo` = '%s',
-                       `thumb` = '%s',
-                       `micro` = '%s',
-                       `name-date` = '%s',
-                       `uri-date` = '%s',
-                       `avatar-date` = '%s'
-                       WHERE `id` = %d
-                       ",
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($contact['id'])
-               );
+               update_contact_avatar($photo,local_user(),$contact['id']);
        }
 
        if($r)
@@ -170,7 +137,7 @@ 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);
 
 
        $tpl = get_markup_template('crepair.tpl');