X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=89b09ef77e8aa8d55418fc36383bd5128ab143ba;hb=a95000d9f58ca1e355540da46fb2bcbad9f81c97;hp=cc1edea229baee150eb6dca2aa82c2b5b6491837;hpb=b41218ca303b9fd8258fd613915d3c4b9fd411c0;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index cc1edea229..89b09ef77e 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -1,13 +1,28 @@ interactive = false; // notice() becomes a no-op since nobody is there to see it @@ -18,10 +33,17 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $node = $a->argv[1]; } - // Main entry point. Our user received a friend request notification (perhaps - // from another site) and clicked 'Approve'. $POST['source_url'] is not set. - // OR we have been called directly from dfrn_request ($handsfree != null) due to - // this being a page type which supports automatic friend acceptance. + /** + * + * Main entry point. Scenario 1. Our user received a friend request notification (perhaps + * from another site) and clicked 'Approve'. + * $POST['source_url'] is not set. If it is, it indicates Scenario 2. + * + * We may also have been called directly from dfrn_request ($handsfree != null) due to + * this being a page type which supports automatic friend acceptance. That is also Scenario 1 + * since we are operating on behalf of our registered user to approve a friendship. + * + */ if(! x($_POST,'source_url')) { @@ -42,31 +64,55 @@ function dfrn_confirm_post(&$a,$handsfree = null) { } - // These come from either the friend request notification form or $handsfree array. + // These data elements may come from either the friend request notification form or $handsfree array. if(is_array($handsfree)) { - $dfrn_id = $handsfree['dfrn_id']; - $intro_id = $handsfree['intro_id']; - $duplex = $handsfree['duplex']; + logger('dfrn_confirm: Confirm in handsfree mode'); + $dfrn_id = $handsfree['dfrn_id']; + $intro_id = $handsfree['intro_id']; + $duplex = $handsfree['duplex']; + $hidden = ((array_key_exists('hidden',$handsfree)) ? intval($handsfree['hidden']) : 0 ); } else { - $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); - $intro_id = intval($_POST['intro_id']); - $duplex = intval($_POST['duplex']); - $cid = intval($_POST['contact_id']); + $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); + $intro_id = ((x($_POST,'intro_id')) ? intval($_POST['intro_id']) : 0 ); + $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); + $cid = ((x($_POST,'contact_id')) ? intval($_POST['contact_id']) : 0 ); + $hidden = ((x($_POST,'hidden')) ? intval($_POST['hidden']) : 0 ); } - // The other person will have been issued an ID when they first requested friendship. - // Locate their record. At this time, their record will have both pending and blocked set to 1. - // There won't be any dfrn_id if this is a network follower, so use the contact_id instead. + /** + * + * Ensure that dfrn_id has precedence when we go to find the contact record. + * We only want to search based on contact id if there is no dfrn_id, + * e.g. for OStatus network followers. + * + */ + + if(strlen($dfrn_id)) + $cid = 0; + + logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id); + if($cid) + logger('dfrn_confirm: Confirming follower with contact_id: ' . $cid); + + + /** + * + * The other person will have been issued an ID when they first requested friendship. + * Locate their record. At this time, their record will have both pending and blocked set to 1. + * There won't be any dfrn_id if this is a network follower, so use the contact_id instead. + * + */ $r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d LIMIT 1", - dbesc($dfrn_id), - intval($cid), - intval($uid) + dbesc($dfrn_id), + intval($cid), + intval($uid) ); if(! count($r)) { + logger('dfrn_confirm: Contact not found in DB.'); notice( t('Contact not found.') . EOL ); return; } @@ -78,23 +124,30 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $site_pubkey = $contact['site-pubkey']; $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; + + $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); + if($contact['network']) + $network = $contact['network']; - if($contact['network'] === 'dfrn') { + if($network === NETWORK_DFRN) { - // Generate a key pair for all further communications with this person. - // We have a keypair for every contact, and a site key for unknown people. - // This provides a means to carry on relationships with other people if - // any single key is compromised. It is a robust key. We're much more - // worried about key leakage than anybody cracking it. + /** + * + * Generate a key pair for all further communications with this person. + * We have a keypair for every contact, and a site key for unknown people. + * This provides a means to carry on relationships with other people if + * any single key is compromised. It is a robust key. We're much more + * worried about key leakage than anybody cracking it. + * + */ $res = openssl_pkey_new(array( - 'digest_alg' => 'whirlpool', + 'digest_alg' => 'sha1', 'private_key_bits' => 4096, 'encrypt_key' => false ) ); - $private_key = ''; openssl_pkey_export($res, $private_key); @@ -112,16 +165,20 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $params = array(); - // Per the protocol document, we will verify both ends by encrypting the dfrn_id with our - // site private key (person on the other end can decrypt it with our site public key). - // Then encrypt our profile URL with the other person's site public key. They can decrypt - // it with their site private key. If the decryption on the other end fails for either - // item, it indicates tampering or key failure on at least one site and we will not be - // able to provide a secure communication pathway. - - // If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 - // or later) then we encrypt the personal public key we send them using AES-256-CBC and a - // random key which is encrypted with their site public key. + /** + * + * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our + * site private key (person on the other end can decrypt it with our site public key). + * Then encrypt our profile URL with the other person's site public key. They can decrypt + * it with their site private key. If the decryption on the other end fails for either + * item, it indicates tampering or key failure on at least one site and we will not be + * able to provide a secure communication pathway. + * + * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 + * or later) then we encrypt the personal public key we send them using AES-256-CBC and a + * random key which is encrypted with their site public key. + * + */ $src_aes_key = random_string(); @@ -147,10 +204,22 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($duplex == 1) $params['duplex'] = 1; - // POST all this stuff to the other site. + logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); + + /** + * + * POST all this stuff to the other site. + * Temporarily raise the network timeout to 120 seconds because the default 60 + * doesn't always give the other side quite enough time to decrypt everything. + * + */ + + $a->config['system']['curl_timeout'] = 120; $res = post_url($dfrn_confirm,$params); + logger('dfrn_confirm: Confirm: received data: ' . $res, LOGGER_DATA); + // Now figure out what they responded. Try to be robust if the remote site is // having difficulty and throwing up errors of some kind. @@ -176,7 +245,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { notice( t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL ); } - $xml = simplexml_load_string($res); + $xml = parse_xml_string($res); $status = (int) $xml->status; $message = unxmlify($xml->message); // human readable text of what may have gone wrong. switch($status) { @@ -223,55 +292,36 @@ function dfrn_confirm_post(&$a,$handsfree = null) { return; } - // We have now established a relationship with the other site. - // Let's make our own personal copy of their profile photo so we don't have - // to always load it from their site. - - require_once("Photo.php"); - - $photo_failure = false; - - $filename = basename($contact['photo']); - $img_str = fetch_url($contact['photo'],true); - $img = new Photo($img_str); - if($img->is_valid()) { - - $img->scaleImageSquare(175); - - $hash = photo_new_resource(); - $r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 4 ); + /* + * + * We have now established a relationship with the other site. + * Let's make our own personal copy of their profile photo so we don't have + * to always load it from their site. + * + * We will also update the contact record with the nature and scope of the relationship. + * + */ - if($r === false) - $photo_failure = true; + require_once('include/Photo.php'); - $img->scaleImage(80); - - $r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 5 ); - - if($r === false) - $photo_failure = true; - - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; - } - else - $photo_failure = true; - - if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; - $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; - } + $photos = import_profile_photo($contact['photo'],$uid,$contact_id); + + logger('dfrn_confirm: confirm - imported photos'); + if($network === NETWORK_DFRN) { - if($contact['network'] === 'dfrn') { + $new_relation = CONTACT_IS_FOLLOWER; + if(($relation == CONTACT_IS_SHARING) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; - $new_relation = REL_VIP; - if(($relation == REL_FAN) || ($duplex)) - $new_relation = REL_BUD; + if(($relation == CONTACT_IS_SHARING) && ($duplex)) + $duplex = 0; - $r = q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', + $r = q("UPDATE `contact` SET + `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', `rel` = %d, `name-date` = '%s', `uri-date` = '%s', @@ -279,33 +329,49 @@ function dfrn_confirm_post(&$a,$handsfree = null) { `blocked` = 0, `pending` = 0, `duplex` = %d, + `hidden` = %d, `network` = 'dfrn' WHERE `id` = %d LIMIT 1 ", - dbesc($photo), - dbesc($thumb), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), intval($new_relation), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), intval($duplex), + intval($hidden), intval($contact_id) ); } else { - $notify = ''; - $poll = ''; + // $network !== NETWORK_DFRN + + $network = (($contact['network']) ? $contact['network'] : NETWORK_OSTATUS); + $notify = (($contact['notify']) ? $contact['notify'] : ''); + $poll = (($contact['poll']) ? $contact['poll'] : ''); + + if((! $contact['notify']) || (! $contact['poll'])) { + $arr = lrdd($contact['url']); + if(count($arr)) { + foreach($arr as $link) { + if($link['@attributes']['rel'] === 'salmon') + $notify = $link['@attributes']['href']; + if($link['@attributes']['rel'] === NAMESPACE_FEED) + $poll = $link['@attributes']['href']; + } + } + } - // $contact['network'] !== 'dfrn' + $new_relation = $contact['rel']; + $writable = $contact['writable']; - $arr = lrdd($contact['url']); - if(count($arr)) { - foreach($arr as $link) { - if($link['@attributes']['rel'] === 'salmon') - $notify = $link['@attributes']['href']; - if($link['@attributes']['rel'] === NAMESPACE_FEED) - $poll = $link['@attributes']['href']; - } + if($network === NETWORK_DIASPORA) { + if($duplex) + $new_relation = CONTACT_IS_FRIEND; + if($new_relation != CONTACT_IS_FOLLOWER) + $writable = 1; } $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -313,24 +379,35 @@ function dfrn_confirm_post(&$a,$handsfree = null) { intval($uid) ); + $r = q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', + `thumb` = '%s', + `micro` = '%s', `name-date` = '%s', `uri-date` = '%s', `avatar-date` = '%s', `notify` = '%s', `poll` = '%s', `blocked` = 0, - `pending` = 0 + `pending` = 0, + `network` = '%s', + `writable` = %d, + `hidden` = %d, + `rel` = %d WHERE `id` = %d LIMIT 1 ", - dbesc($photo), - dbesc($thumb), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc($notify), dbesc($poll), + dbesc($network), + intval($writable), + intval($hidden), + intval($new_relation), intval($contact_id) ); } @@ -338,38 +415,111 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($r === false) notice( t('Unable to set contact photo.') . EOL); + // reload contact info - // Let's send our user to the contact editor in case they want to - // do anything special with this new friend. + $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", + intval($contact_id) + ); + if(count($r)) + $contact = $r[0]; + else + $contact = null; - if($handsfree === null) - goaway($a->get_baseurl() . '/contacts/' . intval($contact_id)); - return; //NOTREACHED + // Send a new friend post if we are allowed to... - } + $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval($uid) + ); + if((count($r)) && (! $hidden) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) && isset($new_relation) && ($new_relation == CONTACT_IS_FRIEND)) { + if($r[0]['network'] === NETWORK_DIASPORA) { + require_once('include/diaspora.php'); + $ret = diaspora_share($user[0],$r[0]); + logger('mod_follow: diaspora_share returns: ' . $ret); + } + require_once('include/items.php'); - // End of first scenario. [Local confirmation of remote friend request]. + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid) + ); + if(count($self)) { + + $arr = array(); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); + $arr['uid'] = $uid; + $arr['contact-id'] = $self[0]['id']; + $arr['wall'] = 1; + $arr['type'] = 'wall'; + $arr['gravity'] = 0; + $arr['origin'] = 1; + $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; + $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; + $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; + $arr['verb'] = ACTIVITY_FRIEND; + $arr['object-type'] = ACTIVITY_OBJ_PERSON; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; + $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; + $arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto; + + $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' + . '' . $contact['url'] . '/' . $contact['name'] . ''; + $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= '' . "\n"; + $arr['last-child'] = 1; + + $arr['allow_cid'] = $user[0]['allow_cid']; + $arr['allow_gid'] = $user[0]['allow_gid']; + $arr['deny_cid'] = $user[0]['deny_cid']; + $arr['deny_gid'] = $user[0]['deny_gid']; + + $i = item_store($arr); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); + } - // Begin scenario two. This is the remote response to the above scenario. - // This will take place on the site that originally initiated the friend request. - // In the section above where the confirming party makes a POST and - // retrieves xml status information, they are communicating with the following code. + } + // Let's send our user to the contact editor in case they want to + // do anything special with this new friend. + + if($handsfree === null) + goaway($a->get_baseurl() . '/contacts/' . intval($contact_id)); + else + return; + //NOTREACHED + } + + /** + * + * + * End of Scenario 1. [Local confirmation of remote friend request]. + * + * Begin Scenario 2. This is the remote response to the above scenario. + * This will take place on the site that originally initiated the friend request. + * In the section above where the confirming party makes a POST and + * retrieves xml status information, they are communicating with the following code. + * + */ if(x($_POST,'source_url')) { // We are processing an external confirmation to an introduction created by our user. - $public_key = $_POST['public_key']; - $dfrn_id = hex2bin($_POST['dfrn_id']); - $source_url = hex2bin($_POST['source_url']); - $aes_key = $_POST['aes_key']; - $duplex = $_POST['duplex']; - $version_id = (float) $_POST['dfrn_version']; + $public_key = ((x($_POST,'public_key')) ? $_POST['public_key'] : ''); + $dfrn_id = ((x($_POST,'dfrn_id')) ? hex2bin($_POST['dfrn_id']) : ''); + $source_url = ((x($_POST,'source_url')) ? hex2bin($_POST['source_url']) : ''); + $aes_key = ((x($_POST,'aes_key')) ? $_POST['aes_key'] : ''); + $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); + $version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0); + + logger('dfrn_confirm: requestee contacted: ' . $node); + logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA); // If $aes_key is set, both of these items require unpacking from the hex transport encoding. @@ -384,7 +534,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { dbesc($node)); if(! count($r)) { - $message = t('No user record found for ') . '\'' . $node . '\''; + $message = sprintf(t('No user record found for \'%s\' '), $node); xml_status(3,$message); // failure // NOTREACHED } @@ -393,7 +543,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $local_uid = $r[0]['uid']; - if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) { + if(! strstr($my_prvkey,'PRIVATE KEY')) { $message = t('Our site encryption key is apparently messed up.'); xml_status(3,$message); } @@ -414,12 +564,22 @@ function dfrn_confirm_post(&$a,$handsfree = null) { dbesc($decrypted_source_url), intval($local_uid) ); - if(! count($ret)) { - // this is either a bogus confirmation (?) or we deleted the original introduction. - $message = t('Contact record was not found for you on our site.'); - xml_status(3,$message); - return; // NOTREACHED + if(strstr($decrypted_source_url,'http:')) + $newurl = str_replace('http:','https:',$decrypted_source_url); + else + $newurl = str_replace('https:','http:',$decrypted_source_url); + + $ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", + dbesc($newurl), + intval($local_uid) + ); + if(! count($ret)) { + // this is either a bogus confirmation (?) or we deleted the original introduction. + $message = t('Contact record was not found for you on our site.'); + xml_status(3,$message); + return; // NOTREACHED + } } $relation = $ret[0]['rel']; @@ -429,6 +589,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $foreign_pubkey = $ret[0]['site-pubkey']; $dfrn_record = $ret[0]['id']; + if(! $foreign_pubkey) { + $message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl); + xml_status(3,$message); + } + $decrypted_dfrn_id = ""; openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey); @@ -442,8 +607,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { } $r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1", - dbesc($decrypted_dfrn_id), - intval($local_uid) + dbesc($decrypted_dfrn_id) ); if(count($r)) { $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); @@ -463,55 +627,33 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // We're good but now we have to scrape the profile photo and send notifications. - require_once("Photo.php"); - $photo_failure = false; $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", intval($dfrn_record)); - if(count($r)) { - $filename = basename($r[0]['photo']); - $img_str = fetch_url($r[0]['photo'],true); - $img = new Photo($img_str); - if($img->is_valid()) { - - $img->scaleImageSquare(175); - - $hash = photo_new_resource(); - - $r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 4); - - if($r === false) - $photo_failure = true; - - $img->scaleImage(80); - $r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 5); + if(count($r)) + $photo = $r[0]['photo']; + else + $photo = $a->get_baseurl() . '/images/default-profile.jpg'; + + require_once("Photo.php"); - if($r === false) - $photo_failure = true; + $photos = import_profile_photo($photo,$local_uid,$dfrn_record); - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; - } - else - $photo_failure = true; - } - else - $photo_failure = true; + logger('dfrn_confirm: request - photos imported'); - if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; - $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; - } + $new_relation = CONTACT_IS_SHARING; + if(($relation == CONTACT_IS_FOLLOWER) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; - $new_relation = REL_FAN; - if(($relation == REL_VIP) || ($duplex)) - $new_relation = REL_BUD; + if(($relation == CONTACT_IS_FOLLOWER) && ($duplex)) + $duplex = 0; $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', + `micro` = '%s', `rel` = %d, `name-date` = '%s', `uri-date` = '%s', @@ -519,15 +661,17 @@ function dfrn_confirm_post(&$a,$handsfree = null) { `blocked` = 0, `pending` = 0, `duplex` = %d, - `network` = 'dfrn' WHERE `id` = %d LIMIT 1 + `network` = '%s' WHERE `id` = %d LIMIT 1 ", - dbesc($photo), - dbesc($thumb), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), intval($new_relation), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), intval($duplex), + dbesc(NETWORK_DFRN), intval($dfrn_record) ); if($r === false) { // indicates schema is messed up or total db failure @@ -538,15 +682,18 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // Otherwise everything seems to have worked and we are almost done. Yay! // Send an email notification - $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` + logger('dfrn_confirm: request: info updated'); + + $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`id` = %d LIMIT 1", intval($dfrn_record) ); if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { - $tpl = (($new_relation == REL_BUD) - ? load_view_file('view/friend_complete_eml.tpl') - : load_view_file('view/intro_complete_eml.tpl')); + push_lang($r[0]['language']); + $tpl = (($new_relation == CONTACT_IS_FRIEND) + ? get_intltext_template('friend_complete_eml.tpl') + : get_intltext_template('intro_complete_eml.tpl')); $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], @@ -558,11 +705,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) { '$uid' => $newuid ) ); - $res = mail($r[0]['email'], t("Connection accepted at ") . $a->config['sitename'], - $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] ); + $res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']), + $email_tpl, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + if(!$res) { // pointless throwing an error here and confusing the person at the other end of the wire. } + pop_lang(); } xml_status(0); // Success return; // NOTREACHED @@ -572,7 +724,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // somebody arrived here by mistake or they are fishing. Send them to the homepage. - goaway($a->get_baseurl()); + goaway(z_root()); // NOTREACHED }