Completed
Pull Request — develop (#57)
by Tony
06:31
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/NotificationController.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@
 block discarded – undo
43 43
         }
44 44
 
45 45
         if ($action == 'read') {
46
-           $result = $notification->markRead($enable);
46
+            $result = $notification->markRead($enable);
47 47
         }
48 48
         elseif ($action == 'sticky') {
49
-           $result = $notification->markSticky(false);
49
+            $result = $notification->markSticky(false);
50 50
         }
51 51
 
52 52
         if ($result === false) {
Please login to merge, or discard this 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/Api/Controllers/APIController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
         $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version;
17 17
         $versions['php']       = phpversion();
18 18
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
19
-	if ($versions['db_driver'] == 'SQLITE') {
19
+    if ($versions['db_driver'] == 'SQLITE') {
20 20
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
21 21
         }
22 22
         else {
Please login to merge, or discard this 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/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/Http/Controllers/SettingsController.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Copyright (C) 2016 Tony Murray <[email protected]>
4
- * This program is free software: you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation, either version 3 of the License, or
7
- * (at your option) any later version.
8
- *
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
12
- * GNU General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU General Public License
15
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
- */
3
+     * Copyright (C) 2016 Tony Murray <[email protected]>
4
+     * This program is free software: you can redistribute it and/or modify
5
+     * it under the terms of the GNU General Public License as published by
6
+     * the Free Software Foundation, either version 3 of the License, or
7
+     * (at your option) any later version.
8
+     *
9
+     * This program is distributed in the hope that it will be useful,
10
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
12
+     * GNU General Public License for more details.
13
+     *
14
+     * You should have received a copy of the GNU General Public License
15
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
+     */
17 17
 
18 18
 namespace App\Http\Controllers;
19 19
 
Please login to merge, or discard this patch.
app/Settings/Settings.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * Settings.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * Settings.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Settings;
26 26
 
27 27
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     private static function recursive_keys(array $array, $prefix = "", array $path = array())
64 64
     {
65 65
         if ($prefix != "") {
66
-            $prefix = trim($prefix, '.') . '.';
66
+            $prefix = trim($prefix, '.').'.';
67 67
         }
68 68
         $result = array();
69 69
         foreach ($array as $key => $val) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                 $result = array_merge($result, self::recursive_keys($val, $prefix, $currentPath));
73 73
             }
74 74
             else {
75
-                $result[$prefix . join('.', $currentPath)] = $val;
75
+                $result[$prefix.join('.', $currentPath)] = $val;
76 76
             }
77 77
         }
78 78
         return $result;
@@ -81,18 +81,18 @@  discard block
 block discarded – undo
81 81
     public function get($key, $default = null)
82 82
     {
83 83
         // return value from cache or fetch it and return it
84
-        return Cache::remember($key, $this->cache_time, function () use ($key, $default) {
84
+        return Cache::remember($key, $this->cache_time, function() use ($key, $default) {
85 85
             $value = $this->database->get($key, $default);
86 86
 
87 87
             if (is_array($value)) {
88 88
                 $value = self::pathToArray($value, $key);
89
-                $config = Config::get('config.' . $key, $default);
89
+                $config = Config::get('config.'.$key, $default);
90 90
                 if (!is_null($config)) {
91 91
                     $value = array_replace_recursive($config, $value);
92 92
                 }
93 93
             }
94 94
             elseif (is_null($value)) {
95
-                return Config::get('config.' . $key);
95
+                return Config::get('config.'.$key);
96 96
             }
97 97
 
98 98
             return $value;
Please login to merge, or discard this patch.
app/Facades/Settings.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * Settings.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * Settings.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Settings;
26 26
 
27 27
 
Please login to merge, or discard this patch.
app/Settings/DatabaseRepository.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16
  */
17 17
 /**
18
- * DatabaseRepository.php
19
- *
20
- * @package    LibreNMS
21
- * @author     Tony Murray <[email protected]>
22
- * @copyright  2016 Tony Murray
23
- * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
- */
18
+     * DatabaseRepository.php
19
+     *
20
+     * @package    LibreNMS
21
+     * @author     Tony Murray <[email protected]>
22
+     * @copyright  2016 Tony Murray
23
+     * @license    @license http://opensource.org/licenses/GPL-3.0 GNU Public License v3 or later
24
+     */
25 25
 namespace App\Settings;
26 26
 
27 27
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
         elseif (count($results) == 1) {
47 47
             $entry = $results->first();
48
-            if($entry->config_name != $key) { //FIXME: better test
48
+            if ($entry->config_name != $key) { //FIXME: better test
49 49
                 // trim the prefix
50 50
                 $local_key = substr($entry->config_name, strlen($key) + 1);
51 51
                 return [$local_key => $entry->config_value];
Please login to merge, or discard this patch.