From 7ab6ce366bbef526d8dfd31327a4a5d2d2147f7b Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 14:37:53 +0700
Subject: [PATCH 1/6] fix: clean code

---
 admin/controllers/home/logout.php                |  4 ++--
 admin/models/users.php                           |  6 +++---
 content/controllers/cart/delete.php              |  5 +++--
 content/controllers/cart/order.php               |  2 +-
 .../forgot-password/change-password.php          |  7 ++++---
 content/controllers/page/index.php               |  7 ++++---
 content/controllers/post/index.php               |  6 +++---
 content/controllers/product/index.php            |  7 ++++---
 content/controllers/shop/index.php               | 13 +++++++------
 content/controllers/type/index.php               |  8 ++++----
 content/views/cart/order.php                     |  6 +++---
 content/views/feedback/index.php                 |  6 +++---
 content/views/product/index.php                  | 16 ++++++++--------
 content/views/shared/header.php                  | 16 ++++++++--------
 lib/functions.php                                |  8 ++++----
 15 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/admin/controllers/home/logout.php b/admin/controllers/home/logout.php
index 680ad5b..adc1691 100644
--- a/admin/controllers/home/logout.php
+++ b/admin/controllers/home/logout.php
@@ -4,12 +4,12 @@
 
 global $userNav;
 
-$user_login = getRecord('users', $userNav);
+$userLogin = getRecord('users', $userNav);
 
 unset($_SESSION['user']);
 cartDestroy();
 
