]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_confirm.php
Again, static *OR* object-referencing calls? Blue or red pill?
[friendica.git] / mod / dfrn_confirm.php
index efb5be3a412acc134699a81ab5efe378ec131fb3..df663f7cd4e285a5c33ccf7cb54016b8b89eff56 100644 (file)
@@ -1,24 +1,32 @@
 <?php
 
-/*
- * Module: dfrn_confirm
+/**
+ * @file mod/dfrn_confirm.php
+ * @brief Module: dfrn_confirm
  * Purpose: Friendship acceptance for DFRN contacts
- *
+ *.
  * There are two possible entry points and three scenarios.
- *
+ *.
  *   1. A form was submitted by our user approving a friendship that originated elsewhere.
  *      This may also be called from dfrn_request to automatically approve a friendship.
  *
- *   2. We may be the target or other side of the conversation to scenario 1, and will 
+ *   2. We may be the target or other side of the conversation to scenario 1, and will
  *      interact with that process on our own user's behalf.
- *   
+ *.
+ *  @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ *    You also find a graphic which describes the confirmation process at
+ *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
  */
 
+require_once('include/enotify.php');
+require_once('include/group.php');
+require_once('include/Probe.php');
+
 function dfrn_confirm_post(&$a,$handsfree = null) {
 
        if(is_array($handsfree)) {
 
-               /**
+               /*
                 * We were called directly from dfrn_request due to automatic friend acceptance.
                 * Any $_POST parameters we may require are supplied in the $handsfree array.
                 *
@@ -33,13 +41,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        $node = $a->argv[1];
        }
 
-               /**
+               /*
                 *
-                * Main entry point. Scenario 1. Our user received a friend request notification (perhaps 
-                * from another site) and clicked 'Approve'. 
+                * 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 
+                * 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.
                 *
@@ -52,7 +60,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if(! $uid) {
                        notice( t('Permission denied.') . EOL );
                        return;
-               }       
+               }
 
                $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($uid)
@@ -61,13 +69,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if(! $user) {
                        notice( t('Profile not found.') . EOL );
                        return;
-               }       
+               }
 
 
                // These data elements may come from either the friend request notification form or $handsfree array.
 
                if(is_array($handsfree)) {
-                       logger('dfrn_confirm: Confirm in handsfree mode');
+                       logger('Confirm in handsfree mode');
                        $dfrn_id   = $handsfree['dfrn_id'];
                        $intro_id  = $handsfree['intro_id'];
                        $duplex    = $handsfree['duplex'];
@@ -83,10 +91,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        $activity = ((x($_POST,'activity'))   ? intval($_POST['activity'])      : 0 );
                }
 
-               /**
+               /*
                 *
                 * 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, 
+                * We only want to search based on contact id if there is no dfrn_id,
                 * e.g. for OStatus network followers.
                 *
                 */
@@ -94,15 +102,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if(strlen($dfrn_id))
                        $cid = 0;
 
-               logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id);
+               logger('Confirming request for dfrn_id (issued) ' . $dfrn_id);
                if($cid)
-                       logger('dfrn_confirm: Confirming follower with contact_id: ' . $cid);
+                       logger('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. 
+                * 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.
                 *
                 */
@@ -113,8 +121,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        intval($uid)
                );
 
-               if(! count($r)) {
-                       logger('dfrn_confirm: Contact not found in DB.'); 
+               if(! dbm::is_result($r)) {
+                       logger('Contact not found in DB.');
                        notice( t('Contact not found.') . EOL );
                        notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
                        return;
@@ -127,7 +135,7 @@ 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'])
@@ -135,51 +143,45 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                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.  
+                        * 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.
                         *
                         */
+                       require_once('include/crypto.php');
 
-                       $res = openssl_pkey_new(array(
-                               'digest_alg' => 'sha1',
-                               'private_key_bits' => 4096,
-                               'encrypt_key' => false )
-                       );
+                       $res = new_keypair(4096);
 
-                       $private_key = '';
 
-                       openssl_pkey_export($res, $private_key);
-
-                       $pubkey = openssl_pkey_get_details($res);
-                       $public_key = $pubkey["key"];
+                       $private_key = $res['prvkey'];
+                       $public_key  = $res['pubkey'];
 
                        // Save the private key. Send them the public key.
 
-                       $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d",
                                dbesc($private_key),
                                intval($contact_id),
-                               intval($uid) 
+                               intval($uid)
                        );
 
                        $params = array();
 
-                       /**
+                       /*
                         *
-                        * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our 
+                        * 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 
+                        * 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.  
+                        * 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.
                         *
                         */
 
@@ -207,12 +209,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        if($duplex == 1)
                                $params['duplex'] = 1;
 
-                       if($user['page-flags'] == PAGE_COMMUNITY)
+                       if($user[0]['page-flags'] == PAGE_COMMUNITY)
                                $params['page'] = 1;
+                       if($user[0]['page-flags'] == PAGE_PRVGROUP)
+                               $params['page'] = 2;
 
-                       logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
+                       logger('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
@@ -224,10 +228,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                        $res = post_url($dfrn_confirm,$params);
 
-                       logger('dfrn_confirm: Confirm: received data: ' . $res, LOGGER_DATA);
+                       logger(' 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. 
+                       // Now figure out what they responded. Try to be robust if the remote site is
+                       // having difficulty and throwing up errors of some kind.
 
                        $leading_junk = substr($res,0,strpos($res,'<?xml'));
 
@@ -237,20 +241,26 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                        // 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.  
-       
+                                       // 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.
 
                                notice( t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL );
                        }
 
+                       if(stristr($res, "<status")===false) {
+                               // wrong xml! stop here!
+                               notice( t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL );
+                               return;
+                       }
+
                        $xml = parse_xml_string($res);
                        $status = (int) $xml->status;
                        $message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
@@ -263,10 +273,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                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",
+                                       $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
                                                dbesc($new_dfrn_id),
                                                intval($contact_id),
-                                               intval($uid) 
+                                               intval($uid)
                                        );
 
                                case 2:
@@ -284,17 +294,17 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                }
 
                        if(($status == 0) && ($intro_id)) {
-       
+
                                // Success. Delete the notification.
-       
-                               $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+
+                               $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
                                        intval($intro_id),
                                        intval($uid)
                                );
-                               
+
                        }
 
