Merge pull request #7139 from annando/ap-mail

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 698fa2f995766722e4d556a1cc57c6ea9ab3125f..eccd77675e91125ed3eae26191bb31b7e678ea07 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -11,7 +11,6 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -19,6 +18,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -250,7 +250,7 @@ function api_login(App $a)
                throw new UnauthorizedException("This API requires login");
        }
 
-       Authentication::setAuthenticatedSessionForUser($record);
+       Session::setAuthenticatedForUser($a, $record);
 
        $_SESSION["allow_api"] = true;
 
@@ -364,7 +364,7 @@ function api_call(App $a)
                Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call']);
                throw new NotImplementedException();
        } catch (HTTPException $e) {
-               header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
+               header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
                return api_error($type, $e);
        }
 }
@@ -384,7 +384,7 @@ function api_error($type, $e)
        /// @TODO:  https://dev.twitter.com/overview/api/response-codes
 
        $error = ["error" => $error,
-                       "code" => $e->httpcode . " " . $e->httpdesc,
+                       "code" => $e->getCode() . " " . $e->httpdesc,
                        "request" => $a->query_string];
 
        $return = api_format_data('status', $type, ['status' => $error]);