butcherman / Tech_Bench

app/Console/Commands/DatabaseCheck.php

Indentation +47 added lines, -47 removed lines

@@ -290,22 +290,22 @@ 
             
             if(!empty($over))
             {
-               foreach($over as $ov)
-               {
-                   $res[] = [
-                       'type'  => 'error',
-                       'value' => '     Link for '.$ov['username'].' is '.$ov['age'].' days old'
-                   ];
+                foreach($over as $ov)
+                {
+                    $res[] = [
+                        'type'  => 'error',
+                        'value' => '     Link for '.$ov['username'].' is '.$ov['age'].' days old'
+                    ];
                    
-                   if($this->fix)
-                   {
-                       UserInitialize::where('username', $ov['username'])->delete();
-                       $res[] = [
-                           'type'  => 'info',
-                           'value' => '          Corrected'
-                       ];
-                   }
-               }
+                    if($this->fix)
+                    {
+                        UserInitialize::where('username', $ov['username'])->delete();
+                        $res[] = [
+                            'type'  => 'info',
+                            'value' => '          Corrected'
+                        ];
+                    }
+                }
             }
         }
         
@@ -425,7 +425,7 @@ 
             }
         }
 		
-		$res = array_merge($res, $res2);
+        $res = array_merge($res, $res2);
         
         return $res;
     }
@@ -434,7 +434,7 @@ 
     private function customerFiles()
     {
         $res = [];
-		$res2 = [];
+        $res2 = [];
         
         $badPointer  = 0;
         $missingFile = 0;
@@ -528,7 +528,7 @@ 
             }
         }
 		
-		$res = array_merge($res, $res2);
+        $res = array_merge($res, $res2);
         
         return $res;
     }
@@ -537,7 +537,7 @@ 
     private function linkFiles()
     {
         $res = [];
-		$res2 = [];
+        $res2 = [];
         
         $badPointer  = 0;
         $missingFile = 0;
@@ -631,7 +631,7 @@ 
             }
         }
 		
-		$res = array_merge($res, $res2);
+        $res = array_merge($res, $res2);
         
         return $res;
     }
@@ -640,7 +640,7 @@ 
     private function tipFiles()
     {
         $res = [];
-		$res2 = [];
+        $res2 = [];
         
         $badPointer  = 0;
         $missingFile = 0;
@@ -734,7 +734,7 @@ 
             }
         }
 		
-		$res = array_merge($res, $res2);
+        $res = array_merge($res, $res2);
         
         return $res;
     }
@@ -749,36 +749,36 @@ 
             'value' => 'Unknown Files.....................'.count($this->fileArr)
         ];
 		