-                       if($status != 0) 
+                       if($status != 0)
                                return;
                }
 
@@ -311,8 +321,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                require_once('include/Photo.php');
 
-               $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
-               
+               update_contact_avatar($contact['photo'],$uid,$contact_id);
+
                logger('dfrn_confirm: confirm - imported photos');
 
                if($network === NETWORK_DFRN) {
@@ -324,33 +334,25 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        if(($relation == CONTACT_IS_SHARING) && ($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, 
+                       $r = q("UPDATE `contact` SET `rel` = %d,
+                               `name-date` = '%s',
+                               `uri-date` = '%s',
+                               `blocked` = 0,
                                `pending` = 0,
                                `duplex` = %d,
                                `hidden` = %d,
-                               `network` = 'dfrn' WHERE `id` = %d LIMIT 1
+                               `network` = '%s' WHERE `id` = %d
                        ",
-                               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),
+                               dbesc(NETWORK_DFRN),
                                intval($contact_id)
                        );
                }
-               else {  
+               else {
 
                        // $network !== NETWORK_DFRN
 
@@ -359,7 +361,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        $poll   = (($contact['poll']) ? $contact['poll'] : '');
 
                        if((! $contact['notify']) || (! $contact['poll'])) {
-                               $arr = lrdd($contact['url']);
+                               $arr = Probe::lrdd($contact['url']);
                                if(count($arr)) {
                                        foreach($arr as $link) {
                                                if($link['@attributes']['rel'] === 'salmon')
@@ -377,38 +379,30 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                if($duplex)
                                        $new_relation = CONTACT_IS_FRIEND;
                                else
-                                       $new_relation = CONTACT_IS_SHARING;
+                                       $new_relation = CONTACT_IS_FOLLOWER;
 
                                if($new_relation != CONTACT_IS_FOLLOWER)
                                        $writable = 1;
                        }
 
-                       $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
                                intval($intro_id),
                                intval($uid)
                        );
 
 
-                       $r = q("UPDATE `contact` SET `photo` = '%s', 
-                               `thumb` = '%s',
-                               `micro` = '%s', 
-                               `name-date` = '%s', 
-                               `uri-date` = '%s', 
-                               `avatar-date` = '%s', 
+                       $r = q("UPDATE `contact` SET `name-date` = '%s',
+                               `uri-date` = '%s',
                                `notify` = '%s',
                                `poll` = '%s',
-                               `blocked` = 0, 
+                               `blocked` = 0,
                                `pending` = 0,
                                `network` = '%s',
                                `writable` = %d,
                                `hidden` = %d,
                                `rel` = %d
-                               WHERE `id` = %d LIMIT 1
+                               WHERE `id` = %d
                        ",
-                               dbesc($photos[0]),
-                               dbesc($photos[1]),
-                               dbesc($photos[2]),
-                               dbesc(datetime_convert()),
                                dbesc(datetime_convert()),
                                dbesc(datetime_convert()),
                                dbesc($notify),
@@ -418,7 +412,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                intval($hidden),
                                intval($new_relation),
                                intval($contact_id)
-                       );                      
+                       );
                }
 
                if($r === false)
@@ -429,17 +423,18 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($contact_id)
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $contact = $r[0];
                else
                        $contact = null;
 
-               if(isset($new_relation) && $new_relation == CONTACT_IS_FRIEND) {
+
+               if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
                        if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
                                require_once('include/diaspora.php');
-                               $ret = diaspora_share($user[0],$r[0]);
-                               logger('mod_follow: diaspora_share returns: ' . $ret);
+                               $ret = diaspora::send_share($user[0],$r[0]);
+                               logger('share returns: ' . $ret);
                        }
 
                        // Send a new friend post if we are allowed to...
@@ -447,7 +442,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
                                intval($uid)
                        );
-                       if((count($r)) && ($activity) && (! $hidden)) {
+
+                       if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
 
                                require_once('include/items.php');
 
@@ -458,7 +454,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                if(count($self)) {
 
                                        $arr = array();
-                                       $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); 
+                                       $arr['guid'] = get_guid(32);
+                                       $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid);
                                        $arr['uid'] = $uid;
                                        $arr['contact-id'] = $self[0]['id'];
                                        $arr['wall'] = 1;
@@ -468,12 +465,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                        $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]';
+                                       $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]';
+
                                        $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
                                        $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+
