X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcrepair.php;h=5b4db09dac1f16ab7a0500ccf6b8e90e9cd90dc5;hb=d523a809a28371be100a2f60e5862cc0f16ea882;hp=9828124ea7408503722a2d21c2ef4972acc6a424;hpb=e41005ce6ea9d6c41e950f0f8be808e1b31898ee;p=friendica.git diff --git a/mod/crepair.php b/mod/crepair.php index 9828124ea7..5b4db09dac 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 .= '
' . $a->data['contact']['name'] . '
'; - $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,27 +117,39 @@ 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.'); - - $o .= '

' . $msg1 . '

'; - - $o .= '
' . $msg2 . EOL . EOL. $msg3 . '
'; + $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 .= 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( + //'$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'), '$label_nick' => t('Account Nickname'), '$label_attag' => t('@Tagname - overrides Name/Nickname'), @@ -166,9 +161,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.'), 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'], + '$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'], @@ -177,7 +177,7 @@ function crepair_content(&$a) { '$poll' => $contact['poll'], '$contact_attag' => $contact['attag'], '$lbl_submit' => t('Submit') - )); + )); return $o;