-		if(count($this->fileArr) > 0)
-		{
-			foreach($this->fileArr as $file)
-			{
-				$fileData = Files::find($file);
+        if(count($this->fileArr) > 0)
+        {
+            foreach($this->fileArr as $file)
+            {
+                $fileData = Files::find($file);
 				
-				$res[] = [
-					'type' => 'line',
-					'value' => '     Unknown File ID - '.$fileData->file_id.' - '.$fileData->file_link.$fileData->file_name,
-					'repOnly' => true
-				];
+                $res[] = [
+                    'type' => 'line',
+                    'value' => '     Unknown File ID - '.$fileData->file_id.' - '.$fileData->file_link.$fileData->file_name,
+                    'repOnly' => true
+                ];
 				
-				if($this->fix)
-				{
-					$res[] = [
-						'type' => 'info',
-						'value' => '          Corrected',
+                if($this->fix)
+                {
+                    $res[] = [
+                        'type' => 'info',
+                        'value' => '          Corrected',
                         'repOnly' => true
-					];
+                    ];
 
-					if(!Storage::exists($fileData->file_link.$fileData->file_name))
-					{
-						Storage::delete($fileData->file_link.$fileData->file_name);
-					}
+                    if(!Storage::exists($fileData->file_link.$fileData->file_name))
+                    {
+                        Storage::delete($fileData->file_link.$fileData->file_name);
+                    }
 					
-					$fileData->delete();
+                    $fileData->delete();
 					
-				}
-			}
-		}
+                }
+            }
+        }
 		
 		
 /*		
@@ -817,7 +817,7 @@ 
     {
         $res = [];
         
-		$allFiles = File::allFiles(config('filesystems.disks.local.root'));
+        $allFiles = File::allFiles(config('filesystems.disks.local.root'));
         
         foreach($allFiles as $pos => $file)
         {

Spacing +67 added lines, -67 removed lines

@@ -125,7 +125,7 @@ 
         $this->output($output);
         
         //  Generate a PDF report if the option is selected
-        if($this->rep)
+        if ($this->rep)
         {
             Storage::disk('logs')->append('dbCheck-'.$today->year.'-'.$today->month.'-'.$today->day.'.log', $this->repData);
         }
@@ -134,10 +134,10 @@ 
     //  Print the output to the screen and write for PDF report
     private function output($data)
     {   
-        foreach($data as $d)
+        foreach ($data as $d)
         {
             //  Console Output
-            if(!isset($d['repOnly']))
+            if (!isset($d['repOnly']))
             {
                 $type = $d['type'];
                 $this->$type($d['value']);
@@ -162,8 +162,8 @@ 
             ->where('user_role.role_id', '<=', 2)
             ->get();
         
-        $res[] = [ 'type' => 'info', 'value' => 'System Administrators ('.count($admins).')'];
-        foreach($admins as $admin)
+        $res[] = ['type' => 'info', 'value' => 'System Administrators ('.count($admins).')'];
+        foreach ($admins as $admin)
         {
             $res[] = [
                 'type' => 'line', 'value' => '     '.$admin->first_name.' '.$admin->last_name
@@ -202,19 +202,19 @@ 
         $settings = UserSettings::all();
         
         $failedItems = [];
-        foreach($users as $user)
+        foreach ($users as $user)
         {
             $match = false;
-            foreach($settings as $setting)
+            foreach ($settings as $setting)
             {
-                if($user->user_id == $setting->user_id)
+                if ($user->user_id == $setting->user_id)
                 {
                     $match = true;
                     break;
                 }
             }
             
-            if(!$match)
+            if (!$match)
             {
                 $failedItems[] = [
                     'user_id' => $user->user_id,
@@ -223,21 +223,21 @@ 
             }
         }
         
-        if($failedItems)
+        if ($failedItems)
         {
             $res[] = [
                 'type'  => 'error',
                 'value' => count($failedItems).' user(s) missing settings information'
             ];
             
-            foreach($failedItems as $item)
+            foreach ($failedItems as $item)
             {
                 $res[] = [
                     'type' => 'line',
                     'value' => '     User ID - '.$item['user_id'].'-'.$item['name']
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     UserSettings::create([
                         'user_id' => $item['user_id']
@@ -263,10 +263,10 @@ 
         
         $links = [];
         $over  = [];
-        if(!empty($initLinks))
+        if (!empty($initLinks))
         {
             //  List each expired link
-            foreach($initLinks as $link)
+            foreach ($initLinks as $link)
             {
                 $links[] = [
                     'username' => $link->username,
@@ -274,7 +274,7 @@ 
                 ];
                 
                 //  See if the link is more than two weeks old
-                if($link->created_at->diffInDays(Carbon::now()) > 14)
+                if ($link->created_at->diffInDays(Carbon::now())>14)
                 {
                     $over[] = [
                         'username' => $link->username,
@@ -288,16 +288,16 @@ 
                 'value' => count($links).' Users are awaiting to be initialized'
             ];
             
-            if(!empty($over))
+            if (!empty($over))
             {
-               foreach($over as $ov)
+               foreach ($over as $ov)
                {
                    $res[] = [
                        'type'  => 'error',
                        'value' => '     Link for '.$ov['username'].' is '.$ov['age'].' days old'
                    ];
                    
-                   if($this->fix)
+                   if ($this->fix)
                    {
                        UserInitialize::where('username', $ov['username'])->delete();
                        $res[] = [
@@ -318,7 +318,7 @@ 
         $files = Files::all();
         
         $fileArr = [];
-        foreach($files as $f)
+        foreach ($files as $f)
         {
             $fileArr[] = $f->file_id;
         }
@@ -343,10 +343,10 @@ 
         ];
         
         //  Verify all files have a database pointer and a valid file
-        foreach($sysFiles as $file)
+        foreach ($sysFiles as $file)
         {
             //  Verify database pointer
-            if(!in_array($file->file_id, $this->fileArr))
+            if (!in_array($file->file_id, $this->fileArr))
             {
                 $badPointer++;
                 $res2[] = [
@@ -355,7 +355,7 @@ 
                     'repOnly' => true
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     SystemFiles::find($file->sys_file_id)->delete();
                     $res2[] = [
@@ -369,7 +369,7 @@ 
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
-                if(!Storage::exists($fileData->file_link.$fileData->file_name))
+                if (!Storage::exists($fileData->file_link.$fileData->file_name))
                 {
                     $missingFile++;
                     $res2[] = [
@@ -378,7 +378,7 @@ 
                         'repOnly' => true
                     ];
 
-                    if($this->fix)
+                    if ($this->fix)
                     {
                         $file->delete();
                         $fileData->delete();
@@ -396,13 +396,13 @@ 
         }
         
         //  Error messages if pointer bad or file missing
-        if($badPointer)
+        if ($badPointer)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Bad file pointers............'.$badPointer
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -410,13 +410,13 @@ 
                 ];
             }
         }
-        if($missingFile)
+        if ($missingFile)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Missing Files................'.$missingFile
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -447,10 +447,10 @@ 
         ];
         
         //  Verify all files have a database pointer and a valid file
-        foreach($custFiles as $file)
+        foreach ($custFiles as $file)
         {
             //  Verify database pointer
-            if(!in_array($file->file_id, $this->fileArr))
+            if (!in_array($file->file_id, $this->fileArr))
             {
                 $badPointer++;
                 $res2[] = [
@@ -459,7 +459,7 @@ 
                     'repOnly' => true
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     CustomerFiles::find($file->cust_file_id)->delete();
                     $res2[] = [
@@ -473,7 +473,7 @@ 
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
-                if(!Storage::exists($fileData->file_link.$fileData->file_name))
+                if (!Storage::exists($fileData->file_link.$fileData->file_name))
                 {
                     $missingFile++;
                     $res2[] = [
@@ -482,7 +482,7 @@ 
                         'repOnly' => true
                     ];
 
-                    if($this->fix)
+                    if ($this->fix)
                     {
                         $file->delete();
                         $fileData->delete();
@@ -499,13 +499,13 @@ 
         }
         
         //  Error messages if pointer bad or file missing
-        if($badPointer)
+        if ($badPointer)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Bad file pointers............'.$badPointer
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -513,13 +513,13 @@ 
                 ];
             }
         }
-        if($missingFile)
+        if ($missingFile)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Missing Files................'.$missingFile
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -550,10 +550,10 @@ 
         ];
         
         //  Verify all files have a database pointer and a valid file
-        foreach($linkFiles as $file)
+        foreach ($linkFiles as $file)
         {
             //  Verify database pointer
-            if(!in_array($file->file_id, $this->fileArr))
+            if (!in_array($file->file_id, $this->fileArr))
             {
                 $badPointer++;
                 $res2[] = [
@@ -562,7 +562,7 @@ 
                     'repOnly' => true
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     FileLinkFiles::find($file->cust_file_id)->delete();
                     $res2[] = [
@@ -576,7 +576,7 @@ 
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
-                if(!Storage::exists($fileData->file_link.$fileData->file_name))
+                if (!Storage::exists($fileData->file_link.$fileData->file_name))
                 {
                     $missingFile++;
                     $res2[] = [
@@ -585,7 +585,7 @@ 
                         'repOnly' => true
                     ];
 
-                    if($this->fix)
+                    if ($this->fix)
                     {
                         $file->delete();
                         $fileData->delete();
@@ -602,13 +602,13 @@ 
         }
         
         //  Error messages if pointer bad or file missing
-        if($badPointer)
+        if ($badPointer)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Bad file pointers............'.$badPointer
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -616,13 +616,13 @@ 
                 ];
             }
         }
-        if($missingFile)
+        if ($missingFile)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Missing Files................'.$missingFile
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -653,10 +653,10 @@ 
         ];
         
         //  Verify all files have a database pointer and a valid file
-        foreach($tipFiles as $file)
+        foreach ($tipFiles as $file)
         {
             //  Verify database pointer
-            if(!in_array($file->file_id, $this->fileArr))
+            if (!in_array($file->file_id, $this->fileArr))
             {
                 $badPointer++;
                 $res2[] = [
@@ -665,7 +665,7 @@ 
                     'repOnly' => true
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     TechTipFiles::find($file->cust_file_id)->delete();
                     $res2[] = [
@@ -679,7 +679,7 @@ 
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
-                if(!Storage::exists($fileData->file_link.$fileData->file_name))
+                if (!Storage::exists($fileData->file_link.$fileData->file_name))
                 {
                     $missingFile++;
                     $res2[] = [
@@ -688,7 +688,7 @@ 
                         'repOnly' => true
                     ];
 
-                    if($this->fix)
+                    if ($this->fix)
                     {
                         $file->delete();
                         $fileData->delete();
@@ -705,13 +705,13 @@ 
         }
         
         //  Error messages if pointer bad or file missing
-        if($badPointer)
+        if ($badPointer)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Bad file pointers............'.$badPointer
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -719,13 +719,13 @@ 
                 ];
             }
         }
-        if($missingFile)
+        if ($missingFile)
         {
             $res[] = [
                 'type' => 'error',
                 'value' => '     Missing Files................'.$missingFile
             ];
-            if($this->fix)
+            if ($this->fix)
             {
                 $res[] = [
                     'type'  => 'info',
@@ -745,13 +745,13 @@ 
         $res = [];
         
         $res[] = [
-            'type' => count($this->fileArr) > 0 ? 'error' : 'line',
+            'type' => count($this->fileArr)>0 ? 'error' : 'line',
             'value' => 'Unknown Files.....................'.count($this->fileArr)
         ];
 		
-		if(count($this->fileArr) > 0)
+		if (count($this->fileArr)>0)
 		{
-			foreach($this->fileArr as $file)
+			foreach ($this->fileArr as $file)
 			{
 				$fileData = Files::find($file);
 				
@@ -761,7 +761,7 @@ 
 					'repOnly' => true
 				];
 				
-				if($this->fix)
+				if ($this->fix)
 				{
 					$res[] = [
 						'type' => 'info',
@@ -769,7 +769,7 @@ 
                         'repOnly' => true
 					];
 
-					if(!Storage::exists($fileData->file_link.$fileData->file_name))
+					if (!Storage::exists($fileData->file_link.$fileData->file_name))
 					{
 						Storage::delete($fileData->file_link.$fileData->file_name);
 					}
@@ -819,22 +819,22 @@ 
         
 		$allFiles = File::allFiles(config('filesystems.disks.local.root'));
         
-        foreach($allFiles as $pos => $file)
+        foreach ($allFiles as $pos => $file)
         {
             $dbFile = Files::where('file_name', basename($file))->get();
                         
-            if(!$dbFile->isEmpty())
+            if (!$dbFile->isEmpty())
             {
                 unset($allFiles[$pos]);
             }
         }
         
         $res[] = [
-            'type'  => count($allFiles) > 0 ? 'error' : 'line',
+            'type'  => count($allFiles)>0 ? 'error' : 'line',
             'value' => 'Rogue Files.......................'.count($allFiles)
         ];
         
-        if($this->fix && count($allFiles) > 0)
+        if ($this->fix && count($allFiles)>0)
         {
             $res[] = [
                 'type' => 'info',
@@ -842,9 +842,9 @@ 
             ];
         }
         
-        if(count($allFiles) > 0)
+        if (count($allFiles)>0)
         {
-            foreach($allFiles as $file)
+            foreach ($allFiles as $file)
             {
                 $res[] = [
                     'type'    => 'info',
@@ -852,7 +852,7 @@ 
                     'repOnly' => true
                 ];
                 
-                if($this->fix)
+                if ($this->fix)
                 {
                     Storage::delete($file);
                     $res[] = [

Braces +4 added lines, -8 removed lines

@@ -364,8 +364,7 @@ 
                         'repOnly' => true
                     ];
                 }
-            }
-            else
+            } else
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
@@ -468,8 +467,7 @@ 
                         'repOnly' => true
                     ];
                 }
-            }
-            else
+            } else
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
@@ -571,8 +569,7 @@ 
                         'repOnly' => true
                     ];
                 }
-            }
-            else
+            } else
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);
@@ -674,8 +671,7 @@ 
                         'repOnly' => true
                     ];
                 }
-            }
-            else
+            } else
             {
                 //  Verify that the file exists
                 $fileData = Files::find($file->file_id);

app/Http/Controllers/TechTipsController.php

Spacing +23 added lines, -23 removed lines

@@ -36,9 +36,9 @@ 
             ->get();
 
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -53,7 +53,7 @@ 
     public function search(Request $request)
     {
         //  Run different request based on if system field is filled out or not
-        if(!empty($request->system))
+        if (!empty($request->system))
         {
             $tipData = TechTips::where('subject', 'like', '%'.$request->tipSearch.'%')
                 ->whereHas('TechTipSystems', function($q) use($request)
@@ -82,9 +82,9 @@ 
             ->get();
 
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -116,9 +116,9 @@ 
         $tipID = $tip->tip_id;
 
         //  Enter all system tags associated with the tip
-        if(is_array($request->sysTags))
+        if (is_array($request->sysTags))
         {
-            foreach($request->sysTags as $tag)
+            foreach ($request->sysTags as $tag)
             {
                 TechTipSystems::create([
                     'tip_id' => $tipID,
@@ -135,10 +135,10 @@ 
         }
 
         //  If there are any files, process them
-        if(!empty($request->file))
+        if (!empty($request->file))
         {
             $filePath = config('filesystems.paths.tips').DIRECTORY_SEPARATOR.$tipID;
-            foreach($request->file as $file)
+            foreach ($request->file as $file)
             {
                 //  Clean the file and store it
                 $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());
@@ -166,7 +166,7 @@ 
         {
             Mail::to($userList)->send(new newTechtip($tipData));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             report($e);
         }
@@ -194,7 +194,7 @@ 
     public function details($id, $name)
     {
         $tipData = TechTips::where('tip_id', $id)->with('user')->first();
-        if(empty($tipData))
+        if (empty($tipData))
         {
             Log::warning('User ID-'.Auth::user()->user_id.' tried to access invlaid Tech Tip ID-'.$id.' Name-'.$name);
             return view('errors.tipNotFound');
@@ -263,7 +263,7 @@ 
     public function edit($id)
     {
         $tipData = TechTips::find($id);
-        if(empty($tipData))
+        if (empty($tipData))
         {
             return 'tip not found';
         }
@@ -281,7 +281,7 @@ 
             ->first();
         
         $tipS = [];
-        foreach($tipSys as $s)
+        foreach ($tipSys as $s)
         {
             $tipS[] = $s->sys_id;
         }
@@ -292,9 +292,9 @@ 
             ->get();
 
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -330,9 +330,9 @@ 
 
         //  Enter all system tags associated with the tip after destroying the existing systems
         TechTipSystems::where('tip_id', $id)->delete();
-        if(is_array($request->sysTags))
+        if (is_array($request->sysTags))
         {
-            foreach($request->sysTags as $tag)
+            foreach ($request->sysTags as $tag)
             {
                 TechTipSystems::create([
                     'tip_id' => $id,
@@ -350,13 +350,13 @@ 
 
         //  Determine if any files were removed
         $tipFiles = TechTipFiles::where('tip_id', $id)->get();
-        if(!$tipFiles->isEmpty())
+        if (!$tipFiles->isEmpty())
         {
-            if(!empty($request->existingFile))
+            if (!empty($request->existingFile))
             {
-                foreach($tipFiles as $file)
+                foreach ($tipFiles as $file)
                 {
-                    if(!in_array($file->file_id, $request->existingFile))
+                    if (!in_array($file->file_id, $request->existingFile))
                     {
                         TechTipFiles::where('file_id', $file->file_id)->delete();
                         Files::deleteFile($file->file_id);
@@ -370,10 +370,10 @@ 
         }
 
         //  Process any new files
-        if(!empty($request->file))
+        if (!empty($request->file))
         {
             $filePath = config('filesystems.paths.tips').DIRECTORY_SEPARATOR.$id;
-            foreach($request->file as $file)
+            foreach ($request->file as $file)
             {
                 //  Clean the file and store it
                 $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());