Completed
Pull Request — develop (#57)
by Tony
12:28 queued 04:26
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/Console/Commands/AddUser.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         // set username
50 50
         $user->username = $this->argument('username');
51 51
         if (User::where('username', $user->username)->exists()) {
52
-            $this->error('User ' . $user->username . ' exists.');
52
+            $this->error('User '.$user->username.' exists.');
53 53
             return;
54 54
         }
55 55
 
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 
89 89
         // save user
90 90
         if ($user->save()) {
91
-            $this->info('User ' . $user->username . ' created.');
91
+            $this->info('User '.$user->username.' created.');
92 92
         }
93 93
         else {
94
-            $this->error('Failed to create user ' . $user->username);
94
+            $this->error('Failed to create user '.$user->username);
95 95
         }
96 96
     }
97 97
 }
Please login to merge, or discard this patch.
app/Settings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     private static function recursive_keys(array $array, $prefix = "", array $path = array())
100 100
     {
101 101
         if ($prefix != "") {
102
-            $prefix = trim($prefix, '.') . '.';
102
+            $prefix = trim($prefix, '.').'.';
103 103
         }
104 104
         $result = array();
105 105
         foreach ($array as $key => $val) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
109 109
             }
110 110
             else {
111
-                $result[$prefix . join('.', $currentPath)] = $val;
111
+                $result[$prefix.join('.', $currentPath)] = $val;
112 112
             }
113 113
         }
114 114
         return $result;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     public function get($key, $default = null)
125 125
     {
126 126
         // return value from cache or fetch it and return it
127
-        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function () use ($key, $default) {
127
+        return Cache::tags(self::$cache_tag)->remember($key, $this->cache_time, function() use ($key, $default) {
128 128
             $db_data = DbConfig::key($key)->get(['config_name', 'config_value']);
129 129
 
130 130
             if (count($db_data) == 1 && $db_data->first()->config_name == $key) {
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
             elseif (count($db_data) >= 1) {
135 135
                 // convert collection to an array and merge with the config fallback
136 136
                 $result = self::collectionToArray($db_data, $key);
137
-                $config = Config::get('config.' . $key, $default);
137
+                $config = Config::get('config.'.$key, $default);
138 138
                 if (!is_null($config) && is_array($config)) {
139 139
                     $result = array_replace_recursive($config, $result);
140 140
                 }
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             }
143 143
             else {
144 144
                 // fallback to the config or return the default value
145
-                return Config::get('config.' . $key, $default);
145
+                return Config::get('config.'.$key, $default);
146 146
             }
147 147
 
148 148
         });
Please login to merge, or discard this patch.