From 98e8be566e7b704ea447c48f66f063b0202126ef Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 19 Apr 2023 21:52:23 +0700
Subject: [PATCH 1/2] remove redundant code

---
 404.php                                                    | 5 -----
 admin/controllers/home/login.php                           | 2 +-
 admin/controllers/order/complete.php                       | 7 +------
 admin/controllers/order/delete.php                         | 5 -----
 admin/controllers/order/index.php                          | 5 -----
 admin/controllers/order/inprocess.php                      | 5 -----
 admin/controllers/order/order-cancell.php                  | 5 -----
 admin/controllers/order/order-complete.php                 | 5 -----
 admin/controllers/order/order-inprocess.php                | 5 -----
 admin/controllers/order/order-noprocess.php                | 5 -----
 admin/controllers/order/view.php                           | 5 -----
 admin/controllers/page/add.php                             | 5 -----
 admin/controllers/page/delete.php                          | 5 -----
 admin/controllers/page/draft.php                           | 5 -----
 admin/controllers/page/edit.php                            | 5 -----
 admin/controllers/page/index.php                           | 5 -----
 admin/controllers/page/public.php                          | 5 -----
 admin/controllers/page/restore.php                         | 5 -----
 admin/controllers/page/trash.php                           | 5 -----
 admin/controllers/page/viewdraft.php                       | 5 -----
 admin/controllers/page/viewtrash.php                       | 5 -----
 admin/controllers/post/add.php                             | 5 -----
 admin/controllers/post/delete.php                          | 5 -----
 admin/controllers/post/draft.php                           | 5 -----
 admin/controllers/post/edit.php                            | 5 -----
 admin/controllers/post/index.php                           | 5 -----
 admin/controllers/post/public.php                          | 5 -----
 admin/controllers/post/restore.php                         | 5 -----
 admin/controllers/post/trash.php                           | 5 -----
 admin/controllers/post/viewdraft.php                       | 5 -----
 admin/controllers/post/viewtrash.php                       | 5 -----
 admin/controllers/product/delete.php                       | 5 -----
 admin/controllers/product/edit.php                         | 5 -----
 admin/controllers/product/hotproduct.php                   | 5 -----
 admin/controllers/product/index.php                        | 5 -----
 admin/controllers/product/newproduct.php                   | 5 -----
 admin/controllers/product/saleproduct.php                  | 5 -----
 admin/controllers/product/update.php                       | 5 -----
 admin/controllers/purchase/cancell-action.php              | 5 -----
 admin/controllers/purchase/cancelled.php                   | 5 -----
 admin/controllers/purchase/confirmed.php                   | 5 -----
 admin/controllers/purchase/delivery.php                    | 5 -----
 admin/controllers/purchase/view.php                        | 5 -----
 admin/controllers/role/admin.php                           | 5 -----
 admin/controllers/role/delete.php                          | 5 -----
 admin/controllers/role/deleteAdmin.php                     | 5 -----
 admin/controllers/role/edit.php                            | 5 -----
 admin/controllers/role/index.php                           | 5 -----
 admin/controllers/shared/statistics.php                    | 5 -----
 admin/controllers/shop/delete.php                          | 5 -----
 admin/controllers/shop/edit.php                            | 5 -----
 admin/controllers/shop/index.php                           | 5 -----
 admin/controllers/slide/delete.php                         | 5 -----
 admin/controllers/slide/edit.php                           | 5 -----
 admin/controllers/slide/index.php                          | 5 -----
 admin/controllers/user/add.php                             | 5 -----
 admin/controllers/user/change-password.php                 | 5 -----
 admin/controllers/user/delete.php                          | 5 -----
 admin/controllers/user/edit.php                            | 5 -----
 admin/controllers/user/info.php                            | 5 -----
 admin/controllers/user/listall.php                         | 5 -----
 admin/controllers/user/result.php                          | 5 -----
 admin/models/backupDB.php                                  | 5 -----
 admin/models/category.php                                  | 5 -----
 admin/models/comments.php                                  | 5 -----
 admin/models/feedbacks.php                                 | 5 -----
 admin/models/header-footer.php                             | 5 -----
 admin/models/media.php                                     | 5 -----
 admin/models/order.php                                     | 5 -----
 admin/models/posts.php                                     | 5 -----
 admin/models/products.php                                  | 5 -----
 admin/models/purchase.php                                  | 5 -----
 admin/models/roles.php                                     | 5 -----
 admin/models/shop.php                                      | 5 -----
 admin/models/slides.php                                    | 5 -----
 admin/models/users.php                                     | 5 -----
 admin/views/backupdb/index.php                             | 5 -----
 admin/views/backupdb/list.php                              | 5 -----
 admin/views/backupdb/resultBackupdb.php                    | 5 -----
 admin/views/category/edit.php                              | 5 -----
 admin/views/category/formEdit.php                          | 5 -----
 admin/views/category/index.php                             | 5 -----
 admin/views/comment/spam.php                               | 5 -----
 admin/views/feedback/order.php                             | 5 -----
 admin/views/header-footer/index.php                        | 5 -----
 admin/views/home/index.php                                 | 5 -----
 admin/views/home/login.php                                 | 5 -----
 admin/views/media/add.php                                  | 5 -----
 admin/views/order/index.php                                | 5 -----
 admin/views/page/edit.php                                  | 5 -----
 admin/views/post/formAdd.php                               | 5 -----
 admin/views/product/hotproduct.php                         | 5 -----
 admin/views/product/newproduct.php                         | 5 -----
 admin/views/purchase/cancelled.php                         | 5 -----
 admin/views/purchase/delivery.php                          | 5 -----
 admin/views/role/admin.php                                 | 5 -----
 admin/views/role/index.php                                 | 5 -----
 admin/views/shared/header.php                              | 5 -----
 admin/views/shared/leftnavbar.php                          | 5 -----
 admin/views/shared/loader.php                              | 5 -----
 admin/views/shared/rightnavbar.php                         | 5 -----
 admin/views/shop/edit.php                                  | 5 -----
 admin/views/slide/edit.php                                 | 5 -----
 admin/views/user/addresult.php                             | 5 -----
 admin/views/user/formInfo.php                              | 5 -----
 admin/views/user/listall.php                               | 5 -----
 content/controllers/cart/add.php                           | 5 -----
 content/controllers/cart/checkout.php                      | 5 -----
 content/controllers/cart/delete.php                        | 5 -----
 content/controllers/cart/destroy.php                       | 5 -----
 content/controllers/cart/index.php                         | 5 -----
 content/controllers/cart/order.php                         | 5 -----
 content/controllers/category/index.php                     | 5 -----
 content/controllers/comment/index.php                      | 5 -----
 content/controllers/feedback/index.php                     | 5 -----
 content/controllers/forgot-password/request.php            | 5 -----
 .../controllers/forgot-password/result-change-password.php | 5 -----
 content/controllers/forgot-password/resultcode.php         | 5 -----
 content/controllers/home/index.php                         | 5 -----
 content/controllers/page/index.php                         | 5 -----
 content/controllers/post/all.php                           | 5 -----
 content/controllers/post/index.php                         | 5 -----
 content/controllers/product/all.php                        | 5 -----
 content/controllers/product/index.php                      | 5 -----
 content/controllers/register/activate.php                  | 5 -----
 content/controllers/register/index.php                     | 5 -----
 content/controllers/register/reactivate.php                | 5 -----
 content/controllers/register/resend.php                    | 5 -----
 content/controllers/search/index.php                       | 5 -----
 content/controllers/shop/index.php                         | 5 -----
 content/controllers/type/index.php                         | 5 -----
 content/models/cart.php                                    | 7 +------
 content/models/feedbacks.php                               | 5 -----
 content/models/posts.php                                   | 5 -----
 content/models/products.php                                | 5 -----
 content/views/cart/checkout.php                            | 5 -----
 content/views/cart/list.php                                | 5 -----
 content/views/cart/order.php                               | 5 -----
 content/views/category/index.php                           | 5 -----
 content/views/comment/index.php                            | 5 -----
 content/views/feedback/index.php                           | 5 -----
 content/views/feedback/result.php                          | 5 -----
 content/views/forgot-password/change-password.php          | 5 -----
 content/views/forgot-password/index.php                    | 5 -----
 content/views/forgot-password/result.php                   | 5 -----
 content/views/home/index.php                               | 5 -----
 content/views/page/index.php                               | 5 -----
 content/views/post/index.php                               | 5 -----
 content/views/product/all.php                              | 5 -----
 content/views/product/index.php                            | 5 -----
 content/views/register/result.php                          | 5 -----
 content/views/search/index.php                             | 5 -----
 content/views/shared/footer.php                            | 5 -----
 content/views/shared/header.php                            | 5 -----
 content/views/shared/sidebar.php                           | 5 -----
 content/views/shop/index.php                               | 5 -----
 content/views/type/index.php                               | 5 -----
 lib/counter.php                                            | 5 -----
 lib/functions.php                                          | 5 -----
 lib/model.php                                              | 5 -----
 lib/statistics.php                                         | 5 -----
 register.php                                               | 5 -----
 162 files changed, 3 insertions(+), 808 deletions(-)

diff --git a/404.php b/404.php
index 381be089..36bc53da 100644
--- a/404.php
+++ b/404.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('lib/model.php');
 $title = 'Error 404 Not Found - Quán Chị Kòi';
