aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-07 16:01:54 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-07 16:01:54 -0800
commit8b974f8f74f6eefc5955a0f9e385f6460504fc42 (patch)
treef73a10571b7b0487aaa15a574fe8ea29a6dce225
parent53627c89a716fcd9bac535169710e65b229e96a5 (diff)
downloadvolse-hubzilla-8b974f8f74f6eefc5955a0f9e385f6460504fc42.tar.gz
volse-hubzilla-8b974f8f74f6eefc5955a0f9e385f6460504fc42.tar.bz2
volse-hubzilla-8b974f8f74f6eefc5955a0f9e385f6460504fc42.zip
abstract the message handlers
-rw-r--r--Zotlabs/Zot/IHandler.php22
-rw-r--r--Zotlabs/Zot/Receiver.php19
-rw-r--r--Zotlabs/Zot/ZotHandler.php38
-rw-r--r--include/zot.php11
-rw-r--r--mod/post.php3
-rw-r--r--version.inc2
6 files changed, 79 insertions, 16 deletions
diff --git a/Zotlabs/Zot/IHandler.php b/Zotlabs/Zot/IHandler.php
new file mode 100644
index 000000000..eeca1555c
--- /dev/null
+++ b/Zotlabs/Zot/IHandler.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+interface IHandler {
+
+ function Ping();
+
+ function Pickup($data);
+
+ function Notify($data);
+
+ function Request($data);
+
+ function AuthCheck($data,$encrypted);
+
+ function Purge($sender,$recipients);
+
+ function Refresh($sender,$recipients);
+
+}
+
diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
index b4d5d5ef6..6a11bcde0 100644
--- a/Zotlabs/Zot/Receiver.php
+++ b/Zotlabs/Zot/Receiver.php
@@ -12,14 +12,17 @@ class Receiver {
protected $validated;
protected $recipients;
protected $response;
+ protected $handler;
- function __construct($data,$prvkey) {
+ function __construct($data,$prvkey,$handler) {
$this->error = false;
$this->validated = false;
$this->messagetype = '';
$this->response = array('success' => false);
+ $this->handler = $handler;
+
if(! is_array($data))
$data = json_decode($data,true);
@@ -76,11 +79,11 @@ class Receiver {
switch($this->messagetype) {
case 'ping':
/* no validation needed */
- zot_reply_ping();
+ $this->handler->Ping();
break;
case 'pickup':
/* perform site validation, as opposed to sender validation */
- zot_reply_pickup($this->data);
+ $this->handler->Pickup($this->data);
break;
default:
@@ -96,24 +99,24 @@ class Receiver {
switch($this->messagetype) {
case 'auth_check':
- zot_reply_auth_check($this->data,$this->encrypted);
+ $this->handler->AuthCheck($this->data,$this->encrypted);
break;
case 'request':
- json_return_and_die(zot_process_message_request($this->data));
+ $this->handler->Request($this->data);
break;
case 'purge':
- zot_reply_purge($this->sender,$this->recipients);
+ $this->handler->Purge($this->sender,$this->recipients);
break;
case 'refresh':
case 'force_refresh':
- zot_reply_refresh($this->sender,$this->recipients);
+ $this->handler->Refresh($this->sender,$this->recipients);
break;
case 'notify':
- zot_reply_notify($this->data);
+ $this->handler->Notify($this->data);
break;
default:
diff --git a/Zotlabs/Zot/ZotHandler.php b/Zotlabs/Zot/ZotHandler.php
new file mode 100644
index 000000000..20332074e
--- /dev/null
+++ b/Zotlabs/Zot/ZotHandler.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Zotlabs\Zot;
+
+require_once('Zotlabs/Zot/IHandler.php');
+
+
+class ZotHandler implements IHandler {
+
+ function Ping() {
+ zot_reply_ping();
+ }
+
+ function Pickup($data) {
+ zot_reply_pickup($data);
+ }
+
+ function Notify($data) {
+ zot_reply_notify($data);
+ }
+
+ function Request($data) {
+ zot_reply_message_request($data));
+ }
+
+ function AuthCheck($data,$encrypted) {
+ zot_reply_auth_check($data,$encrypted);
+ }
+
+ function Purge($sender,$recipients) {
+ zot_reply_purge($sender,$recipients);
+ }
+
+ function Refresh($sender,$recipients) {
+ zot_reply_refresh($sender,$recipients);
+ }
+
+}
diff --git a/include/zot.php b/include/zot.php
index 71c260d65..68b19c3a8 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3494,13 +3494,13 @@ function import_author_zot($x) {
* @param array $data
* @return array
*/
-function zot_process_message_request($data) {
+function zot_reply_message_request($data) {
$ret = array('success' => false);
if (! $data['message_id']) {
$ret['message'] = 'no message_id';
logger('no message_id');
- return $ret;
+ json_return_and_die($ret);
}
$sender = $data['sender'];
@@ -3518,7 +3518,7 @@ function zot_process_message_request($data) {
if (! $c) {
logger('recipient channel not found.');
$ret['message'] .= 'recipient not found.' . EOL;
- return $ret;
+ json_return_and_die($ret);
}
/*
@@ -3536,7 +3536,7 @@ function zot_process_message_request($data) {
);
if (! $r) {
logger('no hubs');
- return $ret;
+ json_return_and_die($ret);
}
$hubs = $r;
@@ -3577,8 +3577,7 @@ function zot_process_message_request($data) {
}
}
$ret['success'] = true;
-
- return $ret;
+ json_return_and_die($ret);
}
diff --git a/mod/post.php b/mod/post.php
index 6885b0d69..d1a53e7a6 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -486,8 +486,9 @@ function post_init(&$a) {
function post_post(&$a) {
require_once('Zotlabs/Zot/Receiver.php');
+ require_once('Zotlabs/Zot/ZotHandler.php');
- $z = new Zotlabs\Zot\Receiver($_REQUEST['data'],get_config('system','prvkey'));
+ $z = new Zotlabs\Zot\Receiver($_REQUEST['data'],get_config('system','prvkey'), new Zotlabs\Zot\ZotHandler());
// notreached;
diff --git a/version.inc b/version.inc
index 8816dde5d..97ba9c359 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-06.1238
+2015-12-07.1239