missing acl selector after merge

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 7018bf52b7dec03ae6b6c173fa6ad1effd5ceb43..d0543ac8459b7fc49675f5dbe74efb9473645ae1 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -201,7 +201,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                        logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
 
-                       // POST all this stuff to the other site.
+                       /**
+                        *
+                        * 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);
 
@@ -232,7 +240,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) {
@@ -378,7 +386,68 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if($r === false)
                                notice( t('Unable to set contact photo.') . EOL);
 
+               // reload contact info
+
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval($contact_id)
+               );
+               if(count($r))
+                       $contact = $r[0];
+               else
+                       $contact = null;
 
+               // 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)) && ($r[0]['hide-friends'] == 0) && (is_array($contact)) &&  isset($new_relation) && ($new_relation == REL_BUD)) {
+
+                       require_once('include/items.php');
+
+                       $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['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'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
+                                       . '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
+                               $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'];
+                               $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");
+
+                       }
+
+               }
                // Let's send our user to the contact editor in case they want to
                // do anything special with this new friend.
 
@@ -429,7 +498,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
                }
@@ -583,8 +652,12 @@ 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.
                        }