]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_confirm.php
relax content-type check on yadi discovery document
[friendica.git] / mod / dfrn_confirm.php
index 3df36182e18ad34cd065b56eea62752b47b0d168..13353a3641c1424acb90f64c5840092b6a2c3e6b 100644 (file)
@@ -1,37 +1,73 @@
 <?php
 
-// There are two possible entry points. Both are called via POST.
+// There are two possible entry points. 
 
-function dfrn_confirm_post(&$a) {
 
-       if($a->argc > 1)
-               $node = $a->argv[1];
+function dfrn_confirm_post(&$a,$handsfree = null) {
+
+       if(is_array($handsfree)) {
+
+               // called directly from dfrn_request due to automatic friend acceptance
+               // any $_POST parameters we may require are supplied in the $handsfree array
+
+               $node = $handsfree['node'];
+               $a->interactive = false; // notice() becomes a no-op since nobody is there to see it
+
+       }
+       else {
+               if($a->argc > 1)
+                       $node = $a->argv[1];
+       }
 
                // Main entry point. Our user received a friend request notification (perhaps 
-               // from another site) and clicked 'Accept'. $POST['source_url'] is not set.
-               // They will perform the following:
+               // 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.
 
        if(! x($_POST,'source_url')) {
 
-               $uid = get_uid();
+               $uid = ((is_array($handsfree)) ? $handsfree['uid'] : local_user());
 
                if(! $uid) {
                        notice( t('Permission denied.') . EOL );
                        return;
                }       
 
-               // These come from the friend request notification form.
-       
-               $dfrn_id  = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : "");
-               $intro_id = intval($_POST['intro_id']);
-               $duplex   = intval($_POST['duplex']);
+               $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+                       intval($uid)
+               );
+
+               if(! $user) {
+                       notice( t('Profile not found.') . EOL );
+                       return;
+               }       
+
+
+               // These 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');
+               }
+               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']);
+               }
+
+               logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id);
 
 
                // 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` = '%s' AND `uid` = %d LIMIT 1",
+               $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)
                );
 
@@ -40,234 +76,264 @@ function dfrn_confirm_post(&$a) {
                        return;
                }
 
-               $contact_id   = $r[0]['id'];
-               $relation     = $r[0]['rel'];
-               $site_pubkey  = $r[0]['site-pubkey'];
-               $dfrn_confirm = $r[0]['confirm'];
-               $aes_allow    = $r[0]['aes_allow'];
-
+               $contact = $r[0];
 
-               // 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.  
+               $contact_id   = $contact['id'];
+               $relation     = $contact['rel'];
+               $site_pubkey  = $contact['site-pubkey'];
+               $dfrn_confirm = $contact['confirm'];
+               $aes_allow    = $contact['aes_allow'];
 
-               $res = openssl_pkey_new(array(
-                       'digest_alg' => 'whirlpool',
-                       'private_key_bits' => 4096,
-                       'encrypt_key' => false )
-               );
+               $network = ((strlen($contact['issued-id'])) ? 'dfrn' : 'stat');
 
+               if($network === 'dfrn') {
 
-               $private_key = '';
+                       // 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.  
 
-               openssl_pkey_export($res, $private_key);
-
-               $pubkey = openssl_pkey_get_details($res);
-               $public_key = $pubkey["key"];
-
-               // Save the private key. Send them the public key.
+                       $res = openssl_pkey_new(array(
+                               'digest_alg' => 'whirlpool',
+                               'private_key_bits' => 4096,
+                               'encrypt_key' => false )
+                       );
 
-               $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       dbesc($private_key),
-                       intval($contact_id),
-                       intval($uid) 
-               );
 
+                       $private_key = '';
 
-               $params = array();
+                       openssl_pkey_export($res, $private_key);
 
-               // 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.
+                       $pubkey = openssl_pkey_get_details($res);
+                       $public_key = $pubkey["key"];
 
-               // 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.  
+                       // Save the private key. Send them the public key.
 
-               $src_aes_key = random_string();
+                       $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               dbesc($private_key),
+                               intval($contact_id),
+                               intval($uid) 
+                       );
 
