deleted my comment of the original line

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 9828124ea7408503722a2d21c2ef4972acc6a424..400817d6f7e42588e4e18c4a8805714f2d40ffef 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -60,12 +60,14 @@ function crepair_post(&$a) {
        $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' , `remote_self` = %d
+       $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),
@@ -150,9 +152,14 @@ function crepair_content(&$a) {
        // 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 ($contact['network'] != NETWORK_FEED)
+       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'));
+
        $tpl = get_markup_template('crepair.tpl');
        $o .= replace_macros($tpl, array(
                '$label_name' => t('Name'),
@@ -166,7 +173,7 @@ 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.'), array('0'=>t('No mirroring'), '1'=>t('Mirror as forwarded posting'), '2'=>t('Mirror as my own posting'))),
+               '$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'],
                '$contact_id'   => $contact['id'],