From 20d2adb6f291b8ace71e8a89ed181f73fd78d3ee Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Sun, 13 Oct 2019 20:45:59 -0400
Subject: app/model/Navigation: Return boolean on checks Remove CSS class
 dependency

---
 app/model/Navigation.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'app/model')

diff --git a/app/model/Navigation.php b/app/model/Navigation.php
index 1a6b88a..d32546b 100644
--- a/app/model/Navigation.php
+++ b/app/model/Navigation.php
@@ -4,27 +4,16 @@ class Navigation
 {
     public function requestContains($route)
     {
-        if (strpos($_SERVER['REQUEST_URI'], $route) !== false) {
-            return true;
-        }
-        return false;
+        return (bool) (strpos($_SERVER['REQUEST_URI'], $route) !== false);
     }
 
     public function isActiveHome()
     {
-        if (strlen(strtok($_SERVER['REQUEST_URI'], '?')) === 1) {
-            return 'navbar__active ';
-        }
-        return;
+        return (bool) (strlen(strtok($_SERVER['REQUEST_URI'], '?')) === 1);
     }
 
     public function isActive($route)
     {
-        if ($_SERVER['REQUEST_URI'] === $route
-            || $this->requestContains($route)
-        ) {
-            return 'navbar__active ';
-        }
-        return;
+        return (bool) ($_SERVER['REQUEST_URI'] === $route || $this->requestContains($route));
     }
 }
-- 
cgit v1.2.3