-               $result = '';
-               openssl_private_encrypt($dfrn_id,$result,$a->user['prvkey']);
+                       $params = array();
 
-               $params['dfrn_id'] = bin2hex($result);
-               $params['public_key'] = $public_key;
+                       // 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.  
 
-               $my_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+                       $src_aes_key = random_string();
 
-               openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
-               $params['source_url'] = bin2hex($params['source_url']);
+                       $result = '';
+                       openssl_private_encrypt($dfrn_id,$result,$user[0]['prvkey']);
 
-               if($aes_allow && function_exists('openssl_encrypt')) {
-                       openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey);
-                       $params['aes_key'] = bin2hex($params['aes_key']);
-                       $params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key));
-               }
+                       $params['dfrn_id'] = bin2hex($result);
+                       $params['public_key'] = $public_key;
 
-               $params['dfrn_version'] = DFRN_PROTOCOL_VERSION ;
-               if($duplex == 1)
-                       $params['duplex'] = 1;
 
-               // POST all this stuff to the other site.
+                       $my_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
 
-               $res = post_url($dfrn_confirm,$params);
+                       openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
+                       $params['source_url'] = bin2hex($params['source_url']);
 
-               // Now figure out what they responded. Try to be robust if the remote site is 
-               // having difficulty and throwing up errors of some kind. 
+                       if($aes_allow && function_exists('openssl_encrypt')) {
+                               openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey);
+                               $params['aes_key'] = bin2hex($params['aes_key']);
+                               $params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key));
+                       }
 
-               $leading_junk = substr($res,0,strpos($res,'<?xml'));
+                       $params['dfrn_version'] = DFRN_PROTOCOL_VERSION ;
+                       if($duplex == 1)
+                               $params['duplex'] = 1;
 
-               $res = substr($res,strpos($res,'<?xml'));
-               if(! strlen($res)) {
+                       logger('dfrn_confirm: Confirm: posted data: ' . print_r($params,true), LOGGER_DATA);
 
-                               // No XML at all, this exchange is messed up really bad.
-                               // We shouldn't proceed, because the xml parser might choke,
-                               // and $status is going to be zero, which indicates success.
-                               // We can hardly call this a success.  
+                       // POST all this stuff to the other site.
 
-                       notice( t('Response from remote site was not understood.') . EOL);
-                       return;
-               }
+                       $res = post_url($dfrn_confirm,$params);
 
-               if(strlen($leading_junk) && get_config('system','debugging')) {
+                       logger('dfrn_confirm: Confirm: received data: ' . $res, LOGGER_DATA);
 
-                               // This might be more common. Mixed error text and some XML.
-                               // If we're configured for debugging, show the text. Proceed in either case.
+                       // Now figure out what they responded. Try to be robust if the remote site is 
+                       // having difficulty and throwing up errors of some kind. 
 
-                       notice( t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL );
-               }
+                       $leading_junk = substr($res,0,strpos($res,'<?xml'));
 
-               $xml = simplexml_load_string($res);
-               $status = (int) $xml->status;
-               $message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
-               switch($status) {
-                       case 0:
-                               notice( t("Confirmation completed successfully.") . EOL);
-                               if(strlen($message))
-                                       notice( t('Remote site reported: ') . $message . EOL);
-                               break;
-                       case 1:
-                               // birthday paradox - generate new dfrn-id and fall through.
-                               $new_dfrn_id = random_string();
-                               $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                                       dbesc($new_dfrn_id),
-                                       intval($contact_id),
-                                       intval($uid) 
-                               );
+                       $res = substr($res,strpos($res,'<?xml'));
+                       if(! strlen($res)) {
 
-                       case 2:
-                               notice( t("Temporary failure. Please wait and try again.") . EOL);
-                               if(strlen($message))
-                                       notice( t('Remote site reported: ') . $message . EOL);
-                               break;
+                                       // No XML at all, this exchange is messed up really bad.
+                                       // We shouldn't proceed, because the xml parser might choke,
+                                       // and $status is going to be zero, which indicates success.
+                                       // We can hardly call this a success.  
+       
+                               notice( t('Response from remote site was not understood.') . EOL);
+                               return;
+                       }
 
