X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=3abbe343b26d0d09709fe0bcd9f3e47a50ab9757;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=9828124ea7408503722a2d21c2ef4972acc6a424;hpb=a2ab431c4ba09fc098be899414e654a6816b0a23;p=friendica.git
diff --git a/mod/crepair.php b/mod/crepair.php
index 9828124ea7..3abbe343b2 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -1,4 +1,6 @@
page['aside'] = '';
if($contact_id) {
- $a->data['contact'] = $r[0];
- $o .= '
';
- $o .= '
' . $a->data['contact']['name'] . '
';
- $o .= '
';
- $o .= '
';
- $a->page['aside'] .= $o;
-
+ $a->data['contact'] = $r[0];
+ $contact = $r[0];
+ profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
}
}
@@ -60,12 +58,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),
@@ -80,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)
@@ -134,50 +117,61 @@ function crepair_content(&$a) {
$contact = $r[0];
- $msg1 = t('Repair Contact Settings');
-
- $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.');
+ $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.');
- $o .= '' . $msg1 . '
';
-
- $o .= '' . $msg2 . EOL . EOL. $msg3 . '
';
-
- $o .= EOL . '' . t('Return to contact editor') . '' . EOL;
+ $returnaddr = "contacts/$cid";
$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 ($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'));
+
+ $update_profile = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DSPR, NETWORK_OSTATUS));
+
+ $tab_str = contacts_tab($a, $contact['id'], 5);
+
+
$tpl = get_markup_template('crepair.tpl');
$o .= replace_macros($tpl, array(
- '$label_name' => t('Name'),
- '$label_nick' => t('Account Nickname'),
- '$label_attag' => t('@Tagname - overrides Name/Nickname'),
- '$label_url' => t('Account URL'),
- '$label_request' => t('Friend Request URL'),
- '$label_confirm' => t('Friend Confirm URL'),
- '$label_notify' => t('Notification Endpoint URL'),
- '$label_poll' => t('Poll/Feed URL'),
- '$label_photo' => t('New photo from this URL'),
+ //'$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'),
+ '$contact_id' => $contact['id'],
+ '$lbl_submit' => t('Submit'),
+
'$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'))),
- '$contact_name' => $contact['name'],
- '$contact_nick' => $contact['nick'],
- '$contact_id' => $contact['id'],
- '$contact_url' => $contact['url'],
- '$request' => $contact['request'],
- '$confirm' => $contact['confirm'],
- '$notify' => $contact['notify'],
- '$poll' => $contact['poll'],
- '$contact_attag' => $contact['attag'],
- '$lbl_submit' => t('Submit')
- ));
+ '$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
+ ),
+
+ '$name' => array('name', t('Name') , htmlentities($contact['name'])),
+ '$nick' => array('nick', t('Account Nickname'), htmlentities($contact['nick'])),
+ '$attag' => array('attag', t('@Tagname - overrides Name/Nickname'), $contact['attag']),
+ '$url' => array('url', t('Account URL'), $contact['url']),
+ '$request' => array('request', t('Friend Request URL'), $contact['request']),
+ 'confirm' => array('confirm', t('Friend Confirm URL'), $contact['confirm']),
+ 'notify' => array('notify', t('Notification Endpoint URL'), $contact['notify']),
+ 'poll' => array('poll', t('Poll/Feed URL'), $contact['poll']),
+ 'photo' => array('photo', t('New photo from this URL'), ''),
+ ));
return $o;