keychecks

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 3d6408bcfe134b7e66603512c9b1872764fc48b6..c72c78445340cfbf481f9826213a218a86f33cae 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -11,6 +11,10 @@ function diaspora2bb($s) {
        $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
        $s = Markdown($s);
        $s = html2bbcode($s);
+
+//     $s = preg_replace('/\[url=(.+?)\<em\>(.+?)\]/ism','[url=$1_$2]',$s);
+//     $s = preg_replace('/\[url=(.+?)\<\/em\>(.+?)\]/ism','[url=$1_$2]',$s);
+
        return $s;
 
 }

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 870e4f2fba24e736aacdb178aa22c60b9ae73587..23bdd7388edc0a22f1bfbaff32de663ebaff603c 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -849,10 +849,12 @@ function dfrn_notify_content(&$a) {
                        openssl_private_encrypt($hash,$challenge,$prv_key);
                        openssl_private_encrypt($id_str,$encrypted_id,$prv_key);
                }
-               else {
+               elseif(strlen($pub_key)) {
                        openssl_public_encrypt($hash,$challenge,$pub_key);
                        openssl_public_encrypt($id_str,$encrypted_id,$pub_key);
                }
+               else
+                       $status = 1;
 
                $challenge    = bin2hex($challenge);
                $encrypted_id = bin2hex($encrypted_id);