Date check added for HTTP signatures

[friendica.git] / src / Util / ExAuth.php

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index de5d52d895ad7c55d03e7dab547ebba0c6195a98..28157c23ef7285bc3443c1f0abbb2ed4765ec225 100644 (file)
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -39,8 +39,6 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 
-require_once 'include/dba.php';
-
 class ExAuth
 {
        private $bDebug;
@@ -124,7 +122,7 @@ class ExAuth
         */
        private function isUser(array $aCommand)
        {
-               $a = get_app();
+               $a = \get_app();
 
                // Check if there is a username
                if (!isset($aCommand[1])) {
@@ -179,17 +177,17 @@ class ExAuth
 
                $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-               $data = Network::curl($url);
+               $curlResult = Network::curl($url);
 
-               if (!is_array($data)) {
+               if (!$curlResult->isSuccess()) {
                        return false;
                }
 
-               if ($data['return_code'] != '200') {
+               if ($curlResult->getReturnCode() != 200) {
                        return false;
                }
 
-               $json = @json_decode($data['body']);
+               $json = @json_decode($curlResult->getBody());
                if (!is_object($json)) {
                        return false;
                }
@@ -204,7 +202,7 @@ class ExAuth
         */
        private function auth(array $aCommand)
        {
-               $a = get_app();
+               $a = \get_app();
 
                // check user authentication
                if (sizeof($aCommand) != 4) {