implement support for JSON-RPC 1.0, 1.1 and 2.0

This implements the slightly more standardized JSON-RPC standard as an
alternative to my home-grown version. The same server handled all formats
including my own simpler variant.

1 files changed, 2 insertions, 14 deletions

diff --git a/lib/exe/jsonrpc.php b/lib/exe/jsonrpc.php
index 3852e2b45..48f22c7dc 100644
--- a/lib/exe/jsonrpc.php
+++ b/lib/exe/jsonrpc.php
@@ -11,21 +11,9 @@ header('Content-Type: application/json');
 
 $server = new JsonRpcServer();
 try {
-    $result = [
-        'error' => [
-            'code' => 0,
-            'message' => 'success'
-        ],
-        'data' => $server->serve(),
-    ];
+    $result = $server->serve();
 } catch (\Exception $e) {
-    $result = [
-        'error' => [
-            'code' => $e->getCode(),
-            'message' => $e->getMessage()
-        ],
-        'data' => null,
-    ];
+    $result = $server->returnError($e);
 }
 
 echo json_encode($result);