Merge pull request #2131 from rabuzarus/3011_hcard_vcard

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 55231faf7dd1e0cb77344080ef366969fd548435..98202ae0b006310cddf8d697d6030054c23ceb95 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -1,4 +1,6 @@
 <?php
+require_once("include/contact_selectors.php");
+require_once("mod/contacts.php");
 
 function crepair_init(&$a) {
        if(! local_user())
@@ -22,11 +24,23 @@ function crepair_init(&$a) {
 
        if($contact_id) {
                        $a->data['contact'] = $r[0];
-                       $o .= '<div class="vcard">';
-                       $o .= '<div class="fn">' . $a->data['contact']['name'] . '</div>';
-                       $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->data['contact']['photo'] . '" alt="' . $a->data['contact']['name'] . '" /></div>';
-                       $o .= '</div>';
-                       $a->page['aside'] .= $o;
+
+                       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;
 
        }
 }
@@ -136,16 +150,10 @@ function crepair_content(&$a) {
 
        $contact = $r[0];
 
-       $msg1 = t('Repair Contact Settings');
-
-       $msg2 = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
-       $msg3 = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
+       $warning = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
+       $info = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
 
-       $o .= '<h2>' . $msg1 . '</h2>';
-
-       $o .= '<div class="error-message">' . $msg2 . EOL . EOL. $msg3 . '</div>';
-
-       $o .= EOL . '<a href="contacts/' . $cid . '">' . t('Return to contact editor') . '</a>' . EOL;
+       $returnaddr = "contacts/$cid";
 
        $allow_remote_self = get_config('system','allow_users_remote_self');
 
@@ -162,8 +170,17 @@ 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);
+
+
        $tpl = get_markup_template('crepair.tpl');
        $o .= replace_macros($tpl, array(
+               //'$title'      => t('Repair Contact Settings'),
+               '$tab_str'      => $tab_str,
+               '$warning'      => $warning,
+               '$info'         => $info,
+               '$returnaddr'   => $returnaddr,
+               '$return'       => t('Return to contact editor'),
                '$update_profile' => update_profile,
                '$udprofilenow' => t('Refetch contact data'),
                '$label_name' => t('Name'),
@@ -177,9 +194,14 @@ function crepair_content(&$a) {
                '$label_photo' => t('New photo from this URL'),
                '$label_remote_self' => t('Remote Self'),
                '$allow_remote_self' => $allow_remote_self,
-               '$remote_self' => array('remote_self', t('Mirror postings from this contact'), $contact['remote_self'], t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), $remote_self_options),
-               '$contact_name' => $contact['name'],
-               '$contact_nick' => $contact['nick'],
+               '$remote_self' => array('remote_self',
+                                       t('Mirror postings from this contact'),
+                                       $contact['remote_self'],
+                                       t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
+                                       $remote_self_options
+                               ),
+               '$contact_name' => htmlentities($contact['name']),
+               '$contact_nick' => htmlentities($contact['nick']),
                '$contact_id'   => $contact['id'],
                '$contact_url'  => $contact['url'],
                '$request'      => $contact['request'],
@@ -188,7 +210,7 @@ function crepair_content(&$a) {
                '$poll'         => $contact['poll'],
                '$contact_attag'  => $contact['attag'],
                '$lbl_submit'   => t('Submit')
-           ));
+       ));
 
        return $o;