kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix webbased upgrade routine.

Browse Source
This commit is contained in:
James Cole
2019-02-04 20:35:46 +01:00
parent def95df49e
commit 0e1da3f797
4 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/System/InstallController.php
View File

@@ -153,6 +153,34 @@ class InstallController extends Controller
return response()->json(['error' => false, 'message' => 'OK']);
}
/**
* Do database decrypt.
*
* @return \Illuminate\Http\JsonResponse
*/
public function decrypt(): JsonResponse
{
if ($this->hasForbiddenFunctions()) {
return response()->json(['error' => true, 'message' => self::FORBIDDEN_ERROR]);
}
try {
Log::debug('Am now calling decrypt database routine...');
Artisan::call('firefly:decrypt-all');
Log::debug(Artisan::output());
} catch (Exception $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
if (strpos($e->getMessage(), 'open_basedir restriction in effect')) {
return response()->json(['error' => true, 'message' => self::BASEDIR_ERROR]);
}
return response()->json(['error' => true, 'message' => self::OTHER_ERROR . ' ' . $e->getMessage()]);
}
return response()->json(['error' => false, 'message' => 'OK']);
}
/**
* Do database verification.
*