+                                       $arr['verb'] = ACTIVITY_FRIEND;
+                                       $arr['object-type'] = ACTIVITY_OBJ_PERSON;
                                        $arr['body'] =  sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
 
                                        $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
@@ -481,6 +481,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                        $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $contact['url'] . '" />' . "\n");
                                        $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $contact['thumb'] . '" />' . "\n");
                                        $arr['object'] .= '</link></object>' . "\n";
+
                                        $arr['last-child'] = 1;
 
                                        $arr['allow_cid'] = $user[0]['allow_cid'];
@@ -490,28 +491,33 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                                        $i = item_store($arr);
                                        if($i)
-                                       proc_run('php',"include/notifier.php","activity","$i");
+                                               proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
                                }
                        }
                }
+
+               $def_gid = get_default_group($uid, $contact["network"]);
+               if($contact && intval($def_gid))
+                       group_add_member($uid, '', $contact['id'], $def_gid);
+
                // 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;  
+                       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 
+        * In the section above where the confirming party makes a POST and
         * retrieves xml status information, they are communicating with the following code.
         *
         */
@@ -527,7 +533,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $duplex     = ((x($_POST,'duplex'))       ? intval($_POST['duplex'])       : 0 );
                $page       = ((x($_POST,'page'))         ? intval($_POST['page'])         : 0 );
                $version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
-       
+
+               $forum = (($page == 1) ? 1 : 0);
+               $prv   = (($page == 2) ? 1 : 0);
+
                logger('dfrn_confirm: requestee contacted: ' . $node);
 
                logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA);
@@ -544,7 +553,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                        dbesc($node));
 
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        $message = sprintf(t('No user record found for \'%s\' '), $node);
                        xml_status(3,$message); // failure
                        // NOTREACHED
@@ -575,7 +584,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        dbesc($decrypted_source_url),
                        intval($local_uid)
                );
-               if(! count($ret)) {
+               if(! dbm::is_result($ret)) {
                        if(strstr($decrypted_source_url,'http:'))
                                $newurl = str_replace('http:','https:',$decrypted_source_url);
                        else
@@ -585,11 +594,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                dbesc($newurl),
                                intval($local_uid)
                        );
-                       if(! count($ret)) {
+                       if(! dbm::is_result($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 
+                               return; // NOTREACHED
                        }
                }
 
@@ -620,27 +629,27 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1",
                        dbesc($decrypted_dfrn_id)
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
                        xml_status(1,$message); // Birthday paradox - duplicate dfrn-id
                        // NOTREACHED
                }
 
-               $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d LIMIT 1",
+               $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d",
                        dbesc($decrypted_dfrn_id),
                        dbesc($dfrn_pubkey),
                        intval($dfrn_record)
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        $message = t('Unable to set your contact credentials on our system.');
                        xml_status(3,$message);
                }
 
                // It's possible that the other person also requested friendship.
