Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.7.x' of github.com:appwrite/appwrite into swoole-and-functions

Browse Source
This commit is contained in:
Eldad Fux
2020-10-30 00:06:04 +02:00
parent a5b8ed9773 788db3d794
commit da71d295c5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/general.php
+8 -6
View File
@@ -16,6 +16,7 @@ use Appwrite\Database\Validator\Authorization;
use Appwrite\Network\Validator\Origin;
use Appwrite\Storage\Device\Local;
use Appwrite\Storage\Storage;
use Utopia\CLI\Console;
Config::setParam('domainVerification', false);
Config::setParam('cookieDomain', 'localhost');
@@ -188,6 +189,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
if($user->getId()) {
Authorization::setRole('user:'.$user->getId());
}
Authorization::setRole('role:'.$role);
\array_map(function ($node) {
@@ -339,12 +341,12 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
$template = ($route) ? $route->getLabel('error', null) : null;
if(php_sapi_name() === 'cli') {
var_dump($route->getMethod());
var_dump($route->getURL());
var_dump(get_class($error));
var_dump($error->getMessage());
var_dump($error->getFile());
var_dump($error->getLine());
Console::error('[Error] Method: '.$route->getMethod());
Console::error('[Error] URL: '.$route->getURL());
Console::error('[Error] Type: '.get_class($error));
Console::error('[Error] Message: '.$error->getMessage());
Console::error('[Error] File: '.$error->getFile());
Console::error('[Error] Line: '.$error->getLine());
}
$version = App::getEnv('_APP_VERSION', 'UNKNOWN');