Completed
Pull Request — master (#52)
by Ron
05:19
created
app/Files.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
                 // Have a number; increment it
44 44
                 $base = $match[1];
45 45
                 $number = intVal($match[2]);
46
-            } 
47
-            else 
46
+            } else 
48 47
             {
49 48
                 // No number; add one
50 49
                 $base = $fileParts['filename'];
@@ -71,8 +70,7 @@  discard block
 block discarded – undo
71 70
             Storage::delete($fileLink);
72 71
             
73 72
             Log::info('File Deleted', ['file_id' => $fileID, 'file_name' => $fileLink, 'user_id' => Auth::user()->user_id]);
74
-        }
75
-        catch(Exception $e)
73
+        } catch(Exception $e)
76 74
         {
77 75
             return false;
78 76
         }
Please login to merge, or discard this patch.
app/Navbar.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@
 block discarded – undo
27 27
                 $navBarSys[$item->sys_id]['category'] = $item->category;
28 28
                 $navBarSys[$item->sys_id]['name'] = $item->sys_name;
29 29
                 $navBarSys[$item->sys_id]['url'] = '/system/'.$item->category.'/'.urlencode($item->sys_name);
30
-            }
31
-            else
30
+            } else
32 31
             {
33 32
                 $navBarSub[$item->sys_id]['category'] = $item->category;
34 33
                 $navBarSub[$item->sys_id]['parent'] = $item->parent_id;
Please login to merge, or discard this patch.
app/User.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -82,8 +82,7 @@
 block discarded – undo
82 82
                     return true;
83 83
                 }
84 84
             }
85
-        }
86
-        else
85
+        } else
87 86
         {
88 87
             if($this->hasRole($roles))
89 88
             {
Please login to merge, or discard this patch.
app/Http/Controllers/CustomerController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,7 @@
 block discarded – undo
55 55
                    $q->where('sys_id', $request->system);
56 56
                 })
57 57
                 ->get();
58
-        }
59
-        else
58
+        } else
60 59
         {
61 60
             $customerData = Customers::where('name', 'like', '%'.$request->customer.'%')
62 61
                 ->where('city', 'like', '%'.$request->city.'%')
Please login to merge, or discard this patch.
app/Exceptions/Handler.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@
 block discarded – undo
38 38
         if(config('app.debug'))
39 39
         {
40 40
             parent::report($exception);
41
-        }
42
-        else
41
+        } else
43 42
         {
44 43
             Log::error('['.$exception->getCode().'] "'.$exception->getMessage().'" on line '.$exception->getTrace()[0]['line'].' of file '.$exception->getTrace()[0]['file']);
45 44
         }
Please login to merge, or discard this patch.
app/Http/Controllers/UserLinksController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,8 +91,7 @@
 block discarded – undo
91 91
         try
92 92
         {
93 93
             Mail::to($user)->send(new NewLinkFile($details));
94
-        }
95
-        catch(Exception $e)
94
+        } catch(Exception $e)
96 95
         {
97 96
             report($e);
98 97
         }
Please login to merge, or discard this patch.
app/Http/Controllers/TechTipsController.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -60,8 +60,7 @@  discard block
 block discarded – undo
60 60
                    $q->where('sys_id', $request->system);
61 61
                 })
62 62
                 ->get();
63
-        }
64
-        else
63
+        } else
65 64
         {
66 65
             $tipData = TechTips::where('subject', 'like', '%'.$request->tipSearch.'%')
67 66
                 ->get();
@@ -118,8 +117,7 @@  discard block
 block discarded – undo
118 117
                     'sys_id' => $tag
119 118
                 ]);
120 119
             }
121
-        }
122
-        else
120
+        } else
123 121
         {
124 122
             TechTipSystems::create([
125 123
                 'tip_id' => $tipID,
@@ -158,8 +156,7 @@  discard block
 block discarded – undo
158 156
         try
159 157
         {
160 158
             Mail::to($userList)->send(new newTechtip($tipData));
161
-        }
162
-        catch(Exception $e)
159
+        } catch(Exception $e)
163 160
         {
164 161
             report($e);
165 162
         }
@@ -285,8 +282,7 @@  discard block
 block discarded – undo
285 282
                     'sys_id' => $tag
286 283
                 ]);
