Upgrade twig to version 3 for php 8.1

[anoweco.git] / www / micropub.php

diff --git a/www/micropub.php b/www/micropub.php
index c0c01b4c4864ab5e3ce595cb9da4a428e81c276a..ab6af864ff1fef631fc45db57db5e130414c0133 100644 (file)
--- a/www/micropub.php
+++ b/www/micropub.php
@@ -35,7 +35,8 @@ function validateToken($token)
         array(
             'http' => array(
                 'header' => array(
-                    'Authorization: Bearer ' . $token
+                    'Authorization: Bearer ' . $token,
+                    'Accept: application/json',
                 ),
                 'ignore_errors' => true,
             ),
@@ -52,10 +53,10 @@ function validateToken($token)
         );
     }
 
-    parse_str($res, $data);
+    $data = json_decode($res, true);
     //FIXME: they spit out non-micropub json error responess
-    verifyUrlParameter($data, 'me');
-    verifyUrlParameter($data, 'client_id');
+    verifyParameter($data, 'me');
+    verifyParameter($data, 'client_id');
     verifyParameter($data, 'scope');
 
     return [$data['me'], $data['client_id'], $data['scope']];
@@ -177,7 +178,9 @@ if ($_SERVER['REQUEST_METHOD'] == 'GET') {
     }
     list($ctype) = explode(';', $_SERVER['CONTENT_TYPE'], 2);
     $ctype = trim($ctype);
-    if ($ctype == 'application/x-www-form-urlencoded') {
+    if ($ctype == 'application/x-www-form-urlencoded'
+        || $ctype == 'multipart/form-data'
+    ) {
         if (!isset($_POST['action'])) {
             $_POST['action'] = 'create';
         }