butcherman / Tech_Bench

app/Console/Commands/backupRun.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         //  Create the archive and place the version file in it
         $this->zip = Zip::create(config('filesystems.disks.backup.root').DIRECTORY_SEPARATOR.$backupName);
         $this->bar->advance();
-        $this->zip->add(config('filesystems.disks.backup.root') . DIRECTORY_SEPARATOR . 'version.txt');
+        $this->zip->add(config('filesystems.disks.backup.root').DIRECTORY_SEPARATOR.'version.txt');
         $this->bar->advance();
         $this->zip->add(base_path().DIRECTORY_SEPARATOR.'.env');
         $this->bar->advance();
@@ -113,9 +113,9 @@ 
         'mysqldump tb-dev5-data -u root');
         $process->run();
 
-        File::put(config('filesystems.disks.backup.root') . DIRECTORY_SEPARATOR . 'database.sql', $process->getOutput());
+        File::put(config('filesystems.disks.backup.root').DIRECTORY_SEPARATOR.'database.sql', $process->getOutput());
         $this->bar->advance();
-        $this->zip->add(config('filesystems.disks.backup.root') . DIRECTORY_SEPARATOR . 'database.sql');
+        $this->zip->add(config('filesystems.disks.backup.root').DIRECTORY_SEPARATOR.'database.sql');
         $this->bar->advance();
     }
 

app/Console/Commands/updateRun.php

Spacing +36 added lines, -36 removed lines

@@ -22,11 +22,11 @@ 
         $this->line('');
         //  Select which update file to use
         $updateFile = $this->checkForUpdate();