diff --git a/admin/controllers/home/login.php b/admin/controllers/home/login.php
index b8a4bc9b..bd33ca9e 100644
--- a/admin/controllers/home/login.php
+++ b/admin/controllers/home/login.php
@@ -12,7 +12,7 @@
 if (isset($_SESSION['user'])) {
     $user = $_SESSION['user'];
 
-    update_sesion_cart();
+    updateCartSession();
     update_cart_user_db();
 
     if ($user['role_id'] == 1 || $user['role_id'] == 2) {
diff --git a/admin/controllers/order/complete.php b/admin/controllers/order/complete.php
index 2f1dd7e9..4f1a10fb 100644
--- a/admin/controllers/order/complete.php
+++ b/admin/controllers/order/complete.php
@@ -1,9 +1,4 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
-<?php 
+<?php
 permission_user();
 require_once('admin/models/order.php');
 //submit form click
diff --git a/admin/controllers/order/delete.php b/admin/controllers/order/delete.php
index c30cbf2e..eb340450 100644
--- a/admin/controllers/order/delete.php
+++ b/admin/controllers/order/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/order/index.php b/admin/controllers/order/index.php
index 26b611b1..a8e0d3fe 100644
--- a/admin/controllers/order/index.php
+++ b/admin/controllers/order/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 if (isset($_POST['order_id'])) {
diff --git a/admin/controllers/order/inprocess.php b/admin/controllers/order/inprocess.php
index 8c2b6a5f..db18b2a5 100644
--- a/admin/controllers/order/inprocess.php
+++ b/admin/controllers/order/inprocess.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php 
 permission_user();
 require_once('admin/models/order.php');
diff --git a/admin/controllers/order/order-cancell.php b/admin/controllers/order/order-cancell.php
index 55aeb508..5f8ef0f5 100644
--- a/admin/controllers/order/order-cancell.php
+++ b/admin/controllers/order/order-cancell.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 $options = array(
diff --git a/admin/controllers/order/order-complete.php b/admin/controllers/order/order-complete.php
index fa58dc7c..b73f7bcc 100644
--- a/admin/controllers/order/order-complete.php
+++ b/admin/controllers/order/order-complete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 $options = array(
diff --git a/admin/controllers/order/order-inprocess.php b/admin/controllers/order/order-inprocess.php
index 105dd5c2..91b194ac 100644
--- a/admin/controllers/order/order-inprocess.php
+++ b/admin/controllers/order/order-inprocess.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 $title = 'Đơn hàng đang xử lý';
diff --git a/admin/controllers/order/order-noprocess.php b/admin/controllers/order/order-noprocess.php
index ba37b540..f0e8ce8f 100644
--- a/admin/controllers/order/order-noprocess.php
+++ b/admin/controllers/order/order-noprocess.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 $title = 'Đơn hàng chưa xử lý';
diff --git a/admin/controllers/order/view.php b/admin/controllers/order/view.php
index 0b574d9c..18adca41 100644
--- a/admin/controllers/order/view.php
+++ b/admin/controllers/order/view.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/order.php');
diff --git a/admin/controllers/page/add.php b/admin/controllers/page/add.php
index 96e402a7..33773e88 100644
--- a/admin/controllers/page/add.php
+++ b/admin/controllers/page/add.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/page/delete.php b/admin/controllers/page/delete.php
index 944b8dab..c83f32c9 100644
--- a/admin/controllers/page/delete.php
+++ b/admin/controllers/page/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/page/draft.php b/admin/controllers/page/draft.php
index 18aaf918..ef655aea 100644
--- a/admin/controllers/page/draft.php
+++ b/admin/controllers/page/draft.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/page/edit.php b/admin/controllers/page/edit.php
index bae667f9..d5bf98da 100644
--- a/admin/controllers/page/edit.php
+++ b/admin/controllers/page/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/page/index.php b/admin/controllers/page/index.php
index 8bf4ef8f..f5295f83 100644
--- a/admin/controllers/page/index.php
+++ b/admin/controllers/page/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/page/public.php b/admin/controllers/page/public.php
index 2aba650a..4b3d5387 100644
--- a/admin/controllers/page/public.php
+++ b/admin/controllers/page/public.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/page/restore.php b/admin/controllers/page/restore.php
index 36d40fa4..87e38b49 100644
--- a/admin/controllers/page/restore.php
+++ b/admin/controllers/page/restore.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/page/trash.php b/admin/controllers/page/trash.php
index 03c402d2..a99e692e 100644
--- a/admin/controllers/page/trash.php
+++ b/admin/controllers/page/trash.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/page/viewdraft.php b/admin/controllers/page/viewdraft.php
index 56c0ee7a..77342842 100644
--- a/admin/controllers/page/viewdraft.php
+++ b/admin/controllers/page/viewdraft.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/page/viewtrash.php b/admin/controllers/page/viewtrash.php
index 1ca4f6fa..f27c108d 100644
--- a/admin/controllers/page/viewtrash.php
+++ b/admin/controllers/page/viewtrash.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/post/add.php b/admin/controllers/post/add.php
index c204c597..5c309eea 100644
--- a/admin/controllers/post/add.php
+++ b/admin/controllers/post/add.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/post/delete.php b/admin/controllers/post/delete.php
index 1a726a4f..1bbef901 100644
--- a/admin/controllers/post/delete.php
+++ b/admin/controllers/post/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/post/draft.php b/admin/controllers/post/draft.php
index 4a542410..2d738a0c 100644
--- a/admin/controllers/post/draft.php
+++ b/admin/controllers/post/draft.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/post/edit.php b/admin/controllers/post/edit.php
index 1c817be2..f3d5698e 100644
--- a/admin/controllers/post/edit.php
+++ b/admin/controllers/post/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/post/index.php b/admin/controllers/post/index.php
index e5e61404..5a16f159 100644
--- a/admin/controllers/post/index.php
+++ b/admin/controllers/post/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/post/public.php b/admin/controllers/post/public.php
index ed2c6842..76c89275 100644
--- a/admin/controllers/post/public.php
+++ b/admin/controllers/post/public.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/post/restore.php b/admin/controllers/post/restore.php
index e3af6920..bb82ea50 100644
--- a/admin/controllers/post/restore.php
+++ b/admin/controllers/post/restore.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/post/trash.php b/admin/controllers/post/trash.php
index c13b3386..4b2bcc89 100644
--- a/admin/controllers/post/trash.php
+++ b/admin/controllers/post/trash.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/post/viewdraft.php b/admin/controllers/post/viewdraft.php
index 4e12a928..8be51662 100644
--- a/admin/controllers/post/viewdraft.php
+++ b/admin/controllers/post/viewdraft.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/post/viewtrash.php b/admin/controllers/post/viewtrash.php
index f8bb5357..f0bd054f 100644
--- a/admin/controllers/post/viewtrash.php
+++ b/admin/controllers/post/viewtrash.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/posts.php');
diff --git a/admin/controllers/product/delete.php b/admin/controllers/product/delete.php
index 76820b2e..163c0dff 100644
--- a/admin/controllers/product/delete.php
+++ b/admin/controllers/product/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_moderator();
 //load model
diff --git a/admin/controllers/product/edit.php b/admin/controllers/product/edit.php
index 084fba98..b8d31a79 100644
--- a/admin/controllers/product/edit.php
+++ b/admin/controllers/product/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/product/hotproduct.php b/admin/controllers/product/hotproduct.php
index ae7a336d..4601656b 100644
--- a/admin/controllers/product/hotproduct.php
+++ b/admin/controllers/product/hotproduct.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/product/index.php b/admin/controllers/product/index.php
index b6f81c97..7644feae 100644
--- a/admin/controllers/product/index.php
+++ b/admin/controllers/product/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/products.php');
diff --git a/admin/controllers/product/newproduct.php b/admin/controllers/product/newproduct.php
index d0e0ecd1..4bd16922 100644
--- a/admin/controllers/product/newproduct.php
+++ b/admin/controllers/product/newproduct.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 //load model
 permission_user();
diff --git a/admin/controllers/product/saleproduct.php b/admin/controllers/product/saleproduct.php
index 426243f1..15efbb4b 100644
--- a/admin/controllers/product/saleproduct.php
+++ b/admin/controllers/product/saleproduct.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 //load model
diff --git a/admin/controllers/product/update.php b/admin/controllers/product/update.php
index 7d7a596c..3c1f79ed 100644
--- a/admin/controllers/product/update.php
+++ b/admin/controllers/product/update.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/products.php');
diff --git a/admin/controllers/purchase/cancell-action.php b/admin/controllers/purchase/cancell-action.php
index b4cffd22..91b1d63d 100644
--- a/admin/controllers/purchase/cancell-action.php
+++ b/admin/controllers/purchase/cancell-action.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/purchase.php');
 $order_id = intval($_GET['order_id']);
diff --git a/admin/controllers/purchase/cancelled.php b/admin/controllers/purchase/cancelled.php
index 2890c8a1..7739b8e3 100644
--- a/admin/controllers/purchase/cancelled.php
+++ b/admin/controllers/purchase/cancelled.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/purchase.php');
 global $userNav;
diff --git a/admin/controllers/purchase/confirmed.php b/admin/controllers/purchase/confirmed.php
index 90192c72..5655ea5c 100644
--- a/admin/controllers/purchase/confirmed.php
+++ b/admin/controllers/purchase/confirmed.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/purchase.php');
 global $userNav;
diff --git a/admin/controllers/purchase/delivery.php b/admin/controllers/purchase/delivery.php
index 93e6944f..9376d521 100644
--- a/admin/controllers/purchase/delivery.php
+++ b/admin/controllers/purchase/delivery.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/purchase.php');
 global $userNav;
diff --git a/admin/controllers/purchase/view.php b/admin/controllers/purchase/view.php
index 588f36a7..f2d4b91f 100644
--- a/admin/controllers/purchase/view.php
+++ b/admin/controllers/purchase/view.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/order.php');
 if (isset($_GET['order_id'])) $order_id = intval($_GET['order_id']);
diff --git a/admin/controllers/role/admin.php b/admin/controllers/role/admin.php
index 51c6bfc3..665adf1b 100644
--- a/admin/controllers/role/admin.php
+++ b/admin/controllers/role/admin.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/users.php');
diff --git a/admin/controllers/role/delete.php b/admin/controllers/role/delete.php
index c0b819f0..7088ae2a 100644
--- a/admin/controllers/role/delete.php
+++ b/admin/controllers/role/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/role/deleteAdmin.php b/admin/controllers/role/deleteAdmin.php
index 59dab5b4..09f241b3 100644
--- a/admin/controllers/role/deleteAdmin.php
+++ b/admin/controllers/role/deleteAdmin.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/role/edit.php b/admin/controllers/role/edit.php
index aa82a15a..ebbc30a8 100644
--- a/admin/controllers/role/edit.php
+++ b/admin/controllers/role/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/role/index.php b/admin/controllers/role/index.php
index 24b63274..24196401 100644
--- a/admin/controllers/role/index.php
+++ b/admin/controllers/role/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/shared/statistics.php b/admin/controllers/shared/statistics.php
index c9583e23..7d80b51c 100644
--- a/admin/controllers/shared/statistics.php
+++ b/admin/controllers/shared/statistics.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 //table orders
 $options_order_complete = array(
diff --git a/admin/controllers/shop/delete.php b/admin/controllers/shop/delete.php
index 9d71e898..5f343ba3 100644
--- a/admin/controllers/shop/delete.php
+++ b/admin/controllers/shop/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/shop/edit.php b/admin/controllers/shop/edit.php
index c500f0dd..76ff6ad0 100644
--- a/admin/controllers/shop/edit.php
+++ b/admin/controllers/shop/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/shop/index.php b/admin/controllers/shop/index.php
index d2cfbd80..9588834b 100644
--- a/admin/controllers/shop/index.php
+++ b/admin/controllers/shop/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/slide/delete.php b/admin/controllers/slide/delete.php
index 8394dee8..581db214 100644
--- a/admin/controllers/slide/delete.php
+++ b/admin/controllers/slide/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/slide/edit.php b/admin/controllers/slide/edit.php
index c966b2dd..d1d89df3 100644
--- a/admin/controllers/slide/edit.php
+++ b/admin/controllers/slide/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/slide/index.php b/admin/controllers/slide/index.php
index 0cd25d72..6bd731a3 100644
--- a/admin/controllers/slide/index.php
+++ b/admin/controllers/slide/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/user/add.php b/admin/controllers/user/add.php
index da1e4ce3..2f59d2c2 100644
--- a/admin/controllers/user/add.php
+++ b/admin/controllers/user/add.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/user/change-password.php b/admin/controllers/user/change-password.php
index 3f8eb26f..f1162ca9 100644
--- a/admin/controllers/user/change-password.php
+++ b/admin/controllers/user/change-password.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/users.php');
 if (isset($_GET['user_id'])) $user_id = intval($_GET['user_id']);
diff --git a/admin/controllers/user/delete.php b/admin/controllers/user/delete.php
index 51435308..bca489f0 100644
--- a/admin/controllers/user/delete.php
+++ b/admin/controllers/user/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 require_once('admin/models/users.php');
diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php
index ce762033..d7533ae3 100644
--- a/admin/controllers/user/edit.php
+++ b/admin/controllers/user/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/admin/controllers/user/info.php b/admin/controllers/user/info.php
index 4eace011..e3192935 100644
--- a/admin/controllers/user/info.php
+++ b/admin/controllers/user/info.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/users.php');
 $title = 'Thông tin cá nhân';
diff --git a/admin/controllers/user/listall.php b/admin/controllers/user/listall.php
index 12c4ed8c..253e049f 100644
--- a/admin/controllers/user/listall.php
+++ b/admin/controllers/user/listall.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 permission_user();
 permission_moderator();
diff --git a/admin/controllers/user/result.php b/admin/controllers/user/result.php
index 32391013..bdb07910 100644
--- a/admin/controllers/user/result.php
+++ b/admin/controllers/user/result.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('admin/models/users.php');
 if (isset($_POST['id_change'])) {
diff --git a/admin/models/backupDB.php b/admin/models/backupDB.php
index 152d9157..98707b20 100644
--- a/admin/models/backupDB.php
+++ b/admin/models/backupDB.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function backup_db()
 {
diff --git a/admin/models/category.php b/admin/models/category.php
index cb85d70d..6d2652b4 100644
--- a/admin/models/category.php
+++ b/admin/models/category.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function deleteSubCategory($id)
 {
diff --git a/admin/models/comments.php b/admin/models/comments.php
index f166218c..de51a45f 100644
--- a/admin/models/comments.php
+++ b/admin/models/comments.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function approveComment($id)
 {
diff --git a/admin/models/feedbacks.php b/admin/models/feedbacks.php
index 7ddb017c..9583b39b 100644
--- a/admin/models/feedbacks.php
+++ b/admin/models/feedbacks.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 
 use PHPMailer\PHPMailer\PHPMailer;
diff --git a/admin/models/header-footer.php b/admin/models/header-footer.php
index a565373a..d7cf7ebf 100644
--- a/admin/models/header-footer.php
+++ b/admin/models/header-footer.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function updateHeaderFooter()
 {
diff --git a/admin/models/media.php b/admin/models/media.php
index 4bcfa352..03729215 100644
--- a/admin/models/media.php
+++ b/admin/models/media.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function media_delete($id)
 {
diff --git a/admin/models/order.php b/admin/models/order.php
index a53b8a3c..532665a2 100644
--- a/admin/models/order.php
+++ b/admin/models/order.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function order_detail($order_id)
 {
diff --git a/admin/models/posts.php b/admin/models/posts.php
index 90d28d3c..044c712c 100644
--- a/admin/models/posts.php
+++ b/admin/models/posts.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function post_trash($id)
 {
diff --git a/admin/models/products.php b/admin/models/products.php
index 3bd1411b..99f2129e 100644
--- a/admin/models/products.php
+++ b/admin/models/products.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function products_delete($id)
 {
diff --git a/admin/models/purchase.php b/admin/models/purchase.php
index 5a27e055..9f40cc8c 100644
--- a/admin/models/purchase.php
+++ b/admin/models/purchase.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function order_cancell($id)
 {
diff --git a/admin/models/roles.php b/admin/models/roles.php
index ef6faf16..2d4ab348 100644
--- a/admin/models/roles.php
+++ b/admin/models/roles.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function role_delete($id)
 {
diff --git a/admin/models/shop.php b/admin/models/shop.php
index 904ad013..7cb9b353 100644
--- a/admin/models/shop.php
+++ b/admin/models/shop.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function categories_delete($id)
 {
diff --git a/admin/models/slides.php b/admin/models/slides.php
index 0e901ebe..f13ff687 100644
--- a/admin/models/slides.php
+++ b/admin/models/slides.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function slide_delete($id)
 {
diff --git a/admin/models/users.php b/admin/models/users.php
index fb683a23..e2a426c2 100644
--- a/admin/models/users.php
+++ b/admin/models/users.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/admin/views/backupdb/index.php b/admin/views/backupdb/index.php
index e0b105e8..483991e4 100644
--- a/admin/views/backupdb/index.php
+++ b/admin/views/backupdb/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/backupdb/list.php b/admin/views/backupdb/list.php
index 1d3602f3..e391dcba 100644
--- a/admin/views/backupdb/list.php
+++ b/admin/views/backupdb/list.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/backupdb/resultBackupdb.php b/admin/views/backupdb/resultBackupdb.php
index dda82c9c..a88ac691 100644
--- a/admin/views/backupdb/resultBackupdb.php
+++ b/admin/views/backupdb/resultBackupdb.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/category/edit.php b/admin/views/category/edit.php
index b033693a..e256585f 100644
--- a/admin/views/category/edit.php
+++ b/admin/views/category/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/category/formEdit.php b/admin/views/category/formEdit.php
index a096d50c..559a6742 100644
--- a/admin/views/category/formEdit.php
+++ b/admin/views/category/formEdit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <section class="content">
     <div class="body_scroll">
         <div class="block-header">
diff --git a/admin/views/category/index.php b/admin/views/category/index.php
index be89f80e..f8ad0dd3 100644
--- a/admin/views/category/index.php
+++ b/admin/views/category/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/comment/spam.php b/admin/views/comment/spam.php
index 29d6b330..b7fe9bf9 100644
--- a/admin/views/comment/spam.php
+++ b/admin/views/comment/spam.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/feedback/order.php b/admin/views/feedback/order.php
index 0fe5ae8c..5fb562f0 100644
--- a/admin/views/feedback/order.php
+++ b/admin/views/feedback/order.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/header-footer/index.php b/admin/views/header-footer/index.php
index 271aaa40..466d0189 100644
--- a/admin/views/header-footer/index.php
+++ b/admin/views/header-footer/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/home/index.php b/admin/views/home/index.php
index 1a19ad4c..76cba356 100644
--- a/admin/views/home/index.php
+++ b/admin/views/home/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/home/login.php b/admin/views/home/login.php
index 5aa6fecd..393be9cb 100644
--- a/admin/views/home/login.php
+++ b/admin/views/home/login.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $contacts = get_a_record('contacts', 1); ?>
 <!doctype html>
diff --git a/admin/views/media/add.php b/admin/views/media/add.php
index 031bf5f5..ca5bdb5d 100644
--- a/admin/views/media/add.php
+++ b/admin/views/media/add.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/order/index.php b/admin/views/order/index.php
index 6fac6302..3925b42b 100644
--- a/admin/views/order/index.php
+++ b/admin/views/order/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/page/edit.php b/admin/views/page/edit.php
index 51c267d7..7085a6e6 100644
--- a/admin/views/page/edit.php
+++ b/admin/views/page/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/post/formAdd.php b/admin/views/post/formAdd.php
index 3813c715..0e1735a9 100644
--- a/admin/views/post/formAdd.php
+++ b/admin/views/post/formAdd.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <section class="content">
     <div class="body_scroll">
         <div class="block-header">
diff --git a/admin/views/product/hotproduct.php b/admin/views/product/hotproduct.php
index 4ff8c2ec..f8af590a 100644
--- a/admin/views/product/hotproduct.php
+++ b/admin/views/product/hotproduct.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/product/newproduct.php b/admin/views/product/newproduct.php
index ee033f55..7d809027 100644
--- a/admin/views/product/newproduct.php
+++ b/admin/views/product/newproduct.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/purchase/cancelled.php b/admin/views/purchase/cancelled.php
index 2e2751c0..e804e3f3 100644
--- a/admin/views/purchase/cancelled.php
+++ b/admin/views/purchase/cancelled.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/purchase/delivery.php b/admin/views/purchase/delivery.php
index 2fd524d3..abc8617c 100644
--- a/admin/views/purchase/delivery.php
+++ b/admin/views/purchase/delivery.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/role/admin.php b/admin/views/role/admin.php
index 8dc28ac8..78186bf9 100644
--- a/admin/views/role/admin.php
+++ b/admin/views/role/admin.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/role/index.php b/admin/views/role/index.php
index da67f75d..977cc03c 100644
--- a/admin/views/role/index.php
+++ b/admin/views/role/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/shared/header.php b/admin/views/shared/header.php
index 470a6484..9325230b 100644
--- a/admin/views/shared/header.php
+++ b/admin/views/shared/header.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $contacts = get_a_record('contacts', 1);
 global $userNav;
diff --git a/admin/views/shared/leftnavbar.php b/admin/views/shared/leftnavbar.php
index 6ea4b0dd..91b22b5f 100644
--- a/admin/views/shared/leftnavbar.php
+++ b/admin/views/shared/leftnavbar.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <aside id="leftsidebar" class="sidebar">
     <div class="navbar-brand">
         <button class="btn-menu ls-toggle-btn" type="button"><i class="zmdi zmdi-menu"></i></button>
diff --git a/admin/views/shared/loader.php b/admin/views/shared/loader.php
index c3df5795..a086f7ad 100644
--- a/admin/views/shared/loader.php
+++ b/admin/views/shared/loader.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <div class="page-loader-wrapper">
     <div class="loader">
         <div class="m-t-30"><img class="zmdi-hc-spin" src="admin/themes/images/loader.svg" width="48" height="48" alt="Admin"></div>
diff --git a/admin/views/shared/rightnavbar.php b/admin/views/shared/rightnavbar.php
index a194a88d..1e5e3149 100644
--- a/admin/views/shared/rightnavbar.php
+++ b/admin/views/shared/rightnavbar.php
@@ -1,9 +1,4 @@
 <!-- Right Icon menu Sidebar -->
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require_once('admin/controllers/shared/statistics.php'); ?>
 <div class="navbar-right">
     <ul class="navbar-nav">
diff --git a/admin/views/shop/edit.php b/admin/views/shop/edit.php
index e78c7281..522e16f5 100644
--- a/admin/views/shop/edit.php
+++ b/admin/views/shop/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/slide/edit.php b/admin/views/slide/edit.php
index 71268b8e..ea00e168 100644
--- a/admin/views/slide/edit.php
+++ b/admin/views/slide/edit.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/admin/views/user/addresult.php b/admin/views/user/addresult.php
index 647bab6b..812d5ea1 100644
--- a/admin/views/user/addresult.php
+++ b/admin/views/user/addresult.php
@@ -1,6 +1 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
\ No newline at end of file
diff --git a/admin/views/user/formInfo.php b/admin/views/user/formInfo.php
index 8f1869d9..3d95568f 100644
--- a/admin/views/user/formInfo.php
+++ b/admin/views/user/formInfo.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <section class="content">
     <div class="body_scroll">
         <div class="block-header">
diff --git a/admin/views/user/listall.php b/admin/views/user/listall.php
index 340e03c2..8bbb6add 100644
--- a/admin/views/user/listall.php
+++ b/admin/views/user/listall.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
 <?php require('admin/views/shared/loader.php'); ?>
 <!-- Overlay For Sidebars -->
diff --git a/content/controllers/cart/add.php b/content/controllers/cart/add.php
index c2eb66c1..d9112211 100644
--- a/content/controllers/cart/add.php
+++ b/content/controllers/cart/add.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) {
     $product_id = intval($_GET['id']);
diff --git a/content/controllers/cart/checkout.php b/content/controllers/cart/checkout.php
index 336edfcb..f4e63b89 100644
--- a/content/controllers/cart/checkout.php
+++ b/content/controllers/cart/checkout.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require('admin/views/shared/header.php');
 if (!empty($_POST)) {
diff --git a/content/controllers/cart/delete.php b/content/controllers/cart/delete.php
index d0e57bdc..ccc9b368 100644
--- a/content/controllers/cart/delete.php
+++ b/content/controllers/cart/delete.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) $product_id = intval($_GET['id']);
 cart_delete($product_id);
diff --git a/content/controllers/cart/destroy.php b/content/controllers/cart/destroy.php
index 4d1f19de..30a75728 100644
--- a/content/controllers/cart/destroy.php
+++ b/content/controllers/cart/destroy.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 cart_destroy();
 if (isset($userNav)) detroy_cart_user_db();
diff --git a/content/controllers/cart/index.php b/content/controllers/cart/index.php
index 2993a32a..e5e9da3b 100644
--- a/content/controllers/cart/index.php
+++ b/content/controllers/cart/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 //form submit
 if (!empty($_POST)) {
diff --git a/content/controllers/cart/order.php b/content/controllers/cart/order.php
index 7997f780..143f821b 100644
--- a/content/controllers/cart/order.php
+++ b/content/controllers/cart/order.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $title = 'Đơn hàng - Quán Chị kòi';
 $cart = cart_list();
diff --git a/content/controllers/category/index.php b/content/controllers/category/index.php
index 68982d65..62d8c894 100644
--- a/content/controllers/category/index.php
+++ b/content/controllers/category/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) {
     $cateid = intval($_GET['id']);
diff --git a/content/controllers/comment/index.php b/content/controllers/comment/index.php
index 8875b4f9..beff0974 100644
--- a/content/controllers/comment/index.php
+++ b/content/controllers/comment/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (!empty($_POST)) {
     global $userNav;
diff --git a/content/controllers/feedback/index.php b/content/controllers/feedback/index.php
index 8346a411..ec6c7e1b 100644
--- a/content/controllers/feedback/index.php
+++ b/content/controllers/feedback/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('content/models/feedbacks.php');
 if (!empty($_POST)) {
diff --git a/content/controllers/forgot-password/request.php b/content/controllers/forgot-password/request.php
index 28c10ecc..065412e4 100644
--- a/content/controllers/forgot-password/request.php
+++ b/content/controllers/forgot-password/request.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/content/controllers/forgot-password/result-change-password.php b/content/controllers/forgot-password/result-change-password.php
index 30e64eb1..23c8423e 100644
--- a/content/controllers/forgot-password/result-change-password.php
+++ b/content/controllers/forgot-password/result-change-password.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/content/controllers/forgot-password/resultcode.php b/content/controllers/forgot-password/resultcode.php
index 1be6be9f..35d9b880 100644
--- a/content/controllers/forgot-password/resultcode.php
+++ b/content/controllers/forgot-password/resultcode.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (!empty($_GET['code'])) {
 
diff --git a/content/controllers/home/index.php b/content/controllers/home/index.php
index b2f71df7..50b8f23e 100644
--- a/content/controllers/home/index.php
+++ b/content/controllers/home/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $options_hotproduct = array(
     'where' => 'product_typeid = 1',
diff --git a/content/controllers/page/index.php b/content/controllers/page/index.php
index 51f3d763..8912a973 100644
--- a/content/controllers/page/index.php
+++ b/content/controllers/page/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('content/models/posts.php');
 if (isset($_GET['id'])) {
diff --git a/content/controllers/post/all.php b/content/controllers/post/all.php
index 0abee1de..79b5a96d 100644
--- a/content/controllers/post/all.php
+++ b/content/controllers/post/all.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('content/models/posts.php');
 $option = array(
diff --git a/content/controllers/post/index.php b/content/controllers/post/index.php
index 9cb96ec4..c6b05214 100644
--- a/content/controllers/post/index.php
+++ b/content/controllers/post/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('content/models/posts.php');
 if (isset($_GET['id'])) {
diff --git a/content/controllers/product/all.php b/content/controllers/product/all.php
index 5ef40198..a3a6c176 100644
--- a/content/controllers/product/all.php
+++ b/content/controllers/product/all.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
diff --git a/content/controllers/product/index.php b/content/controllers/product/index.php
index 4b1396cf..2d2d200f 100644
--- a/content/controllers/product/index.php
+++ b/content/controllers/product/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('content/models/products.php');
 if (isset($_GET['id'])) {
diff --git a/content/controllers/register/activate.php b/content/controllers/register/activate.php
index aeb351af..331a459d 100644
--- a/content/controllers/register/activate.php
+++ b/content/controllers/register/activate.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (!empty($_GET['code'])) {
     $select_user_option = array(
diff --git a/content/controllers/register/index.php b/content/controllers/register/index.php
index 3dcbf48e..9c9b848a 100644
--- a/content/controllers/register/index.php
+++ b/content/controllers/register/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/content/controllers/register/reactivate.php b/content/controllers/register/reactivate.php
index 4164490c..61d02a02 100644
--- a/content/controllers/register/reactivate.php
+++ b/content/controllers/register/reactivate.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (!empty($_GET['code'])) {
 
diff --git a/content/controllers/register/resend.php b/content/controllers/register/resend.php
index 5acf076d..36a65e5d 100644
--- a/content/controllers/register/resend.php
+++ b/content/controllers/register/resend.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // Import PHPMailer classes into the global namespace
 // These must be at the top of your script, not inside a function
diff --git a/content/controllers/search/index.php b/content/controllers/search/index.php
index 06b6edd9..2c923b60 100644
--- a/content/controllers/search/index.php
+++ b/content/controllers/search/index.php
@@ -1,9 +1,4 @@
 
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $keyword = '';
 if (isset($_GET['keyword'])) {
diff --git a/content/controllers/shop/index.php b/content/controllers/shop/index.php
index e59e9108..31c6a0e6 100644
--- a/content/controllers/shop/index.php
+++ b/content/controllers/shop/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) {
     $shop_id = intval($_GET['id']);
diff --git a/content/controllers/type/index.php b/content/controllers/type/index.php
index 35daa518..55b9411c 100644
--- a/content/controllers/type/index.php
+++ b/content/controllers/type/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) {
     $type_id = intval($_GET['id']);
diff --git a/content/models/cart.php b/content/models/cart.php
index 43f00312..084d326a 100644
--- a/content/models/cart.php
+++ b/content/models/cart.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 //khởi tạo giỏ hàng
 if (!isset($_SESSION['cart'])) $_SESSION['cart'] = array();
@@ -29,7 +24,7 @@ function cart_add($product_id, $number)
     }
 }
 //cập nhật giỏ hàng đến cho người dùng và từ người dùng xuống session cart
-function update_sesion_cart()
+function updateCartSession()
 {
     global $userNav, $linkConnectDB;
     if (isset($userNav)) {
diff --git a/content/models/feedbacks.php b/content/models/feedbacks.php
index 76425142..74dc7f74 100644
--- a/content/models/feedbacks.php
+++ b/content/models/feedbacks.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function feedback_add()
 {
diff --git a/content/models/posts.php b/content/models/posts.php
index 19963f58..f8368d01 100644
--- a/content/models/posts.php
+++ b/content/models/posts.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function updateCountView($id)
 {
diff --git a/content/models/products.php b/content/models/products.php
index a2406716..9bf18e48 100644
--- a/content/models/products.php
+++ b/content/models/products.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function updateCountView($id)
 {
diff --git a/content/views/cart/checkout.php b/content/views/cart/checkout.php
index dbcd28a7..e00b1172 100644
--- a/content/views/cart/checkout.php
+++ b/content/views/cart/checkout.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
diff --git a/content/views/cart/list.php b/content/views/cart/list.php
index f90de24c..7156b092 100644
--- a/content/views/cart/list.php
+++ b/content/views/cart/list.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <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 8e561665..450f39e2 100644
--- a/content/views/cart/order.php
+++ b/content/views/cart/order.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/category/index.php b/content/views/category/index.php
index e07ad204..53f7862b 100644
--- a/content/views/category/index.php
+++ b/content/views/category/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/comment/index.php b/content/views/comment/index.php
index 647bab6b..812d5ea1 100644
--- a/content/views/comment/index.php
+++ b/content/views/comment/index.php
@@ -1,6 +1 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
\ No newline at end of file
diff --git a/content/views/feedback/index.php b/content/views/feedback/index.php
index 58be40cd..c17af7be 100644
--- a/content/views/feedback/index.php
+++ b/content/views/feedback/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/feedback/result.php b/content/views/feedback/result.php
index 647bab6b..812d5ea1 100644
--- a/content/views/feedback/result.php
+++ b/content/views/feedback/result.php
@@ -1,6 +1 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
\ No newline at end of file
diff --git a/content/views/forgot-password/change-password.php b/content/views/forgot-password/change-password.php
index 42d2d8e2..cdac60c6 100644
--- a/content/views/forgot-password/change-password.php
+++ b/content/views/forgot-password/change-password.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 if (isset($_GET['id'])) $id = $_GET['id'];
 ?>
diff --git a/content/views/forgot-password/index.php b/content/views/forgot-password/index.php
index 76dc62fb..9ec1f2bd 100644
--- a/content/views/forgot-password/index.php
+++ b/content/views/forgot-password/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <!doctype html>
 <html class="no-js " lang="en">
 <head>
diff --git a/content/views/forgot-password/result.php b/content/views/forgot-password/result.php
index 647bab6b..812d5ea1 100644
--- a/content/views/forgot-password/result.php
+++ b/content/views/forgot-password/result.php
@@ -1,6 +1 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
\ No newline at end of file
diff --git a/content/views/home/index.php b/content/views/home/index.php
index 08cdc800..fe3eaa16 100644
--- a/content/views/home/index.php
+++ b/content/views/home/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main">
     <?php
diff --git a/content/views/page/index.php b/content/views/page/index.php
index 2fa34729..aee87d5c 100644
--- a/content/views/page/index.php
+++ b/content/views/page/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main">
     <section class="page-top">
diff --git a/content/views/post/index.php b/content/views/post/index.php
index 0bd2b7d6..c2f1a0ff 100644
--- a/content/views/post/index.php
+++ b/content/views/post/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main">
     <section class="page-top">
diff --git a/content/views/product/all.php b/content/views/product/all.php
index 4992a791..f6417fd6 100644
--- a/content/views/product/all.php
+++ b/content/views/product/all.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/product/index.php b/content/views/product/index.php
index 9023652c..4d3f3e72 100644
--- a/content/views/product/index.php
+++ b/content/views/product/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/register/result.php b/content/views/register/result.php
index 647bab6b..812d5ea1 100644
--- a/content/views/register/result.php
+++ b/content/views/register/result.php
@@ -1,6 +1 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('admin/views/shared/header.php'); ?>
\ No newline at end of file
diff --git a/content/views/search/index.php b/content/views/search/index.php
index b1dd0939..8bf68824 100644
--- a/content/views/search/index.php
+++ b/content/views/search/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/shared/footer.php b/content/views/shared/footer.php
index 2560f9f5..e0ce8a31 100644
--- a/content/views/shared/footer.php
+++ b/content/views/shared/footer.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 </div>
 <footer class="short" id="footer">
     <div class="container">
diff --git a/content/views/shared/header.php b/content/views/shared/header.php
index e6512a1c..e5650a77 100644
--- a/content/views/shared/header.php
+++ b/content/views/shared/header.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 include_once('content/models/cart.php');
 $cart = cart_list();
diff --git a/content/views/shared/sidebar.php b/content/views/shared/sidebar.php
index 4b71cacd..fbef81b3 100644
--- a/content/views/shared/sidebar.php
+++ b/content/views/shared/sidebar.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 $get_id = array(
     'order_by' => 'id'
diff --git a/content/views/shop/index.php b/content/views/shop/index.php
index 29eef175..bb477ac7 100644
--- a/content/views/shop/index.php
+++ b/content/views/shop/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/content/views/type/index.php b/content/views/type/index.php
index fcb75449..cf57f2a3 100644
--- a/content/views/type/index.php
+++ b/content/views/type/index.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php require('content/views/shared/header.php'); ?>
 <div role="main" class="main shop">
     <div class="container">
diff --git a/lib/counter.php b/lib/counter.php
index 345723e0..fd8e163e 100644
--- a/lib/counter.php
+++ b/lib/counter.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require_once('lib/statistics.php');
 $session = session_id();
diff --git a/lib/functions.php b/lib/functions.php
index 89f4a3c8..51b9e0ea 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 // php.net
 function show_404()
diff --git a/lib/model.php b/lib/model.php
index 282a6413..813b5de3 100644
--- a/lib/model.php
+++ b/lib/model.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 require('config/database.php');
 require('config/config.php');
diff --git a/lib/statistics.php b/lib/statistics.php
index 7b5600db..cf4e67fd 100644
--- a/lib/statistics.php
+++ b/lib/statistics.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php
 function insert_user_online($session, $time, $ip, $browser, $date)
 {
diff --git a/register.php b/register.php
index 0ebfa93a..10ba3f7e 100644
--- a/register.php
+++ b/register.php
@@ -1,8 +1,3 @@
-<!--
-    Developed by: TanHongIT
-    Website: https://tanhongit.com - https://tanhongit.net
-    Github: https://github.com/TanHongIT
--->
 <?php 
 require_once('lib/model.php');
 $contacts = get_a_record('contacts', 1); ?>

From 85fbc6242037a5a15e405195768341886889815e Mon Sep 17 00:00:00 2001
From: Tan Nguyen <tannp27@gmail.com>
Date: Wed, 19 Apr 2023 22:15:34 +0700
Subject: [PATCH 2/2] update style code

---
 admin/controllers/feedback/add.php            |  8 ++---
 admin/controllers/feedback/edit.php           |  2 +-
 admin/controllers/feedback/view.php           |  2 +-
 admin/controllers/media/add.php               |  8 ++---
 admin/controllers/media/delete.php            |  4 +--
 admin/controllers/media/edit.php              |  8 ++---
 admin/controllers/media/image-gallery.php     |  2 +-
 admin/controllers/order/delete.php            |  4 +--
 admin/controllers/order/index.php             |  8 ++---
 admin/controllers/order/order-cancell.php     |  4 +--
 admin/controllers/order/order-complete.php    |  4 +--
 admin/controllers/order/order-inprocess.php   |  2 +-
 admin/controllers/order/order-noprocess.php   |  2 +-
 admin/controllers/order/view.php              |  8 ++---
 admin/controllers/page/add.php                |  8 ++---
 admin/controllers/page/delete.php             |  4 +--
 admin/controllers/page/draft.php              |  4 +--
 admin/controllers/page/edit.php               | 12 +++----
 admin/controllers/page/index.php              |  6 ++--
 admin/controllers/page/public.php             | 14 ++++----
 admin/controllers/page/restore.php            |  4 +--
 admin/controllers/page/trash.php              |  4 +--
 admin/controllers/page/viewdraft.php          |  6 ++--
 admin/controllers/page/viewtrash.php          |  6 ++--
 admin/controllers/post/add.php                |  8 ++---
 admin/controllers/post/delete.php             |  4 +--
 admin/controllers/post/draft.php              |  4 +--
 admin/controllers/post/edit.php               | 12 +++----
 admin/controllers/post/index.php              |  6 ++--
 admin/controllers/post/public.php             | 14 ++++----
 admin/controllers/post/restore.php            |  4 +--
 admin/controllers/post/trash.php              |  4 +--
 admin/controllers/post/viewdraft.php          |  6 ++--
 admin/controllers/post/viewtrash.php          |  6 ++--
 admin/controllers/product/delete.php          |  4 +--
 admin/controllers/product/edit.php            | 12 +++----
 admin/controllers/product/hotproduct.php      |  8 ++---
 admin/controllers/product/index.php           |  2 +-
 admin/controllers/product/newproduct.php      |  8 ++---
 admin/controllers/product/saleproduct.php     |  8 ++---
 admin/controllers/product/update.php          |  2 +-
 admin/controllers/purchase/cancell-action.php |  4 +--
 admin/controllers/purchase/cancelled.php      |  2 +-
 admin/controllers/purchase/confirmed.php      |  2 +-
 admin/controllers/purchase/delivery.php       |  2 +-
 admin/controllers/purchase/index.php          |  2 +-
 admin/controllers/purchase/receied.php        |  2 +-
 admin/controllers/purchase/view.php           |  8 ++---
 admin/controllers/role/admin.php              |  2 +-
 admin/controllers/role/delete.php             |  4 +--
 admin/controllers/role/deleteAdmin.php        |  4 +--
 admin/controllers/role/edit.php               |  8 ++---
 admin/controllers/role/index.php              |  8 ++---
 admin/controllers/shared/statistics.php       |  7 ++--
 admin/controllers/shop/delete.php             |  4 +--
 admin/controllers/shop/edit.php               |  8 ++---
 admin/controllers/slide/delete.php            |  4 +--
 admin/controllers/slide/edit.php              |  8 ++---
 admin/controllers/user/add.php                |  8 ++---
 admin/controllers/user/change-password.php    | 10 +++---
 admin/controllers/user/delete.php             |  6 ++--
 admin/controllers/user/edit.php               | 14 ++++----
 admin/controllers/user/info.php               | 16 ++++-----
 admin/controllers/user/result.php             | 10 +++---
 admin/models/feedbacks.php                    |  2 +-
 admin/models/media.php                        |  8 ++---
 admin/models/order.php                        |  4 +--
 admin/models/posts.php                        | 24 ++++++-------
 admin/models/products.php                     | 18 +++++-----
 admin/models/purchase.php                     |  4 +--
 admin/models/slides.php                       | 22 ++++++------
 admin/models/users.php                        | 34 +++++++++----------
 admin/views/feedback/add.php                  |  2 +-
 admin/views/feedback/edit.php                 |  2 +-
 admin/views/feedback/view.php                 |  2 +-
 admin/views/home/index.php                    |  2 +-
 admin/views/order/tableOrderComplete.php      |  2 +-
 admin/views/order/view.php                    |  2 +-
 admin/views/purchase/cancelled.php            |  8 ++---
 admin/views/purchase/confirmed.php            |  8 ++---
 admin/views/purchase/delivery.php             |  8 ++---
 admin/views/purchase/index.php                |  8 ++---
 admin/views/purchase/receied.php              |  8 ++---
 admin/views/purchase/view.php                 |  2 +-
 admin/views/shared/header.php                 |  2 +-
 admin/views/shared/leftnavbar.php             | 24 ++++++-------
 admin/views/shared/rightnavbar.php            |  2 +-
 admin/views/user/edit.php                     |  2 +-
 composer.json                                 |  2 +-
 content/controllers/cart/add.php              | 10 +++---
 content/controllers/cart/checkout.php         |  8 ++---
 content/controllers/cart/delete.php           |  6 ++--
 content/controllers/cart/index.php            |  4 +--
 content/controllers/category/index.php        |  4 +--
 content/controllers/feedback/index.php        |  6 ++--
 .../forgot-password/change-password.php       |  4 +--
 .../controllers/forgot-password/request.php   |  6 ++--
 .../result-change-password.php                |  8 ++---
 .../forgot-password/resultcode.php            |  6 ++--
 content/controllers/page/index.php            |  6 ++--
 content/controllers/post/index.php            |  6 ++--
 content/controllers/product/all.php           |  4 +--
 content/controllers/product/index.php         |  6 ++--
 content/controllers/register/activate.php     |  2 +-
 content/controllers/register/index.php        | 18 +++++-----
 content/controllers/register/reactivate.php   |  2 +-
 content/controllers/register/resend.php       |  2 +-
 content/controllers/search/index.php          |  4 +--
 content/controllers/shop/index.php            |  4 +--
 content/controllers/type/index.php            |  4 +--
 content/models/cart.php                       | 26 +++++++-------
 content/models/feedbacks.php                  |  6 ++--
 content/views/cart/list.php                   |  2 +-
 content/views/cart/order.php                  |  2 +-
 content/views/category/index.php              |  2 +-
 content/views/product/all.php                 |  2 +-
 content/views/search/index.php                |  4 +--
 content/views/shared/header.php               |  2 +-
 content/views/shop/index.php                  |  2 +-
 content/views/type/index.php                  |  2 +-
 120 files changed, 382 insertions(+), 379 deletions(-)

diff --git a/admin/controllers/feedback/add.php b/admin/controllers/feedback/add.php
index 450539c8..1cf486d5 100644
--- a/admin/controllers/feedback/add.php
+++ b/admin/controllers/feedback/add.php
@@ -8,13 +8,13 @@
 }
 
 if (isset($_GET['order_id'])) {
-    $order_id = intval($_GET['order_id']);
+    $orderId = intval($_GET['order_id']);
 } else {
-    $order_id = 0;
+    $orderId = 0;
 }
 
-$order = get_a_record('orders', $order_id);
-$order_detail = order_detail($order_id);
+$order = get_a_record('orders', $orderId);
+$orderDetail = order_detail($orderId);
 
 if (isset($userNav)) {
     $user_action = get_a_record('users', $userNav);
diff --git a/admin/controllers/feedback/edit.php b/admin/controllers/feedback/edit.php
index b975a120..5e71cef0 100644
--- a/admin/controllers/feedback/edit.php
+++ b/admin/controllers/feedback/edit.php
@@ -21,7 +21,7 @@
 $feedback = get_a_record('feedbacks', $feedbackId);
 
 if ($feedback['order_id'] <> 0) {
-    $order_detail = order_detail($feedback['order_id']);
+    $orderDetail = order_detail($feedback['order_id']);
     $order = get_a_record('orders', $feedback['order_id']);
 }
 if ($feedback['product_id'] <> 0) {
diff --git a/admin/controllers/feedback/view.php b/admin/controllers/feedback/view.php
index a9610bd8..49e7307a 100644
--- a/admin/controllers/feedback/view.php
+++ b/admin/controllers/feedback/view.php
@@ -15,7 +15,7 @@
 $feedback = get_a_record('feedbacks', $feedbackId);
 
 if ($feedback['order_id'] <> 0) {
-    $order_detail = order_detail($feedback['order_id']);
+    $orderDetail = order_detail($feedback['order_id']);
     $order = get_a_record('orders', $feedback['order_id']);
 }
 
diff --git a/admin/controllers/media/add.php b/admin/controllers/media/add.php
index 3f5c1f13..3b243eb7 100644
--- a/admin/controllers/media/add.php
+++ b/admin/controllers/media/add.php
@@ -9,13 +9,13 @@
 }
 
 if (isset($_GET['media_id'])) {
-    $media_id = intval($_GET['media_id']);
+    $mediaId = intval($_GET['media_id']);
 } else {
-    $media_id = 0;
+    $mediaId = 0;
 }
 
-$title = ($media_id == 0) ? '' : 'Cập nhật ảnh';
+$title = ($mediaId == 0) ? '' : 'Cập nhật ảnh';
 $navMedia = 'class="active open"';
-$media_info = get_a_record('media', $media_id);
+$media_info = get_a_record('media', $mediaId);
 
 require('admin/views/media/add.php');
diff --git a/admin/controllers/media/delete.php b/admin/controllers/media/delete.php
index a7c825f4..a9a74015 100644
--- a/admin/controllers/media/delete.php
+++ b/admin/controllers/media/delete.php
@@ -5,7 +5,7 @@
 
 require_once('admin/models/media.php');
 
-$media_id = intval($_GET['media_id']);
-media_delete($media_id);
+$mediaId = intval($_GET['media_id']);
+media_delete($mediaId);
 
 header('location:admin.php?controller=media');
\ No newline at end of file
diff --git a/admin/controllers/media/edit.php b/admin/controllers/media/edit.php
index 365c1a7f..90f30357 100644
--- a/admin/controllers/media/edit.php
+++ b/admin/controllers/media/edit.php
@@ -10,13 +10,13 @@
 }
 
 if (isset($_GET['media_id'])) {
-    $media_id = intval($_GET['media_id']);
+    $mediaId = intval($_GET['media_id']);
 } else {
-    $media_id = 0;
+    $mediaId = 0;
 }
 
-$title = ($media_id == 0) ? 'Thêm Ảnh mới' : 'Cập nhật ảnh';
+$title = ($mediaId == 0) ? 'Thêm Ảnh mới' : 'Cập nhật ảnh';
 $navMedia = 'class="active open"';
-$media_info = get_a_record('media', $media_id);
+$media_info = get_a_record('media', $mediaId);
 
 require('admin/views/media/edit.php');
diff --git a/admin/controllers/media/image-gallery.php b/admin/controllers/media/image-gallery.php
index ab3e1171..5cd7ce5e 100644
--- a/admin/controllers/media/image-gallery.php
+++ b/admin/controllers/media/image-gallery.php
@@ -5,7 +5,7 @@
 
 permission_user();
 
-$user_info_nav = get_a_record('users', $userNav);
+$userInfoNav = get_a_record('users', $userNav);
 
 $options = array(
     'order_by' => 'id ASC'
diff --git a/admin/controllers/order/delete.php b/admin/controllers/order/delete.php
index eb340450..7c009bab 100644
--- a/admin/controllers/order/delete.php
+++ b/admin/controllers/order/delete.php
@@ -3,6 +3,6 @@
 permission_moderator();
 //load model
 require_once('admin/models/order.php');
-$order_id = intval($_GET['order_id']);
-order_delete($order_id);
+$orderId = intval($_GET['order_id']);
+order_delete($orderId);
 header('location:admin.php?controller=order');
\ No newline at end of file
diff --git a/admin/controllers/order/index.php b/admin/controllers/order/index.php
index a8e0d3fe..22e3f689 100644
--- a/admin/controllers/order/index.php
+++ b/admin/controllers/order/index.php
@@ -1,17 +1,17 @@
 <?php
 permission_user();
 if (isset($_POST['order_id'])) {
-    foreach ($_POST['order_id'] as $order_id) {
-        $order_id = intval($order_id);
+    foreach ($_POST['order_id'] as $orderId) {
+        $orderId = intval($orderId);
     }
 }
 $options = array(
     'order_by' => 'status ASC, id DESC'
 );
 $url = 'admin.php?controller=order';
-$total_rows = get_total('orders', $options);
+$totalRows = get_total('orders', $options);
 $title = 'Đơn hàng';
-$nav_order  = 'class="active open"';
+$orderNav  = 'class="active open"';
 $orders = get_all('orders', $options);
 $status = array(
     0 => 'Chưa xử lý',
diff --git a/admin/controllers/order/order-cancell.php b/admin/controllers/order/order-cancell.php
index 5f8ef0f5..ecdcb556 100644
--- a/admin/controllers/order/order-cancell.php
+++ b/admin/controllers/order/order-cancell.php
@@ -4,10 +4,10 @@
     'where' => 'status = 3',
     'order_by' => 'createtime DESC'
 );
-$order_complete  = get_all('orders', $options);
+$orderComplete  = get_all('orders', $options);
 
 $title = 'Đơn hàng đã bị hủy';
-$nav_order  = 'class="active open"';
+$orderNav  = 'class="active open"';
 $status = array(
     0 => 'Chưa xử lý',
     1 => 'Đã xử lý',
diff --git a/admin/controllers/order/order-complete.php b/admin/controllers/order/order-complete.php
index b73f7bcc..cc23353a 100644
--- a/admin/controllers/order/order-complete.php
+++ b/admin/controllers/order/order-complete.php
@@ -4,10 +4,10 @@
     'where' => 'status = 1',
     'order_by' => 'createtime DESC'
 );
-$order_complete  = get_all('orders', $options);
+$orderComplete  = get_all('orders', $options);
 
 $title = 'Đơn hàng đã xử lý';
-$nav_order  = 'class="active open"';
+$orderNav  = 'class="active open"';
 $status = array(
     0 => 'Chưa xử lý',
     1 => 'Đã xử lý',
diff --git a/admin/controllers/order/order-inprocess.php b/admin/controllers/order/order-inprocess.php
index 91b194ac..8ce87022 100644
--- a/admin/controllers/order/order-inprocess.php
+++ b/admin/controllers/order/order-inprocess.php
@@ -1,5 +1,5 @@
 <?php
 permission_user();
 $title = 'Đơn hàng đang xử lý';
-$nav_order  = 'class="active open"';
+$orderNav  = 'class="active open"';
 require('admin/views/order/order-inprocess.php');
diff --git a/admin/controllers/order/order-noprocess.php b/admin/controllers/order/order-noprocess.php
index f0e8ce8f..482fd7e8 100644
--- a/admin/controllers/order/order-noprocess.php
+++ b/admin/controllers/order/order-noprocess.php
@@ -1,5 +1,5 @@
 <?php
 permission_user();
 $title = 'Đơn hàng chưa xử lý';
-$nav_order  = 'class="active open"';
+$orderNav  = 'class="active open"';
 require('admin/views/order/order-noprocess.php');
\ No newline at end of file
diff --git a/admin/controllers/order/view.php b/admin/controllers/order/view.php
index 18adca41..0e994408 100644
--- a/admin/controllers/order/view.php
+++ b/admin/controllers/order/view.php
@@ -1,14 +1,14 @@
 <?php
 permission_user();
 require_once('admin/models/order.php');
-if (isset($_GET['order_id'])) $order_id = intval($_GET['order_id']); else $order_id=0;
-$order = get_a_record('orders', $order_id);
+if (isset($_GET['order_id'])) $orderId = intval($_GET['order_id']); else $orderId=0;
+$order = get_a_record('orders', $orderId);
 if (!$order) {
     show_404();
 }
 $title = 'Chi tiết đơn hàng';
-$nav_order  = 'class="active open"';
-$order_detail = order_detail($order_id);
+$orderNav  = 'class="active open"';
+$orderDetail = order_detail($orderId);
 $status = array(
     0 => 'Đã xác nhận đơn hàng',
     2 => 'Đang giao hàng',
diff --git a/admin/controllers/page/add.php b/admin/controllers/page/add.php
index 33773e88..24704836 100644
--- a/admin/controllers/page/add.php
+++ b/admin/controllers/page/add.php
@@ -6,9 +6,9 @@
     page_add();
 }
 
-if (isset($_GET['post_id'])) $post_id = intval($_GET['post_id']);
-else $post_id = 0;
-$post = get_a_record('posts', $post_id); 
-$nav_page  = 'class="active open"';
+if (isset($_GET['post_id'])) $postId = intval($_GET['post_id']);
+else $postId = 0;
+$post = get_a_record('posts', $postId); 
+$pageNav  = 'class="active open"';
 $title = 'Thêm trang mới - Chị Kòi Quán';
 require('admin/views/page/add.php');
diff --git a/admin/controllers/page/delete.php b/admin/controllers/page/delete.php
index c83f32c9..1f326595 100644
--- a/admin/controllers/page/delete.php
+++ b/admin/controllers/page/delete.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$page_id = intval($_GET['page_id']);
-post_delete($page_id);
+$pageId = intval($_GET['page_id']);
+post_delete($pageId);
 header('location:admin.php?controller=page');
\ No newline at end of file
diff --git a/admin/controllers/page/draft.php b/admin/controllers/page/draft.php
index ef655aea..d238f072 100644
--- a/admin/controllers/page/draft.php
+++ b/admin/controllers/page/draft.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$page_id = intval($_GET['page_id']);
-post_draft($page_id);
+$pageId = intval($_GET['page_id']);
+post_draft($pageId);
 header('location:admin.php?controller=page&action=viewdraft');
\ No newline at end of file
diff --git a/admin/controllers/page/edit.php b/admin/controllers/page/edit.php
index d5bf98da..5139ade9 100644
--- a/admin/controllers/page/edit.php
+++ b/admin/controllers/page/edit.php
@@ -5,14 +5,14 @@
 if (!empty($_POST)) {
     page_update();
 }
-if (isset($_GET['post_id'])) $post_id = intval($_GET['post_id']);
-else $post_id = 0;
+if (isset($_GET['post_id'])) $postId = intval($_GET['post_id']);
+else $postId = 0;
 $title = 'Sửa trang - Chị Kòi Quán';
-$nav_page  = 'class="active open"';
-$post = get_a_record('posts', $post_id);
+$pageNav  = 'class="active open"';
+$post = get_a_record('posts', $postId);
 global $userNav;
-$login_user = get_a_record('users', $userNav);
-if ($login_user['role_id'] == 2) {
+$loginUser = get_a_record('users', $userNav);
+if ($loginUser['role_id'] == 2) {
     if ($post['post_author'] == $userNav)  require('admin/views/page/edit.php');
     else  header('location:admin.php?controller=page');
 } else  require('admin/views/page/edit.php');
diff --git a/admin/controllers/page/index.php b/admin/controllers/page/index.php
index f5295f83..be672e76 100644
--- a/admin/controllers/page/index.php
+++ b/admin/controllers/page/index.php
@@ -3,7 +3,7 @@
 require_once('admin/models/posts.php');
 
 $title = 'All Page - Chị Kòi Quán';
-$nav_page  = 'class="active open"';
+$pageNav  = 'class="active open"';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
 
@@ -20,8 +20,8 @@
 $pages  = get_all('posts', $options);
 
 $url = 'admin.php?controller=page';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/page/index.php');
diff --git a/admin/controllers/page/public.php b/admin/controllers/page/public.php
index 4b3d5387..411f7a64 100644
--- a/admin/controllers/page/public.php
+++ b/admin/controllers/page/public.php
@@ -1,19 +1,19 @@
 <?php
 permission_user();
 require_once('admin/models/posts.php');
-$page_id = intval($_GET['post_id']);
+$pageId = intval($_GET['post_id']);
 
-$post = get_a_record('posts', $page_id);
+$post = get_a_record('posts', $pageId);
 global $userNav;
-$login_user = get_a_record('users', $userNav);
+$loginUser = get_a_record('users', $userNav);
 
-if ($login_user['role_id'] == 2) {
+if ($loginUser['role_id'] == 2) {
     if ($post['post_author'] == $userNav) {
-        post_public($page_id);
+        post_public($pageId);
         require('admin/views/page/result.php');
     } else  header('location:admin.php?controller=page');
 } else {
-    post_public($page_id);
-    echo '<div style="padding-top: 200" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi trại thái của trang là "Công khai". Giờ đây trang này đã có thể xem được đối với người dùng.<br><br> Đến <a href="admin.php?controller=page">All Page</a> hoặc <a href="javascript: history.go(-1)">Trở lại</a>.!!</div></div>';
+    post_public($pageId);
+    echo '<div style="padding-top: 200px" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi trại thái của trang là "Công khai". Giờ đây trang này đã có thể xem được đối với người dùng.<br><br> Đến <a href="admin.php?controller=page">All Page</a> hoặc <a href="javascript: history.go(-1)">Trở lại</a>.!!</div></div>';
     require('admin/views/page/result.php');
 }
diff --git a/admin/controllers/page/restore.php b/admin/controllers/page/restore.php
index 87e38b49..29291ef0 100644
--- a/admin/controllers/page/restore.php
+++ b/admin/controllers/page/restore.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$page_id = intval($_GET['post_id']);
-post_restore($page_id);
+$pageId = intval($_GET['post_id']);
+post_restore($pageId);
 header('location:admin.php?controller=page&action=viewtrash');
\ No newline at end of file
diff --git a/admin/controllers/page/trash.php b/admin/controllers/page/trash.php
index a99e692e..588792bc 100644
--- a/admin/controllers/page/trash.php
+++ b/admin/controllers/page/trash.php
@@ -3,7 +3,7 @@
 permission_moderator();
 require_once('admin/models/posts.php');
 if (isset($_GET['post_id'])) {
-    $page_id = intval($_GET['post_id']);
-    post_trash($page_id);
+    $pageId = intval($_GET['post_id']);
+    post_trash($pageId);
 }
 header('location:admin.php?controller=page&action=viewtrash');
diff --git a/admin/controllers/page/viewdraft.php b/admin/controllers/page/viewdraft.php
index 77342842..e6e90595 100644
--- a/admin/controllers/page/viewdraft.php
+++ b/admin/controllers/page/viewdraft.php
@@ -1,7 +1,7 @@
 <?php
 permission_user();
 require_once('admin/models/posts.php');
-$nav_page  = 'class="active open"';
+$pageNav  = 'class="active open"';
 $title = 'Các bản nháp';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
@@ -19,8 +19,8 @@
 $pages  = get_all('posts', $options);
 
 $url = 'admin.php?controller=page&action=viewdraft';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/page/viewdraft.php');
diff --git a/admin/controllers/page/viewtrash.php b/admin/controllers/page/viewtrash.php
index f27c108d..129f26fe 100644
--- a/admin/controllers/page/viewtrash.php
+++ b/admin/controllers/page/viewtrash.php
@@ -1,7 +1,7 @@
 <?php
 permission_user();
 require_once('admin/models/posts.php');
-$nav_page  = 'class="active open"';
+$pageNav  = 'class="active open"';
 $title = 'Thùng rác';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
@@ -19,8 +19,8 @@
 $pages  = get_all('posts', $options);
 
 $url = 'admin.php?controller=page&action=viewtrash';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/page/viewtrash.php');
diff --git a/admin/controllers/post/add.php b/admin/controllers/post/add.php
index 5c309eea..d4c48a6a 100644
--- a/admin/controllers/post/add.php
+++ b/admin/controllers/post/add.php
@@ -6,9 +6,9 @@
     post_add();
 }
 
-if (isset($_GET['post_id'])) $post_id = intval($_GET['post_id']);
-else $post_id = 0;
-$post = get_a_record('posts', $post_id);
+if (isset($_GET['post_id'])) $postId = intval($_GET['post_id']);
+else $postId = 0;
+$post = get_a_record('posts', $postId);
 $title = 'Thêm trang mới - Chị Kòi Quán';
-$nav_post  = 'class="active open"';
+$postNav  = 'class="active open"';
 require('admin/views/post/add.php');
diff --git a/admin/controllers/post/delete.php b/admin/controllers/post/delete.php
index 1bbef901..842dcdf4 100644
--- a/admin/controllers/post/delete.php
+++ b/admin/controllers/post/delete.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$post_id = intval($_GET['post_id']);
-post_delete($post_id);
+$postId = intval($_GET['post_id']);
+post_delete($postId);
 header('location:admin.php?controller=post');
\ No newline at end of file
diff --git a/admin/controllers/post/draft.php b/admin/controllers/post/draft.php
index 2d738a0c..c8fb620c 100644
--- a/admin/controllers/post/draft.php
+++ b/admin/controllers/post/draft.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$post_id = intval($_GET['post_id']);
-post_draft($post_id);
+$postId = intval($_GET['post_id']);
+post_draft($postId);
 header('location:admin.php?controller=post&action=viewdraft');
\ No newline at end of file
diff --git a/admin/controllers/post/edit.php b/admin/controllers/post/edit.php
index f3d5698e..c4e1e0d8 100644
--- a/admin/controllers/post/edit.php
+++ b/admin/controllers/post/edit.php
@@ -5,14 +5,14 @@
 if (!empty($_POST)) {
     post_update();
 }
-if (isset($_GET['post_id'])) $post_id = intval($_GET['post_id']);
-else $post_id = 0;
+if (isset($_GET['post_id'])) $postId = intval($_GET['post_id']);
+else $postId = 0;
 $title = 'Sửa bài viết - Chị Kòi Quán';
-$nav_post  = 'class="active open"';
-$post = get_a_record('posts', $post_id);
+$postNav  = 'class="active open"';
+$post = get_a_record('posts', $postId);
 global $userNav;
-$login_user = get_a_record('users', $userNav);
-if ($login_user['role_id'] == 2) {
+$loginUser = get_a_record('users', $userNav);
+if ($loginUser['role_id'] == 2) {
     if ($post['post_author'] == $userNav)  require('admin/views/post/edit.php');
     else  header('location:admin.php?controller=post');
 } else  require('admin/views/post/edit.php');
diff --git a/admin/controllers/post/index.php b/admin/controllers/post/index.php
index 5a16f159..081defd5 100644
--- a/admin/controllers/post/index.php
+++ b/admin/controllers/post/index.php
@@ -3,7 +3,7 @@
 require_once('admin/models/posts.php');
 
 $title = 'All Post - Chị Kòi Quán';
-$nav_post  = 'class="active open"';
+$postNav  = 'class="active open"';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
 
@@ -20,8 +20,8 @@
 $posts  = get_all('posts', $options);
 
 $url = 'admin.php?controller=post';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/post/index.php');
diff --git a/admin/controllers/post/public.php b/admin/controllers/post/public.php
index 76c89275..6b88c1a4 100644
--- a/admin/controllers/post/public.php
+++ b/admin/controllers/post/public.php
@@ -1,19 +1,19 @@
 <?php
 permission_user();
 require_once('admin/models/posts.php');
-$post_id = intval($_GET['post_id']);
+$postId = intval($_GET['post_id']);
 
-$post = get_a_record('posts', $post_id);
+$post = get_a_record('posts', $postId);
 global $userNav;
-$login_user = get_a_record('users', $userNav);
+$loginUser = get_a_record('users', $userNav);
 
-if ($login_user['role_id'] == 2) {
+if ($loginUser['role_id'] == 2) {
     if ($post['post_author'] == $userNav) {
-        post_public($post_id);
+        post_public($postId);
         require('admin/views/post/result.php');
     } else  header('location:admin.php?controller=post');
 } else {
-    post_public($post_id);
-    echo '<div style="padding-top: 200" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi trại thái của trang là "Công khai". Giờ đây trang này đã có thể xem được đối với người dùng.<br><br> Đến <a href="admin.php?controller=post">All post</a> hoặc <a href="javascript: history.go(-1)">Trở lại</a>.!!</div></div>';
+    post_public($postId);
+    echo '<div style="padding-top: 200px" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi trại thái của trang là "Công khai". Giờ đây trang này đã có thể xem được đối với người dùng.<br><br> Đến <a href="admin.php?controller=post">All post</a> hoặc <a href="javascript: history.go(-1)">Trở lại</a>.!!</div></div>';
     require('admin/views/post/result.php');
 }
diff --git a/admin/controllers/post/restore.php b/admin/controllers/post/restore.php
index bb82ea50..f78d1651 100644
--- a/admin/controllers/post/restore.php
+++ b/admin/controllers/post/restore.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/posts.php');
-$post_id = intval($_GET['post_id']);
-post_restore($post_id);
+$postId = intval($_GET['post_id']);
+post_restore($postId);
 header('location:admin.php?controller=post&action=viewtrash');
\ No newline at end of file
diff --git a/admin/controllers/post/trash.php b/admin/controllers/post/trash.php
index 4b2bcc89..30357d22 100644
--- a/admin/controllers/post/trash.php
+++ b/admin/controllers/post/trash.php
@@ -3,7 +3,7 @@
 permission_moderator();
 require_once('admin/models/posts.php');
 if (isset($_GET['post_id'])) {
-    $post_id = intval($_GET['post_id']);
-    post_trash($post_id);
+    $postId = intval($_GET['post_id']);
+    post_trash($postId);
 }
 header('location:admin.php?controller=post&action=viewtrash');
diff --git a/admin/controllers/post/viewdraft.php b/admin/controllers/post/viewdraft.php
index 8be51662..82da08d6 100644
--- a/admin/controllers/post/viewdraft.php
+++ b/admin/controllers/post/viewdraft.php
@@ -3,7 +3,7 @@
 require_once('admin/models/posts.php');
 
 $title = 'Các bản nháp';
-$nav_post  = 'class="active open"';
+$postNav  = 'class="active open"';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
 
@@ -20,8 +20,8 @@
 $posts  = get_all('posts', $options);
 
 $url = 'admin.php?controller=post&action=viewdraft';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/post/viewdraft.php');
diff --git a/admin/controllers/post/viewtrash.php b/admin/controllers/post/viewtrash.php
index f0bd054f..1a24b066 100644
--- a/admin/controllers/post/viewtrash.php
+++ b/admin/controllers/post/viewtrash.php
@@ -1,7 +1,7 @@
 <?php
 permission_user();
 require_once('admin/models/posts.php');
-$nav_post  = 'class="active open"';
+$postNav  = 'class="active open"';
 $title = 'Thùng rác';
 if (isset($_GET['page'])) $page = intval($_GET['page']);
 else $page = 1;
@@ -19,8 +19,8 @@
 $posts  = get_all('posts', $options);
 
 $url = 'admin.php?controller=post&action=viewtrash';
-$total_rows = get_total('posts', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('posts', $options);
+$total = ceil($totalRows / $limit);
 
 $pagination = pagination_admin($url, $page, $total);
 require('admin/views/post/viewtrash.php');
diff --git a/admin/controllers/product/delete.php b/admin/controllers/product/delete.php
index 163c0dff..7cb60ee2 100644
--- a/admin/controllers/product/delete.php
+++ b/admin/controllers/product/delete.php
@@ -2,6 +2,6 @@
 permission_moderator();
 //load model
 require_once('admin/models/products.php');
-$product_id = intval($_GET['product_id']);
-products_delete($product_id);
+$productId = intval($_GET['product_id']);
+products_delete($productId);
 header('location:admin.php?controller=product');
\ No newline at end of file
diff --git a/admin/controllers/product/edit.php b/admin/controllers/product/edit.php
index b8d31a79..653ccb2a 100644
--- a/admin/controllers/product/edit.php
+++ b/admin/controllers/product/edit.php
@@ -6,12 +6,12 @@
     product_update();
 }
 
-if (isset($_GET['product_id'])) $product_id = intval($_GET['product_id']);
-else $product_id = 0;
-$title = ($product_id == 0) ? 'Thêm sản phẩm' : 'Sửa sản phẩm: ';
-$nav_product  = 'class="active open"';
-$product = get_a_record('products', $product_id);
-if ($product_id <> 0) $title .= $product['product_name'];
+if (isset($_GET['product_id'])) $productId = intval($_GET['product_id']);
+else $productId = 0;
+$title = ($productId == 0) ? 'Thêm sản phẩm' : 'Sửa sản phẩm: ';
+$productNav  = 'class="active open"';
+$product = get_a_record('products', $productId);
+if ($productId <> 0) $title .= $product['product_name'];
 $options = array(
     'order_by' => 'createDate'
 );
diff --git a/admin/controllers/product/hotproduct.php b/admin/controllers/product/hotproduct.php
index 4601656b..d84707ef 100644
--- a/admin/controllers/product/hotproduct.php
+++ b/admin/controllers/product/hotproduct.php
@@ -3,11 +3,11 @@
 //load model
 require_once('admin/models/products.php');
 if (isset($_POST['product_id'])) {
-    foreach ($_POST['product_id'] as $product_id) {
-        $product_id = intval($product_id);
-        products_delete($product_id);
+    foreach ($_POST['product_id'] as $productId) {
+        $productId = intval($productId);
+        products_delete($productId);
     }
 }
 $title = 'Sản phẩm mới order';
-$nav_product  = 'class="active open"';
+$productNav  = 'class="active open"';
 require('admin/views/product/hotproduct.php');
\ No newline at end of file
diff --git a/admin/controllers/product/index.php b/admin/controllers/product/index.php
index 7644feae..2e54a58d 100644
--- a/admin/controllers/product/index.php
+++ b/admin/controllers/product/index.php
@@ -2,5 +2,5 @@
 permission_user();
 require_once('admin/models/products.php');
 $title = 'Tổng Danh Sách Các Sản phẩm';
-$nav_product  = 'class="active open"';
+$productNav  = 'class="active open"';
 require('admin/views/product/index.php');
\ No newline at end of file
diff --git a/admin/controllers/product/newproduct.php b/admin/controllers/product/newproduct.php
index 4bd16922..d57f22ef 100644
--- a/admin/controllers/product/newproduct.php
+++ b/admin/controllers/product/newproduct.php
@@ -3,11 +3,11 @@
 permission_user();
 require_once('admin/models/products.php');
 if (isset($_POST['product_id'])) {
-    foreach ($_POST['product_id'] as $product_id) {
-        $product_id = intval($product_id);
-        products_delete($product_id);
+    foreach ($_POST['product_id'] as $productId) {
+        $productId = intval($productId);
+        products_delete($productId);
     }
 }
 $title = 'Sản phẩm mới - Quản trị Quán Chị Kòi';
-$nav_product  = 'class="active open"';
+$productNav  = 'class="active open"';
 require('admin/views/product/newproduct.php');
\ No newline at end of file
diff --git a/admin/controllers/product/saleproduct.php b/admin/controllers/product/saleproduct.php
index 15efbb4b..d1d2ead4 100644
--- a/admin/controllers/product/saleproduct.php
+++ b/admin/controllers/product/saleproduct.php
@@ -3,11 +3,11 @@
 //load model
 require_once('admin/models/products.php');
 if (isset($_POST['product_id'])) {
-    foreach ($_POST['product_id'] as $product_id) {
-        $product_id = intval($product_id);
-        products_delete($product_id);
+    foreach ($_POST['product_id'] as $productId) {
+        $productId = intval($productId);
+        products_delete($productId);
     }
 }
 $title = 'Sản phẩm khuyến mại';
-$nav_product  = 'class="active open"';
+$productNav  = 'class="active open"';
 require('admin/views/product/saleproduct.php');
\ No newline at end of file
diff --git a/admin/controllers/product/update.php b/admin/controllers/product/update.php
index 3c1f79ed..fd933132 100644
--- a/admin/controllers/product/update.php
+++ b/admin/controllers/product/update.php
@@ -2,5 +2,5 @@
 permission_user();
 require_once('admin/models/products.php');
 $title = 'Tổng Các Sản phẩm Vừa chỉnh sửa';
-$nav_product  = 'class="active open"';
+$productNav  = 'class="active open"';
 require('admin/views/product/update.php');
\ No newline at end of file
diff --git a/admin/controllers/purchase/cancell-action.php b/admin/controllers/purchase/cancell-action.php
index 91b1d63d..edf7af80 100644
--- a/admin/controllers/purchase/cancell-action.php
+++ b/admin/controllers/purchase/cancell-action.php
@@ -1,5 +1,5 @@
 <?php
 require_once('admin/models/purchase.php');
-$order_id = intval($_GET['order_id']);
-order_cancell($order_id);
+$orderId = intval($_GET['order_id']);
+order_cancell($orderId);
 header('location:admin.php?controller=purchase&action=cancelled');
diff --git a/admin/controllers/purchase/cancelled.php b/admin/controllers/purchase/cancelled.php
index 7739b8e3..1557f517 100644
--- a/admin/controllers/purchase/cancelled.php
+++ b/admin/controllers/purchase/cancelled.php
@@ -6,7 +6,7 @@
         'where' => 'status = 3 and user_id =' . $userNav,
         'order_by' => 'createtime DESC'
     );
-    $order_cancelled  = get_all('orders', $options);
+    $cancelledOrders  = get_all('orders', $options);
     $title = 'Đơn hàng đã hủy';
     $your_Purchase  = 'class="active open"';
     $status = array(
diff --git a/admin/controllers/purchase/confirmed.php b/admin/controllers/purchase/confirmed.php
index 5655ea5c..3298e5fc 100644
--- a/admin/controllers/purchase/confirmed.php
+++ b/admin/controllers/purchase/confirmed.php
@@ -6,7 +6,7 @@
         'where' => 'status = 0 and user_id =' . $userNav,
         'order_by' => 'createtime DESC'
     );
-    $order_confirmed  = get_all('orders', $options);
+    $confirmedOrders  = get_all('orders', $options);
     $title = 'Đơn hàng đã xác nhận';
     $your_Purchase  = 'class="active open"';
     $status = array(
diff --git a/admin/controllers/purchase/delivery.php b/admin/controllers/purchase/delivery.php
index 9376d521..b0bc639b 100644
--- a/admin/controllers/purchase/delivery.php
+++ b/admin/controllers/purchase/delivery.php
@@ -6,7 +6,7 @@
         'where' => 'status = 2 and user_id =' . $userNav,
         'order_by' => 'createtime DESC'
     );
-    $order_delivery  = get_all('orders', $options);
+    $deliveryOrders  = get_all('orders', $options);
     $title = 'Đơn hàng đang vận chuyển';
     $your_Purchase  = 'class="active open"';
     $status = array(
diff --git a/admin/controllers/purchase/index.php b/admin/controllers/purchase/index.php
index 16829395..8e56a064 100644
--- a/admin/controllers/purchase/index.php
+++ b/admin/controllers/purchase/index.php
@@ -6,7 +6,7 @@
         'where' => 'user_id =' . $userNav,
         'order_by' => 'createtime DESC'
     );
-    $order_all  = get_all('orders', $options);
+    $orders  = get_all('orders', $options);
     $title = 'Tất cả đơn hàng của bạn';
     $your_Purchase  = 'class="active open"';
     $status = array(
diff --git a/admin/controllers/purchase/receied.php b/admin/controllers/purchase/receied.php
index 428efacb..1ae021ea 100644
--- a/admin/controllers/purchase/receied.php
+++ b/admin/controllers/purchase/receied.php
@@ -6,7 +6,7 @@
         'where' => 'status = 1 and user_id =' . $userNav,
         'order_by' => 'createtime DESC'
     );
-    $order_receied  = get_all('orders', $options);
+    $receiedOrders  = get_all('orders', $options);
     $title = 'Đơn hàng đã nhận';
     $your_Purchase  = 'class="active open"';
     $status = array(
diff --git a/admin/controllers/purchase/view.php b/admin/controllers/purchase/view.php
index f2d4b91f..40ac5233 100644
--- a/admin/controllers/purchase/view.php
+++ b/admin/controllers/purchase/view.php
@@ -1,14 +1,14 @@
 <?php
 require_once('admin/models/order.php');
-if (isset($_GET['order_id'])) $order_id = intval($_GET['order_id']);
-else $order_id = 0;
-$order = get_a_record('orders', $order_id);
+if (isset($_GET['order_id'])) $orderId = intval($_GET['order_id']);
+else $orderId = 0;
+$order = get_a_record('orders', $orderId);
 if (!$order) {
     show_404();
 }
 $title = 'Chi tiết đơn hàng';
 $your_Purchase  = 'class="active open"';
-$order_detail = order_detail($order_id);
+$orderDetail = order_detail($orderId);
 $status = array(
     0 => 'Đã xác nhận đơn hàng',
     2 => 'Đang giao hàng',
diff --git a/admin/controllers/role/admin.php b/admin/controllers/role/admin.php
index 665adf1b..4ea8927a 100644
--- a/admin/controllers/role/admin.php
+++ b/admin/controllers/role/admin.php
@@ -5,6 +5,6 @@
     'order_by' => 'id ASC'
 );
 $title = 'Danh sách Admin';
-$nav_admin  = 'class="active open"';
+$adminNav  = 'class="active open"';
 $list_user = get_all('users', $options);
 require('admin/views/role/admin.php');
diff --git a/admin/controllers/role/delete.php b/admin/controllers/role/delete.php
index 7088ae2a..ac3bdad6 100644
--- a/admin/controllers/role/delete.php
+++ b/admin/controllers/role/delete.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/roles.php');
-$role_id = intval($_GET['role_id']);
-role_delete($role_id);
+$roleId = intval($_GET['role_id']);
+role_delete($roleId);
 header('location:admin.php?controller=role');
\ No newline at end of file
diff --git a/admin/controllers/role/deleteAdmin.php b/admin/controllers/role/deleteAdmin.php
index 09f241b3..79039d76 100644
--- a/admin/controllers/role/deleteAdmin.php
+++ b/admin/controllers/role/deleteAdmin.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/users.php');
-$role_id = intval($_GET['user_id']);
-user_delete($role_id);
+$roleId = intval($_GET['user_id']);
+user_delete($roleId);
 header('location:admin.php?controller=role&action=admin');
diff --git a/admin/controllers/role/edit.php b/admin/controllers/role/edit.php
index ebbc30a8..76c302a7 100644
--- a/admin/controllers/role/edit.php
+++ b/admin/controllers/role/edit.php
@@ -5,8 +5,8 @@
 if (!empty($_POST)) {
     role_update();
 }
-if (isset($_GET['role_id'])) $role_id = intval($_GET['role_id']); else $role_id=0;
-$title = ($role_id==0) ? 'Thêm quyền truy cập' : 'Sửa quyền truy cập';
-$nav_admin  = 'class="active open"';
-$role = get_a_record('roles', $role_id);
+if (isset($_GET['role_id'])) $roleId = intval($_GET['role_id']); else $roleId=0;
+$title = ($roleId==0) ? 'Thêm quyền truy cập' : 'Sửa quyền truy cập';
+$adminNav  = 'class="active open"';
+$role = get_a_record('roles', $roleId);
 require('admin/views/role/edit.php');
\ No newline at end of file
diff --git a/admin/controllers/role/index.php b/admin/controllers/role/index.php
index 24196401..5b707528 100644
--- a/admin/controllers/role/index.php
+++ b/admin/controllers/role/index.php
@@ -3,9 +3,9 @@
 permission_moderator();
 require_once('admin/models/roles.php');
 if (isset($_POST['role_id'])) {
-    foreach ($_POST['role_id'] as $role_id) {
-        $role_id = intval($role_id);
-        role_delete($role_id);
+    foreach ($_POST['role_id'] as $roleId) {
+        $roleId = intval($roleId);
+        role_delete($roleId);
     }
 }
 $url = 'admin.php?controller=role';
@@ -13,6 +13,6 @@
     'order_by' => 'id ASC'
 );
 $title = 'Danh sách quyền truy cập website';
-$nav_admin  = 'class="active open"';
+$adminNav  = 'class="active open"';
 $roles = get_all('roles', $options);
 require('admin/views/role/index.php');
\ No newline at end of file
diff --git a/admin/controllers/shared/statistics.php b/admin/controllers/shared/statistics.php
index 7d80b51c..75284968 100644
--- a/admin/controllers/shared/statistics.php
+++ b/admin/controllers/shared/statistics.php
@@ -1,10 +1,13 @@
 <?php
-//table orders
+/**
+ * @var $userNav
+ */
+
 $options_order_complete = array(
     'where' => 'status = 1',
     'order_by' => 'createtime DESC'
 );
-$order_completes = get_all('orders', $options_order_complete);
+$orderCompletes = get_all('orders', $options_order_complete);
 
 $options_order = array(
     'order_by' => 'id DESC'
diff --git a/admin/controllers/shop/delete.php b/admin/controllers/shop/delete.php
index 5f343ba3..57d15a2d 100644
--- a/admin/controllers/shop/delete.php
+++ b/admin/controllers/shop/delete.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/shop.php');
-$cate_id = intval($_GET['cate_id']);
-categories_delete($cate_id);
+$categoryId = intval($_GET['cate_id']);
+categories_delete($categoryId);
 header('location:admin.php?controller=shop');
diff --git a/admin/controllers/shop/edit.php b/admin/controllers/shop/edit.php
index 76ff6ad0..0c536b4b 100644
--- a/admin/controllers/shop/edit.php
+++ b/admin/controllers/shop/edit.php
@@ -5,9 +5,9 @@
 if (!empty($_POST)) {
     category_uodate();
 }
-if (isset($_GET['cate_id'])) $cate_id = intval($_GET['cate_id']);
-else $cate_id = 0;
-$title = ($cate_id == 0) ? 'Thêm danh mục' : 'Sửa danh mục';
-$category = get_a_record('categories', $cate_id);
+if (isset($_GET['cate_id'])) $categoryId = intval($_GET['cate_id']);
+else $categoryId = 0;
+$title = ($categoryId == 0) ? 'Thêm danh mục' : 'Sửa danh mục';
+$category = get_a_record('categories', $categoryId);
 $navCategory = 'class="active open"';
 require('admin/views/shop/edit.php');
diff --git a/admin/controllers/slide/delete.php b/admin/controllers/slide/delete.php
index 581db214..688582c5 100644
--- a/admin/controllers/slide/delete.php
+++ b/admin/controllers/slide/delete.php
@@ -2,6 +2,6 @@
 permission_user();
 permission_moderator();
 require_once('admin/models/slides.php');
-$slide_id = intval($_GET['slide_id']);
-slide_delete($slide_id);
+$slideId = intval($_GET['slide_id']);
+slide_delete($slideId);
 header('location:admin.php?controller=slide');
\ No newline at end of file
diff --git a/admin/controllers/slide/edit.php b/admin/controllers/slide/edit.php
index d1d89df3..8e6be291 100644
--- a/admin/controllers/slide/edit.php
+++ b/admin/controllers/slide/edit.php
@@ -6,9 +6,9 @@
     slide_update();
 } else {
 }
-if (isset($_GET['slide_id'])) $slide_id = intval($_GET['slide_id']);
-else $slide_id = 0;
-$title = ($slide_id == 0) ? 'Thêm slides' : 'Sửa slides';
+if (isset($_GET['slide_id'])) $slideId = intval($_GET['slide_id']);
+else $slideId = 0;
+$title = ($slideId == 0) ? 'Thêm slides' : 'Sửa slides';
 $navHF = 'class="active open"';
-$slide = get_a_record('slides', $slide_id);
+$slide = get_a_record('slides', $slideId);
 require('admin/views/slide/edit.php');
diff --git a/admin/controllers/user/add.php b/admin/controllers/user/add.php
index 2f59d2c2..47a3a077 100644
--- a/admin/controllers/user/add.php
+++ b/admin/controllers/user/add.php
@@ -5,9 +5,9 @@
 if (!empty($_POST)) {
     user_add();
 }
-if (isset($_GET['user_id'])) $user_id = intval($_GET['user_id']);
-else $user_id = 0;
-$title = ($user_id == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
+if (isset($_GET['user_id'])) $userId = intval($_GET['user_id']);
+else $userId = 0;
+$title = ($userId == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
 $nav_user = 'class="active open"';
-$user_info = get_a_record('users', $user_id);
+$user_info = get_a_record('users', $userId);
 require('admin/views/user/add.php');
diff --git a/admin/controllers/user/change-password.php b/admin/controllers/user/change-password.php
index f1162ca9..2902c3be 100644
--- a/admin/controllers/user/change-password.php
+++ b/admin/controllers/user/change-password.php
@@ -1,13 +1,13 @@
 <?php
 require_once('admin/models/users.php');
-if (isset($_GET['user_id'])) $user_id = intval($_GET['user_id']);
-else $user_id = 0;
+if (isset($_GET['user_id'])) $userId = intval($_GET['user_id']);
+else $userId = 0;
 global $userNav;
-$login_user = get_a_record('users', $userNav);
-if ($user_id != $userNav && $login_user['role_id'] == 0) {
+$loginUser = get_a_record('users', $userNav);
+if ($userId != $userNav && $loginUser['role_id'] == 0) {
     header('location:index.php');
     exit;
 }
-$user_info = get_a_record('users', $user_id);
+$user_info = get_a_record('users', $userId);
 $nav_user = $nav_profile = 'class="active open"';
 require('admin/views/user/change-password.php');
diff --git a/admin/controllers/user/delete.php b/admin/controllers/user/delete.php
index bca489f0..6225373e 100644
--- a/admin/controllers/user/delete.php
+++ b/admin/controllers/user/delete.php
@@ -1,14 +1,14 @@
 <?php
 permission_user();
 require_once('admin/models/users.php');
-$user_id = intval($_GET['user_id']);
+$userId = intval($_GET['user_id']);
 global $userNav;
 $user = get_a_record('users', $userNav);
 if ($_GET['user_id'] == $userNav || $user['role_id'] <> 1) {
-    echo '<div style="padding-top: 200" class="container"><div class="alert alert-danger" style="text-align: center;"><strong>Error!</strong> Bạn không có quyền hoặc không được phép xóa người dùng này.<br><br> Hãy <a href="javascript: history.go(-1)">Quay lại</a> .!!</div></div>';
+    echo '<div style="padding-top: 200px" class="container"><div class="alert alert-danger" style="text-align: center;"><strong>Error!</strong> Bạn không có quyền hoặc không được phép xóa người dùng này.<br><br> Hãy <a href="javascript: history.go(-1)">Quay lại</a> .!!</div></div>';
     require('admin/views/user/result.php');
     exit;
 } else {
-    user_delete($user_id);
+    user_delete($userId);
 }
 header('location:admin.php?controller=user&action=listall');
diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php
index d7533ae3..b7c779ac 100644
--- a/admin/controllers/user/edit.php
+++ b/admin/controllers/user/edit.php
@@ -4,20 +4,20 @@
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
-if (isset($_GET['user_id'])) $user_id = intval($_GET['user_id']);
-else $user_id = 0;
+if (isset($_GET['user_id'])) $userId = intval($_GET['user_id']);
+else $userId = 0;
 global $userNav;
-$login_user = get_a_record('users', $userNav);
-if ($user_id != $userNav && $login_user['role_id'] == 0) {
+$loginUser = get_a_record('users', $userNav);
+if ($userId != $userNav && $loginUser['role_id'] == 0) {
     header('location:index.php');
-} elseif ($user_id != $userNav && $login_user['role_id'] == 2) {
+} elseif ($userId != $userNav && $loginUser['role_id'] == 2) {
     header('location:admin.php');
 }
 require_once('admin/models/users.php');
 if (!empty($_POST)) {
     user_update();
 }
-$title = ($user_id == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
+$title = ($userId == 0) ? 'Thêm thông tin' : 'Cập nhật thông tin tài khoản';
 $nav_user = 'class="active open"';
-$user_info = get_a_record('users', $user_id);
+$user_info = get_a_record('users', $userId);
 require('admin/views/user/edit.php');
diff --git a/admin/controllers/user/info.php b/admin/controllers/user/info.php
index e3192935..093dcb76 100644
--- a/admin/controllers/user/info.php
+++ b/admin/controllers/user/info.php
@@ -3,21 +3,21 @@
 $title = 'Thông tin cá nhân';
 $nav_profile = $nav_user = 'class="active open"';
 global $linkConnectDB;
-if (isset($_GET['user_id'])) $user_id = intval($_GET['user_id']);
-else $user_id = 0;
-if (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT id FROM users WHERE id='$user_id'")) == 0) {
-    echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> NgườI dùng này không tồn tại. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+if (isset($_GET['user_id'])) $userId = intval($_GET['user_id']);
+else $userId = 0;
+if (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT id FROM users WHERE id='$userId'")) == 0) {
+    echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> NgườI dùng này không tồn tại. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
     require('admin/views/user/result.php');
     exit;
 }
 global $userNav;
-$login_user = get_a_record('users', $userNav);
-if ($user_id != $userNav && $login_user['role_id'] == 0) {
+$loginUser = get_a_record('users', $userNav);
+if ($userId != $userNav && $loginUser['role_id'] == 0) {
     header('location:index.php');
     exit;
-} elseif ($user_id != $userNav && $login_user['role_id'] == 2) {
+} elseif ($userId != $userNav && $loginUser['role_id'] == 2) {
     header('location:admin.php');
     exit;
 }
-$user_info = get_a_record('users', $user_id);
+$user_info = get_a_record('users', $userId);
 require('admin/views/user/info.php');
diff --git a/admin/controllers/user/result.php b/admin/controllers/user/result.php
index bdb07910..b808dd72 100644
--- a/admin/controllers/user/result.php
+++ b/admin/controllers/user/result.php
@@ -2,8 +2,8 @@
 require_once('admin/models/users.php');
 if (isset($_POST['id_change'])) {
     global $userNav;
-    $login_user = get_a_record('users', $userNav);
-    if ($_POST['id_change'] != $userNav && $login_user['role_id'] == 0) {
+    $loginUser = get_a_record('users', $userNav);
+    if ($_POST['id_change'] != $userNav && $loginUser['role_id'] == 0) {
         header('location:index.php');
     }
     $id = intval($_POST['id_change']);
@@ -12,10 +12,10 @@
     $confirmPassword = md5($_POST['confirmPassword']);
 }
 if ($newpassword == $currentpassword) {
-    echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Mật khẩu mới của bạn không được phép giống mật khẩu hiện tại !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Mật khẩu mới của bạn không được phép giống mật khẩu hiện tại !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>";
 } elseif (strlen($_POST['newPassword']) < 8) {
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc thay đổi mật khẩu thất bại. Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc thay đổi mật khẩu thất bại. Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
 } elseif ($newpassword == $confirmPassword) {
     echo changePassword($id, $newpassword, $currentpassword);
-} else echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Ô nhập xác thực mật khẩu không đúng với mật khẩu mới bạn nhập vào !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>";
+} else echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Ô nhập xác thực mật khẩu không đúng với mật khẩu mới bạn nhập vào !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>";
 require('admin/views/user/result.php');
diff --git a/admin/models/feedbacks.php b/admin/models/feedbacks.php
index 9583b39b..c95955c2 100644
--- a/admin/models/feedbacks.php
+++ b/admin/models/feedbacks.php
@@ -18,7 +18,7 @@ function addFeedbackOrder()
         'status' => 0
     );
     save('feedbacks', $feedback_add);
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Thư phản hồi của bạn đã được gửi đến hệ thống của quán Chị Kòi. Cảm ơn bạn đã gửi lại phải hồi về quán. <br><br>Hãy đến <a href='admin.php'>Dashboard</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Thư phản hồi của bạn đã được gửi đến hệ thống của quán Chị Kòi. Cảm ơn bạn đã gửi lại phải hồi về quán. <br><br>Hãy đến <a href='admin.php'>Dashboard</a></div></div>";
     require('content/views/feedback/result.php');
     exit;
 }
diff --git a/admin/models/media.php b/admin/models/media.php
index 03729215..d7b3778b 100644
--- a/admin/models/media.php
+++ b/admin/models/media.php
@@ -20,7 +20,7 @@ function media_add()
         'media_name' => escape($_POST['name']),
         'createDate' => gmdate('Y-m-d H:i:s', time() + 7 * 3600)
     );
-    $media_id =  save('media', $media_add);
+    $mediaId =  save('media', $media_add);
     $slugg = slug($_POST['name']);
     $config = array(
         'name' => $slugg,
@@ -30,7 +30,7 @@ function media_add()
     $images = upload('imggggg', $config);
     if ($images) {
         $media_add = array(
-            'id' => $media_id,
+            'id' => $mediaId,
             'slug' => $images
         );
         save('media', $media_add);
@@ -43,7 +43,7 @@ function media_update()
         'id' => intval($_POST['media_id']),
         'media_name' => escape($_POST['name']),
     );
-    $media_id =  save('media', $media_edit);
+    $mediaId =  save('media', $media_edit);
     $slugg = slug($_POST['name']);
     $config = array(
         'name' => $slugg,
@@ -53,7 +53,7 @@ function media_update()
     $images = upload('imggggg', $config);
     if ($images) {
         $media_edit = array(
-            'id' => $media_id,
+            'id' => $mediaId,
             'slug' => $images
         );
         save('media', $media_edit);
diff --git a/admin/models/order.php b/admin/models/order.php
index 532665a2..1169d35b 100644
--- a/admin/models/order.php
+++ b/admin/models/order.php
@@ -1,11 +1,11 @@
 <?php
-function order_detail($order_id)
+function order_detail($orderId)
 {
     global $linkConnectDB;
     $sql = "SELECT products.id, products.product_name,products.img1, products.product_price,products.product_typeid, products.percentoff, products.saleoff, order_detail.quantity, products.slug
 			FROM order_detail
 			INNER JOIN products ON products.id=order_detail.product_id
-			WHERE order_detail.order_id=$order_id";
+			WHERE order_detail.order_id=$orderId";
     $query = mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
     $data = array();
     if (mysqli_num_rows($query) > 0) {
diff --git a/admin/models/posts.php b/admin/models/posts.php
index 044c712c..4f95cc8b 100644
--- a/admin/models/posts.php
+++ b/admin/models/posts.php
@@ -57,9 +57,9 @@ function page_update()
         'totalview' => intval($_POST['totalview']),
         'post_type' => 2
     );
-    $post_id = save('posts', $post);
+    $postId = save('posts', $post);
     //upload ảnh 1 của post
-    $image_name1 = slug($name) . '-' . $post_id . 'page';
+    $image_name1 = slug($name) . '-' . $postId . 'page';
     $config1 = array(
         'name' => $image_name1,
         'upload_path'  => 'public/upload/ckeditorimages/',
@@ -69,7 +69,7 @@ function page_update()
     //cập nhật ảnh mới lên database 
     if ($image1) {
         $post = array(
-            'id' => $post_id,
+            'id' => $postId,
             'post_avatar' => $image1
         );
         save('posts', $post);
@@ -92,9 +92,9 @@ function page_add()
         'post_type' => 2,
         'post_status' => 'Draft'
     );
-    $post_id = save('posts', $post);
+    $postId = save('posts', $post);
     //upload ảnh 1 của post
-    $image_name1 = slug($name) . '-' . $post_id . 'page';
+    $image_name1 = slug($name) . '-' . $postId . 'page';
     $config1 = array(
         'name' => $image_name1,
         'upload_path'  => 'public/upload/ckeditorimages/',
@@ -104,7 +104,7 @@ function page_add()
     //cập nhật ảnh mới lên database 
     if ($image1) {
         $post = array(
-            'id' => $post_id,
+            'id' => $postId,
             'post_avatar' => $image1
         );
         save('posts', $post);
@@ -127,9 +127,9 @@ function post_update()
         'totalview' => intval($_POST['totalview']),
         'post_type' => 1
     );
-    $post_id = save('posts', $post);
+    $postId = save('posts', $post);
     //upload ảnh 1 của post
-    $image_name1 = slug($name) . '-' . $post_id . 'post';
+    $image_name1 = slug($name) . '-' . $postId . 'post';
     $config1 = array(
         'name' => $image_name1,
         'upload_path'  => 'public/upload/ckeditorimages/',
@@ -139,7 +139,7 @@ function post_update()
     //cập nhật ảnh mới lên database 
     if ($image1) {
         $post = array(
-            'id' => $post_id,
+            'id' => $postId,
             'post_avatar' => $image1
         );
         save('posts', $post);
@@ -162,9 +162,9 @@ function post_add()
         'post_type' => 1,
         'post_status' => 'Draft'
     );
-    $post_id = save('posts', $post);
+    $postId = save('posts', $post);
     //upload ảnh 1 của post
-    $image_name1 = slug($name) . '-' . $post_id . 'post';
+    $image_name1 = slug($name) . '-' . $postId . 'post';
     $config1 = array(
         'name' => $image_name1,
         'upload_path'  => 'public/upload/ckeditorimages/',
@@ -174,7 +174,7 @@ function post_add()
     //cập nhật ảnh mới lên database 
     if ($image1) {
         $post = array(
-            'id' => $post_id,
+            'id' => $postId,
             'post_avatar' => $image1
         );
         save('posts', $post);
diff --git a/admin/models/products.php b/admin/models/products.php
index 99f2129e..85294afa 100644
--- a/admin/models/products.php
+++ b/admin/models/products.php
@@ -61,9 +61,9 @@ function product_update()
         'editBy' => escape($editby),
         'editDate' => $editDate
     );
-    $product_id = save('products', $product);
+    $productId = save('products', $product);
     //upload ảnh 1 của product
-    $image_name1 = $slug . '-' . $product_id . 'img1';
+    $image_name1 = $slug . '-' . $productId . 'img1';
     $config1 = array(
         'name' => $image_name1,
         'upload_path'  => 'public/upload/products/',
@@ -73,13 +73,13 @@ function product_update()
     //cập nhật ảnh mới lên database 
     if ($image1) {
         $product = array(
-            'id' => $product_id,
+            'id' => $productId,
             'img1' => $image1
         );
         save('products', $product);
     }
     //upload ảnh 2 của product
-    $image_name2 = $slug . '-' . $product_id . 'img2';
+    $image_name2 = $slug . '-' . $productId . 'img2';
     $config2 = array(
         'name' => $image_name2,
         'upload_path'  => 'public/upload/products/',
@@ -89,13 +89,13 @@ function product_update()
     //cập nhật ảnh mới lên database
     if ($image2) {
         $product = array(
-            'id' => $product_id,
+            'id' => $productId,
             'img2' => $image2
         );
         save('products', $product);
     }
     //upload ảnh 3 của product
-    $image_name3 = $slug . '-' . $product_id . 'img3';
+    $image_name3 = $slug . '-' . $productId . 'img3';
     $config3 = array(
         'name' => $image_name3,
         'upload_path'  => 'public/upload/products/',
@@ -105,13 +105,13 @@ function product_update()
     //cập nhật ảnh mới lên database 
     if ($image3) {
         $product = array(
-            'id' => $product_id,
+            'id' => $productId,
             'img3' => $image3
         );
         save('products', $product);
     }
     //upload ảnh 4 của product
-    $image_name4 = $slug . '-' . $product_id . 'img4';
+    $image_name4 = $slug . '-' . $productId . 'img4';
     $config4 = array(
         'name' => $image_name4,
         'upload_path'  => 'public/upload/products/',
@@ -121,7 +121,7 @@ function product_update()
     //cập nhật ảnh mới lên database 
     if ($image4) {
         $product = array(
-            'id' => $product_id,
+            'id' => $productId,
             'img4' => $image4
         );
         save('products', $product);
diff --git a/admin/models/purchase.php b/admin/models/purchase.php
index 9f40cc8c..20ff956e 100644
--- a/admin/models/purchase.php
+++ b/admin/models/purchase.php
@@ -8,13 +8,13 @@ function order_cancell($id)
     $sql = "UPDATE orders SET status=3,editTime='" . gmdate('Y-m-d H:i:s', time() + 7 * 3600) . "' where id=" . $id;
     mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
 }
-function purchase_order_detail($order_id)
+function purchase_order_detail($orderId)
 {
     global $linkConnectDB;
     $sql = "SELECT products.id, products.product_name,products.img1, products.product_price,products.product_typeid, products.percentoff, products.saleoff, order_detail.quantity, order_detail.product_id, products.product_description, products.slug
 			FROM order_detail
 			INNER JOIN products ON products.id=order_detail.product_id
-			WHERE order_detail.order_id=$order_id";
+			WHERE order_detail.order_id=$orderId";
     $query = mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
     $data = array();
     if (mysqli_num_rows($query) > 0) {
diff --git a/admin/models/slides.php b/admin/models/slides.php
index f13ff687..a7ab7bb8 100644
--- a/admin/models/slides.php
+++ b/admin/models/slides.php
@@ -40,8 +40,8 @@ function slide_update()
         'slide_text5' => escape($_POST['slide_text5']),
         'status' => intval($_POST['status'])
     );
-    $slide_id = save('slides', $slides);
-    $image_name1 = 'image1' . '-' . $slide_id . '-' . slug($name);
+    $slideId = save('slides', $slides);
+    $image_name1 = 'image1' . '-' . $slideId . '-' . slug($name);
     $config = array(
         'name' => $image_name1,
         'upload_path' => 'public/upload/slides/',
@@ -50,12 +50,12 @@ function slide_update()
     $image1 = upload('image1', $config); //$field = name of input
     if ($image1) {
         $slides = array(
-            'id' => $slide_id,
+            'id' => $slideId,
             'slide_img1' => $image1
         );
         save('slides', $slides);
     }
-    $image_name2 = 'image2' . '-' . $slide_id . '-' . slug($name);
+    $image_name2 = 'image2' . '-' . $slideId . '-' . slug($name);
     $config = array(
         'name' => $image_name2,
         'upload_path' => 'public/upload/slides/',
@@ -64,12 +64,12 @@ function slide_update()
     $image2 = upload('image2', $config);
     if ($image2) {
         $slides = array(
-            'id' => $slide_id,
+            'id' => $slideId,
             'slide_img2' => $image2
         );
         save('slides', $slides);
     }
-    $image_name3 = 'image3' . '-' . $slide_id . '-' . slug($name);
+    $image_name3 = 'image3' . '-' . $slideId . '-' . slug($name);
     $config = array(
         'name' => $image_name3,
         'upload_path' => 'public/upload/slides/',
@@ -78,12 +78,12 @@ function slide_update()
     $image3 = upload('image3', $config);
     if ($image3) {
         $slides = array(
-            'id' => $slide_id,
+            'id' => $slideId,
             'slide_img3' => $image3
         );
         save('slides', $slides);
     }
-    $image_name4 = 'image4' . '-' . $slide_id . '-' . slug($name);
+    $image_name4 = 'image4' . '-' . $slideId . '-' . slug($name);
     $config = array(
         'name' => $image_name4,
         'upload_path' => 'public/upload/slides/',
@@ -92,12 +92,12 @@ function slide_update()
     $image4 = upload('image4', $config);
     if ($image4) {
         $slides = array(
-            'id' => $slide_id,
+            'id' => $slideId,
             'slide_img4' => $image4
         );
         save('slides', $slides);
     }
-    $image_name5 = 'image5' . '-' . $slide_id . '-' . slug($name);
+    $image_name5 = 'image5' . '-' . $slideId . '-' . slug($name);
     $config = array(
         'name' => $image_name5,
         'upload_path' => 'public/upload/slides/',
@@ -106,7 +106,7 @@ function slide_update()
     $image5 = upload('image5', $config);
     if ($image5) {
         $slides = array(
-            'id' => $slide_id,
+            'id' => $slideId,
             'slide_img5' => $image5
         );
         save('slides', $slides);
diff --git a/admin/models/users.php b/admin/models/users.php
index e2a426c2..008a77e1 100644
--- a/admin/models/users.php
+++ b/admin/models/users.php
@@ -56,7 +56,7 @@ function changePassword($id, $newpassword, $currentPassword)
     mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
     $rows =  mysqli_affected_rows($linkConnectDB); //Gets the number of affected rows in a previous MySQL operation
     if ($rows <> 1) {
-        return  "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Bạn đã nhập mật khẩu hiện tại không đúng !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>" . mysqli_error($linkConnectDB);
+        return  "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Bạn đã nhập mật khẩu hiện tại không đúng !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='admin.php'>Đến Dashboard</a></div></div>" . mysqli_error($linkConnectDB);
     } else {
         $options = array(
             'id' => $id,
@@ -106,7 +106,7 @@ function changePassword($id, $newpassword, $currentPassword)
         } catch (Exception $e) {
             echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
         }
-        return '<div style="padding-top: 200" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi mật khẩu thành công. Và một tin nhắn thông báo đã được gửi đến Email của người dùng này. Hãy <a href="admin.php?controller=home&action=logout">Đăng xuất</a> và đăng nhập lại.!!</div></div>';
+        return '<div style="padding-top: 200px" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi mật khẩu thành công. Và một tin nhắn thông báo đã được gửi đến Email của người dùng này. Hãy <a href="admin.php?controller=home&action=logout">Đăng xuất</a> và đăng nhập lại.!!</div></div>';
     }
 }
 function user_update()
@@ -133,14 +133,14 @@ function user_update()
     $email_check = addslashes($_POST['email']);
     $id_check = intval($_POST['user_id']);
     if (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE user_email='$email_check'")) != 0 && mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE id='$id_check' AND user_email='$email_check'")) <> 1) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('admin/views/user/result.php');
         exit;
     } else {
         $get_currentEmail_user = get_a_record('users', $_POST['user_id']);
         $currentEmail = $get_currentEmail_user['user_email'];
-        $user_id =  save('users', $user_edit);
-        $avatar_name = 'avatar-user' . $user_id . '-' . slug($_POST['username']);
+        $userId =  save('users', $user_edit);
+        $avatar_name = 'avatar-user' . $userId . '-' . slug($_POST['username']);
         $config = array(
             'name' => $avatar_name,
             'upload_path'  => 'public/upload/images/',
@@ -150,12 +150,12 @@ function user_update()
         //cập nhật ảnh mới
         if ($avatar) {
             $user_edit = array(
-                'id' => $user_id,
+                'id' => $userId,
                 'user_avatar' => $avatar
             );
             save('users', $user_edit);
         }
-        $user_edited = get_a_record('users', $user_id);
+        $user_edited = get_a_record('users', $userId);
         if ($user_edited['user_email'] != $currentEmail) {
             //send mail
             require 'vendor/autoload.php';
@@ -201,7 +201,7 @@ function user_update()
                 echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
             }
             $verificationCode_add = array(
-                'id' => $user_id,
+                'id' => $userId,
                 'verificationCode' => $verificationCode,
                 'verified' => 0
             );
@@ -228,23 +228,23 @@ function user_add()
     $email = addslashes($_POST['email']);
     //https://freetuts.net/xay-dung-chuc-nang-dang-nhap-va-dang-ky-voi-php-va-mysql-85.html
     if (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_username FROM users WHERE user_username='$username'")) > 0) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Tên đăng nhập này đã có người dùng. Vui lòng chọn tên đăng nhập khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Tên đăng nhập này đã có người dùng. Vui lòng chọn tên đăng nhập khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('admin/views/user/addresult.php');
         exit;
     } elseif (!preg_match("/([a-z0-9_]+|[a-z0-9_]+\.[a-z0-9_]+)@(([a-z0-9]|[a-z0-9]+\.[a-z0-9]+)+\.([a-z]{2,4}))/i", $email)) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('admin/views/user/addresult.php');
         exit;
     } elseif (strlen($_POST['password']) < 8) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         exit;
     } elseif (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE user_email='$email'")) > 0) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('admin/views/user/addresult.php');
         exit;
     } else {
-        $user_id =  save('users', $user_add);
-        $avatar_name = 'avatar-user' . $user_id . '-' . slug($_POST['username']);
+        $userId =  save('users', $user_add);
+        $avatar_name = 'avatar-user' . $userId . '-' . slug($_POST['username']);
         $config = array(
             'name' => $avatar_name,
             'upload_path'  => 'public/upload/images/',
@@ -253,7 +253,7 @@ function user_add()
         $avatar = upload('imagee', $config);
         if ($avatar) {
             $user_add = array(
-                'id' => $user_id,
+                'id' => $userId,
                 'user_avatar' => $avatar
             );
             save('users', $user_add);
@@ -301,11 +301,11 @@ function user_add()
             echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
         }
         $verificationCode_add = array(
-            'id' => $user_id,
+            'id' => $userId,
             'verificationCode' => $verificationCode,
             'verified' => 0
         );
         save('users', $verificationCode_add);
-        header('location:admin.php?controller=user&action=info&user_id=' . $user_id);
+        header('location:admin.php?controller=user&action=info&user_id=' . $userId);
     }
 }
diff --git a/admin/views/feedback/add.php b/admin/views/feedback/add.php
index a34b33a2..9abb1f76 100644
--- a/admin/views/feedback/add.php
+++ b/admin/views/feedback/add.php
@@ -72,7 +72,7 @@
                                         <?php
                                         $stt = 0;
                                         $order_total = 0;
-                                        foreach ($order_detail as $product) :
+                                        foreach ($orderDetail as $product) :
                                             $stt++;
                                             if ($product["product_typeid"] == 3) {
                                                 $order_total += ($product['product_price'] - (($product['product_price']) * ($product['percentoff']) / 100)) * $product['quantity'];
diff --git a/admin/views/feedback/edit.php b/admin/views/feedback/edit.php
index 5a853653..7ae7fc6f 100644
--- a/admin/views/feedback/edit.php
+++ b/admin/views/feedback/edit.php
@@ -73,7 +73,7 @@
                                             <?php
                                             $stt = 0;
                                             $order_total = 0;
-                                            foreach ($order_detail as $product) :
+                                            foreach ($orderDetail as $product) :
                                                 $stt++;
                                                 if ($product["product_typeid"] == 3) {
                                                     $order_total += ($product['product_price'] - (($product['product_price']) * ($product['percentoff']) / 100)) * $product['quantity'];
diff --git a/admin/views/feedback/view.php b/admin/views/feedback/view.php
index b826edc7..e0c83068 100644
--- a/admin/views/feedback/view.php
+++ b/admin/views/feedback/view.php
@@ -73,7 +73,7 @@
                                             <?php
                                             $stt = 0;
                                             $order_total = 0;
-                                            foreach ($order_detail as $product) :
+                                            foreach ($orderDetail as $product) :
                                                 $stt++;
                                                 if ($product["product_typeid"] == 3) {
                                                     $order_total += ($product['product_price'] - (($product['product_price']) * ($product['percentoff']) / 100)) * $product['quantity'];
diff --git a/admin/views/home/index.php b/admin/views/home/index.php
index 76cba356..5cccf0bf 100644
--- a/admin/views/home/index.php
+++ b/admin/views/home/index.php
@@ -23,7 +23,7 @@
         </div>
     </div>
     <div class="container-fluid">
-        <?php if ($user_info_nav['role_id']  == 0) : ?>
+        <?php if ($userInfoNav['role_id']  == 0) : ?>
             <div class="row clearfix">
                 <div class="col-lg-3 col-md-6 col-sm-12">
                     <div class="card widget_2 big_icon sales">
diff --git a/admin/views/order/tableOrderComplete.php b/admin/views/order/tableOrderComplete.php
index b93abc0f..28003289 100644
--- a/admin/views/order/tableOrderComplete.php
+++ b/admin/views/order/tableOrderComplete.php
@@ -43,7 +43,7 @@
                             </tr>
                         </tfoot>
                         <tbody>
-                            <?php foreach ($order_complete as $order) : ?>
+                            <?php foreach ($orderComplete as $order) : ?>
                                 <tr>
                                     <td><?php echo $order['id'] ?></td>
                                     <td><a href="admin.php?controller=order&amp;action=view&amp;order_id=<?php echo $order['id']; ?>"><?php echo $order['customer']; ?></a></td>
diff --git a/admin/views/order/view.php b/admin/views/order/view.php
index 40200c80..9e3a1fa0 100644
--- a/admin/views/order/view.php
+++ b/admin/views/order/view.php
@@ -72,7 +72,7 @@
                                         <?php
                                         $stt = 0;
                                         $order_total = 0;
-                                        foreach ($order_detail as $product) :
+                                        foreach ($orderDetail as $product) :
                                             $stt++;
                                             if ($product["product_typeid"] == 3) {
                                                 $order_total += ($product['product_price'] - (($product['product_price']) * ($product['percentoff']) / 100)) * $product['quantity'];
diff --git a/admin/views/purchase/cancelled.php b/admin/views/purchase/cancelled.php
index e804e3f3..924c60b0 100644
--- a/admin/views/purchase/cancelled.php
+++ b/admin/views/purchase/cancelled.php
@@ -27,13 +27,13 @@
         <div class="container-fluid">
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12">
-                    <?php if (empty($order_cancelled)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
-                    <?php foreach ($order_cancelled as $order) :
-                        $order_detail = purchase_order_detail($order['id']); ?>
+                    <?php if (empty($cancelledOrders)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
+                    <?php foreach ($cancelledOrders as $order) :
+                        $orderDetail = purchase_order_detail($order['id']); ?>
                         <div class="card">
                             <div class="body">
                                 <ul class="comment-reply list-unstyled">
-                                    <?php foreach ($order_detail as $product) : ?>
+                                    <?php foreach ($orderDetail as $product) : ?>
                                         <li>
                                             <div class="icon-box"><a href="product/<?php echo $product['product_id']; ?>-<?php echo $product['slug']; ?>"><img class="img-fluid img-thumbnail" src="public/upload/products/<?= $product['img1'] ?>" style="max-width:80px;" alt="Awesome Image"></a></div>
                                             <div class="text-box">
diff --git a/admin/views/purchase/confirmed.php b/admin/views/purchase/confirmed.php
index 18ed90a2..34d7b418 100644
--- a/admin/views/purchase/confirmed.php
+++ b/admin/views/purchase/confirmed.php
@@ -27,13 +27,13 @@
         <div class="container-fluid">
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12">
-                    <?php if (empty($order_confirmed)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
-                    <?php foreach ($order_confirmed as $order) :
-                        $order_detail = purchase_order_detail($order['id']); ?>
+                    <?php if (empty($confirmedOrders)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
+                    <?php foreach ($confirmedOrders as $order) :
+                        $orderDetail = purchase_order_detail($order['id']); ?>
                         <div class="card">
                             <div class="body">
                                 <ul class="comment-reply list-unstyled">
-                                    <?php foreach ($order_detail as $product) : ?>
+                                    <?php foreach ($orderDetail as $product) : ?>
                                         <li>
                                             <div class="icon-box"><a href="product/<?php echo $product['product_id']; ?>-<?php echo $product['slug']; ?>"><img class="img-fluid img-thumbnail" src="public/upload/products/<?= $product['img1'] ?>" style="max-width:80px;" alt="Awesome Image"></a></div>
                                             <div class="text-box">
diff --git a/admin/views/purchase/delivery.php b/admin/views/purchase/delivery.php
index abc8617c..8b43b7ad 100644
--- a/admin/views/purchase/delivery.php
+++ b/admin/views/purchase/delivery.php
@@ -27,13 +27,13 @@
         <div class="container-fluid">
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12">
-                    <?php if (empty($order_delivery)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
-                    <?php foreach ($order_delivery as $order) :
-                        $order_detail = purchase_order_detail($order['id']); ?>
+                    <?php if (empty($deliveryOrders)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
+                    <?php foreach ($deliveryOrders as $order) :
+                        $orderDetail = purchase_order_detail($order['id']); ?>
                         <div class="card">
                             <div class="body">
                                 <ul class="comment-reply list-unstyled">
-                                    <?php foreach ($order_detail as $product) : ?>
+                                    <?php foreach ($orderDetail as $product) : ?>
                                         <li>
                                             <div class="icon-box"><a href="product/<?php echo $product['product_id']; ?>-<?php echo $product['slug']; ?>"><img class="img-fluid img-thumbnail" src="public/upload/products/<?= $product['img1'] ?>" style="max-width:80px;" alt="Awesome Image"></a></div>
                                             <div class="text-box">
diff --git a/admin/views/purchase/index.php b/admin/views/purchase/index.php
index 9ce9a4e2..ce8fc8e2 100644
--- a/admin/views/purchase/index.php
+++ b/admin/views/purchase/index.php
@@ -27,13 +27,13 @@
         <div class="container-fluid">
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12">
-                    <?php if (empty($order_all)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
-                    <?php foreach ($order_all as $order) :
-                        $order_detail = purchase_order_detail($order['id']); ?>
+                    <?php if (empty($orders)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
+                    <?php foreach ($orders as $order) :
+                        $orderDetail = purchase_order_detail($order['id']); ?>
                         <div class="card">
                             <div class="body">
                                 <ul class="comment-reply list-unstyled">
-                                    <?php foreach ($order_detail as $product) : ?>
+                                    <?php foreach ($orderDetail as $product) : ?>
                                         <li>
                                             <div class="icon-box"><a href="product/<?php echo $product['product_id']; ?>-<?php echo $product['slug']; ?>"><img class="img-fluid img-thumbnail" src="public/upload/products/<?= $product['img1'] ?>" style="max-width:80px;" alt="Awesome Image"></a></div>
                                             <div class="text-box">
diff --git a/admin/views/purchase/receied.php b/admin/views/purchase/receied.php
index 46393b7d..fc893378 100644
--- a/admin/views/purchase/receied.php
+++ b/admin/views/purchase/receied.php
@@ -27,13 +27,13 @@
         <div class="container-fluid">
             <div class="row clearfix">
                 <div class="col-lg-12 col-md-12">
-                    <?php if (empty($order_receied)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
-                    <?php foreach ($order_receied as $order) :
-                        $order_detail = purchase_order_detail($order['id']); ?>
+                    <?php if (empty($receiedOrders)) echo '<h2 style="text-align: center;">Chưa có đơn hàng nào</h2>'; ?>
+                    <?php foreach ($receiedOrders as $order) :
+                        $orderDetail = purchase_order_detail($order['id']); ?>
                         <div class="card">
                             <div class="body">
                                 <ul class="comment-reply list-unstyled">
-                                    <?php foreach ($order_detail as $product) : ?>
+                                    <?php foreach ($orderDetail as $product) : ?>
                                         <li>
                                             <div class="icon-box"><a href="product/<?php echo $product['product_id']; ?>-<?php echo $product['slug']; ?>"><img class="img-fluid img-thumbnail" src="public/upload/products/<?= $product['img1'] ?>" style="max-width:80px;" alt="Awesome Image"></a></div>
                                             <div class="text-box">
diff --git a/admin/views/purchase/view.php b/admin/views/purchase/view.php
index a2270666..4bdf1524 100644
--- a/admin/views/purchase/view.php
+++ b/admin/views/purchase/view.php
@@ -72,7 +72,7 @@
                                         <?php
                                         $stt = 0;
                                         $order_total = 0;
-                                        foreach ($order_detail as $product) :
+                                        foreach ($orderDetail as $product) :
                                             $stt++;
                                             if ($product["product_typeid"] == 3) {
                                                 $order_total += ($product['product_price'] - (($product['product_price']) * ($product['percentoff']) / 100)) * $product['quantity'];
diff --git a/admin/views/shared/header.php b/admin/views/shared/header.php
index 9325230b..d35f9b58 100644
--- a/admin/views/shared/header.php
+++ b/admin/views/shared/header.php
@@ -1,7 +1,7 @@
 <?php
 $contacts = get_a_record('contacts', 1);
 global $userNav;
-$user_info_nav = get_a_record('users', $userNav) ?>
+$userInfoNav = get_a_record('users', $userNav) ?>
 <!doctype html>
 <html class="no-js " lang="en">
 
diff --git a/admin/views/shared/leftnavbar.php b/admin/views/shared/leftnavbar.php
index 91b22b5f..3952e2f7 100644
--- a/admin/views/shared/leftnavbar.php
+++ b/admin/views/shared/leftnavbar.php
@@ -7,11 +7,11 @@
         <ul class="list">
             <li>
                 <div class="user-info">
-                    <a class="image" href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>"><img src="public/upload/images/<?= $user_info_nav['user_avatar'] ?>" alt="User"></a>
+                    <a class="image" href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>"><img src="public/upload/images/<?= $userInfoNav['user_avatar'] ?>" alt="User"></a>
                     <div class="detail">
-                        <h4><?= $user_info_nav['user_name'] ?></h4>
-                        <small><?php if ($user_info_nav['role_id'] == 1) echo 'Admin';
-                                elseif ($user_info_nav['role_id'] == 2) echo 'Moderator';
+                        <h4><?= $userInfoNav['user_name'] ?></h4>
+                        <small><?php if ($userInfoNav['role_id'] == 1) echo 'Admin';
+                                elseif ($userInfoNav['role_id'] == 2) echo 'Moderator';
                                 else echo "User"; ?></small>
                     </div>
                 </div>
@@ -21,7 +21,7 @@
             <li <?php if (isset($nav_profile)) echo $nav_profile; ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-account"></i><span>Profile</span></a>
                 <ul class="ml-menu">
                     <li><a href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>">Your profile</a></li>
-                    <li><a href="admin.php?controller=user&action=change-password&user_id=<?= $user_info_nav['id'] ?>">Change your Password</a></li>
+                    <li><a href="admin.php?controller=user&action=change-password&user_id=<?= $userInfoNav['id'] ?>">Change your Password</a></li>
                 </ul>
             </li>
             <li <?= $yourFeedback ?? '' ?>><a href="admin.php?controller=feedback&action=myfeedback"><i class="zmdi zmdi-mail-send"></i><span>Your Feedback</span></a></li>
@@ -34,8 +34,8 @@
                     <li><a href="admin.php?controller=purchase&action=cancelled">Đơn hàng đã hủy</a></li>
                 </ul>
             </li>
-            <?php if ($user_info_nav['role_id'] != 0) :
-                if ($user_info_nav['role_id'] == 1) : ?>
+            <?php if ($userInfoNav['role_id'] != 0) :
+                if ($userInfoNav['role_id'] == 1) : ?>
                     <li <?= $navCategory ?? ''; ?>> <a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-folder"></i><span>Quản lý danh mục</span></a>
                         <ul class="ml-menu">
                             <li><a href="admin.php?controller=shop">1. Nhóm danh mục</a></li>
@@ -57,7 +57,7 @@
                             <li><a href="admin.php?controller=header-footer&action=listMenuFooter">Link Menu Footer</a></li>
                         </ul>
                     </li>
-                    <li <?php if (isset($nav_admin)) echo $nav_admin; ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-account"></i><span>Admin</span></a>
+                    <li <?= $adminNav ?? '' ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-account"></i><span>Admin</span></a>
                         <ul class="ml-menu">
                             <li><a href="admin.php?controller=user&action=info&user_id=<?= $userNav ?>">Your Profile</a></li>
                             <li><a href="admin.php?controller=role">List Role</a></li>
@@ -66,7 +66,7 @@
                         </ul>
                     </li>
                 <?php endif; ?>
-                <li <?php if (isset($nav_page)) echo $nav_page; ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-blogger"></i><span>Blog -> Page</span></a>
+                <li <?= $pageNav ?? '' ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-blogger"></i><span>Blog -> Page</span></a>
                     <ul class="ml-menu">
                         <li><a href="admin.php?controller=page">All Page</a></li>
                         <li><a href="admin.php?controller=page&action=viewtrash">Thùng rác</a></li>
@@ -74,7 +74,7 @@
                         <li><a href="admin.php?controller=page&action=add">ADD New Page</a></li>
                     </ul>
                 </li>
-                <li <?php if (isset($nav_post)) echo $nav_post; ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-blogger"></i><span>Blog -> Post</span></a>
+                <li <?= $postNav ?? '' ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-blogger"></i><span>Blog -> Post</span></a>
                     <ul class="ml-menu">
                         <li><a href="admin.php?controller=post">All Post</a></li>
                         <li><a href="admin.php?controller=post&action=viewtrash">Thùng rác</a></li>
@@ -82,7 +82,7 @@
                         <li><a href="admin.php?controller=post&action=add">ADD New Post</a></li>
                     </ul>
                 </li>
-                <li <?php if (isset($nav_product)) echo $nav_product; ?>> <a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-collection-text"></i><span>Quản lý sản phẩm</span></a>
+                <li <?= $productNav ?? '' ?>> <a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-collection-text"></i><span>Quản lý sản phẩm</span></a>
                     <ul class="ml-menu">
                         <li><a href="admin.php?controller=product">Danh sách sản phẩm</a></li>
                         <li><a href="admin.php?controller=product&action=update">Sản phẩm mới cập nhật</a></li>
@@ -92,7 +92,7 @@
                         <li><a href="admin.php?controller=product&amp;action=edit">Add sản phẩm mới</a></li>
                     </ul>
                 </li>
-                <li <?php if (isset($nav_order)) echo $nav_order; ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-shopping-cart"></i><span>Quản lý đơn hàng</span></a>
+                <li <?= $orderNav ?? '' ?>><a href="javascript:void(0);" class="menu-toggle"><i class="zmdi zmdi-shopping-cart"></i><span>Quản lý đơn hàng</span></a>
                     <ul class="ml-menu">
                         <li><a href="admin.php?controller=order">Danh sách All đơn hàng</a></li>
                         <li><a href="admin.php?controller=order&amp;action=order-noprocess">Đơn hàng chưa xử lý</a></li>
diff --git a/admin/views/shared/rightnavbar.php b/admin/views/shared/rightnavbar.php
index 1e5e3149..7e8e2754 100644
--- a/admin/views/shared/rightnavbar.php
+++ b/admin/views/shared/rightnavbar.php
@@ -3,7 +3,7 @@
 <div class="navbar-right">
     <ul class="navbar-nav">
         <li><a href="#search" class="main_search" title="Search..."><i class="zmdi zmdi-search"></i></a></li>
-        <?php if ($user_info_nav['role_id'] != 0) : ?>
+        <?php if ($userInfoNav['role_id'] != 0) : ?>
             <li class="dropdown">
                 <a href="javascript:void(0);" class="dropdown-toggle" title="App" data-toggle="dropdown" role="button"><i class="zmdi zmdi-apps"></i>
                     <div class="notify"><span class="heartbit"></span><span class="point"></span></div>
diff --git a/admin/views/user/edit.php b/admin/views/user/edit.php
index a5f3a4f7..28745747 100644
--- a/admin/views/user/edit.php
+++ b/admin/views/user/edit.php
@@ -74,7 +74,7 @@
                 <div class="col-lg-12">
                     <form id="product-form" class="form-horizontal" method="post" action="admin.php?controller=user&action=edit" enctype="multipart/form-data" role="form">
                         <input name="user_id" type="hidden" value="<?php echo $user_info ? $user_info['id'] : '0'; ?>" />
-                        <?php if ($login_user['role_id'] == 1) : ?>
+                        <?php if ($loginUser['role_id'] == 1) : ?>
                             <h4 class="card-inside-title" style="font-weight:bold;">Tên đăng nhập:</h4>
                             <div class="row clearfix">
                                 <div class="col-sm-12">
diff --git a/composer.json b/composer.json
index 5957006f..b9606558 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "php",
     "php-mvc",
     "php-mvc-shop",
-    "php-mvc-shop-project",
+    "php-mvc-shop-project"
   ],
   "homepage": "https://tanhongit.com",
   "authors": [
diff --git a/content/controllers/cart/add.php b/content/controllers/cart/add.php
index d9112211..0f850b1b 100644
--- a/content/controllers/cart/add.php
+++ b/content/controllers/cart/add.php
@@ -1,10 +1,10 @@
 <?php
 if (isset($_GET['id'])) {
-    $product_id = intval($_GET['id']);
+    $productId = intval($_GET['id']);
 }
 $option_slug_product = array(
     'select' => 'slug',
-    'where' => 'id=' . $product_id
+    'where' => 'id=' . $productId
 );
 $product_slugs = get_all('products', $option_slug_product);
 foreach ($product_slugs as $slug) {
@@ -14,9 +14,9 @@
     $product = array(
         'number' => intval($_POST['number_cart'])
     );
-    cart_add($product_id, $product['number']);
+    cart_add($productId, $product['number']);
     global $userNav;
     if (isset($userNav)) update_cart_user_db();
 }
-echo $product_id;
-header('location:../../product/' . $product_id . '-' . $product_slug);
+echo $productId;
+header('location:../../product/' . $productId . '-' . $product_slug);
diff --git a/content/controllers/cart/checkout.php b/content/controllers/cart/checkout.php
index f4e63b89..3f2ab490 100644
--- a/content/controllers/cart/checkout.php
+++ b/content/controllers/cart/checkout.php
@@ -12,19 +12,19 @@
 		'message' => escape($_POST['message']),
 		'user_id' => intval($_POST['user_id'])
 	);
-	$order_id = save('orders', $order);
+	$orderId = save('orders', $order);
 
 	$cart = cart_list();
 	//lấy sản phẩm trong session cart
 	foreach ($cart as $product) {
-		$order_detail = array(
+		$orderDetail = array(
 			'id' => 0,
-			'order_id' => $order_id,
+			'order_id' => $orderId,
 			'product_id' => $product['id'],
 			'quantity' => $product['number'],
 			'price' => $product['price']
 		);
-		save('order_detail', $order_detail);
+		save('order_detail', $orderDetail);
 	}
 	cart_destroy(); //xoá cart sau khi save order db
 	global $userNav;
diff --git a/content/controllers/cart/delete.php b/content/controllers/cart/delete.php
index ccc9b368..0b2b3e47 100644
--- a/content/controllers/cart/delete.php
+++ b/content/controllers/cart/delete.php
@@ -1,6 +1,6 @@
 <?php
-if (isset($_GET['id'])) $product_id = intval($_GET['id']);
-cart_delete($product_id);
+if (isset($_GET['id'])) $productId = intval($_GET['id']);
+cart_delete($productId);
 global $userNav;
-if (isset($userNav)) delete_cart_user_db($product_id);
+if (isset($userNav)) delete_cart_user_db($productId);
 header('location:' . PATH_URL . 'cart');
diff --git a/content/controllers/cart/index.php b/content/controllers/cart/index.php
index e5e9da3b..e616b1e5 100644
--- a/content/controllers/cart/index.php
+++ b/content/controllers/cart/index.php
@@ -1,8 +1,8 @@
 <?php
 //form submit
 if (!empty($_POST)) {
-    foreach ($_POST['number'] as $product_id => $number) {
-        cart_update($product_id, $number);
+    foreach ($_POST['number'] as $productId => $number) {
+        cart_update($productId, $number);
         global $userNav;
         if (isset($userNav)) update_cart_user_db();
     }
diff --git a/content/controllers/category/index.php b/content/controllers/category/index.php
index 62d8c894..f15d9a93 100644
--- a/content/controllers/category/index.php
+++ b/content/controllers/category/index.php
@@ -26,8 +26,8 @@
 
 $url = 'category/' . $cateid . '-' . $category['slug'];
 
-$total_rows = get_total('products', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('products', $options);
+$total = ceil($totalRows / $limit);
 
 $products = get_all('products', $options);
 $pagination = pagination($url, $page, $total);
diff --git a/content/controllers/feedback/index.php b/content/controllers/feedback/index.php
index ec6c7e1b..be56d99e 100644
--- a/content/controllers/feedback/index.php
+++ b/content/controllers/feedback/index.php
@@ -3,9 +3,9 @@
 if (!empty($_POST)) {
     feedback_add();
 }
-if (isset($_GET['product_id'])) $product_id = intval($_GET['product_id']);
-else $product_id = 0;
-$product = get_a_record('products', $product_id);
+if (isset($_GET['product_id'])) $productId = intval($_GET['product_id']);
+else $productId = 0;
+$product = get_a_record('products', $productId);
 if (isset($userNav)) {
     $user_action = get_a_record('users', $userNav);
 }
diff --git a/content/controllers/forgot-password/change-password.php b/content/controllers/forgot-password/change-password.php
index ca201780..a621c8bf 100644
--- a/content/controllers/forgot-password/change-password.php
+++ b/content/controllers/forgot-password/change-password.php
@@ -1,5 +1,5 @@
 <?php
-if (isset($_GET['id'])) $user_id = $_GET['id'];
-$user_info = get_a_record('users', $user_id);
+if (isset($_GET['id'])) $userId = $_GET['id'];
+$user_info = get_a_record('users', $userId);
 $title = 'Change Password - Forgot Password';
 require('content/views/forgot-password/change-password.php');
\ No newline at end of file
diff --git a/content/controllers/forgot-password/request.php b/content/controllers/forgot-password/request.php
index 065412e4..a43176e7 100644
--- a/content/controllers/forgot-password/request.php
+++ b/content/controllers/forgot-password/request.php
@@ -8,11 +8,11 @@
     $email = $_POST['email'];
     global $linkConnectDB;
     if (!preg_match("/([a-z0-9_]+|[a-z0-9_]+\.[a-z0-9_]+)@(([a-z0-9]|[a-z0-9]+\.[a-z0-9]+)+\.([a-z]{2,4}))/i", $email)) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
         require('content/views/forgot-password/result.php');
         exit;
     } elseif (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE user_email='$email'")) < 1) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không có người dùng và không tồn tại trong máy chủ. Vui lòng chọn lại Email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không có người dùng và không tồn tại trong máy chủ. Vui lòng chọn lại Email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
         require('content/views/forgot-password/result.php');
         exit;
     } else {
@@ -66,7 +66,7 @@
         } catch (Exception $e) {
             echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
         }
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn sẽ nhận được tin nhắn Email xác nhận đổi mật khẩu với email mà bạn vừa nhập.<br><br> Vui lòng đến hộp thư và kiểm tra tin nhắn và xác nhận liên kết đổi mật khẩu ở đó!!</div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn sẽ nhận được tin nhắn Email xác nhận đổi mật khẩu với email mà bạn vừa nhập.<br><br> Vui lòng đến hộp thư và kiểm tra tin nhắn và xác nhận liên kết đổi mật khẩu ở đó!!</div></div>";
         require('content/views/forgot-password/result.php');
     }
 }
diff --git a/content/controllers/forgot-password/result-change-password.php b/content/controllers/forgot-password/result-change-password.php
index 23c8423e..45144bb9 100644
--- a/content/controllers/forgot-password/result-change-password.php
+++ b/content/controllers/forgot-password/result-change-password.php
@@ -13,9 +13,9 @@
     $user = get_a_record('users', $id);
     $email = $user['user_email'];
     if ($newpassword == $user['user_password']) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Mật khẩu mới của bạn vừa nhập là mật khẩu của bạn hiện tại đó. <br><br>Bạn đã nhớ lại mật khẩu của mình chưa <i class='zmdi zmdi-favorite'></i> !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Mật khẩu mới của bạn vừa nhập là mật khẩu của bạn hiện tại đó. <br><br>Bạn đã nhớ lại mật khẩu của mình chưa <i class='zmdi zmdi-favorite'></i> !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến trang chủ</a></div></div>";
     } elseif (strlen($_POST['newpassword']) < 8) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc thay đổi mật khẩu thất bại. Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc thay đổi mật khẩu thất bại. Mật khẩu bạn nhập phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif ($newpassword == $confirmNewPassword) {
         $options = array(
             'id' => $id,
@@ -62,7 +62,7 @@
         } catch (Exception $e) {
             echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
         }
-        echo '<div style="padding-top: 200" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi mật khẩu thành công. Và một tin nhắn thông báo đã được gửi đến Email của người dùng này. Hãy đến trang <a href="admin.php?controller=home&action=login">Đăng nhập</a> và đăng nhập lại.!!</div></div>';
-    } else echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Ô nhập xác thực mật khẩu không đúng với mật khẩu mới mà bạn nhập vào !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến trang chủ</a></div></div>";
+        echo '<div style="padding-top: 200px" class="container"><div class="alert alert-success" style="text-align: center;"><strong>Tốt!</strong> Bạn đã thay đổi mật khẩu thành công. Và một tin nhắn thông báo đã được gửi đến Email của người dùng này. Hãy đến trang <a href="admin.php?controller=home&action=login">Đăng nhập</a> và đăng nhập lại.!!</div></div>';
+    } else echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Việc thay đổi mật khẩu có vấn đề. Ô nhập xác thực mật khẩu không đúng với mật khẩu mới mà bạn nhập vào !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến trang chủ</a></div></div>";
 }
 require('content/views/forgot-password/result.php');
diff --git a/content/controllers/forgot-password/resultcode.php b/content/controllers/forgot-password/resultcode.php
index 35d9b880..333865f3 100644
--- a/content/controllers/forgot-password/resultcode.php
+++ b/content/controllers/forgot-password/resultcode.php
@@ -9,13 +9,13 @@
     foreach ($user_need_change_pass as $user) {
         if ($user['verificationCode'] == $_GET['code']) {
             $verifi_id_user = 1;
-            $user_id = $user['id'];
+            $userId = $user['id'];
         }
     }
     if ($verifi_id_user != 1) {
-        echo "<div style='padding-top: 200' 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>";
+        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 {
-        header('location:' . PATH_URL . 'index.php?controller=forgot-password&action=change-password&id=' . $user_id);
+        header('location:' . PATH_URL . 'index.php?controller=forgot-password&action=change-password&id=' . $userId);
     }
 }
diff --git a/content/controllers/page/index.php b/content/controllers/page/index.php
index 8912a973..4fd3d037 100644
--- a/content/controllers/page/index.php
+++ b/content/controllers/page/index.php
@@ -1,13 +1,13 @@
 <?php
 require_once('content/models/posts.php');
 if (isset($_GET['id'])) {
-    $post_id = intval($_GET['id']);
+    $postId = intval($_GET['id']);
 } else show_404();
-$page = get_a_record('posts', $post_id);
+$page = get_a_record('posts', $postId);
 $user = get_a_record('users', $page['post_author']);
 if (!$page || $page['post_status'] <> 'Publiced') {
     show_404();
-} else   updateCountView($post_id);
+} else   updateCountView($postId);
 $title = $page['post_title'] . ' - Quán Chị Kòi';
 $url_product = 'page/' . $page['id'] . '-' . $page['post_slug'];
 $image_product = PATH_URL . 'public/upload/ckeditorimages/' . $page['post_avatar'];
diff --git a/content/controllers/post/index.php b/content/controllers/post/index.php
index c6b05214..f51d321b 100644
--- a/content/controllers/post/index.php
+++ b/content/controllers/post/index.php
@@ -1,13 +1,13 @@
 <?php
 require_once('content/models/posts.php');
 if (isset($_GET['id'])) {
-    $post_id = intval($_GET['id']);
+    $postId = intval($_GET['id']);
 } else show_404();
-$post = get_a_record('posts', $post_id);
+$post = get_a_record('posts', $postId);
 $user = get_a_record('users', $post['post_author']);
 if (!$post || $post['post_status'] <> 'Publiced') {
     show_404();
-} else   updateCountView($post_id);
+} else   updateCountView($postId);
 $image_post = $post['post_avatar'];
 $title = $post['post_title'] . ' - Quán Chị Kòi';
 $url_product = 'post/' . $post['id'] . '-' . $post['post_slug'];
diff --git a/content/controllers/product/all.php b/content/controllers/product/all.php
index a3a6c176..b5b6c286 100644
--- a/content/controllers/product/all.php
+++ b/content/controllers/product/all.php
@@ -13,8 +13,8 @@
 );
 
 $url = 'index.php?controller=product&action=all';
-$total_rows = get_total('products', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('products', $options);
+$total = ceil($totalRows / $limit);
 $pagination = pagination($url, $page, $total);
 
 $products_all = get_all('products', $options);
diff --git a/content/controllers/product/index.php b/content/controllers/product/index.php
index 2d2d200f..805ab0cc 100644
--- a/content/controllers/product/index.php
+++ b/content/controllers/product/index.php
@@ -1,13 +1,13 @@
 <?php
 require_once('content/models/products.php');
 if (isset($_GET['id'])) {
-    $product_id = intval($_GET['id']);
+    $productId = intval($_GET['id']);
 } else show_404();
-$product = get_a_record('products', $product_id);
+$product = get_a_record('products', $productId);
 
 if (!$product) {
     show_404();
-} else   updateCountView($product_id);
+} else   updateCountView($productId);
 $title = $product['product_name'] . ' - Quán Chị Kòi';
 $image_product = PATH_URL . 'public/upload/products/' . $product['img1'];
 $url_product = 'product/' . $product['id'] . '-' . $product['slug'];
diff --git a/content/controllers/register/activate.php b/content/controllers/register/activate.php
index 331a459d..48c438c2 100644
--- a/content/controllers/register/activate.php
+++ b/content/controllers/register/activate.php
@@ -18,6 +18,6 @@
         'verified' => 1
     );
     save('users', $user_edit);
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn đã kích hoạt tài khoản thành công, giờ bạn đã có thể đăng nhập vào website của quán Chị Kòi. Hãy đến <a href='admin.php'>Đăng nhập</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn đã kích hoạt tài khoản thành công, giờ bạn đã có thể đăng nhập vào website của quán Chị Kòi. Hãy đến <a href='admin.php'>Đăng nhập</a></div></div>";
     require('content/views/register/result.php');
 }
diff --git a/content/controllers/register/index.php b/content/controllers/register/index.php
index 9c9b848a..2d37254b 100644
--- a/content/controllers/register/index.php
+++ b/content/controllers/register/index.php
@@ -27,20 +27,20 @@
     }
     $title = 'Kết quả đăng ký thành viên';
     if (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_username FROM users WHERE user_username='$username'")) > 0) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Tên đăng nhập này đã có người dùng. Vui lòng chọn tên đăng nhập khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Tên đăng nhập này đã có người dùng. Vui lòng chọn tên đăng nhập khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif ($_POST['confirmPassword'] != $_POST['password']) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc đăng ký thành viên có vấn đề. Bạn đã không xác thực đúng mật khẩu đã nhập !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc đăng ký thành viên có vấn đề. Bạn đã không xác thực đúng mật khẩu đã nhập !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif (!preg_match("/([a-z0-9_]+|[a-z0-9_]+\.[a-z0-9_]+)@(([a-z0-9]|[a-z0-9]+\.[a-z0-9]+)+\.([a-z]{2,4}))/i", $email)) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này không hợp lệ. Vui long nhập email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE user_email='$email' and verified = 0")) > 0) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này đã đăng ký nhưng chưa được kích hoạt. nếu bạn đã từng đăng ký với email này vui lòng vào hộp thư đến hoặc kiểm tra trong muc spam sẽ có thư gửi yêu cầu xác nhận. Bạn hãy click vào link, Email sẽ được kích hoạt ngay. <br><br>Bạn có muốn <a href='index.php?controller=register&action=resend&id=" . $get_userid_of_email . "'>gửi lại mã kích hoạt</a> ??<br><br>Hoặc nếu muốn đăng ký thành viên mới hãy <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này đã đăng ký nhưng chưa được kích hoạt. nếu bạn đã từng đăng ký với email này vui lòng vào hộp thư đến hoặc kiểm tra trong muc spam sẽ có thư gửi yêu cầu xác nhận. Bạn hãy click vào link, Email sẽ được kích hoạt ngay. <br><br>Bạn có muốn <a href='index.php?controller=register&action=resend&id=" . $get_userid_of_email . "'>gửi lại mã kích hoạt</a> ??<br><br>Hoặc nếu muốn đăng ký thành viên mới hãy <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif (mysqli_num_rows(mysqli_query($linkConnectDB, "SELECT user_email FROM users WHERE user_email='$email'")) > 0) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Email này đã có người dùng. Vui lòng chọn Email khác. <a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } elseif (strlen($_POST['password']) < 8) {
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc đăng ký thành viên có vấn đề. Mật khẩu của bạn phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-danger'><strong>NO!</strong> Việc đăng ký thành viên có vấn đề. Mật khẩu của bạn phải dài từ 8 ký tự trở lên !! <br><a href='javascript: history.go(-1)'>Trở lại</a> hoặc <a href='index.php'>Đến Trang chủ</a></div></div>";
     } else {
         // Load Composer's autoloader
-        $user_id = save('users', $user_add);
+        $userId = save('users', $user_add);
         //send mail
         require 'vendor/autoload.php';
         include 'lib/config/sendmail.php';
@@ -84,11 +84,11 @@
             echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
         }
         $verificationCode_add = array(
-            'id' => $user_id,
+            'id' => $userId,
             'verificationCode' => $verificationCode
         );
         save('users', $verificationCode_add);
-        echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done! Mã kích hoạt</strong> đã được gửi đến email: <strong>" . $email . "</strong>. <br><br>Vui lòng mở hộp thư đến email của bạn và nhấp vào liên kết đã cho để bạn có thể đăng nhập. <br><br><br>Email chưa được xác minh này đã được lưu vào Database.</div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done! Mã kích hoạt</strong> đã được gửi đến email: <strong>" . $email . "</strong>. <br><br>Vui lòng mở hộp thư đến email của bạn và nhấp vào liên kết đã cho để bạn có thể đăng nhập. <br><br><br>Email chưa được xác minh này đã được lưu vào Database.</div></div>";
     }
 }
 require('content/views/register/result.php');
diff --git a/content/controllers/register/reactivate.php b/content/controllers/register/reactivate.php
index 61d02a02..80207c27 100644
--- a/content/controllers/register/reactivate.php
+++ b/content/controllers/register/reactivate.php
@@ -15,6 +15,6 @@
         'verified' => 1
     );
     save('users', $user_edit);
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn đã xác nhận thành công việc đổi email mới cho tài khoản, giờ bạn đã có thể đăng nhập vào website của quán Chị Kòi. Hãy đến <a href='admin.php'>Đăng nhập</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Bạn đã xác nhận thành công việc đổi email mới cho tài khoản, giờ bạn đã có thể đăng nhập vào website của quán Chị Kòi. Hãy đến <a href='admin.php'>Đăng nhập</a></div></div>";
     require('content/views/register/result.php');
 }
diff --git a/content/controllers/register/resend.php b/content/controllers/register/resend.php
index 36a65e5d..38f9489f 100644
--- a/content/controllers/register/resend.php
+++ b/content/controllers/register/resend.php
@@ -57,6 +57,6 @@
     } catch (Exception $e) {
         echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
     }
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done! Mã kích hoạt</strong> đã được gửi đến email: <strong>" . $email . "</strong>. <br><br>Vui lòng mở hộp thư đến email của bạn và nhấp vào liên kết đã cho để bạn có thể đăng nhập.</div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done! Mã kích hoạt</strong> đã được gửi đến email: <strong>" . $email . "</strong>. <br><br>Vui lòng mở hộp thư đến email của bạn và nhấp vào liên kết đã cho để bạn có thể đăng nhập.</div></div>";
     require('content/views/register/result.php');
 }
diff --git a/content/controllers/search/index.php b/content/controllers/search/index.php
index 2c923b60..8bd46a3c 100644
--- a/content/controllers/search/index.php
+++ b/content/controllers/search/index.php
@@ -17,8 +17,8 @@
     'order_by' => 'id DESC'
 );
 $url = 'index.php?controller=search&keyword=' . $keyword;
-$total_rows = get_total('products', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('products', $options);
+$total = ceil($totalRows / $limit);
 
 //data
 $products = get_all('products', $options);
diff --git a/content/controllers/shop/index.php b/content/controllers/shop/index.php
index 31c6a0e6..0d2eee58 100644
--- a/content/controllers/shop/index.php
+++ b/content/controllers/shop/index.php
@@ -24,8 +24,8 @@
 );
 
 $url = 'shop/' . $shop_id . '-' . $category['slug'];
-$total_rows = get_total('products', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('products', $options);
+$total = ceil($totalRows / $limit);
 
 $products = get_all('products', $options);
 $pagination = pagination($url, $page, $total);
diff --git a/content/controllers/type/index.php b/content/controllers/type/index.php
index 55b9411c..b9c91c0a 100644
--- a/content/controllers/type/index.php
+++ b/content/controllers/type/index.php
@@ -18,8 +18,8 @@
     'order_by' => 'id DESC'
 );
 $url = 'type/' . $type_id . '-' . $type['slug'];
-$total_rows = get_total('products', $options);
-$total = ceil($total_rows / $limit);
+$totalRows = get_total('products', $options);
+$total = ceil($totalRows / $limit);
 $products = get_all('products', $options);
 $pagination = pagination($url, $page, $total);
 
diff --git a/content/models/cart.php b/content/models/cart.php
index 084d326a..0f187235 100644
--- a/content/models/cart.php
+++ b/content/models/cart.php
@@ -2,17 +2,17 @@
 //khởi tạo giỏ hàng
 if (!isset($_SESSION['cart'])) $_SESSION['cart'] = array();
 //thêm giỏ hàng
-function cart_add($product_id, $number)
+function cart_add($productId, $number)
 {
-    if (isset($_SESSION['cart'][$product_id])) {
+    if (isset($_SESSION['cart'][$productId])) {
         //nếu đã có sp trong giỏ hàng thì số lượng công thêm $number
-        $_SESSION['cart'][$product_id]['number'] += $number;
+        $_SESSION['cart'][$productId]['number'] += $number;
     } else {
         //lấy thông tin sản phẩm từ CSDL và lưu vào giỏ hàng
-        $product = get_a_record('products', $product_id);
+        $product = get_a_record('products', $productId);
 
-        $_SESSION['cart'][$product_id] = array(
-            'id' => $product_id,
+        $_SESSION['cart'][$productId] = array(
+            'id' => $productId,
             'name' => $product['product_name'],
             'image' => $product['img1'],
             'number' => $number,
@@ -129,26 +129,26 @@ function detroy_cart_user_db()
     mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
 }
 //xóa động bộ tùy sản phẩm được loại khỏi cart 
-function delete_cart_user_db($product_id)
+function delete_cart_user_db($productId)
 {
     global $userNav, $linkConnectDB;
-    $sql = "DELETE FROM cart_user WHERE user_id=" . $userNav . " and product_id=" . $product_id;
+    $sql = "DELETE FROM cart_user WHERE user_id=" . $userNav . " and product_id=" . $productId;
     mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB));
 }
 //Cập nhật số lượng sản phẩm
-function cart_update($product_id, $number)
+function cart_update($productId, $number)
 {
     if ($number == 0) {
         //xóa sp ra khỏi giỏ hàng
-        unset($_SESSION['cart'][$product_id]);
+        unset($_SESSION['cart'][$productId]);
     } else {
-        $_SESSION['cart'][$product_id]['number'] = $number;
+        $_SESSION['cart'][$productId]['number'] = $number;
     }
 }
 //Xóa sản phẩm ra khỏi giỏ hàng
-function cart_delete($product_id)
+function cart_delete($productId)
 {
-    unset($_SESSION['cart'][$product_id]);
+    unset($_SESSION['cart'][$productId]);
 }
 //Tổng giá trị giỏ hàng
 function cart_total()
diff --git a/content/models/feedbacks.php b/content/models/feedbacks.php
index 74dc7f74..2d501fc1 100644
--- a/content/models/feedbacks.php
+++ b/content/models/feedbacks.php
@@ -16,16 +16,16 @@ function feedback_add()
     $phone = addslashes($_POST['phone']);
     $email = addslashes($_POST['email']);
     if (!preg_match("/([a-z0-9_]+|[a-z0-9_]+\.[a-z0-9_]+)@(([a-z0-9]|[a-z0-9]+\.[a-z0-9]+)+\.([a-z]{2,4}))/i", $email)) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này không hợp lệ. Vui lòng nhập email khác. <br><br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> Email này không hợp lệ. Vui lòng nhập email khác. <br><br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('content/views/feedback/result.php');
         exit;
     } elseif (!preg_replace("[^0-9]", '', $phone)) {
-        echo "<div style='padding-top: 200' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> SĐT này không hợp lệ. Vui lòng nhập lại SĐT khác. <br><br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
+        echo "<div style='padding-top: 200px' class='container'><div class='alert alert-danger' style='text-align: center;'><strong>NO!</strong> SĐT này không hợp lệ. Vui lòng nhập lại SĐT khác. <br><br><a href='javascript: history.go(-1)'>Trở lại</a></div></div>";
         require('content/views/feedback/result.php');
         exit;
     }
     save('feedbacks', $feedback_add);
-    echo "<div style='padding-top: 200' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Thư phản hồi của bạn đã được gửi đến hệ thống của quán Chị Kòi. Cảm ơn bạn đã gửi lại phải hồi về quán. <br><br>Hãy đến <a href='index.php'>Trang chủ</a></div></div>";
+    echo "<div style='padding-top: 200px' class='container'><div style='text-align: center;' class='alert alert-success'><strong>Done!</strong> Thư phản hồi của bạn đã được gửi đến hệ thống của quán Chị Kòi. Cảm ơn bạn đã gửi lại phải hồi về quán. <br><br>Hãy đến <a href='index.php'>Trang chủ</a></div></div>";
     require('content/views/feedback/result.php');
     exit;
 }
diff --git a/content/views/cart/list.php b/content/views/cart/list.php
index 7156b092..88df2305 100644
--- a/content/views/cart/list.php
+++ b/content/views/cart/list.php
@@ -25,7 +25,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($cart as $product_id => $product) { ?>
+                    <?php foreach ($cart as $productId => $product) { ?>
                         <tr class="cart_table_item">
                             <td class="product-remove">
                                 <a title="Remove this item" class="remove" href="cart/delete/<?php echo $product['id']; ?>">
diff --git a/content/views/cart/order.php b/content/views/cart/order.php
index 450f39e2..ce74e59b 100644
--- a/content/views/cart/order.php
+++ b/content/views/cart/order.php
@@ -43,7 +43,7 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <?php foreach ($cart as $product_id => $product) { ?>
+                                        <?php foreach ($cart as $productId => $product) { ?>
                                             <tr class="cart_table_item">
                                                 <td class="product-thumbnail">
                                                     <a href="product/<?php echo $product['id'] . '-' . slug($product['name']); ?>">
diff --git a/content/views/category/index.php b/content/views/category/index.php
index 53f7862b..01d2b0c2 100644
--- a/content/views/category/index.php
+++ b/content/views/category/index.php
@@ -7,7 +7,7 @@
                 <div class="row">
                     <div class="col-md-6">
                         <h1 class="shorter"><strong><?php echo $category['subcategory_name']; ?></strong></h1>
-                        <p>Hiển thị <?php if ($total_rows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
+                        <p>Hiển thị <?php if ($totalRows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
                     </div>
                 </div>
                 <div class="row">
diff --git a/content/views/product/all.php b/content/views/product/all.php
index f6417fd6..4bea869b 100644
--- a/content/views/product/all.php
+++ b/content/views/product/all.php
@@ -7,7 +7,7 @@
                 <div class="row">
                     <div class="col-md-6">
                         <h1 class="shorter"><strong>Xem tất cả sản phẩm</strong></h1>
-                        <p>Hiển thị <?php if ($total_rows >= 12) echo '1–12 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
+                        <p>Hiển thị <?php if ($totalRows >= 12) echo '1–12 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
                     </div>
                 </div>
                 <div class="row">
diff --git a/content/views/search/index.php b/content/views/search/index.php
index 8bf68824..54692013 100644
--- a/content/views/search/index.php
+++ b/content/views/search/index.php
@@ -7,7 +7,7 @@
                 <div class="row">
                     <div class="col-md-6">
                         <h1 class="shorter"><strong>Search</strong></h1>
-                        <p>Hiển thị <?php if ($total_rows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
+                        <p>Hiển thị <?php if ($totalRows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
                     </div>
                 </div>
                 <div class="row">
@@ -24,7 +24,7 @@
                     <hr>
                     <div><?php if (empty($products)) { ?>
                             <h3 class="col-sm-12">Không tìm thấy kết quả phù hợp cho từ khoá trên.</h3>
-                        <?php } else { ?><h3 class="col-sm-12">Có tổng cộng <?php echo $total_rows ?> kết quả phù hợp với từ
+                        <?php } else { ?><h3 class="col-sm-12">Có tổng cộng <?php echo $totalRows ?> kết quả phù hợp với từ
                                 khóa "<?php echo $keyword ?>".</h3><?php } ?></div>
                     <hr class="tall">
                     <ul class="products product-thumb-info-list" data-plugin-masonry data-plugin-options='{"layoutMode": "fitRows"}'>
diff --git a/content/views/shared/header.php b/content/views/shared/header.php
index e5650a77..49e23148 100644
--- a/content/views/shared/header.php
+++ b/content/views/shared/header.php
@@ -325,7 +325,7 @@
 												<div class="col-md-12">
 													<table cellspacing="0" class="cart">
 														<tbody>
-															<?php foreach ($cart as $product_id => $product_cart) { ?>
+															<?php foreach ($cart as $productId => $product_cart) { ?>
 																<tr>
 																	<td class="product-thumbnail">
 																		<a href="product/<?php echo $product_cart['id'] . '-' . slug($product_cart['name']); ?>">
diff --git a/content/views/shop/index.php b/content/views/shop/index.php
index bb477ac7..71aaa3c4 100644
--- a/content/views/shop/index.php
+++ b/content/views/shop/index.php
@@ -7,7 +7,7 @@
                 <div class="row">
                     <div class="col-md-6">
                         <h1 class="shorter"><strong><?php echo $category['category_name']; ?></strong></h1>
-                        <p>Hiển thị <?php if ($total_rows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
+                        <p>Hiển thị <?php if ($totalRows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
                     </div>
                 </div>
                 <div class="row">
diff --git a/content/views/type/index.php b/content/views/type/index.php
index cf57f2a3..a4007493 100644
--- a/content/views/type/index.php
+++ b/content/views/type/index.php
@@ -10,7 +10,7 @@
                 <div class="row">
                     <div class="col-md-6">
                         <h1 class="shorter"><strong><?php echo $type['type_name'] ?></strong></h1>
-                        <p>Hiển thị <?php if ($total_rows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
+                        <p>Hiển thị <?php if ($totalRows >= 9) echo '1–9 trong '; ?><?php echo $total_rows; ?> kết quả.</p>
                     </div>
                 </div>