Completed
Pull Request — develop (#57)
by Tony
06:12
created
app/Providers/RouteServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      */
38 38
     public function map(Router $router)
39 39
     {
40
-        $router->group(['namespace' => $this->namespace], function ($router) {
40
+        $router->group(['namespace' => $this->namespace], function($router) {
41 41
             require app_path('Http/routes.php');
42 42
         });
43 43
     }
Please login to merge, or discard this patch.
app/Api/Controllers/DeviceController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
         }
68 68
         else {
69 69
             $user = User::find($request->user()->user_id);
70
-            $device =  $user->devices()->find($id);
70
+            $device = $user->devices()->find($id);
71 71
         }
72 72
         // morph the data as required
73 73
         if ($request->query('displayFormat') == 'link') {
Please login to merge, or discard this patch.
app/Api/Controllers/APIController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         $stats['ports']      = \App\Port::all()->count();
36 36
         $stats['syslog']     = \App\Syslog::all()->count();
37 37
         $stats['eventlog']   = \App\Eventlog::all()->count();
38
-        $stats['apps']       = DB::table('applications')->count();;
38
+        $stats['apps']       = DB::table('applications')->count(); ;
39 39
         $stats['services']   = DB::table('services')->count();
40 40
         $stats['storage']    = DB::table('storage')->count();
41 41
         $stats['diskio']     = DB::table('ucd_diskio')->count();
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
         $notification = Notification::find($id);
41 41
         $enable = strpos($action, 'un') === false;
42
-        if(!$enable) {
42
+        if (!$enable) {
43 43
             $action = substr($action, 2);
44 44
         }
45 45
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         $notification = new Notification;
69 69
         $notification->title    = $request->title;
70 70
         $notification->body     = $request->body;
71
-        $notification->checksum = hash('sha512',$request->user()->user_id.'.LOCAL.'.$request->title);
71
+        $notification->checksum = hash('sha512', $request->user()->user_id.'.LOCAL.'.$request->title);
72 72
         $notification->source   = $request->user()->user_id;
73 73
         if ($notification->save())
74 74
         {
Please login to merge, or discard this patch.
app/Models/Notification.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 
71 71
     public function scopeLimit($query)
72 72
     {
73
-        return $query->select('notifications.*','key', 'users.username');
73
+        return $query->select('notifications.*', 'key', 'users.username');
74 74
     }
75 75
 
76 76
     public function scopeSource($query)
Please login to merge, or discard this patch.
app/Models/DbConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 
50 50
     public function scopeKey($query, $key)
51 51
     {
52
-        return $query->where('config_name', 'LIKE', $key . '%');
52
+        return $query->where('config_name', 'LIKE', $key.'%');
53 53
     }
54 54
 
55 55
     public function scopeExactKey($query, $key)
Please login to merge, or discard this patch.
app/Settings/Settings.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 use Cache;
30 30
 use Config;
31 31
 use DB;
32
-use Illuminate\Contracts\Config\Repository as ConfigContract;  // adds the possibility to replace the default Config facade
32
+use Illuminate\Contracts\Config\Repository as ConfigContract; // adds the possibility to replace the default Config facade
33 33
 
34 34
 class Settings implements ConfigContract
35 35
 {
@@ -62,18 +62,18 @@  discard block
 block discarded – undo
62 62
     public function get($key, $default = null)
63 63
     {
64 64
         // return value from cache or fetch it and return it
65
-        return Cache::remember($key, $this->cache_time, function () use ($key, $default) {
65
+        return Cache::remember($key, $this->cache_time, function() use ($key, $default) {
66 66
             $value = $this->database->get($key, $default);
67 67
 
68 68
             if (is_array($value)) {
69 69
                 $value = self::pathToArray($value, $key);
70
-                $config = Config::get('config.' . $key, $default);
70
+                $config = Config::get('config.'.$key, $default);
71 71
                 if (!is_null($config)) {
72 72
                     $value = array_replace_recursive($config, $value);
73 73
                 }
74 74
             }
75 75
             elseif (is_null($value)) {
76
-                return Config::get('config.' . $key);
76
+                return Config::get('config.'.$key);
77 77
             }
78 78
 
79 79
             return $value;
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     private static function recursive_keys(array $array, $prefix = "", array $path = array())
151 151
     {
152 152
         if ($prefix != "") {
153
-            $prefix = trim($prefix, '.') . '.';
153
+            $prefix = trim($prefix, '.').'.';
154 154
         }
155 155
         $result = array();
156 156
         foreach ($array as $key => $val) {
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
160 160
             }
161 161
             else {
162
-                $result[$prefix . join('.', $currentPath)] = $val;
162
+                $result[$prefix.join('.', $currentPath)] = $val;
163 163
             }
164 164
         }
165 165
         return $result;
Please login to merge, or discard this patch.