-        if ($updateFile) {
+        if($updateFile) {
             //  Open up the file and verify it is at least the same version as the current setup
             $valid = $this->openUpdate($updateFile);
 
-            if ($valid)
+            if($valid)
             {
                 $this->call('down');
                 $this->copyFiles($updateFile);
@@ -48,26 +48,26 @@ 
         $updates    = Storage::disk('staging')->files('updates');
 
         //  Cycle through each file in the update directory to see if they are update files
-        foreach ($updates as $update)
+        foreach($updates as $update)
         {
             $baseName = explode('/', $update)[1];
 
             //  Verify the file is in the .zip format
             $fileParts = pathinfo($baseName);
-            if ($fileParts['extension'] == 'zip')
+            if($fileParts['extension'] == 'zip')
             {
                 //  Verify this is actually an update file
-                $zip = Zip::open(config('filesystems.disks.staging.root') .
-                    DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $baseName);
+                $zip = Zip::open(config('filesystems.disks.staging.root').
+                    DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$baseName);
                 $files = $zip->listFiles();
-                if (in_array($fileParts['filename'] . '/config/version.yml', $files))
+                if(in_array($fileParts['filename'].'/config/version.yml', $files))
                 {
                     $updateList[] = $baseName;
                 }
             }
         }
 
-        if (empty($updateList))
+        if(empty($updateList))
         {
             $this->error('No updates have been loaded to the system');
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
@@ -75,15 +75,15 @@ 
         }
 
         //  Determine if there is more than one update that can be applied
-        if (count($updateList) > 1)
+        if(count($updateList) > 1)
         {
             $this->line('');
 
             $anticipate = [];
-            foreach ($updateList as $key => $up) {
+            foreach($updateList as $key => $up) {
                 $opt = $key + 1;
                 $anticipate[$opt] = $up;
-                $this->line('[' . $opt . '] ' . $up);
+                $this->line('['.$opt.'] '.$up);
             }
             $updateFile = $this->choice('Please select which update you would like to load', $anticipate);
         }
@@ -101,21 +101,21 @@ 
         $fileParts = pathinfo($file);
         $folder = $fileParts['filename'];
 
-        $zip = Zip::open(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $file);
+        $zip = Zip::open(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$file);
 
-        $zip->extract(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp');
+        $zip->extract(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp');
         $zip->close();
 
-        $verFile = fopen(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp' .
-            DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . 'config' .
-            DIRECTORY_SEPARATOR . 'version.yml', 'r');
+        $verFile = fopen(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
+            DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR.'config'.
+            DIRECTORY_SEPARATOR.'version.yml', 'r');
 
         $verData = [];
         $i = 0;
-        while (!feof(
+        while(!feof(
         /** @scrutinizer ignore-type */
         $verFile))
         {
@@ -124,7 +124,7 @@ 
             $verFile);
             $data = explode(':', $line);
 
-            if (($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3)
+            if(($data[0] === '  major' || $data[0] === '  minor' || $data[0] === '  patch') && $i < 3)
             {
                 $verData[trim($data[0])] = trim($data[1]);
                 $i++;
@@ -134,15 +134,15 @@ 
         $curVersion = new \PragmaRX\Version\Package\Version();
 
         $valid = false;
-        if ($verData['major'] > $curVersion->major())
+        if($verData['major'] > $curVersion->major())
         {
             $valid = true;
         }
-        else if ($verData['minor'] > $curVersion->minor())
+        else if($verData['minor'] > $curVersion->minor())
         {
             $valid = true;
         }
-        else if ($verData['patch'] >= $curVersion->patch())
+        else if($verData['patch'] >= $curVersion->patch())
         {
             $valid = true;
         }
@@ -156,24 +156,24 @@ 
         $fileParts = pathinfo($updateFile);
         $folder = $fileParts['filename'];
 
-        $updateFile = config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . 'tmp' .
-            DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR;
+        $updateFile = config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
+            DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR;
 
         // Copy files
-        File::copyDirectory($updateFile . 'app',       base_path() . DIRECTORY_SEPARATOR . 'app');
-        File::copyDirectory($updateFile . 'bootstrap', base_path() . DIRECTORY_SEPARATOR . 'bootstrap');
-        File::copyDirectory($updateFile . 'config',    base_path() . DIRECTORY_SEPARATOR . 'config');
-        File::copyDirectory($updateFile . 'database',  base_path() . DIRECTORY_SEPARATOR . 'database');
-        File::copyDirectory($updateFile . 'resources', base_path() . DIRECTORY_SEPARATOR . 'resources');
-        File::copyDirectory($updateFile . 'routes',    base_path() . DIRECTORY_SEPARATOR . 'routes');
+        File::copyDirectory($updateFile.'app', base_path().DIRECTORY_SEPARATOR.'app');
+        File::copyDirectory($updateFile.'bootstrap', base_path().DIRECTORY_SEPARATOR.'bootstrap');
+        File::copyDirectory($updateFile.'config', base_path().DIRECTORY_SEPARATOR.'config');
+        File::copyDirectory($updateFile.'database', base_path().DIRECTORY_SEPARATOR.'database');
+        File::copyDirectory($updateFile.'resources', base_path().DIRECTORY_SEPARATOR.'resources');
+        File::copyDirectory($updateFile.'routes', base_path().DIRECTORY_SEPARATOR.'routes');
 
         //  Run Composer Updates
-        exec('cd ' . base_path() . ' && composer install --no-dev --no-interaction --optimize-autoloader --no-ansi > /dev/null 2>&1');
+        exec('cd '.base_path().' && composer install --no-dev --no-interaction --optimize-autoloader --no-ansi > /dev/null 2>&1');
         $this->call('ziggy:generate');
         //  Run NPM
-        exec('cd ' . base_path() . ' && npm install --only=production > /dev/null 2>&1');
-        exec('cd ' . base_path() . ' && npm run production > /dev/null 2>&1');
+        exec('cd '.base_path().' && npm install --only=production > /dev/null 2>&1');
+        exec('cd '.base_path().' && npm run production > /dev/null 2>&1');
 
         //  Update the database
         $this->call('migrate', ['--force' => 'default']);

Braces +4 added lines, -2 removed lines

@@ -22,7 +22,8 @@ 
         $this->line('');
         //  Select which update file to use
         $updateFile = $this->checkForUpdate();
-        if ($updateFile) {
+        if ($updateFile)
+        {
             //  Open up the file and verify it is at least the same version as the current setup
             $valid = $this->openUpdate($updateFile);
 
@@ -80,7 +81,8 @@ 
             $this->line('');
 
             $anticipate = [];
-            foreach ($updateList as $key => $up) {
+            foreach ($updateList as $key => $up)
+            {
                 $opt = $key + 1;
                 $anticipate[$opt] = $up;
                 $this->line('[' . $opt . '] ' . $up);

app/Console/Commands/backupRestore.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         /** @scrutinizer ignore-type */
         $this->argument('filename'));
         $this->baseName = $fileParts['filename'];
-        $this->archive = Zip::open(config('filesystems.disks.backup.root') . DIRECTORY_SEPARATOR .
+        $this->archive = Zip::open(config('filesystems.disks.backup.root').DIRECTORY_SEPARATOR.
         /** @scrutinizer ignore-type */
         $this->argument('filename'));
         // if (!$this->archive->has('version.txt')) {

app/Http/Controllers/Admin/AdminController.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
     //  Admin landing page
     public function index()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return view('admin.index');
     }
 
@@ -45,7 +45,7 @@ 
                             ->makeVisible('user_id')
                     );
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('User Collection Data:', $userLinks->toArray());
         return view('admin.userLinks', [
             'links' => $userLinks,
@@ -57,7 +57,7 @@ 
     {
         $user = User::find($id);
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('User Link Data:', $user->toArray());
         return view('admin.linkDetails', [
             'user' => $user,
@@ -68,7 +68,7 @@ 
     public function passwordPolicy()
     {
         $this->authorize('hasAccess', 'Manage Users');
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return view('admin.userSecurity', [
             'passExpire' => config('auth.passwords.settings.expire'),
         ]);
@@ -77,7 +77,7 @@ 
     //  Submit the form to change the user password policy
     public function submitPolicy(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
         $this->authorize('hasAccess', 'Manage Users');
 
         $request->validate([
@@ -91,7 +91,7 @@ 
         Log::notice('User '.Auth::user()->full_name.' updated User Password Policy');
 
         //  If the setting is changing from never to xx days, update all users
-        if ($request->passExpire == 0) {
+        if($request->passExpire == 0) {
             User::whereNotNull('password_expires')->update([
                 'password_expires' => null
             ]);
@@ -111,7 +111,7 @@ 
     public function roleSettings()
     {
         $this->authorize('hasAccess', 'Manage User Roles');
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         $roles = UserRoleType::with(['UserRolePermissions' => function($query)
         {
             $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id');
@@ -128,7 +128,7 @@ 
 
     public function submitRoleSettings(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data: ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data: ', $request->toArray());
         $this->authorize('hasAccess', 'Manage User Roles');
 
         $request->validate([
@@ -166,7 +166,7 @@ 
             'name'        => $request->name,
             'description' => $request->description,
         ]);
-        foreach ($request->permissions as $perm)
+        foreach($request->permissions as $perm)
         {
             UserRolePermissions::create([
                 'role_id'      => $role->role_id,

Braces +4 added lines, -5 removed lines

@@ -36,8 +36,7 @@ 
         $userLinks = new UserCollection(
                         User::withCount([
                                 'FileLinks',
-                                'FileLinks as expired_file_links_count' => function($query)
-                                {
+                                'FileLinks as expired_file_links_count' => function($query) {
                                     $query->where('expire', '<', Carbon::now());
                                 }
                             ])
@@ -91,7 +90,8 @@ 
         Log::notice('User '.Auth::user()->full_name.' updated User Password Policy');
 
         //  If the setting is changing from never to xx days, update all users
-        if ($request->passExpire == 0) {
+        if ($request->passExpire == 0)
+        {
             User::whereNotNull('password_expires')->update([
                 'password_expires' => null
             ]);
@@ -112,8 +112,7 @@ 
     {
         $this->authorize('hasAccess', 'Manage User Roles');
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
-        $roles = UserRoleType::with(['UserRolePermissions' => function($query)
-        {
+        $roles = UserRoleType::with(['UserRolePermissions' => function($query) {
             $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id');
         }])->get();
         $perms = UserRolePermissionTypes::all();

app/Http/Controllers/Admin/UserController.php

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
     public function __construct()
     {
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->authorize('hasAccess', 'Manage Users');
             return $next($request);
         });
@@ -37,7 +37,7 @@ 
         $userList = User::with('LastUserLogin')->get()->makeVisible('user_id');
         $route    = 'admin.user.edit';
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('User list:', $userList->toArray());
         return view('admin.userIndex', [
             'userList' => $userList,
@@ -48,7 +48,7 @@ 
     //  Check if a username is in use
     public function checkUser($username, $type)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
         $user = User::where($type, $username)->first();
 
         if(!$user)
@@ -91,7 +91,7 @@ 
             }
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('Role data: ', $roleArr);
         return view('admin.newUser', [
             'roles' => $roleArr
@@ -101,7 +101,7 @@ 
     //  Submit the Add User form
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
         //  Validate the new user form
         $request->validate([
             'role'       => 'required|numeric|exists:user_role_types,role_id',
@@ -145,7 +145,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        $route    = '';
+        $route = '';
 
         if($type !== 'inactive')
         {
@@ -155,7 +155,7 @@ 
                 /** @scrutinizer ignore-call */
                 ->makeVisible('user_id'));
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('Inactive User List: ', $userList->toArray());
 
         return view('admin.userDeleted', [
@@ -171,10 +171,10 @@ 
         $roles = UserRoleType::all();
         $user  = new UserResource(User::findOrFail($id));
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         //  Make sure that the user is not trying to edit someone with more permissions
-        if ($user->role_id < Auth::user()->role_id)
+        if($user->role_id < Auth::user()->role_id)
         {
             Log::notice('User '.Auth::user()->full_name.' tried to update a user that has more permissions than they do.  This request was denied.');
             return abort(403);
@@ -182,10 +182,10 @@ 
 
         //  Good to go - get role information
         $roleArr = [];
-        foreach ($roles as $role) {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
+        foreach($roles as $role) {
+            if($role->role_id == 1 && Auth::user()->role_id != 1) {
                 continue;
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
+            } else if($role->role_id == 2 && Auth::user()->role_id > 1) {
                 continue;
             } else {
                 // $roleArr[$role->role_id] = $role->name;
@@ -208,7 +208,7 @@ 
     //  Reactivate a disabled user
     public function reactivateUser($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         User::withTrashed()->where('user_id', $id)->restore();
 
         Log::info('User ID '.$id.' reactivated by '.Auth::user()->full_name);
@@ -220,7 +220,7 @@ 
     //  Submit the update user form
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
         $request->validate([
             'username'   => [
                                 'required',
@@ -238,7 +238,7 @@ 
         //  Update the user data
         $user = User::findOrFail($id);
 
-        if ($user->role_id < Auth::user()->role_id)
+        if($user->role_id < Auth::user()->role_id)
         {
             return abort(403);
         }
@@ -260,7 +260,7 @@ 
     //  Submit the change password form
     public function submitPassword(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $request->validate([
             'password' => 'required|string|min:6|confirmed',
@@ -279,12 +279,12 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user) {
+        if(!$user) {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id) {
+        else if($user->role_id < Auth::user()->role_id) {
             $success = false;
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
         }
@@ -297,10 +297,10 @@ 
                 'password_expires' => $nextChange
             ]);
             $success = true;
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
         }
 
-        Log::notice('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->Full_name, [
+        Log::notice('User ID-'.$request->user_id.' password chagned by '.Auth::user()->Full_name, [
             'success' => $success,
             'reason'  => $reason,
         ]);
@@ -343,7 +343,7 @@ 
             $reason  = 'User '.$user->full_name.' successfully deactivated.';
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::notice('User ID-'.$id.' disabled by '.Auth::user()->full_name, [
             'success' => $success,
             'reason'  => $reason,

Braces +16 added lines, -7 removed lines

@@ -182,12 +182,18 @@ 
 
         //  Good to go - get role information
         $roleArr = [];
-        foreach ($roles as $role) {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
+        foreach ($roles as $role)
+        {
+            if ($role->role_id == 1 && Auth::user()->role_id != 1)
+            {
                 continue;
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
+            }
+            else if ($role->role_id == 2 && Auth::user()->role_id > 1)
+            {
                 continue;
-            } else {
+            }
+            else
+            {
                 // $roleArr[$role->role_id] = $role->name;
                 $roleArr[] = [
                     'value' => $role->role_id,
@@ -279,17 +285,20 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user) {
+        if (!$user)
+        {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id) {
+        else if ($user->role_id < Auth::user()->role_id)
+        {
             $success = false;
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
         }
         //  Good to go - update user password
-        else {
+        else
+        {
             //  Update the user data
             $user->update(
             [