diff --git a/app/Services/Grapher/Graph/CoreBundle.php b/app/Services/Grapher/Graph/CoreBundle.php index 7a2dd5752..a1d055852 100644 --- a/app/Services/Grapher/Graph/CoreBundle.php +++ b/app/Services/Grapher/Graph/CoreBundle.php @@ -174,7 +174,7 @@ public function authorise(): bool return false; } - if( !Auth::check() && is_numeric( config( 'grapher.access.trunk' ) ) && config( 'grapher.access.trunk' ) === User::AUTH_PUBLIC ) { + if( !Auth::check() && is_numeric( config( 'grapher.access.trunk' ) ) && (int)config( 'grapher.access.trunk' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/app/Services/Grapher/Graph/Customer.php b/app/Services/Grapher/Graph/Customer.php index 44b251a9e..4424a4d35 100644 --- a/app/Services/Grapher/Graph/Customer.php +++ b/app/Services/Grapher/Graph/Customer.php @@ -130,7 +130,7 @@ public static function authorisedForAllCustomers(): bool return true; } - if( !Auth::check() && is_numeric( config( 'grapher.access.customer' ) ) && config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { + if( !Auth::check() && is_numeric( config( 'grapher.access.customer' ) ) && (int)config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { return true; } @@ -153,7 +153,7 @@ public function authorise(): bool $us = Auth::getUser(); // NB: see above authorisedForAllCustomers() - if( is_numeric( config( 'grapher.access.customer' ) ) && config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { + if( is_numeric( config( 'grapher.access.customer' ) ) && (int)config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/app/Services/Grapher/Graph/Latency.php b/app/Services/Grapher/Graph/Latency.php index 95538799a..60effc535 100644 --- a/app/Services/Grapher/Graph/Latency.php +++ b/app/Services/Grapher/Graph/Latency.php @@ -241,7 +241,7 @@ public static function authorisedForAllCustomers(): bool return true; } - if( !Auth::check() && is_numeric( config( 'grapher.access.latency' ) ) && config( 'grapher.access.latency' ) === User::AUTH_PUBLIC ) { + if( !Auth::check() && is_numeric( config( 'grapher.access.latency' ) ) && (int)config( 'grapher.access.latency' ) === User::AUTH_PUBLIC ) { return true; } @@ -264,7 +264,7 @@ public function authorise(): bool $us = Auth::getUser(); // NB: see above authorisedForAllCustomers() - if( is_numeric( config( 'grapher.access.latency' ) ) && config( 'grapher.access.latency' ) === User::AUTH_PUBLIC ) { + if( is_numeric( config( 'grapher.access.latency' ) ) && (int)config( 'grapher.access.latency' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/app/Services/Grapher/Graph/P2p.php b/app/Services/Grapher/Graph/P2p.php index 5578682a2..6ad55488d 100644 --- a/app/Services/Grapher/Graph/P2p.php +++ b/app/Services/Grapher/Graph/P2p.php @@ -191,7 +191,7 @@ public function authorise(): bool $us = Auth::getUser(); // NB: see above authorisedForAllCustomers() - if( is_numeric( config( 'grapher.access.p2p' ) ) && config( 'grapher.access.p2p' ) === User::AUTH_PUBLIC ) { + if( is_numeric( config( 'grapher.access.p2p' ) ) && (int)config( 'grapher.access.p2p' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/app/Services/Grapher/Graph/PhysicalInterface.php b/app/Services/Grapher/Graph/PhysicalInterface.php index d256f3aaf..ee63e3031 100644 --- a/app/Services/Grapher/Graph/PhysicalInterface.php +++ b/app/Services/Grapher/Graph/PhysicalInterface.php @@ -139,7 +139,7 @@ public function authorise(): bool /** @var User $us */ $us = Auth::getUser(); - if( is_numeric( config( 'grapher.access.customer' ) ) && config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { + if( is_numeric( config( 'grapher.access.customer' ) ) && (int)config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/app/Services/Grapher/Graph/VirtualInterface.php b/app/Services/Grapher/Graph/VirtualInterface.php index 9443c3566..00270c5c2 100644 --- a/app/Services/Grapher/Graph/VirtualInterface.php +++ b/app/Services/Grapher/Graph/VirtualInterface.php @@ -139,7 +139,7 @@ public function authorise(): bool /** @var User $us */ $us = Auth::getUser(); - if( is_numeric( config( 'grapher.access.customer' ) ) && config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { + if( is_numeric( config( 'grapher.access.customer' ) ) && (int)config( 'grapher.access.customer' ) === User::AUTH_PUBLIC ) { return $this->allow(); } diff --git a/resources/views/layouts/menus/associate.foil.php b/resources/views/layouts/menus/associate.foil.php index 2fe320da4..09768c770 100644 --- a/resources/views/layouts/menus/associate.foil.php +++ b/resources/views/layouts/menus/associate.foil.php @@ -97,13 +97,13 @@ - + Facility Graphs - + Inter-Switch / PoP Graphs diff --git a/resources/views/layouts/menus/public.foil.php b/resources/views/layouts/menus/public.foil.php index 16081a765..9af16d709 100644 --- a/resources/views/layouts/menus/public.foil.php +++ b/resources/views/layouts/menus/public.foil.php @@ -55,31 +55,31 @@ Statistics