mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-20 11:19:16 +00:00
Improve installer middleware for Sandstorm.
This commit is contained in:
@@ -25,16 +25,16 @@ namespace FireflyIII\Http\Controllers\System;
|
||||
|
||||
|
||||
use Artisan;
|
||||
use Cache;
|
||||
use Exception;
|
||||
use FireflyIII\Http\Controllers\Controller;
|
||||
use FireflyIII\Support\Facades\Preferences;
|
||||
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
|
||||
use FireflyIII\Support\Preferences;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Arr;
|
||||
use Laravel\Passport\Passport;
|
||||
use Log;
|
||||
use phpseclib\Crypt\RSA;
|
||||
use Cache;
|
||||
|
||||
/**
|
||||
* Class InstallController
|
||||
@@ -79,6 +79,7 @@ class InstallController extends Controller
|
||||
Log::error($e->getTraceAsString());
|
||||
if (strpos($e->getMessage(), 'open_basedir restriction in effect')) {
|
||||
Cache::clear();
|
||||
|
||||
return response()->json(['error' => true, 'message' => self::BASEDIR_ERROR]);
|
||||
}
|
||||
|
||||
@@ -99,6 +100,9 @@ class InstallController extends Controller
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
// index will set FF3 version.
|
||||
app('fireflyconfig')->set('ff3_version', (string)config('firefly.version'));
|
||||
|
||||
return view('install.index');
|
||||
}
|
||||
|
||||
@@ -195,6 +199,7 @@ class InstallController extends Controller
|
||||
Cache::clear();
|
||||
Preferences::mark();
|
||||
|
||||
|
||||
return response()->json(['error' => false, 'message' => 'OK']);
|
||||
}
|
||||
|
||||
@@ -221,6 +226,8 @@ class InstallController extends Controller
|
||||
|
||||
return response()->json(['error' => true, 'message' => self::OTHER_ERROR . ' ' . $e->getMessage()]);
|
||||
}
|
||||
|
||||
|
||||
// clear cache as well.
|
||||
Cache::clear();
|
||||
Preferences::mark();
|
||||
|
Reference in New Issue
Block a user