Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 58473146d19c37b197f0f69e6cde0617d8ffdc92..e2094b1f31b97eaacb7fc44ef52465cf25cabd96 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -423,9 +423,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
                                $arr['verb'] = ACTIVITY_FRIEND;
                                $arr['object-type'] = ACTIVITY_OBJ_PERSON;
-                               $arr['body'] = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url] ' . t('is now friends with')
-                                       . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . "\n\n\n" 
-                                       . ' [url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+                               
+                               $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>';
@@ -505,7 +507,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);
                }
@@ -630,15 +632,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
                logger('dfrn_confirm: request: info updated');
 
-               $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+               $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)) {
 
+                       push_lang($r[0]['language']);
                        $tpl = (($new_relation == REL_BUD) 
-                               ? load_view_file('view/friend_complete_eml.tpl')
-                               : load_view_file('view/intro_complete_eml.tpl'));
+                               ? get_intltext_template('friend_complete_eml.tpl')
+                               : get_intltext_template('intro_complete_eml.tpl'));
                
                        $email_tpl = replace_macros($tpl, array(
                                '$sitename' => $a->config['sitename'],
@@ -659,6 +662,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                        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