From 5c5b94e83a11a700b09694af34b1f3e84555ceb5 Mon Sep 17 00:00:00 2001
From: danpros <dan@danpros.com>
Date: Fri, 19 Feb 2021 15:03:50 +0700
Subject: [PATCH] Always add slash

---
 system/admin/views/menu.html.php | 2 +-
 system/includes/functions.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/admin/views/menu.html.php b/system/admin/views/menu.html.php
index 1a98ae6..211da36 100644
--- a/system/admin/views/menu.html.php
+++ b/system/admin/views/menu.html.php
@@ -19,7 +19,7 @@ function parseMenus($menus) {
 }
 
 function parseMenu($menu) {
-	$li = '<li class="dd-item" data-class="'. $menu->class .'" data-id="'. $menu->id .'" data-name="'.$menu->name.'" data-slug="'.$menu->slug.'">';
+	$li = '<li class="dd-item" data-class="'. $menu->class .'" data-id="'. $menu->id .'" data-name="'.$menu->name.'" data-slug="'.htmlspecialchars($menu->slug, FILTER_SANITIZE_URL).'">';
 	$li .= '<div class="dd-handle">'.$menu->name.'</div>';
 	$li .= '<span class="button-delete btn btn-danger btn-xs" data-owner-id="'.$menu->id.'">Delete</span>';
 	$li .= '<span class="button-edit btn btn-primary btn-xs" data-owner-id="'.$menu->id.'">Edit</span>';
diff --git a/system/includes/functions.php b/system/includes/functions.php
index bc9cbeb..5271665 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -2021,7 +2021,7 @@ function parseNode($node, $child = null) {
 			}
 		}
 		
-		$li .= '<a href="'.$node->slug.'">'.$node->name.'</a>';
+		$li .= '<a href="'.htmlspecialchars(rtrim($node->slug, '/') . '/', FILTER_SANITIZE_URL).'">'.$node->name.'</a>';
 		if (isset($node->children)) { 
 			$li .= parseNodes($node->children, true, null);
 		}
@@ -2047,7 +2047,7 @@ function parseNode($node, $child = null) {
 			}
 		}
 		
-		$li .= '<a class="dropdown-toggle" data-toggle="dropdown" href="'.$node->slug.'">'.$node->name.'<b class="caret"></b></a>';
+		$li .= '<a class="dropdown-toggle" data-toggle="dropdown" href="'.htmlspecialchars(rtrim($node->slug, '/') . '/', FILTER_SANITIZE_URL).'">'.$node->name.'<b class="caret"></b></a>';
 		if (isset($node->children)) { 
 			$li .= parseNodes($node->children, true, null);
 		}