-               // If it is a duplex relationship, ditch the issued-id if one exists. 
+               // If it is a duplex relationship, ditch the issued-id if one exists.
 
                if($duplex) {
-                       $r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d LIMIT 1",
+                       $r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d",
                                intval($dfrn_record)
                        );
                }
@@ -652,14 +661,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($dfrn_record));
 
-               if(count($r))
+               if (dbm::is_result($r))
                        $photo = $r[0]['photo'];
                else
                        $photo = $a->get_baseurl() . '/images/person-175.jpg';
-                               
-               require_once("Photo.php");
 
-               $photos = import_profile_photo($photo,$local_uid,$dfrn_record);
+               require_once("include/Photo.php");
+
+               update_contact_avatar($photo,$local_uid,$dfrn_record);
 
                logger('dfrn_confirm: request - photos imported');
 
@@ -670,29 +679,23 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                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', 
-                       `avatar-date` = '%s', 
-                       `blocked` = 0, 
+               $r = q("UPDATE `contact` SET
+                       `rel` = %d,
+                       `name-date` = '%s',
+                       `uri-date` = '%s',
+                       `blocked` = 0,
                        `pending` = 0,
-                       `duplex` = %d, 
+                       `duplex` = %d,
                        `forum` = %d,
-                       `network` = '%s' WHERE `id` = %d LIMIT 1
+                       `prv` = %d,
+                       `network` = '%s' WHERE `id` = %d
                ",
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
                        intval($new_relation),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
                        intval($duplex),
-                       intval($page),
+                       intval($forum),
+                       intval($prv),
                        dbesc(NETWORK_DFRN),
                        intval($dfrn_record)
                );
@@ -710,33 +713,85 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        WHERE `contact`.`id` = %d LIMIT 1",
                        intval($dfrn_record)
                );
-               if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
-
-                       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'],
-                               '$siteurl' =>  $a->get_baseurl(),
-                               '$username' => $r[0]['username'],
-                               '$email' => $r[0]['email'],
-                               '$fn' => $r[0]['name'],
-                               '$dfrn_url' => $r[0]['url'],
-                               '$uid' => $newuid )
+
+               if (dbm::is_result($r))
+                       $combined = $r[0];
+
+               if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
+                       $mutual = ($new_relation == CONTACT_IS_FRIEND);
+                       notification(array(
+                               'type'         => NOTIFY_CONFIRM,
+                               'notify_flags' => $r[0]['notify-flags'],
+                               'language'     => $r[0]['language'],
+                               'to_name'      => $r[0]['username'],
+                               'to_email'     => $r[0]['email'],
+                               'uid'          => $r[0]['uid'],
+                               'link'             => $a->get_baseurl() . '/contacts/' . $dfrn_record,
+                               'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+                               'source_link'  => $r[0]['url'],
+                               'source_photo' => $r[0]['photo'],
+                               'verb'         => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW),
+                               'otype'        => 'intro'
+                       ));
+               }
+
+               // Send a new friend post if we are allowed to...
+
+               if($page && intval(get_pconfig($local_uid,'system','post_joingroup'))) {
+                       $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+                               intval($local_uid)
                        );
-       
-                       $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.
+
+                       if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
+
+                               require_once('include/items.php');
+
+                               $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+                                       intval($local_uid)
+                               );
+
+                               if(count($self)) {
+
+                                       $arr = array();
+                                       $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid);
+                                       $arr['uid'] = $local_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'];
+
+                                       $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
+                                       $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]';
+
+                                       $B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]';
+                                       $BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]';
+
+                                       $arr['verb'] = ACTIVITY_JOIN;
+                                       $arr['object-type'] = ACTIVITY_OBJ_GROUP;
+                                       $arr['body'] =  sprintf( t('%1$s has joined %2$s'), $A, $B)."\n\n\n" .$BPhoto;
+                                       $arr['object'] = '<object><type>' . ACTIVITY_OBJ_GROUP . '</type><title>' . $combined['name'] . '</title>'
+                                               . '<id>' . $combined['url'] . '/' . $combined['name'] . '</id>';
+                                       $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $combined['url'] . '" />' . "\n");
+                                       $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $combined['thumb'] . '" />' . "\n");
+                                       $arr['object'] .= '</link></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(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+
+                               }
                        }
-                       pop_lang();
                }
                xml_status(0); // Success
                return; // NOTREACHED