287 284
             }
288
-        }
289
-        else
285
+        } else
290 286
         {
291 287
             TechTipSystems::create([
292 288
                 'tip_id' => $id,
@@ -308,8 +304,7 @@  discard block
 block discarded – undo
308 304
                         Files::deleteFile($file->file_id);
309 305
                     }
310 306
                 }
311
-            }
312
-            else
307
+            } else
313 308
             {
314 309
                 TechTipFiles::where('tip_id', $id)->delete();
315 310
             }
Please login to merge, or discard this patch.
app/Http/Controllers/UserController.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
             if($role->role_id == 1 && Auth::user()->role_id != 1)
44 44
             {
45 45
                 continue;
46
-            }
47
-            else
46
+            } else
48 47
             {
49 48
                 $roleArr[$role->role_id] = $role->name;
50 49
             }
@@ -94,8 +93,7 @@  discard block
 block discarded – undo
94 93
         try
95 94
         {
96 95
             Mail::to($request->email)->send(new InitializeUser($hash, $request->username, $request->first_name.' '.$request->last_name));
97
-        }
98
-        catch(Exception $e)
96
+        } catch(Exception $e)
99 97
         {
100 98
             report($e);
101 99
         }
@@ -203,8 +201,7 @@  discard block
 block discarded – undo
203 201
             if($role->role_id == 1 && Auth::user()->role_id != 1)
204 202
             {
205 203
                 continue;
206
-            }
207
-            else
204
+            } else
208 205
             {
209 206
                 $roleArr[$role->role_id] = $role->name;
210 207
             }
Please login to merge, or discard this patch.
app/Http/Controllers/InstallerController.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@  discard block
 block discarded – undo
40 40
                 {
41 41
                     $sysArr[$cat->name][] = $sys->name;
42 42
                 }
43
-            }
44
-            else
43
+            } else
45 44
             {
46 45
                 $sysArr[$cat->name] = null;
47 46
             }
@@ -126,8 +125,7 @@  discard block
 block discarded – undo
126 125
             Log::info('Test Email Successfully Sent to '.Auth::user()->email);
127 126
             Mail::to(Auth::user()->email)->send(new TestEmail());
128 127
             return 'success';
129
-        }
130
-        catch(Exception $e)
128
+        } catch(Exception $e)
131 129
         {
132 130
             Log::notice('Test Email Failed.  Message: '.$e);
133 131
             $msg = '['.$e->getCode().'] "'.$e->getMessage().'" on line '.$e->getTrace()[0]['line'].' of file '.$e->getTrace()[0]['file'];
@@ -190,8 +188,7 @@  discard block
 block discarded – undo
190 188
                 User::whereNotNull('password_expires')->update([
191 189
                     'password_expires' => null
192 190
                 ]);
193
-            }
194
-            else
191
+            } else
195 192
             {
196 193
                 $newExpire = Carbon::now()->addDays($request->passExpire);
197 194
                 User::whereNull('password_expires')->update([
@@ -262,8 +259,7 @@  discard block
 block discarded – undo
262 259
                         'name' => $field
263 260
                     ]);
264 261
                     $id = $newField->data_type_id;
265
-                }
266
-                else
262
+                } else
267 263
                 {
268 264
                     $id = $id->data_type_id;
269 265
                 }
@@ -352,8 +348,7 @@  discard block
 block discarded – undo
352 348
                             'name' => $field
353 349
                         ]);
354 350
                         $id = $newField->data_type_id;
355
-                    }
356
-                    else
351
+                    } else
357 352
                     {
358 353
                         $id = $id->data_type_id;
359 354
                     }
Please login to merge, or discard this patch.