Rename Photo::newResource() result variable from $hash to $resource_id

[friendica.git] / mod / api.php

diff --git a/mod/api.php b/mod/api.php
index e7214624211ca5661b25e47f7cc773d48a928f69..9a802b515a6a1a0f1cd7a504336f38c7e3e5e532 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -2,20 +2,18 @@
 /**
  * @file mod/api.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Login;
 
-require_once 'include/api.php';
+require_once __DIR__ . '/../include/api.php';
 
-function oauth_get_client($request)
+function oauth_get_client(OAuthRequest $request)
 {
-
-
        $params = $request->get_parameters();
        $token = $params['oauth_token'];
 
@@ -59,7 +57,7 @@ function api_content(App $a)
                } catch (Exception $e) {
                        echo "<pre>";
                        var_dump($e);
-                       killme();
+                       exit();
                }
 
                if (!empty($_POST['oauth_yes'])) {
@@ -79,7 +77,7 @@ function api_content(App $a)
                                        $glue = "?";
                                }
                                $a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
-                               killme();
+                               exit();
                        }
 
                        $tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
@@ -117,5 +115,5 @@ function api_content(App $a)
        }
 
        echo api_call($a);
-       killme();
+       exit();
 }