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

use config helper instead of env in application code

Browse Source
This commit is contained in:
Ethan Brace
2020-04-26 06:07:27 -04:00
parent 16092f657c
commit 6a11f130c2
18 changed files with 29 additions and 23 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'];

2
app/Http/ViewComposers/Notifications.php
View File

@ -19,7 +19,7 @@ class Notifications
public function compose(View $view)
{
// No need to add suggestions in console
if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) {
if (app()->runningInConsole() || !config('app.installed') || !user()) {
return;
}

6
app/Http/ViewComposers/Suggestions.php
View File

@ -20,7 +20,7 @@ class Suggestions
public function compose(View $view)
{
// No need to add suggestions in console
if (app()->runningInConsole() || !env('APP_INSTALLED')) {
if (app()->runningInConsole() || !config('app.installed')) {
return;
}
@ -31,10 +31,10 @@ class Suggestions
if ($path) {
$suggestions = $this->getSuggestions($path);
if ($suggestions) {
$suggestion_modules = $suggestions->modules;
foreach ($suggestion_modules as $key => $module) {
$installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first();