Merge pull request #1950 from annando/1510-contact-menu

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index ec963b1053897cf912ebb8c6e83b18f2b6c10c54..686be3948f26ac2ffcbe55fdc9859dd54e47bff7 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -22,13 +22,14 @@ 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;
+                        $tpl = get_markup_template("vcard-widget.tpl");
+                        $vcard_widget .= replace_macros($tpl, array(
+                                '$name' => htmlentities($a->data['contact']['name']),
+                                '$photo' => $a->data['contact']['photo']
+                        ));
+                       $a->page['aside'] .= $vcard_widget;
 
-       }       
+       }
 }
 
 
@@ -59,24 +60,28 @@ function crepair_post(&$a) {
        $poll    = ((x($_POST,'poll')) ? $_POST['poll'] : '');
        $attag   = ((x($_POST,'attag')) ? $_POST['attag'] : '');
        $photo   = ((x($_POST,'photo')) ? $_POST['photo'] : '');
+       $remote_self = ((x($_POST,'remote_self')) ? $_POST['remote_self'] : false);
+       $nurl    = normalise_link($url);
 
-       $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' 
-               WHERE `id` = %d AND `uid` = %d LIMIT 1",
+       $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
+               WHERE `id` = %d AND `uid` = %d",
                dbesc($name),
                dbesc($nick),
                dbesc($url),
+               dbesc($nurl),
                dbesc($request),
                dbesc($confirm),
                dbesc($notify),
                dbesc($poll),
                dbesc($attag),
+               intval($remote_self),
                intval($contact['id']),
                local_user()
        );
 
        if($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
-               require_once("Photo.php");
+               require_once("include/Photo.php");
 
                $photos = import_profile_photo($photo,local_user(),$contact['id']);
 
@@ -86,7 +91,7 @@ function crepair_post(&$a) {
                        `name-date` = '%s',
                        `uri-date` = '%s',
                        `avatar-date` = '%s'
-                       WHERE `id` = %d LIMIT 1
+                       WHERE `id` = %d
                        ",
                        dbesc($photos[0]),
                        dbesc($photos[1]),
@@ -143,8 +148,25 @@ function crepair_content(&$a) {
 
        $o .= EOL . '<a href="contacts/' . $cid . '">' . t('Return to contact editor') . '</a>' . EOL;
 
+       $allow_remote_self = get_config('system','allow_users_remote_self');
+
+       // Disable remote self for everything except feeds.
+       // There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
+       // Problem is, you couldn't reply to both networks.
+       if (!in_array($contact['network'], array(NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA)))
+               $allow_remote_self = false;
+
+       if ($contact['network'] == NETWORK_FEED)
+               $remote_self_options = array('0'=>t('No mirroring'), '1'=>t('Mirror as forwarded posting'), '2'=>t('Mirror as my own posting'));
+       else
+               $remote_self_options = array('0'=>t('No mirroring'), '2'=>t('Mirror as my own posting'));
+
+       $update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
+
        $tpl = get_markup_template('crepair.tpl');
        $o .= replace_macros($tpl, array(
+               '$update_profile' => update_profile,
+               '$udprofilenow' => t('Refetch contact data'),
                '$label_name' => t('Name'),
                '$label_nick' => t('Account Nickname'),
                '$label_attag' => t('@Tagname - overrides Name/Nickname'),
@@ -154,8 +176,11 @@ function crepair_content(&$a) {
                '$label_notify' => t('Notification Endpoint URL'),
                '$label_poll' => t('Poll/Feed URL'),
                '$label_photo' => t('New photo from this URL'),
-               '$contact_name' => $contact['name'],
-               '$contact_nick' => $contact['nick'],
+               '$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' => htmlentities($contact['name']),
+               '$contact_nick' => htmlentities($contact['nick']),
                '$contact_id'   => $contact['id'],
                '$contact_url'  => $contact['url'],
                '$request'      => $contact['request'],
@@ -164,7 +189,7 @@ function crepair_content(&$a) {
                '$poll'         => $contact['poll'],
                '$contact_attag'  => $contact['attag'],
                '$lbl_submit'   => t('Submit')
-       ));
+           ));
 
        return $o;