shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
denisdulici
2020-05-08 16:36:04 +03:00
parent 871604b514 0e73a2bf69
commit 534bef0ae4
23 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/Login.php
View File

@ -115,7 +115,7 @@ class Login extends Controller
auth()->logout();
// Session destroy is required if stored in database
if (env('SESSION_DRIVER') == 'database') {
if (config('session.driver') == 'database') {
$request = app('Illuminate\Http\Request');
$request->session()->getHandler()->destroy($request->session()->getId());
}

4
app/Http/Controllers/Install/Database.php
View File

@ -27,8 +27,10 @@ class Database extends Controller
*/
public function store(Request $request)
{
$connection = config('database.default','mysql');
$host = $request['hostname'];
$port = env('DB_PORT', '3306');
$port = config("database.connections.$connection.port", '3306');
$database = $request['database'];
$username = $request['username'];
$password = $request['password'];

6
app/Http/Controllers/Modules/Item.php
View File

@ -84,19 +84,19 @@ class Item extends Controller
// Download
$steps[] = [
'text' => trans('modules.installation.download', ['module' => $name]),
'url' => url('apps/download')
'url' => route('apps.download')
];
// Unzip
$steps[] = [
'text' => trans('modules.installation.unzip', ['module' => $name]),
'url' => url('apps/unzip')
'url' => route('apps.unzip')
];
// Download
$steps[] = [
'text' => trans('modules.installation.install', ['module' => $name]),
'url' => url('apps/install')
'url' => route('apps.install')
];
return response()->json([