+                       if(strlen($leading_junk) && get_config('system','debugging')) {
+       
+                                       // This might be more common. Mixed error text and some XML.
+                                       // If we're configured for debugging, show the text. Proceed in either case.
 
-                       case 3:
-                               notice( t("Introduction failed or was revoked.") . EOL);
-                               if(strlen($message))
-                                       notice( t('Remote site reported: ') . $message . EOL);
-                               break;
+                               notice( t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL );
                        }
 
-               if(($status == 0) && ($intro_id)) {
-
-                       // Success. Delete the notification.
+                       $xml = simplexml_load_string($res);
+                       $status = (int) $xml->status;
+                       $message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
+                       switch($status) {
+                               case 0:
+                                       notice( t("Confirmation completed successfully.") . EOL);
+                                       if(strlen($message))
+                                               notice( t('Remote site reported: ') . $message . EOL);
+                                       break;
+                               case 1:
+                                       // birthday paradox - generate new dfrn-id and fall through.
+                                       $new_dfrn_id = random_string();
+                                       $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                               dbesc($new_dfrn_id),
+                                               intval($contact_id),
+                                               intval($uid) 
+                                       );
+
+                               case 2:
+                                       notice( t("Temporary failure. Please wait and try again.") . EOL);
+                                       if(strlen($message))
+                                               notice( t('Remote site reported: ') . $message . EOL);
+                                       break;
+
+
+                               case 3:
+                                       notice( t("Introduction failed or was revoked.") . EOL);
+                                       if(strlen($message))
+                                               notice( t('Remote site reported: ') . $message . EOL);
+                                       break;
+                               }
+
+                       if(($status == 0) && ($intro_id)) {
+       
+                               // Success. Delete the notification.
+       
+                               $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                       intval($intro_id),
+                                       intval($uid)
+                               );
+                               
+                       }
 
-                       $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval($intro_id),
-                               intval($uid)
-                       );
-                       
+                       if($status != 0) 
+                               return;
                }
 
-               if($status != 0) 
-                       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;
-
-               $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval($contact_id));
-               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($uid, $contact_id, $hash, $filename, t('Contact Photos'), 4 );
+               $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
+               
+               logger('dfrn_confirm: confirm - imported photos');
+
+               if($network === 'dfrn') {
+
+                       $new_relation = REL_VIP;
+                       if(($relation == REL_FAN) || ($duplex))
+                               $new_relation = REL_BUD;
+
+                       if(($relation == REL_FAN) && ($duplex))
+                               $duplex = 0;
+
+                       $r = q("UPDATE `contact` SET `photo` = '%s', 
+                               `thumb` = '%s',
+                               `micro` = '%s', 
+                               `rel` = %d, 
+                               `name-date` = '%s', 
+                               `uri-date` = '%s', 
+                               `avatar-date` = '%s', 
+                               `blocked` = 0, 
+                               `pending` = 0,
+                               `duplex` = %d,
+                               `network` = 'dfrn' WHERE `id` = %d LIMIT 1
+                       ",
+                               dbesc($photos[0]),
+                               dbesc($photos[1]),
+                               dbesc($photos[2]),
+                               intval($new_relation),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               intval($duplex),
+                               intval($contact_id)
+                       );
+               }
+               else {  
 
-                               if($r === false)
-                                       $photo_failure = true;
+                       $notify = '';
+                       $poll   = '';
 
-                               $img->scaleImage(80);
+                       // $network !== 'dfrn'
 
-                               $r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 5 );
+                       $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($r === false)
-                                       $photo_failure = true;
+                       $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               intval($intro_id),
+                               intval($uid)
+                       );
 
-                               $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
-                               $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
-                       }
-                       else
-                               $photo_failure = true;
-               }
-               else
-                       $photo_failure = true;
 
