From 9fd2c2dd8ac6a5b015a30eb0508d387c15df9575 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 11 Nov 2012 19:12:20 -0800
Subject: hush-hush ultra top-secret mode

---
 include/text.php |  7 ++++++-
 include/zot.php  | 13 +++++++++++--
 version.inc      |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/include/text.php b/include/text.php
index 6c1a102c0..ee7595c01 100644
--- a/include/text.php
+++ b/include/text.php
@@ -341,7 +341,12 @@ function sanitise_acl(&$item) {
 if(! function_exists('perms2str')) {
 function perms2str($p) {
 	$ret = '';
-	$tmp = $p;
+
+	if(is_array($p))
+		$tmp = $p;
+	else
+		$tmp = explode(',',$p);
+
 	if(is_array($tmp)) {
 		array_walk($tmp,'sanitise_acl');
 		$ret = implode('',$tmp);
diff --git a/include/zot.php b/include/zot.php
index 90b91ff6e..b503f3a55 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -59,8 +59,9 @@ function zot_verify(&$item,$identity) {
 
 
 
-function zot_notify($channel,$url,$type = 'notify',$recipients = null) {
-	$x = z_post_url($url, array(
+function zot_notify($channel,$url,$type = 'notify',$recipients = null, $remote_key = null) {
+
+	$params = array(
 		'type' => $type,
 		'sender' => json_encode(array(
 			'guid' => $channel['channel_guid'],
@@ -72,6 +73,14 @@ function zot_notify($channel,$url,$type = 'notify',$recipients = null) {
 		'callback' => '/post',
 		'version' => ZOT_REVISION)
 	);
+
+	// Hush-hush ultra top-secret mode
+
+	if($remote_key) {
+		$params = aes_encapsulate($params,$remote_key);
+	}
+
+	$x = z_post_url($url,$prams);
 	return($x);
 }
 
diff --git a/version.inc b/version.inc
index f4b5b2086..cf7a2bc05 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-11-10.134
+2012-11-11.135
-- 
cgit v1.2.3