@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\User; |
| 6 | 6 | use App\Device; |
| 7 | -use App\Port; |
|
| 8 | 7 | use Illuminate\Http\Request; |
| 9 | 8 | |
| 10 | 9 | class DeviceController extends Controller |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | if ($request->query('displayFormat') == 'human') { |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - return $devices; |
|
| 34 | + return $devices; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -19,8 +19,7 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -19,8 +19,7 @@ discard block |
||
| 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 |
||
| 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 | } |
@@ -45,13 +45,13 @@ |
||
| 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 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | // TODO: move to a common file |
| 46 | 46 | // base = 1024 for bits, 1000 for mibibits |
| 47 | - function formatBps($bits, $precision = 2, $base=1000) { |
|
| 47 | + function formatBps($bits, $precision = 2, $base = 1000) { |
|
| 48 | 48 | $units = array('bps', 'Kbps', 'Mbps', 'Gbps', 'Tbps'); |
| 49 | 49 | |
| 50 | 50 | $bits = max($bits, 0); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $bits /= pow($base, $pow); |
| 55 | 55 | |
| 56 | - return round($bits, $precision) . ' ' . $units[$pow]; |
|
| 56 | + return round($bits, $precision).' '.$units[$pow]; |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // ---- Define Reletionships ---- |