X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=4f00190990654b0a898aee8a0722ecfe1413f076;hb=14dff6b0e0c5ff43df8b2cd8da440bdeaf2b3384;hp=0706a102d425b0bf7af43305415226c0e9dc9479;hpb=e35c55dd3bd5de9cd39abaeb2d7d0867f681886d;p=friendica.git
diff --git a/mod/crepair.php b/mod/crepair.php
index 0706a102d4..4f00190990 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -22,11 +22,12 @@ function crepair_init(&$a) {
if($contact_id) {
$a->data['contact'] = $r[0];
- $o .= '
';
- $o .= '
' . $a->data['contact']['name'] . '
';
- $o .= '
';
- $o .= '
';
- $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;
}
}
@@ -60,12 +61,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),
@@ -134,19 +137,35 @@ function crepair_content(&$a) {
$contact = $r[0];
- $msg1 = t('Repair Contact Settings');
+ $warning = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.');
+ $info = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.');
- $msg2 = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.');
- $msg3 = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.');
+ $returnaddr = "contacts/$cid";
- $o .= '' . $msg1 . '
';
+ $allow_remote_self = get_config('system','allow_users_remote_self');
- $o .= '' . $msg2 . EOL . EOL. $msg3 . '
';
+ // 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;
- $o .= EOL . '' . t('Return to contact editor') . '' . EOL;
+ 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(
+ '$title' => t('Repair Contact Settings'),
+ '$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'),
'$label_nick' => t('Account Nickname'),
'$label_attag' => t('@Tagname - overrides Name/Nickname'),
@@ -157,10 +176,15 @@ function crepair_content(&$a) {
'$label_poll' => t('Poll/Feed URL'),
'$label_photo' => t('New photo from this URL'),
'$label_remote_self' => t('Remote Self'),
- '$allow_remote_self' => get_config('system','allow_users_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'))),
- '$contact_name' => $contact['name'],
- '$contact_nick' => $contact['nick'],
+ '$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'],
@@ -169,7 +193,7 @@ function crepair_content(&$a) {
'$poll' => $contact['poll'],
'$contact_attag' => $contact['attag'],
'$lbl_submit' => t('Submit')
- ));
+ ));
return $o;