aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-21 05:43:26 -0700
committerFriendika <info@friendika.com>2011-09-21 05:43:26 -0700
commit11ca81adbaa033123ca1aa2c354fb3be6f5225d0 (patch)
treec987c2b5efe4b02680dc7f5e97ba60fbd74173aa
parent9115e9c90b749e1739d412df2d63ae96e0b89b3e (diff)
downloadvolse-hubzilla-11ca81adbaa033123ca1aa2c354fb3be6f5225d0.tar.gz
volse-hubzilla-11ca81adbaa033123ca1aa2c354fb3be6f5225d0.tar.bz2
volse-hubzilla-11ca81adbaa033123ca1aa2c354fb3be6f5225d0.zip
keychecks
-rw-r--r--include/bb2diaspora.php4
-rw-r--r--mod/dfrn_notify.php4
2 files changed, 7 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 3d6408bcf..c72c78445 100644
--- 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 870e4f2fb..23bdd7388 100644
--- 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);