Completed
Pull Request — develop (#28)
by Neil
07:35
created
app/Api/Controllers/DeviceController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
         if ($request->query('displayFormat') == 'human') {
32 32
         }
33 33
 
34
-       return $devices;
34
+        return $devices;
35 35
     }
36 36
 
37 37
     /**
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Api/Controllers/PortController.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,7 @@  discard block
 block discarded – undo
19 19
     public function list_devices(Request $request) {
20 20
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
21 21
             return Device::all();
22
-        }
23
-        else {
22
+        } else {
24 23
             return User::find($request->user()->user_id)->devices()->get();
25 24
         }
26 25
     }
@@ -31,8 +30,7 @@  discard block
 block discarded – undo
31 30
     public function list_ports(Request $request) {
32 31
         if ($request->user()->level >= 10 || $request->user()->level == 5) {
33 32
             return Port::all();
34
-        }
35
-        else {
33
+        } else {
36 34
             return User::find($request->user()->user_id)->ports()->get();
37 35
         }
38 36
     }
Please login to merge, or discard this patch.
app/Port.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@
 block discarded – undo
45 45
     // TODO: move to a common file
46 46
     // base = 1024 for bits, 1000 for mibibits
47 47
     function formatBps($bits, $precision = 2, $base=1000) {
48
-       $units = array('bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps');
48
+        $units = array('bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps');
49 49
 
50
-       $bits = max($bits, 0);
51
-       $pow = floor(($bits ? log($bits) : 0) / log($base));
52
-       $pow = min($pow, count($units) - 1);
50
+        $bits = max($bits, 0);
51
+        $pow = floor(($bits ? log($bits) : 0) / log($base));
52
+        $pow = min($pow, count($units) - 1);
53 53
 
54
-       $bits /= pow($base, $pow);
54
+        $bits /= pow($base, $pow);
55 55
 
56 56
         return round($bits, $precision) . ' ' . $units[$pow];
57 57
     }
Please login to merge, or discard this patch.
app/Api/Controllers/APIController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 class ApiController extends Controller
12 12
 {
13 13
     /**
14
-    * Get info about the install
15
-    */
14
+     * Get info about the install
15
+     */
16 16
     public function get_info()
17 17
     {
18 18
         $versions['git'] = `git rev-parse --short HEAD`;
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
     /**
30 30
      * Get statistics about the install
31
-    **/
31
+     **/
32 32
     public function get_stats()
33 33
     {
34 34
         $stats['devices']    = DB::select('SELECT COUNT(device_id) AS `total` FROM `devices`')[0]->total;
Please login to merge, or discard this patch.