From 8b974f8f74f6eefc5955a0f9e385f6460504fc42 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 7 Dec 2015 16:01:54 -0800 Subject: abstract the message handlers --- Zotlabs/Zot/IHandler.php | 22 ++++++++++++++++++++++ Zotlabs/Zot/Receiver.php | 19 +++++++++++-------- Zotlabs/Zot/ZotHandler.php | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 Zotlabs/Zot/IHandler.php create mode 100644 Zotlabs/Zot/ZotHandler.php (limited to 'Zotlabs') 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 @@ +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 @@ +