Check that the table exists

Should probably find a way to handle this that doesn't require a DB call
This commit is contained in:
snipe 2016-05-14 15:05:20 -07:00
parent 4dd3a95b6d
commit 1a14abed05

View file

@ -5,6 +5,7 @@ namespace App\Http\Middleware;
use Closure; use Closure;
use Config; use Config;
use Route; use Route;
use Schema;
use App\Models\User; use App\Models\User;
class CheckForSetup class CheckForSetup
@ -13,12 +14,22 @@ class CheckForSetup
{ {
try { try {
$users_table_exists = Schema::hasTable('users');
$settings_table_exists = Schema::hasTable('settings');
if ($users_table_exists && $settings_table_exists) {
$usercount = User::withTrashed()->count(); $usercount = User::withTrashed()->count();
if (($usercount > 0) && (Route::is('setup*'))) { if (($usercount > 0) && (Route::is('setup*'))) {
return redirect(config('app.url')); return redirect(config('app.url'));
} else { } else {
return $next($request); return $next($request);
} }
} else {
return $next($request);
}
} catch (\Exception $e) { } catch (\Exception $e) {
return $next($request); return $next($request);
} }