-               if($photo_failure) {
-                       $photo = $a->get_baseurl() . '/images/default-profile.jpg';
-                       $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
+                       $r = q("UPDATE `contact` SET `photo` = '%s', 
+                               `thumb` = '%s',
+                               `micro` = '%s', 
+                               `name-date` = '%s', 
+                               `uri-date` = '%s', 
+                               `avatar-date` = '%s', 
+                               `notify` = '%s',
+                               `poll` = '%s',
+                               `blocked` = 0, 
+                               `pending` = 0,
+                               `network` = 'stat'
+                               WHERE `id` = %d LIMIT 1
+                       ",
+                               dbesc($photos[0]),
+                               dbesc($photos[1]),
+                               dbesc($photos[2]),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               dbesc($notify),
+                               dbesc($poll),
+                               intval($contact_id)
+                       );                      
                }
 
-               $new_relation = REL_VIP;
-               if(($relation == REL_FAN) || ($duplex))
-                       $new_relation = REL_BUD;
-
-               $r = q("UPDATE `contact` SET `photo` = '%s', 
-                       `thumb` = '%s', 
-                       `rel` = %d, 
-                       `name-date` = '%s', 
-                       `uri-date` = '%s', 
-                       `avatar-date` = '%s', 
-                       `blocked` = 0, 
-                       `pending` = 0,
-                       `duplex` = %d,
-                       `network` = 'dfrn' WHERE `id` = %d LIMIT 1
-               ",
-                       dbesc($photo),
-                       dbesc($thumb),
-                       intval($new_relation),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($duplex),
-                       intval($contact_id)
-               );
                if($r === false)
-                       notice( t('Unable to set contact photo.') . EOL);
+                               notice( t('Unable to set contact photo.') . EOL);
 
 
                // Let's send our user to the contact editor in case they want to
                // do anything special with this new friend.
-               goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
+
+               if($handsfree === null)
+                       goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
                return;  //NOTREACHED
+
        }
 
 
@@ -291,7 +357,10 @@ function dfrn_confirm_post(&$a) {
                $aes_key    = $_POST['aes_key'];
                $duplex     = $_POST['duplex'];
                $version_id = (float) $_POST['dfrn_version'];
+       
+               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.
 
@@ -364,8 +433,7 @@ function dfrn_confirm_post(&$a) {
                }
 
                $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.');
@@ -385,55 +453,33 @@ function dfrn_confirm_post(&$a) {
 
                // 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($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(count($r))
+                       $photo = $r[0]['photo'];
                else
-                       $photo_failure = true;
-
-               if($photo_failure) {
                        $photo = $a->get_baseurl() . '/images/default-profile.jpg';
-                       $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
-               }
+                               
+               require_once("Photo.php");
+
+               $photos = import_profile_photo($photo,$local_uid,$dfrn_record);
+
+               logger('dfrn_confirm: request - photos imported');
 
                $new_relation = REL_FAN;
                if(($relation == REL_VIP) || ($duplex))
                        $new_relation = REL_BUD;
 
+               if(($relation == REL_VIP) && ($duplex))
+                       $duplex = 0;
+
                $r = q("UPDATE `contact` SET 
                        `photo` = '%s', 
                        `thumb` = '%s', 
+                       `micro` = '%s',
                        `rel` = %d, 
                        `name-date` = '%s', 
                        `uri-date` = '%s', 
@@ -443,8 +489,9 @@ function dfrn_confirm_post(&$a) {
                        `duplex` = %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()),
@@ -452,7 +499,7 @@ function dfrn_confirm_post(&$a) {
                        intval($duplex),
                        intval($dfrn_record)
                );
-               if($r === false) { // indicates schema is messed up or total db failure
+               if($r === false) {    // indicates schema is messed up or total db failure
                        $message = t('Unable to update your contact profile details on our system');
                        xml_status(3,$message);
                }
@@ -460,6 +507,8 @@ function dfrn_confirm_post(&$a) {
                // Otherwise everything seems to have worked and we are almost done. Yay!
                // Send an email notification
 
+               logger('dfrn_confirm: request: info updated');
+
                $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                        WHERE `contact`.`id` = %d LIMIT 1",
                        intval($dfrn_record)
@@ -481,7 +530,7 @@ function dfrn_confirm_post(&$a) {
                        );
        
                        $res = mail($r[0]['email'], t("Connection accepted at ") . $a->config['sitename'],
-                               $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+                               $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
                        if(!$res) {
                                // pointless throwing an error here and confusing the person at the other end of the wire.
                        }