Fixes from live

inex · Aug 20, 2020 · 01a63a5 · 01a63a5
1 parent 263392b
commit 01a63a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/Http/Middleware/Services/LookingGlass.php b/app/Http/Middleware/Services/LookingGlass.php
@@ -104,7 +104,7 @@ public function handle($request, Closure $next )
             $router = D2EM::getRepository( RouterEntity::class )->findOneBy( [ 'handle' => $request->handle ] );
 
             if( !$router || !$router->hasApi() ) {
-                AlertContainer::push( "Handle not found", Alert::DANGER );
+                AlertContainer::push( "No router with the provided handle was found", Alert::DANGER );
                 return redirect( route( 'lg::index' ) );
             }
         } catch( RouterException $e ) {
@@ -118,8 +118,7 @@ public function handle($request, Closure $next )
         }
 
         if( ( $request->net || $request->mask ) && !$this->validateNetworkRoute( $request ) ) {
-            AlertContainer::push( "Invalid network prefix", Alert::DANGER );
-            return redirect( route( 'lg::bgp-sum', [ 'handle' => $request->handle ] ) );
+            abort(404);
         }
 
         // let's authorise for access (this throws an exception)

diff --git a/resources/views/services/lg/bgp-summary.foil.php b/resources/views/services/lg/bgp-summary.foil.php
@@ -52,7 +52,7 @@
                         <?=$p->neighbor_address?>
                     </td>
                     <td class="pr-4">
-                        <?= $t->ee( $p->description_short ) ?? $t->ee( $p->description ) ?? "" ?>
+                        <?= ( $p->description_short ?? false ) ? $t->ee( $p->description_short ) : $t->ee( $p->description ?? "" ) ?>
                     </td>
                     <td class="text-right pr-4" data-order="<?= $p->neighbor_as ?>">
                         <?= $t->asNumber( $p->neighbor_as, false ) ?>