multi-user, do not cache open mbox

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 24e8bf106a9a938dcf6e0ddf3352b2839fcbf38f..58473146d19c37b197f0f69e6cde0617d8ffdc92 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -240,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) {
@@ -434,12 +434,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                $arr['object'] .= '</link></object>' . "\n";
                                $arr['last-child'] = 1;
 
-                               $i = item_store($arr);
-
-                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+                               $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'];
 
-                           //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"activity\" \"$i\" &", array(),$foo));
-                           proc_run($php_path,"include/notifier.php","activity","$i");
+                               $i = item_store($arr);
+                               if($i)
+                               proc_run('php',"include/notifier.php","activity","$i");
 
                        }
 
@@ -494,7 +496,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
                }
@@ -648,8 +650,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.
                        }