aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-12-01 13:39:00 -0800
committerFriendika <info@friendika.com>2010-12-01 13:39:00 -0800
commit9513f1f1668a33be3fc2b241fe3662e9de42d84b (patch)
tree3a29494164ebfe0a51284599f73411c0c154dda6
parent99bbc29747e8b8f4f9a7a1952aecbbd202ed2470 (diff)
downloadvolse-hubzilla-9513f1f1668a33be3fc2b241fe3662e9de42d84b.tar.gz
volse-hubzilla-9513f1f1668a33be3fc2b241fe3662e9de42d84b.tar.bz2
volse-hubzilla-9513f1f1668a33be3fc2b241fe3662e9de42d84b.zip
rino recipient patch
-rw-r--r--include/items.php4
-rw-r--r--mod/dfrn_notify.php9
2 files changed, 11 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 4bd46b427..04b86ab3f 100644
--- a/include/items.php
+++ b/include/items.php
@@ -726,7 +726,7 @@ function dfrn_deliver($owner,$contact,$atom) {
$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
}
- if($rino && rino_allowed) {
+ if($rino && $rino_allowed) {
$key = substr(random_string(),0,16);
$data = bin2hex(aes_encrypt($postvars['data'],$key));
$postvars['data'] = $data;
@@ -772,7 +772,7 @@ function dfrn_deliver($owner,$contact,$atom) {
* $contact = the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
* from an external network and MAY create an appropriate contact record. Otherwise, we MUST
* have a contact record.
- * $hub = should wefind ahub declation in the feed, pass it back to our calling process, who might (or
+ * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
* might not) try and subscribe to it.
*
*/
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 830a2d255..cd7523a01 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -483,12 +483,21 @@ function dfrn_notify_content(&$a) {
$challenge = bin2hex($challenge);
$encrypted_id = bin2hex($encrypted_id);
+ $rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
+
+ $rino_enable = get_config('system','rino_encrypt');
+
+ if(! $rino_enable)
+ $rino = 0;
+
+
header("Content-type: text/xml");
echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n"
. '<dfrn_notify>' . "\r\n"
. "\t" . '<status>' . $status . '</status>' . "\r\n"
. "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n"
+ . "\t" . '<rino>' . $rino . '</rino>' . "\r\n"
. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
. '</dfrn_notify>' . "\r\n" ;