-if ($user_login['role_id'] == 0) {
+if ($userLogin['role_id'] == 0) {
     header('location:index.php');
 } else {
     header('location:admin.php');
diff --git a/admin/models/users.php b/admin/models/users.php
index 55595eb..dc54302 100644
--- a/admin/models/users.php
+++ b/admin/models/users.php
@@ -116,17 +116,17 @@ function changePassword($id, $newpassword, $currentPassword)
 function user_update()
 {
     global $userNav;
-    $user_login = getRecord('users', $userNav);
+    $userLogin = getRecord('users', $userNav);
     if ($_POST['user_id'] <> 0) {
         $editTime = gmdate('Y-m-d H:i:s', time() + 7 * 3600);
     } else {
         $editTime = '0000-00-00 00:00:00';
     }
 
-    if (isset($_POST['roleid']) && $user_login['role_id'] == 1) {
+    if (isset($_POST['roleid']) && $userLogin['role_id'] == 1) {
         $roleid = $_POST['roleid'];
     } else {
-        $roleid = $user_login['role_id'];
+        $roleid = $userLogin['role_id'];
     }
 
     $user_edit = [
diff --git a/content/controllers/cart/delete.php b/content/controllers/cart/delete.php
index b106cc2..4e5dc64 100644
--- a/content/controllers/cart/delete.php
+++ b/content/controllers/cart/delete.php
@@ -1,8 +1,9 @@
 <?php
 
-if (isset($_GET['id'])) {
-    $productId = intval($_GET['id']);
+if (!isset($_GET['id'])) {
+    show404NotFound();
 }
+$productId = intval($_GET['id']);
 cart_delete($productId);
 global $userNav;
 if (isset($userNav)) {
diff --git a/content/controllers/cart/order.php b/content/controllers/cart/order.php
index 66b484f..636c928 100644
--- a/content/controllers/cart/order.php
+++ b/content/controllers/cart/order.php
@@ -7,7 +7,7 @@
 }
 global $userNav;
 if (isset($userNav)) {
-    $user_login = getRecord('users', $userNav);
+    $userLogin = getRecord('users', $userNav);
 }
 //load view
 require('content/views/cart/order.php');
diff --git a/content/controllers/forgot-password/change-password.php b/content/controllers/forgot-password/change-password.php
index 640d7ef..74976b5 100644
--- a/content/controllers/forgot-password/change-password.php
+++ b/content/controllers/forgot-password/change-password.php
@@ -1,8 +1,9 @@
 <?php
 
-if (isset($_GET['id'])) {
-    $userId = $_GET['id'];
+if (!isset($_GET['id'])) {
+    show404NotFound();
 }
-$user_info = getRecord('users', $userId);
+
+$user_info = getRecord('users', intval($_GET['id']));
 $title = 'Change Password - Forgot Password';
 require('content/views/forgot-password/change-password.php');
diff --git a/content/controllers/page/index.php b/content/controllers/page/index.php
index 9dabe8e..6ba9326 100644
--- a/content/controllers/page/index.php
+++ b/content/controllers/page/index.php
@@ -1,11 +1,12 @@
 <?php
 
 require_once('content/models/posts.php');
-if (isset($_GET['id'])) {
-    $postId = intval($_GET['id']);
-} else {
+
+if (!isset($_GET['id'])) {
     show404NotFound();
 }
+
+$postId = intval($_GET['id']);
 $page = getRecord('posts', $postId);
 $user = getRecord('users', $page['post_author']);
 if (!$page || $page['post_status'] <> 'Publiced') {
diff --git a/content/controllers/post/index.php b/content/controllers/post/index.php
index 46fab1f..dde0e18 100644
--- a/content/controllers/post/index.php
+++ b/content/controllers/post/index.php
@@ -1,11 +1,11 @@
 <?php
 
 require_once('content/models/posts.php');
-if (isset($_GET['id'])) {
-    $postId = intval($_GET['id']);
-} else {
+if (!isset($_GET['id'])) {
     show404NotFound();
 }
+
+$postId = intval($_GET['id']);
 $post = getRecord('posts', $postId);
 $user = getRecord('users', $post['post_author']);
 if (!$post || $post['post_status'] <> 'Publiced') {
diff --git a/content/controllers/product/index.php b/content/controllers/product/index.php
index 7323221..8b0f195 100644
--- a/content/controllers/product/index.php
+++ b/content/controllers/product/index.php
@@ -1,11 +1,12 @@
 <?php
 
 require_once('content/models/products.php');
-if (isset($_GET['id'])) {
-    $productId = intval($_GET['id']);
-} else {
+
+if (!isset($_GET['id'])) {
     show404NotFound();
 }
+
+$productId = intval($_GET['id']);
 $product = getRecord('products', $productId);
 
 if (!$product) {
diff --git a/content/controllers/shop/index.php b/content/controllers/shop/index.php
index 4d8c468..b882bf8 100644
--- a/content/controllers/shop/index.php
+++ b/content/controllers/shop/index.php
@@ -1,11 +1,12 @@
 <?php
 
-if (isset($_GET['id'])) {
-    $shop_id = intval($_GET['id']);
-} else {
+if (!isset($_GET['id'])) {
     show404NotFound();
 }
-$category = getRecord('categories', $shop_id);
+
+$shopId = intval($_GET['id']);
+
+$category = getRecord('categories', $shopId);
 if (!$category) {
     show404NotFound();
 }
@@ -25,13 +26,13 @@
 $offset = ($page - 1) * $limit;
 
 $options = [
-    'where' => 'category_id=' . $shop_id,
+    'where' => 'category_id=' . $shopId,
     'limit' => $limit,
     'offset' => $offset,
     'order_by' => 'id DESC',
 ];
 
-$url = 'shop/' . $shop_id . '-' . $category['slug'];
+$url = 'shop/' . $shopId . '-' . $category['slug'];
 $totalRows = getTotal('products', $options);
 $total = ceil($totalRows / $limit);
 
diff --git a/content/controllers/type/index.php b/content/controllers/type/index.php
index ca599e9..0c0f908 100644
--- a/content/controllers/type/index.php
+++ b/content/controllers/type/index.php
@@ -1,11 +1,11 @@
 <?php
 
 if (isset($_GET['id'])) {
-    $type_id = intval($_GET['id']);
+    $typeId = intval($_GET['id']);
 } else {
     show404NotFound();
 }
-$type = getRecord('types', $type_id);
+$type = getRecord('types', $typeId);
 if (!$type) {
     show404NotFound();
 }
@@ -20,12 +20,12 @@
 $offset = ($page - 1) * $limit;
 
 $options = [
-    'where' => 'product_typeid=' . $type_id,
+    'where' => 'product_typeid=' . $typeId,
     'limit' => $limit,
     'offset' => $offset,
     'order_by' => 'id DESC',
 ];
-$url = 'type/' . $type_id . '-' . $type['slug'];
+$url = 'type/' . $typeId . '-' . $type['slug'];
 $totalRows = getTotal('products', $options);
 $total = ceil($totalRows / $limit);
 $products = getAll('products', $options);
diff --git a/content/views/cart/order.php b/content/views/cart/order.php
index da519e6..2c71468 100644
--- a/content/views/cart/order.php
+++ b/content/views/cart/order.php
@@ -174,7 +174,7 @@
                                             <div class="form-group">
                                                 <div class="col-md-12">
                                                     <label><strong>Họ & Tên</strong></label>
-                                                    <input type="text" name="name" value="<?= $user_login['user_name'] ?>" class="form-control" required="required" placeholder="Nhập họ và tên thật ...">
+                                                    <input type="text" name="name" value="<?= $userLogin['user_name'] ?>" class="form-control" required="required" placeholder="Nhập họ và tên thật ...">
                                                 </div>
                                             </div>
                                         </div>
@@ -186,7 +186,7 @@
                                                 </div>
                                                 <div class="col-md-6">
                                                     <label><strong>SĐT để liên lạc</strong></label>
-                                                    <input type="text" value="<?= $user_login['user_phone'] ?>" name="phone" required="required" class="form-control">
+                                                    <input type="text" value="<?= $userLogin['user_phone'] ?>" name="phone" required="required" class="form-control">
                                                 </div>
                                             </div>
                                         </div>
@@ -194,7 +194,7 @@
                                             <div class="form-group">
                                                 <div class="col-md-12">
                                                     <label><strong>Địa chỉ </strong></label>
-                                                    <input type="text" name="address" value="<?= $user_login['user_address'] ?>" required="required" class="form-control" placeholder="Mong các bạn nhập chi tiết địa chỉ ạ...">
+                                                    <input type="text" name="address" value="<?= $userLogin['user_address'] ?>" required="required" class="form-control" placeholder="Mong các bạn nhập chi tiết địa chỉ ạ...">
                                                 </div>
                                             </div>
                                         </div>
diff --git a/content/views/feedback/index.php b/content/views/feedback/index.php
index d3e285b..4097ae2 100644
--- a/content/views/feedback/index.php
+++ b/content/views/feedback/index.php
@@ -57,9 +57,9 @@
                                     <?php else : ?>
                                         <h3>Bạn sẽ gửi phản hồi với tư cách là người dùng: <a href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>"><b><?= $user_action['user_name'] ?></b></a></h3>
                                         <input type="hidden" class="form-control" name="user_id" value="<?= $userNav ?>">
-                                        <input type="hidden" name="name" value="<?= $user_login['user_name'] ?>" class="form-control">
-                                        <input type="hidden" name="email" value="<?= $user_login['user_email'] ?>" class="form-control">
-                                        <input type="hidden" value="<?= $user_login['user_phone'] ?>" name="phone" class="form-control">
+                                        <input type="hidden" name="name" value="<?= $userLogin['user_name'] ?>" class="form-control">
+                                        <input type="hidden" name="email" value="<?= $userLogin['user_email'] ?>" class="form-control">
+                                        <input type="hidden" value="<?= $userLogin['user_phone'] ?>" name="phone" class="form-control">
                                     <?php endif; ?>
                                     <div class="row">
                                         <div class="form-group">
diff --git a/content/views/product/index.php b/content/views/product/index.php
index 3c9a1be..8217bd5 100644
--- a/content/views/product/index.php
+++ b/content/views/product/index.php
@@ -194,16 +194,16 @@ class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button>
                                                             </div>
                                                         </div>
                                                     <?php else : ?>
-                                                        <input name="author" type="hidden" value="<?= $user_login['user_name'] ?>">
-                                                        <input name="email" type="hidden" value="<?= $user_login['user_email'] ?>">
-                                                        <input name="link_image" type="hidden" value="<?= $user_login['user_avatar'] ?>">
+                                                        <input name="author" type="hidden" value="<?= $userLogin['user_name'] ?>">
+                                                        <input name="email" type="hidden" value="<?= $userLogin['user_email'] ?>">
+                                                        <input name="link_image" type="hidden" value="<?= $userLogin['user_avatar'] ?>">
                                                     <?php endif; ?>
                                                 </div>
                                                 <div class="row">
                                                     <div class="form-group">
                                                         <div class="col-md-12">
                                                             <?php if (isset($userNav)) : ?>
-                                                                <label>Bạn đang đăng nhập với tài khoản <strong><?= $user_login['user_name'] ?></strong>. Bạn muốn <a href="admin.php?controller=home&action=logout">đăng xuất</a> ?</label>
+                                                                <label>Bạn đang đăng nhập với tài khoản <strong><?= $userLogin['user_name'] ?></strong>. Bạn muốn <a href="admin.php?controller=home&action=logout">đăng xuất</a> ?</label>
                                                             <?php else : ?>
                                                                 <label>Bạn có muốn <strong><a href="admin.php?controller=home&action=login">đăng nhập</a></strong> để bình luận bằng tài khoản của bạn.!</label>
                                                             <?php endif; ?>
@@ -243,11 +243,11 @@ class="form-control" name="author" id="author"
                                                     </div>
                                                 <?php else : ?>
                                                     <input name="author" type="hidden" id="author"
-                                                        value="<?= $user_login['user_name'] ?>">
+                                                        value="<?= $userLogin['user_name'] ?>">
                                                     <input name="email" type="hidden" id="email"
-                                                        value="<?= $user_login['user_email'] ?>">
+                                                        value="<?= $userLogin['user_email'] ?>">
                                                     <input name="link_image" type="hidden" id="link_image"
-                                                        value="<?= $user_login['user_avatar'] ?>">
+                                                        value="<?= $userLogin['user_avatar'] ?>">
                                                 <?php endif; ?>
                                             </div>
                                             <div class="row">
@@ -255,7 +255,7 @@ class="form-control" name="author" id="author"
                                                     <div class="col-md-12">
                                                         <?php if (isset($userNav)) : ?>
                                                             <label>Bạn đang đăng nhập với tài khoản
-                                                                <strong><?= $user_login['user_name'] ?></strong>. Bạn muốn
+                                                                <strong><?= $userLogin['user_name'] ?></strong>. Bạn muốn
                                                                 <a href="admin.php?controller=home&action=logout">đăng
                                                                     xuất</a>
                                                                 ?</label>
diff --git a/content/views/shared/header.php b/content/views/shared/header.php
index 46224b0..62932dd 100644
--- a/content/views/shared/header.php
+++ b/content/views/shared/header.php
@@ -31,7 +31,7 @@
 ];
 $menu_footers = getAll('menu_footers', $options_menu_footer);
 global $userNav;
-$user_login = getRecord('users', $userNav);
+$userLogin = getRecord('users', $userNav);
 
 if (isset($image_product)) {
     $link_image = $image_product;
@@ -121,7 +121,7 @@
 						<li>
 							<a href="<?= $contactUrl ?>"><i class="fa fa-headphones"></i>Liên hệ</a>
 						</li>
-						<?php if (!isset($user_login)) : ?>
+						<?php if (!isset($userLogin)) : ?>
 							<li>
 								<a href="register.php"><strong><i class="fa fa-sign-in"></i>Đăng ký</strong></a>
 							</li>
@@ -288,11 +288,11 @@
 							<?php else : ?>
 								<li class="dropdown mega-menu-item mega-menu-signin signin logged" id="headerAccount">
 									<a class="dropdown-toggle" href="admin.php">
-										<?php if (!isset($user_login['user_avatar'])) {
+										<?php if (!isset($userLogin['user_avatar'])) {
 										    echo '<i class="fa fa-user"></i>';
 										} else {
-										    echo '<img style="max-width: 25px;  border-radius: 15px 15px 15px 15px;" src="public/upload/images/' . $user_login['user_avatar'] . '" alt="' . $user_login['user_name'] . '">';
-										} ?> <?= $user_login['user_username'] ?>
+										    echo '<img style="max-width: 25px;  border-radius: 15px 15px 15px 15px;" src="public/upload/images/' . $userLogin['user_avatar'] . '" alt="' . $userLogin['user_name'] . '">';
+										} ?> <?= $userLogin['user_username'] ?>
 										<i class="fa fa-angle-down"></i>
 									</a>
 									<ul class="dropdown-menu">
@@ -302,11 +302,11 @@
 													<div class="col-md-6">
 														<div class="user-avatar">
 															<div class="img-thumbnail">
-																<img src="public/upload/images/<?= $user_login['user_avatar'] ?>" alt="<?= $user_login['user_name'] ?>">
+																<img src="public/upload/images/<?= $userLogin['user_avatar'] ?>" alt="<?= $userLogin['user_name'] ?>">
 															</div>
-															<p><strong><?= $user_login['user_name'] ?></strong><span><?php if ($user_login['role_id'] == 0) {
+															<p><strong><?= $userLogin['user_name'] ?></strong><span><?php if ($userLogin['role_id'] == 0) {
 															    echo 'Khách hàng';
-															} elseif ($user_login['role_id'] == 1) {
+															} elseif ($userLogin['role_id'] == 1) {
 															    echo 'Admin';
 															} else {
 															    echo 'Moderator';
diff --git a/lib/functions.php b/lib/functions.php
index 69d904f..013f42f 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -157,8 +157,8 @@ function upload($field, $config = [])
 function permission_user(): void
 {
     global $userNav;
-    $user_login = getRecord('users', $userNav);
-    if ($user_login['role_id'] == 0) {
+    $userLogin = getRecord('users', $userNav);
+    if ($userLogin['role_id'] == 0) {
         header('location:index.php');
         exit;
     }
@@ -170,8 +170,8 @@ function permission_user(): void
 function permission_moderator(): void
 {
     global $userNav;
-    $user_login = getRecord('users', $userNav);
-    if ($user_login['role_id'] == 2) {
+    $userLogin = getRecord('users', $userNav);
+    if ($userLogin['role_id'] == 2) {
         header('location:admin.php');
         exit;
     }

From aa65b23158b415018b6c4dd6e57c996145a96b00 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 15:38:08 +0700
Subject: [PATCH 2/6] fix: clean code

---
 admin/controllers/feedback/add.php            |  2 +-
 admin/views/feedback/add.php                  |  6 ++--
 content/controllers/feedback/index.php        |  2 +-
 .../controllers/forgot-password/request.php   |  4 +--
 .../forgot-password/resultcode.php            | 12 +++----
 content/controllers/home/index.php            |  6 ++--
 content/controllers/product/all.php           |  2 +-
 content/controllers/register/activate.php     | 10 +++---
 content/controllers/register/reactivate.php   |  8 ++---
 content/controllers/register/resend.php       |  8 ++---
 content/views/cart/list.php                   |  6 ++++
 content/views/cart/order.php                  | 10 +++++-
 content/views/category/index.php              | 11 ++++++-
 content/views/feedback/index.php              | 12 +++++--
 .../views/forgot-password/change-password.php |  8 +++--
 content/views/forgot-password/index.php       |  4 +--
 content/views/home/hotproduct.php             | 32 +++++++++----------
 content/views/home/newproduct.php             | 32 +++++++++----------
 content/views/home/saleproduct.php            | 32 +++++++++----------
 content/views/page/index.php                  |  9 +++++-
 content/views/post/index.php                  |  9 +++++-
 content/views/product/all.php                 | 12 +++++--
 content/views/search/index.php                | 10 +++++-
 content/views/shop/index.php                  | 12 ++++++-
 content/views/type/index.php                  | 11 ++++++-
 25 files changed, 176 insertions(+), 94 deletions(-)

diff --git a/admin/controllers/feedback/add.php b/admin/controllers/feedback/add.php
index c75a19e..e24b5cb 100644
--- a/admin/controllers/feedback/add.php
+++ b/admin/controllers/feedback/add.php
@@ -20,7 +20,7 @@
 $orderDetail = orderDetail($orderId);
 
 if (isset($userNav)) {
-    $user_action = getRecord('users', $userNav);
+    $userAction = getRecord('users', $userNav);
 }
 
 $status = [
diff --git a/admin/views/feedback/add.php b/admin/views/feedback/add.php
index e41755a..b70234b 100644
--- a/admin/views/feedback/add.php
+++ b/admin/views/feedback/add.php
@@ -110,9 +110,9 @@
                         <form action="admin.php?controller=feedback&action=add&order_id=<?= $order['id'] ?>" method="post">
                             <input type="hidden" name="feedback_id" value="0">
                             <input type="hidden" class="form-control" name="user_id" value="<?= $userNav ?>">
-                            <input type="hidden" name="name" value="<?= $user_action['user_name'] ?>" class="form-control">
-                            <input type="hidden" name="email" value="<?= $user_action['user_email'] ?>" class="form-control">
-                            <input type="hidden" value="<?= $user_action['user_phone'] ?>" name="phone" class="form-control">
+                            <input type="hidden" name="name" value="<?= $userAction['user_name'] ?>" class="form-control">
+                            <input type="hidden" name="email" value="<?= $userAction['user_email'] ?>" class="form-control">
+                            <input type="hidden" value="<?= $userAction['user_phone'] ?>" name="phone" class="form-control">
                             <input type="hidden" value="<?= $order['id'] ?>" name="order_id" class="form-control">
                             <h4>Nhập dòng tin phản hồi về đơn hàng này</h4>
                             <textarea name="message" placeholder="Nhập phản hồi của bạn" required style="width: 100%;" rows="10"></textarea>
diff --git a/content/controllers/feedback/index.php b/content/controllers/feedback/index.php
index c27e9c9..989c15d 100644
--- a/content/controllers/feedback/index.php
+++ b/content/controllers/feedback/index.php
@@ -13,7 +13,7 @@
 
 $product = getRecord('products', $productId);
 if (isset($userNav)) {
-    $user_action = getRecord('users', $userNav);
+    $userAction = getRecord('users', $userNav);
 }
 $title = 'Gửi phản hồi của bạn đến Chị Kòi Quán';
 require('content/views/feedback/index.php');
diff --git a/content/controllers/forgot-password/request.php b/content/controllers/forgot-password/request.php
index ef01652..025e6bb 100644
--- a/content/controllers/forgot-password/request.php
+++ b/content/controllers/forgot-password/request.php
@@ -23,14 +23,14 @@
         $users = getAll('users', $option);
         foreach ($users as $user) {
             if ($user['user_email'] == $email) {
-                $verification_Code = $user['verificationCode'];
+                $verificationCode = $user['verificationCode'];
             }
         }
         include 'lib/config/sendmail.php';
         $mail = new PHPMailer(true);
 
         try {
-            $verificationLink = PATH_URL . "index.php?controller=forgot-password&action=resultcode&code=" . $verification_Code;
+            $verificationLink = PATH_URL . "index.php?controller=forgot-password&action=resultcode&code=" . $verificationCode;
             //content
             $htmlStr = "";
             $htmlStr .= "Xin chào " . $username . ' (' . $email . "),<br /><br />";
diff --git a/content/controllers/forgot-password/resultcode.php b/content/controllers/forgot-password/resultcode.php
index 91eec98..2db8032 100644
--- a/content/controllers/forgot-password/resultcode.php
+++ b/content/controllers/forgot-password/resultcode.php
@@ -2,18 +2,18 @@
 
 if (!empty($_GET['code'])) {
 
-    $select_user_option = [
+    $selectUserOption = [
         'order_by' => 'id',
     ];
-    $verifi_id_user = 0;
-    $user_need_change_pass = getAll('users', $select_user_option);
-    foreach ($user_need_change_pass as $user) {
+    $userVerifyId = 0;
+    $needChangePassUsers = getAll('users', $selectUserOption);
+    foreach ($needChangePassUsers as $user) {
         if ($user['verificationCode'] == $_GET['code']) {
-            $verifi_id_user = 1;
+            $userVerifyId = 1;
             $userId = $user['id'];
         }
     }
-    if ($verifi_id_user != 1) {
+    if ($userVerifyId != 1) {
         echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>Oh No!</strong> Link xác nhận tài khoản để đổi mật khẩu của bạn không đúng. Vui lòng kiểm tra lại. <br><br>Nếu đây là lỗi của hệ thống, mong bạn có thể gửi phản hổi <a href='index.php?controller=feedback'>Tại đây</a></div></div>";
         require('content/views/forgot-password/result.php');
     } else {
diff --git a/content/controllers/home/index.php b/content/controllers/home/index.php
index 945cb55..5b4f04b 100644
--- a/content/controllers/home/index.php
+++ b/content/controllers/home/index.php
@@ -6,21 +6,21 @@
     'offset' => '0',
     'order_by' => 'createDate DESC',
 ];
-$hot_products = getAll('products', $options_hotproduct);
+$hotProducts = getAll('products', $options_hotproduct);
 $options_newproduct = [
     'where' => 'product_typeid = 2',
     'limit' => '12',
     'offset' => '0',
     'order_by' => 'createDate DESC',
 ];
-$new_products = getAll('products', $options_newproduct);
+$newProducts = getAll('products', $options_newproduct);
 $options_saleproduct = [
     'where' => 'product_typeid = 3',
     'limit' => '12',
     'offset' => '0',
     'order_by' => 'createDate DESC',
 ];
-$saleoff_products = getAll('products', $options_saleproduct);
+$saleoffProducts = getAll('products', $options_saleproduct);
 $title = 'Trang chủ - Quán Chị Kòi';
 $option_slide = [
     'order_by' => 'id asc',
diff --git a/content/controllers/product/all.php b/content/controllers/product/all.php
index 02c6ca6..7184b85 100644
--- a/content/controllers/product/all.php
+++ b/content/controllers/product/all.php
@@ -21,5 +21,5 @@
 $total = ceil($totalRows / $limit);
 $pagination = pagination($url, $page, $total);
 
-$products_all = getAll('products', $options);
+$products = getAll('products', $options);
 require('content/views/product/all.php');
diff --git a/content/controllers/register/activate.php b/content/controllers/register/activate.php
index f57f045..44f9773 100644
--- a/content/controllers/register/activate.php
+++ b/content/controllers/register/activate.php
@@ -1,20 +1,20 @@
 <?php
 
 if (!empty($_GET['code'])) {
-    $select_user_option = [
+    $selectUserOption = [
         'order_by' => 'id',
     ];
-    $user_need_activate = getAll('users', $select_user_option);
+    $user_need_activate = getAll('users', $selectUserOption);
     foreach ($user_need_activate as $user) {
         if ($user['verificationCode'] == $_GET['code']) {
-            $verifi_id_user = $user['id'];
+            $userVerifyId = $user['id'];
         }
     }
-    if (!isset($verifi_id_user)) {
+    if (!isset($userVerifyId)) {
         show404NotFound();
     }
     $user_edit = [
-        'id' => $verifi_id_user,
+        'id' => $userVerifyId,
         'verified' => 1,
     ];
     save('users', $user_edit);
diff --git a/content/controllers/register/reactivate.php b/content/controllers/register/reactivate.php
index a2281f9..1c27381 100644
--- a/content/controllers/register/reactivate.php
+++ b/content/controllers/register/reactivate.php
@@ -2,17 +2,17 @@
 
 if (!empty($_GET['code'])) {
 
-    $select_user_option = [
+    $selectUserOption = [
         'order_by' => 'id',
     ];
-    $user_need_activate = getAll('users', $select_user_option);
+    $user_need_activate = getAll('users', $selectUserOption);
     foreach ($user_need_activate as $user) {
         if ($user['verificationCode'] == $_GET['code']) {
-            $verifi_id_user = $user['id'];
+            $userVerifyId = $user['id'];
         }
     }
     $user_edit = [
-        'id' => $verifi_id_user,
+        'id' => $userVerifyId,
         'verified' => 1,
     ];
     save('users', $user_edit);
diff --git a/content/controllers/register/resend.php b/content/controllers/register/resend.php
index f8bdf96..d8822d6 100644
--- a/content/controllers/register/resend.php
+++ b/content/controllers/register/resend.php
@@ -9,12 +9,12 @@
     $option = [
         'order_by' => 'id',
     ];
-    $get_user_notActive = getAll('users', $option);
-    foreach ($get_user_notActive as $user) {
+    $notActiveUsers = getAll('users', $option);
+    foreach ($notActiveUsers as $user) {
         if ($user['id'] == $_GET['id']) {
             $email = $user['user_email'];
             $username = $user['user_username'];
-            $verification_Code = $user['verificationCode'];
+            $verificationCode = $user['verificationCode'];
         }
     }
     //send mail
@@ -22,7 +22,7 @@
     $mail = new PHPMailer(true);
 
     try {
-        $verificationLink = PATH_URL . "index.php?controller=register&action=activate&code=" . $verification_Code;
+        $verificationLink = PATH_URL . "index.php?controller=register&action=activate&code=" . $verificationCode;
         //content
         $htmlStr = "";
         $htmlStr .= "Xin chào " . $username . ' (' . $email . "),<br /><br />";
diff --git a/content/views/cart/list.php b/content/views/cart/list.php
index 9667645..47043b1 100644
--- a/content/views/cart/list.php
+++ b/content/views/cart/list.php
@@ -1,3 +1,9 @@
+<?php
+
+/**
+* @var array $cart
+ */
+?>
 <div class="featured-box featured-box-secundary featured-box-cart">
     <div class="box-content">
         <form method="post" action="index.php?controller=cart" role="form">
diff --git a/content/views/cart/order.php b/content/views/cart/order.php
index 2c71468..9746664 100644
--- a/content/views/cart/order.php
+++ b/content/views/cart/order.php
@@ -1,4 +1,12 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $cart
+ * @var array $userLogin
+ */
+
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
diff --git a/content/views/category/index.php b/content/views/category/index.php
index 1afae57..2f872c6 100644
--- a/content/views/category/index.php
+++ b/content/views/category/index.php
@@ -1,4 +1,13 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $category
+ * @var array $products
+ * @var string $pagination
+ * @var int $totalRows
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
diff --git a/content/views/feedback/index.php b/content/views/feedback/index.php
index 4097ae2..0044079 100644
--- a/content/views/feedback/index.php
+++ b/content/views/feedback/index.php
@@ -1,4 +1,10 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $userLogin
+ * @var array $userAction
+ */
+require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
@@ -6,7 +12,7 @@
             <div class="col-md-12">
                 <h2 class="shorter"><strong>Gửi phản hồi của bạn đến Chị Kòi Quán</strong></h2>
                 <?php if (isset($userNav)) {
-                    echo '<p>Bạn đang đăng nhập với người dùng: <a href="admin.php?controller=user&action=info&user_id=' . $userNav . '"><b>' . $user_action['user_name'] . '</b></a></p>';
+                    echo '<p>Bạn đang đăng nhập với người dùng: <a href="admin.php?controller=user&action=info&user_id=' . $userNav . '"><b>' . $userAction['user_name'] . '</b></a></p>';
                 } else {
                     echo '<p>Bạn đã có tài khoản người dùng? <a href="admin.php">Nhấn vào đây đăng nhập.</a></p>';
                 } ?>
@@ -55,7 +61,7 @@
                                             </div>
                                         </div>
                                     <?php else : ?>
-                                        <h3>Bạn sẽ gửi phản hồi với tư cách là người dùng: <a href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>"><b><?= $user_action['user_name'] ?></b></a></h3>
+                                        <h3>Bạn sẽ gửi phản hồi với tư cách là người dùng: <a href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>"><b><?= $userAction['user_name'] ?></b></a></h3>
                                         <input type="hidden" class="form-control" name="user_id" value="<?= $userNav ?>">
                                         <input type="hidden" name="name" value="<?= $userLogin['user_name'] ?>" class="form-control">
                                         <input type="hidden" name="email" value="<?= $userLogin['user_email'] ?>" class="form-control">
diff --git a/content/views/forgot-password/change-password.php b/content/views/forgot-password/change-password.php
index c2c10f3..610fdfc 100644
--- a/content/views/forgot-password/change-password.php
+++ b/content/views/forgot-password/change-password.php
@@ -1,4 +1,8 @@
 <?php
+
+/**
+ * @var string $title
+ */
 if (isset($_GET['id'])) {
     $id = $_GET['id'];
 }
@@ -51,7 +55,7 @@
                     <div class="copyright text-center">
                         &copy;
                         <script>
-                            document.write(new Date().getFullYear())
+                            document.write(new Date().getFullYear().toString())
                         </script>,
                         <span>Phát triển bởi <a href="https://tanhongit.com" target="_blank">TanHongIT</a></span>
                     </div>
@@ -69,4 +73,4 @@
     <script src="admin/themes/bundles/vendorscripts.bundle.js"></script> <!-- Lib Scripts Plugin Js -->
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/content/views/forgot-password/index.php b/content/views/forgot-password/index.php
index 9ec1f2b..8d6dacf 100644
--- a/content/views/forgot-password/index.php
+++ b/content/views/forgot-password/index.php
@@ -34,7 +34,7 @@
                 </form>
                 <div class="copyright text-center">
                     &copy;
-                    <script>document.write(new Date().getFullYear())</script>,
+                    <script>document.write(new Date().getFullYear().toString())</script>,
                     <span>Thiết kế: <a href="https://thememakker.com/" target="_blank">ThemeMakker</a></span><span> - Phát triển bởi <a href="https://tanhongit.com" target="_blank">TanHongIT</a></span>
                 </div>
             </div>
@@ -50,4 +50,4 @@
 <script src="admin/themes/bundles/libscripts.bundle.js"></script>
 <script src="admin/themes/bundles/vendorscripts.bundle.js"></script> <!-- Lib Scripts Plugin Js --> 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/content/views/home/hotproduct.php b/content/views/home/hotproduct.php
index a1d5520..435b7c6 100644
--- a/content/views/home/hotproduct.php
+++ b/content/views/home/hotproduct.php
@@ -8,43 +8,43 @@
 						<h2><a href="type/1-san-pham-hot">Sản Phẩm <strong>Nổi Bật</strong></a></h2>
 					</div>
 					<ul class="products product-thumb-info-list">
-						<?php if (empty($hot_products)) : ?>
+						<?php if (empty($hotProducts)) : ?>
 							<h3 class="col-sm-12">Không có sản phẩm nào trong danh mục này.</h3>
 						<?php endif; ?>
-						<?php foreach ($hot_products as $hot_product) : ?>
+						<?php foreach ($hotProducts as $hotProduct) : ?>
 							<li class="col-sm-3 col-xs-12 product">
-								<?php if ($hot_product['saleoff'] != 0) : ?>
+								<?php if ($hotProduct['saleoff'] != 0) : ?>
 									<a href="type/3-san-pham-dang-giam-gia">
-										<span class="onsale">-<?= $hot_product['percentoff']; ?>%</span>
+										<span class="onsale">-<?= $hotProduct['percentoff']; ?>%</span>
 									</a>
 								<?php endif; ?>
 								<span class="product-thumb-info">
-									<form action="cart/add/<?= $hot_product['id']; ?>" method="post">
+									<form action="cart/add/<?= $hotProduct['id']; ?>" method="post">
 										<input type="hidden" name="number_cart" value="1">
-										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $hot_product['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
+										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $hotProduct['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
 									</form>
-									<a href="product/<?= $hot_product['id']; ?>-<?= $hot_product['slug']; ?>">
+									<a href="product/<?= $hotProduct['id']; ?>-<?= $hotProduct['slug']; ?>">
 										<span class="product-thumb-info-image">
 											<span class="product-thumb-info-act">
 												<span class="product-thumb-info-act-left"><em>Lượt xem</em></span>
 												<span class="product-thumb-info-act-right"><em><i class="fa fa-plus"></i> Chi tiết</em></span>
 											</span>
-											<img alt="<?=$hot_product['product_name']?>" class="img-responsive" src="public/upload/products/<?= $hot_product['img1']; ?>">
+											<img alt="<?=$hotProduct['product_name']?>" class="img-responsive" src="public/upload/products/<?= $hotProduct['img1']; ?>">
 										</span>
 									</a>
 									<span class="product-thumb-info-content">
-										<a href="product/<?= $hot_product['id']; ?>-<?= $hot_product['slug']; ?>/">
-											<h4 title="<?= $hot_product['product_name']; ?>"><?php if (strlen($hot_product['product_name']) > 50) {
-											    echo substr($hot_product['product_name'], 0, 57) . '...';
+										<a href="product/<?= $hotProduct['id']; ?>-<?= $hotProduct['slug']; ?>/">
+											<h4 title="<?= $hotProduct['product_name']; ?>"><?php if (strlen($hotProduct['product_name']) > 50) {
+											    echo substr($hotProduct['product_name'], 0, 57) . '...';
 											} else {
-											    echo $hot_product['product_name'];
+											    echo $hotProduct['product_name'];
 											}  ?></h4>
 											<span class="price">
-												<?php if ($hot_product['saleoff'] != 0) { ?>
-													<del><span class="amount"><?= number_format($hot_product['product_price'], 0, ',', '.');  ?></span></del>
-													<ins><span class="amount"><?= number_format(($hot_product['product_price']) - (($hot_product['product_price'] * $hot_product['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
+												<?php if ($hotProduct['saleoff'] != 0) { ?>
+													<del><span class="amount"><?= number_format($hotProduct['product_price'], 0, ',', '.');  ?></span></del>
+													<ins><span class="amount"><?= number_format(($hotProduct['product_price']) - (($hotProduct['product_price'] * $hotProduct['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
 												<?php } else { ?>
-													<ins><span class="amount"><?= number_format($hot_product['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
+													<ins><span class="amount"><?= number_format($hotProduct['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
 												<?php } ?>
 											</span>
 										</a>
diff --git a/content/views/home/newproduct.php b/content/views/home/newproduct.php
index 1f7566a..70b16b5 100644
--- a/content/views/home/newproduct.php
+++ b/content/views/home/newproduct.php
@@ -7,43 +7,43 @@
 						<h2><a href="type/2-san-pham-moi">Sản Phẩm <strong>Mới</strong></a></h2>
 					</div>
 					<ul class="products product-thumb-info-list">
-						<?php if (empty($new_products)) : ?>
+						<?php if (empty($newProducts)) : ?>
 							<h3 class="col-sm-12">Không có sản phẩm nào trong danh mục này.</h3>
 						<?php endif; ?>
-						<?php foreach ($new_products as $new_product) : ?>
+						<?php foreach ($newProducts as $newProduct) : ?>
 							<li class="col-sm-3 col-xs-12 product">
-								<?php if ($new_product['saleoff'] != 0) : ?>
+								<?php if ($newProduct['saleoff'] != 0) : ?>
 									<a href="type/3-san-pham-dang-giam-gia">
-										<span class="onsale">-<?= $new_product['percentoff']; ?>%</span>
+										<span class="onsale">-<?= $newProduct['percentoff']; ?>%</span>
 									</a>
 								<?php endif; ?>
 								<span class="product-thumb-info">
-									<form action="cart/add/<?= $new_product['id']; ?>" method="post">
+									<form action="cart/add/<?= $newProduct['id']; ?>" method="post">
 										<input type="hidden" name="number_cart" value="1">
-										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $new_product['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
+										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $newProduct['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
 									</form>
-									<a href="product/<?= $new_product['id']; ?>-<?= $new_product['slug']; ?>">
+									<a href="product/<?= $newProduct['id']; ?>-<?= $newProduct['slug']; ?>">
 										<span class="product-thumb-info-image">
 											<span class="product-thumb-info-act">
 												<span class="product-thumb-info-act-left"><em>Lượt xem</em></span>
 												<span class="product-thumb-info-act-right"><em><i class="fa fa-plus"></i> Chi tiết</em></span>
 											</span>
-											<img alt="<?=$new_product['product_name']?>" class="img-responsive" src="public/upload/products/<?= $new_product['img1']; ?>">
+											<img alt="<?=$newProduct['product_name']?>" class="img-responsive" src="public/upload/products/<?= $newProduct['img1']; ?>">
 										</span>
 									</a>
 									<span class="product-thumb-info-content">
-										<a href="product/<?= $new_product['id']; ?>-<?= $new_product['slug']; ?>/">
-											<h4 title="<?= $new_product['product_name']; ?>"><?php if (strlen($new_product['product_name']) > 50) {
-											    echo substr($new_product['product_name'], 0, 57) . '...';
+										<a href="product/<?= $newProduct['id']; ?>-<?= $newProduct['slug']; ?>/">
+											<h4 title="<?= $newProduct['product_name']; ?>"><?php if (strlen($newProduct['product_name']) > 50) {
+											    echo substr($newProduct['product_name'], 0, 57) . '...';
 											} else {
-											    echo $new_product['product_name'];
+											    echo $newProduct['product_name'];
 											}  ?></h4>
 											<span class="price">
-												<?php if ($new_product['saleoff'] != 0) { ?>
-													<del title="<?= $new_product['product_name']; ?>"><span class="amount"><?= number_format($new_product['product_price'], 0, ',', '.');  ?></span></del>
-													<ins title="<?= $new_product['product_name']; ?>"><span class="amount"><?= number_format(($new_product['product_price']) - (($new_product['product_price'] * $new_product['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
+												<?php if ($newProduct['saleoff'] != 0) { ?>
+													<del title="<?= $newProduct['product_name']; ?>"><span class="amount"><?= number_format($newProduct['product_price'], 0, ',', '.');  ?></span></del>
+													<ins title="<?= $newProduct['product_name']; ?>"><span class="amount"><?= number_format(($newProduct['product_price']) - (($newProduct['product_price'] * $newProduct['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
 												<?php } else { ?>
-													<ins><span class="amount"><?= number_format($new_product['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
+													<ins><span class="amount"><?= number_format($newProduct['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
 												<?php } ?>
 											</span>
 										</a>
diff --git a/content/views/home/saleproduct.php b/content/views/home/saleproduct.php
index 00bd2d4..23f36d1 100644
--- a/content/views/home/saleproduct.php
+++ b/content/views/home/saleproduct.php
@@ -8,43 +8,43 @@
 						<h2><a href="type/3-san-pham-dang-giam-gia">Sản Phẩm Đang <strong>Giảm Giá</strong></a></h2>
 					</div>
 					<ul class="products product-thumb-info-list">
-						<?php if (empty($saleoff_products)) : ?>
+						<?php if (empty($saleoffProducts)) : ?>
 							<h3 class="col-sm-12">Không có sản phẩm nào trong danh mục này.</h3>
 						<?php endif; ?>
-						<?php foreach ($saleoff_products as $saleoff_product) : ?>
+						<?php foreach ($saleoffProducts as $saleoffProduct) : ?>
 							<li class="col-sm-3 col-xs-12 product">
-								<?php if ($saleoff_product['saleoff'] != 0) : ?>
+								<?php if ($saleoffProduct['saleoff'] != 0) : ?>
 									<a href="type/3-san-pham-dang-giam-gia">
-										<span class="onsale">-<?= $saleoff_product['percentoff']; ?>%</span>
+										<span class="onsale">-<?= $saleoffProduct['percentoff']; ?>%</span>
 									</a>
 								<?php endif; ?>
 								<span class="product-thumb-info">
-									<form style="text-align: center;" action="cart/add/<?= $saleoff_product['id']; ?>" method="post">
+									<form style="text-align: center;" action="cart/add/<?= $saleoffProduct['id']; ?>" method="post">
 										<input type="hidden" name="number_cart" value="1">
-										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $saleoff_product['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
+										<a class="add-to-cart-product"><button type="submit" href="cart/add/<?= $saleoffProduct['id']; ?>"><i class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button></a>
 									</form>
-									<a href="product/<?= $saleoff_product['id']; ?>-<?= $saleoff_product['slug']; ?>">
+									<a href="product/<?= $saleoffProduct['id']; ?>-<?= $saleoffProduct['slug']; ?>">
 										<span class="product-thumb-info-image">
 											<span class="product-thumb-info-act">
 												<span class="product-thumb-info-act-left"><em>Lượt xem</em></span>
 												<span class="product-thumb-info-act-right"><em><i class="fa fa-plus"></i> Chi tiết</em></span>
 											</span>
-											<img alt="<?=$saleoff_product['product_name']?>" class="img-responsive" src="public/upload/products/<?= $saleoff_product['img1']; ?>">
+											<img alt="<?=$saleoffProduct['product_name']?>" class="img-responsive" src="public/upload/products/<?= $saleoffProduct['img1']; ?>">
 										</span>
 									</a>
 									<span class="product-thumb-info-content">
-										<a href="product/<?= $saleoff_product['id']; ?>-<?= $saleoff_product['slug']; ?>/">
-										<h4 title="<?= $saleoff_product['product_name']; ?>"><?php if (strlen($saleoff_product['product_name']) > 50) {
-										    echo substr($saleoff_product['product_name'], 0, 57) . '...';
+										<a href="product/<?= $saleoffProduct['id']; ?>-<?= $saleoffProduct['slug']; ?>/">
+										<h4 title="<?= $saleoffProduct['product_name']; ?>"><?php if (strlen($saleoffProduct['product_name']) > 50) {
+										    echo substr($saleoffProduct['product_name'], 0, 57) . '...';
 										} else {
-										    echo $saleoff_product['product_name'];
+										    echo $saleoffProduct['product_name'];
 										}  ?></h4>
 											<span class="price">
-												<?php if ($saleoff_product['saleoff'] != 0) { ?>
-													<del><span class="amount"><?= number_format($saleoff_product['product_price'], 0, ',', '.');  ?></span></del>
-													<ins><span class="amount"><?= number_format(($saleoff_product['product_price']) - (($saleoff_product['product_price'] * $saleoff_product['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
+												<?php if ($saleoffProduct['saleoff'] != 0) { ?>
+													<del><span class="amount"><?= number_format($saleoffProduct['product_price'], 0, ',', '.');  ?></span></del>
+													<ins><span class="amount"><?= number_format(($saleoffProduct['product_price']) - (($saleoffProduct['product_price'] * $saleoffProduct['percentoff']) / 100), 0, ',', '.'); ?> VNĐ</span></ins>
 												<?php } else { ?>
-													<ins><span class="amount"><?= number_format($saleoff_product['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
+													<ins><span class="amount"><?= number_format($saleoffProduct['product_price'], 0, ',', '.');  ?> VNĐ</span></ins>
 												<?php } ?>
 											</span>
 										</a>
diff --git a/content/views/page/index.php b/content/views/page/index.php
index 1db0317..a2b42c6 100644
--- a/content/views/page/index.php
+++ b/content/views/page/index.php
@@ -1,4 +1,11 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $page
+ * @var array $user
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main">
     <section class="page-top">
         <div class="container">
diff --git a/content/views/post/index.php b/content/views/post/index.php
index e869544..0af5637 100644
--- a/content/views/post/index.php
+++ b/content/views/post/index.php
@@ -1,4 +1,11 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $post
+ * @var array $user
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main">
     <section class="page-top">
         <div class="container">
diff --git a/content/views/product/all.php b/content/views/product/all.php
index e1a5591..a130ab5 100644
--- a/content/views/product/all.php
+++ b/content/views/product/all.php
@@ -1,4 +1,12 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $products
+ * @var string $pagination
+ * @var int $totalRows
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
@@ -15,7 +23,7 @@
                 <div class="row">
                     <ul class="products product-thumb-info-list" data-plugin-masonry data-plugin-options='{"layoutMode": "fitRows"}'>
                         <?php
-                        foreach ($products_all as $product) : ?>
+                        foreach ($products as $product) : ?>
                             <li class="col-md-4 col-sm-6 col-xs-12 product">
                                 <?php if ($product['saleoff'] != 0) : ?>
                                     <a href="type/3-san-pham-dang-giam-gia">
diff --git a/content/views/search/index.php b/content/views/search/index.php
index bba3897..f68dece 100644
--- a/content/views/search/index.php
+++ b/content/views/search/index.php
@@ -1,4 +1,12 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var string $keyword
+ * @var string $pagination
+ * @var int $totalRows
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
diff --git a/content/views/shop/index.php b/content/views/shop/index.php
index 36b7b3c..d6457b2 100644
--- a/content/views/shop/index.php
+++ b/content/views/shop/index.php
@@ -1,4 +1,14 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $products
+ * @var array $type
+ * @var string $pagination
+ * @var array $category
+ * @var int $totalRows
+ */
+require('content/views/shared/header.php');
+?>
 <div role="main" class="main shop">
     <div class="container">
         <hr class="tall">
diff --git a/content/views/type/index.php b/content/views/type/index.php
index 7b1701a..5d7c274 100644
--- a/content/views/type/index.php
+++ b/content/views/type/index.php
@@ -1,4 +1,13 @@
-<?php require('content/views/shared/header.php'); ?>
+<?php
+
+/**
+ * @var array $products
+ * @var array $type
+ * @var string $pagination
+ * @var int $totalRows
+ */
+require('content/views/shared/header.php');
+  ?>
 <div role="main" class="main shop">
     <div class="container">
 

From c7f664e4760eb166d0084d532eb5222bfd5e5e07 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 16:36:52 +0700
Subject: [PATCH 3/6] fix: clean code

---
 admin/controllers/category/index.php   |  2 +-
 admin/controllers/product/edit.php     |  2 +-
 admin/controllers/user/edit.php        |  1 -
 admin/views/category/index.php         |  2 +-
 admin/views/product/formEdit.php       |  4 +--
 content/controllers/category/index.php |  7 ++--
 content/controllers/product/index.php  |  4 +--
 content/views/product/index.php        |  6 ++--
 content/views/shared/footer.php        | 48 +++++++++++++-------------
 content/views/shared/header.php        | 32 ++++++++---------
 content/views/shared/sidebar.php       | 36 +++++++++----------
 11 files changed, 70 insertions(+), 74 deletions(-)

diff --git a/admin/controllers/category/index.php b/admin/controllers/category/index.php
index dfee229..8f0d410 100644
--- a/admin/controllers/category/index.php
+++ b/admin/controllers/category/index.php
@@ -9,7 +9,7 @@
     'order_by' => 'id',
 ];
 $title = 'Danh mục sản phẩm';
-$subcategories = getAll('subcategory', $options);
+$subCategoryData = getAll('subcategory', $options);
 $navCategory = 'class="active open"';
 
 require('admin/views/category/index.php');
diff --git a/admin/controllers/product/edit.php b/admin/controllers/product/edit.php
index 9c8911c..de3586a 100644
--- a/admin/controllers/product/edit.php
+++ b/admin/controllers/product/edit.php
@@ -31,7 +31,7 @@
     'select' => 'id,category_name',
     'order_by' => 'id',
 ]);
-$subcategories = getAll('subcategory', [
+$subCategoryData = getAll('subcategory', [
     'select' => 'id,subcategory_name',
     'order_by' => 'subcategory_name',
 ]);
diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php
index 8bbed28..bdb06c1 100644
--- a/admin/controllers/user/edit.php
+++ b/admin/controllers/user/edit.php
@@ -2,7 +2,6 @@
 
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
-use PHPMailer\PHPMailer\PHPMailer;
 
 if (isset($_GET['user_id'])) {
     $userId = intval($_GET['user_id']);
diff --git a/admin/views/category/index.php b/admin/views/category/index.php
index b1a46d8..87b775a 100644
--- a/admin/views/category/index.php
+++ b/admin/views/category/index.php
@@ -63,7 +63,7 @@
                                         </tr>
                                     </tfoot>
                                     <tbody>
-                                        <?php foreach ($subcategories as $subcategory) : ?>
+                                        <?php foreach ($subCategoryData as $subcategory) : ?>
                                             <tr>
                                                 <td><?= $subcategory['id'] ?></td>
                                                 <td><a href="admin.php?controller=category&amp;action=edit&amp;sub_cate_id=<?= $subcategory['id']; ?>"><?= $subcategory['subcategory_name']; ?></a></td>
diff --git a/admin/views/product/formEdit.php b/admin/views/product/formEdit.php
index 7a64ab0..1f308f1 100644
--- a/admin/views/product/formEdit.php
+++ b/admin/views/product/formEdit.php
@@ -51,7 +51,7 @@
                                     </tr>
                                     <tr>
                                         <td><strong>Thuộc danh mục con</strong> </td>
-                                        <td><?php foreach ($subcategories as $subcategory) {
+                                        <td><?php foreach ($subCategoryData as $subcategory) {
                                             if ($product && ($product['sub_category_id'] == $subcategory['id'])) {
                                                 echo $subcategory['subcategory_name'];
                                             }
@@ -151,7 +151,7 @@
                                 <div class="row clearfix">
                                     <div class="col-sm-12">
                                         <select name="subcategory_id" class="form-control show-tick">
-                                            <?php foreach ($subcategories as $subcategory) {
+                                            <?php foreach ($subCategoryData as $subcategory) {
                                                 $selected = '';
                                                 if ($product && ($product['sub_category_id'] == $subcategory['id'])) {
                                                     $selected = 'selected=""';
diff --git a/content/controllers/category/index.php b/content/controllers/category/index.php
index 62c319b..dbdda41 100644
--- a/content/controllers/category/index.php
+++ b/content/controllers/category/index.php
@@ -7,6 +7,7 @@
 $categoryId = intval($_GET['id']);
 
 $category = getRecord('subcategory', $categoryId);
+
 if (!$category) {
     show404NotFound();
 }
@@ -40,9 +41,9 @@
 $products = getAll('products', $options);
 $pagination = pagination($url, $page, $total);
 
-$subcategories = getRecord('subcategory', $_GET["id"]);
-if ($subcategories['id'] != 0) {
-    $breadCrumb = $subcategories['subcategory_name'];
+$subCategoryData = getRecord('subcategory', $_GET["id"]);
+if ($subCategoryData['id'] != 0) {
+    $breadCrumb = $subCategoryData['subcategory_name'];
 }
 $title = $category['subcategory_name'] . ' - Quán Chị Kòi';
 require('content/views/category/index.php');
diff --git a/content/controllers/product/index.php b/content/controllers/product/index.php
index 8b0f195..870e8c2 100644
--- a/content/controllers/product/index.php
+++ b/content/controllers/product/index.php
@@ -21,9 +21,9 @@
     'select' => 'id, category_name',
     'order_by' => 'id ASC',
 ]);
-$subcategories = getRecord('subcategory', $product['sub_category_id']);
+$subCategoryData = getRecord('subcategory', $product['sub_category_id']);
 if ($product['sub_category_id'] != 0) {
-    $breadCrumb = $subcategories['subcategory_name'];
+    $breadCrumb = $subCategoryData['subcategory_name'];
 }
 $comment_option = [
     'where' => 'product_id=' . $product['id'],
diff --git a/content/views/product/index.php b/content/views/product/index.php
index 8217bd5..8d75524 100644
--- a/content/views/product/index.php
+++ b/content/views/product/index.php
@@ -6,7 +6,7 @@
             <ul class="breadcrumb">
                 <li><a href="<?= PATH_URL; ?>home">Home</a></li>
                 <li><a
-                        href="category/<?= $subcategories['id'] . '-' . $subcategories['slug']; ?>"><?= $breadCrumb ?></a>
+                        href="category/<?= $subCategoryData['id'] . '-' . $subCategoryData['slug']; ?>"><?= $breadCrumb ?></a>
                 </li>
                 <li class="active"><?= $product['product_name'] ?></li>
             </ul>
@@ -81,7 +81,7 @@ class="fa fa-shopping-cart"></i> Thêm vào giỏ hàng</button>
                             </form>
                             <div class="product_meta">
                                 <span class="posted_in">Danh Mục Con: <a rel="tag"
-                                        href="category/<?= $subcategories['id'] . '-' . $subcategories['slug']; ?>"><?= $breadCrumb ?></a></span>
+                                        href="category/<?= $subCategoryData['id'] . '-' . $subCategoryData['slug']; ?>"><?= $breadCrumb ?></a></span>
                             </div>
                             <hr class="tall">
                             <div class="feedback">
@@ -298,7 +298,7 @@ class="btn btn-primary" data-loading-text="Loading...">Xác nhận
                     </div>
                     <?php $product_related = getAll('products', [
                         'limit' => '8',
-                        'where' => $subcategories['id'] . '=sub_category_id and id<>' . $product['id'], //liên quan theo category
+                        'where' => $subCategoryData['id'] . '=sub_category_id and id<>' . $product['id'], //liên quan theo category
                         'offset' => '0',
                         'order_by' => 'totalView DESC',
                     ]); ?>
diff --git a/content/views/shared/footer.php b/content/views/shared/footer.php
index 40a0b23..55ebe42 100644
--- a/content/views/shared/footer.php
+++ b/content/views/shared/footer.php
@@ -4,39 +4,39 @@
         <div class="row">
             <div class="col-md-9">
                 <h4>Thông tin</h4>
-                <p><?= $about_footer ?><a href="<?= $aboutUrl ?>" class="btn-flat btn-xs">Xem thêm <i class="fa fa-arrow-right"></i></a></p>
+                <p><?= $aboutFooter ?><a href="<?= $aboutUrl ?>" class="btn-flat btn-xs">Xem thêm <i class="fa fa-arrow-right"></i></a></p>
                 <hr class="light">
                 <div class="row">
                     <div class="col-md-3">
-                        <h5><?= $menu_footers[12]['menu_name'] ?></h5>
+                        <h5><?= $footerMenu[12]['menu_name'] ?></h5>
                         <ul class="list icons list-unstyled">
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[0]['menu_url'] ?>"><?= $menu_footers[0]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[1]['menu_url'] ?>"><?= $menu_footers[1]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[2]['menu_url'] ?>"><?= $menu_footers[2]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[0]['menu_url'] ?>"><?= $footerMenu[0]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[1]['menu_url'] ?>"><?= $footerMenu[1]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[2]['menu_url'] ?>"><?= $footerMenu[2]['menu_name'] ?></a></li>
                         </ul>
                     </div>
                     <div class="col-md-3">
-                        <h5><?= $menu_footers[13]['menu_name'] ?></h5>
+                        <h5><?= $footerMenu[13]['menu_name'] ?></h5>
                         <ul class="list icons list-unstyled">
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[3]['menu_url'] ?>"><?= $menu_footers[3]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[4]['menu_url'] ?>"><?= $menu_footers[4]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[5]['menu_url'] ?>"><?= $menu_footers[5]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[3]['menu_url'] ?>"><?= $footerMenu[3]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[4]['menu_url'] ?>"><?= $footerMenu[4]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[5]['menu_url'] ?>"><?= $footerMenu[5]['menu_name'] ?></a></li>
                         </ul>
                     </div>
                     <div class="col-md-3">
-                        <h5><?= $menu_footers[14]['menu_name'] ?></h5>
+                        <h5><?= $footerMenu[14]['menu_name'] ?></h5>
                         <ul class="list icons list-unstyled">
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[6]['menu_url'] ?>"><?= $menu_footers[6]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[7]['menu_url'] ?>"><?= $menu_footers[7]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[8]['menu_url'] ?>"><?= $menu_footers[8]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[6]['menu_url'] ?>"><?= $footerMenu[6]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[7]['menu_url'] ?>"><?= $footerMenu[7]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[8]['menu_url'] ?>"><?= $footerMenu[8]['menu_name'] ?></a></li>
                         </ul>
                     </div>
                     <div class="col-md-3">
-                        <h5><?= $menu_footers[15]['menu_name'] ?></h5>
+                        <h5><?= $footerMenu[15]['menu_name'] ?></h5>
                         <ul class="list icons list-unstyled">
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[9]['menu_url'] ?>"><?= $menu_footers[9]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[10]['menu_url'] ?>"><?= $menu_footers[10]['menu_name'] ?></a></li>
-                            <li><i class="fa fa-caret-right"></i> <a href="<?= $menu_footers[11]['menu_url'] ?>"><?= $menu_footers[11]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[9]['menu_url'] ?>"><?= $footerMenu[9]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[10]['menu_url'] ?>"><?= $footerMenu[10]['menu_name'] ?></a></li>
+                            <li><i class="fa fa-caret-right"></i> <a href="<?= $footerMenu[11]['menu_url'] ?>"><?= $footerMenu[11]['menu_name'] ?></a></li>
                         </ul>
                     </div>
                 </div>
@@ -46,14 +46,14 @@
                 <span class="phone"><?= $phone ?></span>
                 <p class="short">SĐT Phụ: <?= $phone2 ?></p>
                 <ul class="list icons list-unstyled push-top">
-                    <li><i class="fa fa-map-marker"></i> <strong>Địa chỉ:</strong> <?= $address_contact ?></li>
-                    <li><i class="fa fa-envelope"></i> <strong>Email:</strong> <a href="mailto:<?= $email_contact ?>"><?= $email_contact ?></a></li>
+                    <li><i class="fa fa-map-marker"></i> <strong>Địa chỉ:</strong> <?= $contactAddress ?></li>
+                    <li><i class="fa fa-envelope"></i> <strong>Email:</strong> <a href="mailto:<?= $contactEmail ?>"><?= $contactEmail ?></a></li>
                 </ul>
                 <div class="social-icons push-top">
                     <ul class="social-icons">
-                        <li class="facebook"><a href="<?= $link_Facebook ?>" target="_blank" data-placement="bottom" data-tooltip title="Facebook">Facebook</a></li>
-                        <li class="twitter"><a href="<?= $link_Twitter ?>" target="_blank" data-placement="bottom" data-tooltip title="Twitter">Twitter</a></li>
-                        <li class="linkedin"><a href="<?= $linkedin_contact ?>" target="_blank" data-placement="bottom" data-tooltip title="Linkedin">Linkedin</a></li>
+                        <li class="facebook"><a href="<?= $contactFacebook ?>" target="_blank" data-placement="bottom" data-tooltip title="Facebook">Facebook</a></li>
+                        <li class="twitter"><a href="<?= $contactTwitter ?>" target="_blank" data-placement="bottom" data-tooltip title="Twitter">Twitter</a></li>
+                        <li class="linkedin"><a href="<?= $contactLinkedin ?>" target="_blank" data-placement="bottom" data-tooltip title="Linkedin">Linkedin</a></li>
                     </ul>
                 </div>
             </div>
@@ -63,7 +63,7 @@
         <div class="container">
             <div class="row">
                 <p>© Copyright <script>
-                        document.write(new Date().getFullYear())
+                        document.write(new Date().getFullYear().toString())
                     </script> - Phát triển bởi <span><a href="https://tanhongit.com">TanHongIT</a></span>.</p>
             </div>
         </div>
@@ -80,7 +80,7 @@
     };
 
     (function(d, s, id) {
-        var js, fjs = d.getElementsByTagName(s)[0];
+        let js, fjs = d.getElementsByTagName(s)[0];
         if (d.getElementById(id)) {
             return;
         }
diff --git a/content/views/shared/header.php b/content/views/shared/header.php
index 62932dd..1b807bd 100644
--- a/content/views/shared/header.php
+++ b/content/views/shared/header.php
@@ -13,31 +13,27 @@
     $phone = preg_replace("/([0-9]{3})([0-9]{4})/", "$1-$2", $contact['phone']);
     $phone2 = preg_replace("/([0-9]{3})([0-9]{4})/", "$1-$2", $contact['phone_2']);
     $contactUrl = $contact['link_Contact'];
-    $email_contact = $contact['email'];
-    $link_Facebook = $contact['link_Facebook'];
-    $link_Twitter = $contact['link_Twitter'];
-    $address_contact = $contact['address'];
-    $zalo_contact = $contact['zalo'];
-    $linkedin_contact = $contact['link_linkedin'];
+    $contactEmail = $contact['email'];
+    $contactFacebook = $contact['link_Facebook'];
+    $contactTwitter = $contact['link_Twitter'];
+    $contactAddress = $contact['address'];
+    $contactZalo = $contact['zalo'];
+    $contactLinkedin = $contact['link_linkedin'];
     $aboutUrl = $contact['link_about'];
-    $about_footer = $contact['about_footer'];
-    $link_logo = $contact['link_Logo'];
+    $aboutFooter = $contact['about_footer'];
+    $linkLogo = $contact['link_Logo'];
     $favicon = $contact['favicon'];
 }
-$options_menu_footer = [
+$menuFooterOptions = [
     'order_by' => 'id',
-
     'offset' => 15,
 ];
-$menu_footers = getAll('menu_footers', $options_menu_footer);
+$footerMenu = getAll('menu_footers', $menuFooterOptions);
 global $userNav;
 $userLogin = getRecord('users', $userNav);
 
-if (isset($image_product)) {
-    $link_image = $image_product;
-} else {
-    $link_image = PATH_URL . 'public/img/bang-hieu-chikoishop.jpg';
-}
+$link_image = $image_product ?? PATH_URL.'public/img/bang-hieu-chikoishop.jpg';
+
 if (isset($url_product)) {
     $url_site = PATH_URL . $url_product . '/';
 } else {
@@ -109,8 +105,8 @@
 			<div class="container">
 				<div class="logo">
 					<a href="home">
-						<?php if (isset($link_logo)) : ?>
-							<img alt="Porto" width="111" height="54" data-sticky-width="82" data-sticky-height="40" src="public/img/<?= $link_logo ?>"><?php endif; ?>
+						<?php if (isset($linkLogo)) : ?>
+							<img alt="Porto" width="111" height="54" data-sticky-width="82" data-sticky-height="40" src="public/img/<?= $linkLogo ?>"><?php endif; ?>
 					</a>
 				</div>
 				<nav>
diff --git a/content/views/shared/sidebar.php b/content/views/shared/sidebar.php
index a329b2d..9a4219e 100644
--- a/content/views/shared/sidebar.php
+++ b/content/views/shared/sidebar.php
@@ -2,15 +2,15 @@
 $get_id = [
     'order_by' => 'id',
 ];
-$sub_cate = getAll('subcategory', $get_id);
+$subCategoryData = getAll('subcategory', $get_id);
 $shops = getAll('categories', $get_id);
 $types = getAll('types', $get_id);
-$product_top = getAll('products', [
+$topProducts = getAll('products', [
     'limit' => '6',
     'offset' => '0',
     'order_by' => 'totalView DESC',
 ]);
-$product_new = getAll('products', [
+$newProducts = getAll('products', [
     'limit' => '5',
     'offset' => '0',
     'order_by' => 'id DESC',
@@ -31,7 +31,7 @@
     <?php foreach ($types as $type) { ?>
         <a href="type/<?= $type['id'] . '-' . $type['slug']; ?>"><span class="label label-dark"><?= $type['type_name'] ?></span></a>
     <?php } ?><br>
-    <?php foreach ($sub_cate as $cate) { ?>
+    <?php foreach ($subCategoryData as $cate) { ?>
         <a href="category/<?= $cate['id'] . '-' . $cate['slug']; ?>"><span class="label label-dark"><?= $cate['subcategory_name'] ?></span></a>
     <?php } ?>
     <?php foreach ($shops as $shop) { ?>
@@ -40,22 +40,22 @@
     <hr />
     <h4 style="font-weight: bold;">SẢN PHẨM HÀNG ĐẦU</h4>
     <ul class="simple-post-list">
-        <?php foreach ($product_top as $topview_product) : ?>
+        <?php foreach ($topProducts as $product) : ?>
             <li>
                 <div class="post-image">
                     <div class="img-thumbnail">
-                        <a href="product/<?= $topview_product['id'] . '-' . slug($topview_product['product_name']) ?>">
-                            <img alt="<?= $topview_product['product_name'] ?>" width="60" height="60" class="img-responsive" src="public/upload/products/<?= $topview_product['img1'] ?>">
+                        <a href="product/<?= $product['id'] . '-' . slug($product['product_name']) ?>">
+                            <img alt="<?= $product['product_name'] ?>" width="60" height="60" class="img-responsive" src="public/upload/products/<?= $product['img1'] ?>">
                         </a>
                     </div>
                 </div>
                 <div class="post-info">
-                    <a href="product/<?= $topview_product['id'] . '-' . slug($topview_product['product_name']) ?>"><?= $topview_product['product_name'] ?></a>
+                    <a href="product/<?= $product['id'] . '-' . slug($product['product_name']) ?>"><?= $product['product_name'] ?></a>
                     <div class="post-meta">
-                        <?php if ($topview_product['saleoff'] != 0) {
-                            echo number_format(($topview_product['product_price']) - (($topview_product['product_price'] * $topview_product['percentoff']) / 100), 0, ',', '.') . ' VNĐ';
+                        <?php if ($product['saleoff'] != 0) {
+                            echo number_format(($product['product_price']) - (($product['product_price'] * $product['percentoff']) / 100), 0, ',', '.') . ' VNĐ';
                         } else {
-                            echo number_format($topview_product['product_price'], 0, ',', '.') . ' VNĐ';
+                            echo number_format($product['product_price'], 0, ',', '.') . ' VNĐ';
                         } ?>
                     </div>
                 </div>
@@ -65,22 +65,22 @@
     <?php if (isset($get_sidebar_with_only_product)) { ?>
         <h4 style="font-weight: bold;">SẢN PHẨM MỚI NHẤT</h4>
         <ul class="simple-post-list">
-            <?php foreach ($product_new as $topview_product) : ?>
+            <?php foreach ($newProducts as $product) : ?>
                 <li>
                     <div class="post-image">
                         <div class="img-thumbnail">
-                            <a href="product/<?= $topview_product['id'] . '-' . slug($topview_product['product_name']) ?>">
-                                <img alt="<?= $topview_product['product_name'] ?>" width="60" height="60" class="img-responsive" src="public/upload/products/<?= $topview_product['img1'] ?>">
+                            <a href="product/<?= $product['id'] . '-' . slug($product['product_name']) ?>">
+                                <img alt="<?= $product['product_name'] ?>" width="60" height="60" class="img-responsive" src="public/upload/products/<?= $product['img1'] ?>">
                             </a>
                         </div>
                     </div>
                     <div class="post-info">
-                        <a href="product/<?= $topview_product['id'] . '-' . slug($topview_product['product_name']) ?>"><?= $topview_product['product_name'] ?></a>
+                        <a href="product/<?= $product['id'] . '-' . slug($product['product_name']) ?>"><?= $product['product_name'] ?></a>
                         <div class="post-meta">
-                            <?php if ($topview_product['saleoff'] != 0) {
-                                echo number_format(($topview_product['product_price']) - (($topview_product['product_price'] * $topview_product['percentoff']) / 100), 0, ',', '.') . ' VNĐ';
+                            <?php if ($product['saleoff'] != 0) {
+                                echo number_format(($product['product_price']) - (($product['product_price'] * $product['percentoff']) / 100), 0, ',', '.') . ' VNĐ';
                             } else {
-                                echo number_format($topview_product['product_price'], 0, ',', '.') . ' VNĐ';
+                                echo number_format($product['product_price'], 0, ',', '.') . ' VNĐ';
                             } ?>
                         </div>
                     </div>

From 2719efb7e5ae5b28a89c26d5ae5c307c30c512e1 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 16:57:18 +0700
Subject: [PATCH 4/6] feat: create rule for demo admin account

---
 admin/controllers/user/change-password.php |  1 +
 admin/controllers/user/delete.php          |  1 +
 admin/controllers/user/edit.php            |  1 +
 lib/model.php                              | 16 ++++++++++++++++
 4 files changed, 19 insertions(+)

diff --git a/admin/controllers/user/change-password.php b/admin/controllers/user/change-password.php
index 19a6526..b3c6939 100644
--- a/admin/controllers/user/change-password.php
+++ b/admin/controllers/user/change-password.php
@@ -3,6 +3,7 @@
 require_once('admin/models/users.php');
 if (isset($_GET['user_id'])) {
     $userId = intval($_GET['user_id']);
+    checkAdmin($userId);
 } else {
     $userId = 0;
 }
diff --git a/admin/controllers/user/delete.php b/admin/controllers/user/delete.php
index 75baaf0..fa5a31c 100644
--- a/admin/controllers/user/delete.php
+++ b/admin/controllers/user/delete.php
@@ -3,6 +3,7 @@
 permission_user();
 require_once('admin/models/users.php');
 $userId = intval($_GET['user_id']);
+checkAdmin($userId);
 global $userNav;
 $user = getRecord('users', $userNav);
 if ($_GET['user_id'] == $userNav || $user['role_id'] <> 1) {
diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php
index bdb06c1..a201a1e 100644
--- a/admin/controllers/user/edit.php
+++ b/admin/controllers/user/edit.php
@@ -17,6 +17,7 @@
 }
 require_once('admin/models/users.php');
 if (!empty($_POST)) {
+    checkAdmin($_POST['user_id']);
     user_update();
 }
 $title = ($userId == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
diff --git a/lib/model.php b/lib/model.php
index b8a34ba..802f699 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -157,3 +157,19 @@ function getTime($timePost, $timeReply): string
 
     return $result;
 }
+
+/**
+ * @param $userId
+ *
+ * @return false|void
+ */
+function checkAdmin($userId)
+{
+    $user = getRecord('users', $userId);
+    if ($user['user_username'] == 'admin') {
+        header('location:admin.php?controller=user&action=edit&user_id=' . $userId);
+        die;
+    }
+
+    return false;
+}

From be1559b54d4b45553cb863cda85293c2d4c1ba1d Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 16:57:59 +0700
Subject: [PATCH 5/6] Revert "feat: create rule for demo admin account"

- This should use for deploy demo branch

This reverts commit 2719efb7e5ae5b28a89c26d5ae5c307c30c512e1.
---
 admin/controllers/user/change-password.php |  1 -
 admin/controllers/user/delete.php          |  1 -
 admin/controllers/user/edit.php            |  1 -
 lib/model.php                              | 16 ----------------
 4 files changed, 19 deletions(-)

diff --git a/admin/controllers/user/change-password.php b/admin/controllers/user/change-password.php
index b3c6939..19a6526 100644
--- a/admin/controllers/user/change-password.php
+++ b/admin/controllers/user/change-password.php
@@ -3,7 +3,6 @@
 require_once('admin/models/users.php');
 if (isset($_GET['user_id'])) {
     $userId = intval($_GET['user_id']);
-    checkAdmin($userId);
 } else {
     $userId = 0;
 }
diff --git a/admin/controllers/user/delete.php b/admin/controllers/user/delete.php
index fa5a31c..75baaf0 100644
--- a/admin/controllers/user/delete.php
+++ b/admin/controllers/user/delete.php
@@ -3,7 +3,6 @@
 permission_user();
 require_once('admin/models/users.php');
 $userId = intval($_GET['user_id']);
-checkAdmin($userId);
 global $userNav;
 $user = getRecord('users', $userNav);
 if ($_GET['user_id'] == $userNav || $user['role_id'] <> 1) {
diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php
index a201a1e..bdb06c1 100644
--- a/admin/controllers/user/edit.php
+++ b/admin/controllers/user/edit.php
@@ -17,7 +17,6 @@
 }
 require_once('admin/models/users.php');
 if (!empty($_POST)) {
-    checkAdmin($_POST['user_id']);
     user_update();
 }
 $title = ($userId == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
diff --git a/lib/model.php b/lib/model.php
index 802f699..b8a34ba 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -157,19 +157,3 @@ function getTime($timePost, $timeReply): string
 
     return $result;
 }
-
-/**
- * @param $userId
- *
- * @return false|void
- */
-function checkAdmin($userId)
-{
-    $user = getRecord('users', $userId);
-    if ($user['user_username'] == 'admin') {
-        header('location:admin.php?controller=user&action=edit&user_id=' . $userId);
-        die;
-    }
-
-    return false;
-}

From 2f5cc1897f547fe476d44870f636613dedc6f938 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Mon, 8 Jan 2024 17:03:39 +0700
Subject: [PATCH 6/6] fix: update database

---
 admin/controllers/shared/statistics.php                |  2 +-
 admin/controllers/slide/edit.php                       |  1 -
 .../db-backup-tanhongit-2022-07-10-12-37-26.sql        | 10 +++++-----
 admin/models/posts.php                                 |  2 +-
 content/controllers/page/index.php                     |  2 +-
 content/controllers/post/index.php                     |  2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/admin/controllers/shared/statistics.php b/admin/controllers/shared/statistics.php
index 7422c1a..9765250 100644
--- a/admin/controllers/shared/statistics.php
+++ b/admin/controllers/shared/statistics.php
@@ -251,7 +251,7 @@
 
 $options_posts_status = [
     'order_by' => 'id DESC',
-    'where' => 'post_status="Publiced"',
+    'where' => 'post_status="Published"',
 ];
 $total_posts_status = getTotal('posts', $options_posts_status);
 
diff --git a/admin/controllers/slide/edit.php b/admin/controllers/slide/edit.php
index abf8eac..31dcb95 100644
--- a/admin/controllers/slide/edit.php
+++ b/admin/controllers/slide/edit.php
@@ -5,7 +5,6 @@
 require_once('admin/models/slides.php');
 if (!empty($_POST)) {
     slide_update();
-} else {
 }
 if (isset($_GET['slide_id'])) {
     $slideId = intval($_GET['slide_id']);
diff --git a/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql b/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql
index cccc7a4..37984e2 100644
--- a/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql
+++ b/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql
@@ -280,12 +280,12 @@ CREATE TABLE `posts` (
   KEY `fk_id_author` (`post_author`)
 ) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-INSERT INTO posts VALUES("1","2","2020-04-08 05:57:42","","About","Publiced","2020-04-08 06:31:51","2","Tân Hồng ","48","about","about-1page.png");
-INSERT INTO posts VALUES("9","3","2020-04-12 13:20:20","","Web developmwnt","Publiced","0000-00-00 00:00:00","2","","0","fewrfewrew","");
-INSERT INTO posts VALUES("8","2","2020-04-08 23:13:53","","Điều khoản sử dụng","Publiced","0000-00-00 00:00:00","2","","1","terms-of-use-page","");
+INSERT INTO posts VALUES("1","2","2020-04-08 05:57:42","","About","Published","2020-04-08 06:31:51","2","Tân Hồng ","48","about","about-1page.png");
+INSERT INTO posts VALUES("9","3","2020-04-12 13:20:20","","Web developmwnt","Published","0000-00-00 00:00:00","2","","0","fewrfewrew","");
+INSERT INTO posts VALUES("8","2","2020-04-08 23:13:53","","Điều khoản sử dụng","Published","0000-00-00 00:00:00","2","","1","terms-of-use-page","");
 INSERT INTO posts VALUES("6","2","2020-04-08 11:47:48","","Dmca Luật bản quyền","Trash","2020-04-08 10:25:58","1","Tân Hồng ","5","dmca-luat-ban","");
 INSERT INTO posts VALUES("5","2","2020-04-09 14:03:15","Phim việt chất lượng cao<br />
-\n<img alt=\"\" src=\"/php-mvc-shop/public/upload/ckeditorimages/about-1page.png\" style=\"height:271px; width:482px\" />","Phim việt","Publiced","2020-04-08 10:13:10","1","Tân Hồng ","4","phim-viet","phim-viet-5post.png");
+\n<img alt=\"\" src=\"/php-mvc-shop/public/upload/ckeditorimages/about-1page.png\" style=\"height:271px; width:482px\" />","Phim việt","Published","2020-04-08 10:13:10","1","Tân Hồng ","4","phim-viet","phim-viet-5post.png");
 INSERT INTO posts VALUES("4","2","2020-04-12 12:54:02","ouhiuh<br />
 \naad<br />
 \n<img alt=\"\" src=\"/php-mvc-shop/public/upload/ckeditorimages/tenor.gif\" style=\"height:498px; width:498px\" /><br />
@@ -293,7 +293,7 @@ INSERT INTO posts VALUES("4","2","2020-04-12 12:54:02","ouhiuh<br />
 \nfhgtfrdhtrd<br />
 \nỵytrj","Privacy Policy","Draft","2020-04-08 06:05:46","2","Tân Hồng ","7","privacy-policy","privacy-policy-4page.jpg");
 INSERT INTO posts VALUES("3","2","2020-04-08 06:17:37","Luật bản quyền dựa tr&ecirc;n luật to&agrave;n cầu<br />
-\n<img alt=\"\" src=\"/php-mvc-shop/public/upload/ckeditorimages/dmca-luat-ban-quyen-2page.jpg\" style=\"height:304px; width:650px\" />","Dmca Luật bản quyền","Publiced","2020-04-07 23:52:43","2","","1","dmca-luat-ban-quyen","");
+\n<img alt=\"\" src=\"/php-mvc-shop/public/upload/ckeditorimages/dmca-luat-ban-quyen-2page.jpg\" style=\"height:304px; width:650px\" />","Dmca Luật bản quyền","Published","2020-04-07 23:52:43","2","","1","dmca-luat-ban-quyen","");
 
 
 DROP TABLE IF EXISTS products;
diff --git a/admin/models/posts.php b/admin/models/posts.php
index 0dca126..78c97c6 100644
--- a/admin/models/posts.php
+++ b/admin/models/posts.php
@@ -41,7 +41,7 @@ function publicPost($id)
         show404NotFound();
     }
     global $linkConnectDB;
-    $sql = 'UPDATE posts SET post_status="Publiced", post_date="' . gmdate('Y-m-d H:i:s', time() + 7 * 3600) . '" where id=' . $id;
+    $sql = 'UPDATE posts SET post_status="Published", post_date="' . gmdate('Y-m-d H:i:s', time() + 7 * 3600) . '" where id=' . $id;
     mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
 }
 function postDelete($id)
diff --git a/content/controllers/page/index.php b/content/controllers/page/index.php
index 6ba9326..0ac0784 100644
--- a/content/controllers/page/index.php
+++ b/content/controllers/page/index.php
@@ -9,7 +9,7 @@
 $postId = intval($_GET['id']);
 $page = getRecord('posts', $postId);
 $user = getRecord('users', $page['post_author']);
-if (!$page || $page['post_status'] <> 'Publiced') {
+if (!$page || $page['post_status'] <> 'Published') {
     show404NotFound();
 } else {
     updateCountView($postId);
diff --git a/content/controllers/post/index.php b/content/controllers/post/index.php
index dde0e18..a289ff3 100644
--- a/content/controllers/post/index.php
+++ b/content/controllers/post/index.php
@@ -8,7 +8,7 @@
 $postId = intval($_GET['id']);
 $post = getRecord('posts', $postId);
 $user = getRecord('users', $post['post_author']);
-if (!$post || $post['post_status'] <> 'Publiced') {
+if (!$post || $post['post_status'] <> 'Published') {
     show404NotFound();
 } else {
     updateCountView($postId);