diff --git a/admin/controllers/category/index.php b/admin/controllers/category/index.php index dfee229..8f0d410 100644 --- a/admin/controllers/category/index.php +++ b/admin/controllers/category/index.php @@ -9,7 +9,7 @@ 'order_by' => 'id', ]; $title = 'Danh mục sản phẩm'; -$subcategories = getAll('subcategory', $options); +$subCategoryData = getAll('subcategory', $options); $navCategory = 'class="active open"'; require('admin/views/category/index.php'); diff --git a/admin/controllers/feedback/add.php b/admin/controllers/feedback/add.php index c75a19e..e24b5cb 100644 --- a/admin/controllers/feedback/add.php +++ b/admin/controllers/feedback/add.php @@ -20,7 +20,7 @@ $orderDetail = orderDetail($orderId); if (isset($userNav)) { - $user_action = getRecord('users', $userNav); + $userAction = getRecord('users', $userNav); } $status = [ diff --git a/admin/controllers/home/logout.php b/admin/controllers/home/logout.php index 680ad5b..adc1691 100644 --- a/admin/controllers/home/logout.php +++ b/admin/controllers/home/logout.php @@ -4,12 +4,12 @@ global $userNav; -$user_login = getRecord('users', $userNav); +$userLogin = getRecord('users', $userNav); unset($_SESSION['user']); cartDestroy(); -if ($user_login['role_id'] == 0) { +if ($userLogin['role_id'] == 0) { header('location:index.php'); } else { header('location:admin.php'); diff --git a/admin/controllers/product/edit.php b/admin/controllers/product/edit.php index 9c8911c..de3586a 100644 --- a/admin/controllers/product/edit.php +++ b/admin/controllers/product/edit.php @@ -31,7 +31,7 @@ 'select' => 'id,category_name', 'order_by' => 'id', ]); -$subcategories = getAll('subcategory', [ +$subCategoryData = getAll('subcategory', [ 'select' => 'id,subcategory_name', 'order_by' => 'subcategory_name', ]); diff --git a/admin/controllers/shared/statistics.php b/admin/controllers/shared/statistics.php index 7422c1a..9765250 100644 --- a/admin/controllers/shared/statistics.php +++ b/admin/controllers/shared/statistics.php @@ -251,7 +251,7 @@ $options_posts_status = [ 'order_by' => 'id DESC', - 'where' => 'post_status="Publiced"', + 'where' => 'post_status="Published"', ]; $total_posts_status = getTotal('posts', $options_posts_status); diff --git a/admin/controllers/slide/edit.php b/admin/controllers/slide/edit.php index abf8eac..31dcb95 100644 --- a/admin/controllers/slide/edit.php +++ b/admin/controllers/slide/edit.php @@ -5,7 +5,6 @@ require_once('admin/models/slides.php'); if (!empty($_POST)) { slide_update(); -} else { } if (isset($_GET['slide_id'])) { $slideId = intval($_GET['slide_id']); diff --git a/admin/controllers/user/edit.php b/admin/controllers/user/edit.php index 8bbed28..bdb06c1 100644 --- a/admin/controllers/user/edit.php +++ b/admin/controllers/user/edit.php @@ -2,7 +2,6 @@ // Import PHPMailer classes into the global namespace // These must be at the top of your script, not inside a function -use PHPMailer\PHPMailer\PHPMailer; if (isset($_GET['user_id'])) { $userId = intval($_GET['user_id']); diff --git a/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql b/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql index cccc7a4..37984e2 100644 --- a/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql +++ b/admin/database/db-backup-tanhongit-2022-07-10-12-37-26.sql @@ -280,12 +280,12 @@ CREATE TABLE `posts` ( KEY `fk_id_author` (`post_author`) ) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -INSERT INTO posts VALUES("1","2","2020-04-08 05:57:42","","About","Publiced","2020-04-08 06:31:51","2","Tân Hồng ","48","about","about-1page.png"); -INSERT INTO posts VALUES("9","3","2020-04-12 13:20:20","","Web developmwnt","Publiced","0000-00-00 00:00:00","2","","0","fewrfewrew",""); -INSERT INTO posts VALUES("8","2","2020-04-08 23:13:53","","Điều khoản sử dụng","Publiced","0000-00-00 00:00:00","2","","1","terms-of-use-page",""); +INSERT INTO posts VALUES("1","2","2020-04-08 05:57:42","","About","Published","2020-04-08 06:31:51","2","Tân Hồng ","48","about","about-1page.png"); +INSERT INTO posts VALUES("9","3","2020-04-12 13:20:20","","Web developmwnt","Published","0000-00-00 00:00:00","2","","0","fewrfewrew",""); +INSERT INTO posts VALUES("8","2","2020-04-08 23:13:53","","Điều khoản sử dụng","Published","0000-00-00 00:00:00","2","","1","terms-of-use-page",""); INSERT INTO posts VALUES("6","2","2020-04-08 11:47:48","","Dmca Luật bản quyền","Trash","2020-04-08 10:25:58","1","Tân Hồng ","5","dmca-luat-ban",""); INSERT INTO posts VALUES("5","2","2020-04-09 14:03:15","Phim việt chất lượng cao
-\n\"\"","Phim việt","Publiced","2020-04-08 10:13:10","1","Tân Hồng ","4","phim-viet","phim-viet-5post.png"); +\n\"\"","Phim việt","Published","2020-04-08 10:13:10","1","Tân Hồng ","4","phim-viet","phim-viet-5post.png"); INSERT INTO posts VALUES("4","2","2020-04-12 12:54:02","ouhiuh
\naad
\n\"\"
@@ -293,7 +293,7 @@ INSERT INTO posts VALUES("4","2","2020-04-12 12:54:02","ouhiuh
\nfhgtfrdhtrd
\nỵytrj","Privacy Policy","Draft","2020-04-08 06:05:46","2","Tân Hồng ","7","privacy-policy","privacy-policy-4page.jpg"); INSERT INTO posts VALUES("3","2","2020-04-08 06:17:37","Luật bản quyền dựa trên luật toàn cầu
-\n\"\"","Dmca Luật bản quyền","Publiced","2020-04-07 23:52:43","2","","1","dmca-luat-ban-quyen",""); +\n\"\"","Dmca Luật bản quyền","Published","2020-04-07 23:52:43","2","","1","dmca-luat-ban-quyen",""); DROP TABLE IF EXISTS products; diff --git a/admin/models/posts.php b/admin/models/posts.php index 0dca126..78c97c6 100644 --- a/admin/models/posts.php +++ b/admin/models/posts.php @@ -41,7 +41,7 @@ function publicPost($id) show404NotFound(); } global $linkConnectDB; - $sql = 'UPDATE posts SET post_status="Publiced", post_date="' . gmdate('Y-m-d H:i:s', time() + 7 * 3600) . '" where id=' . $id; + $sql = 'UPDATE posts SET post_status="Published", post_date="' . gmdate('Y-m-d H:i:s', time() + 7 * 3600) . '" where id=' . $id; mysqli_query($linkConnectDB, $sql) or die(mysqli_error($linkConnectDB)); } function postDelete($id) diff --git a/admin/models/users.php b/admin/models/users.php index 55595eb..dc54302 100644 --- a/admin/models/users.php +++ b/admin/models/users.php @@ -116,17 +116,17 @@ function changePassword($id, $newpassword, $currentPassword) function user_update() { global $userNav; - $user_login = getRecord('users', $userNav); + $userLogin = getRecord('users', $userNav); if ($_POST['user_id'] <> 0) { $editTime = gmdate('Y-m-d H:i:s', time() + 7 * 3600); } else { $editTime = '0000-00-00 00:00:00'; } - if (isset($_POST['roleid']) && $user_login['role_id'] == 1) { + if (isset($_POST['roleid']) && $userLogin['role_id'] == 1) { $roleid = $_POST['roleid']; } else { - $roleid = $user_login['role_id']; + $roleid = $userLogin['role_id']; } $user_edit = [ diff --git a/admin/views/category/index.php b/admin/views/category/index.php index b1a46d8..87b775a 100644 --- a/admin/views/category/index.php +++ b/admin/views/category/index.php @@ -63,7 +63,7 @@ - + diff --git a/admin/views/feedback/add.php b/admin/views/feedback/add.php index e41755a..b70234b 100644 --- a/admin/views/feedback/add.php +++ b/admin/views/feedback/add.php @@ -110,9 +110,9 @@
- - - + + +

Nhập dòng tin phản hồi về đơn hàng này

diff --git a/admin/views/product/formEdit.php b/admin/views/product/formEdit.php index 7a64ab0..1f308f1 100644 --- a/admin/views/product/formEdit.php +++ b/admin/views/product/formEdit.php @@ -51,7 +51,7 @@ Thuộc danh mục con -
+
@@ -186,7 +194,7 @@
- +
@@ -194,7 +202,7 @@
- +
diff --git a/content/views/category/index.php b/content/views/category/index.php index 1afae57..2f872c6 100644 --- a/content/views/category/index.php +++ b/content/views/category/index.php @@ -1,4 +1,13 @@ - +

diff --git a/content/views/feedback/index.php b/content/views/feedback/index.php index d3e285b..0044079 100644 --- a/content/views/feedback/index.php +++ b/content/views/feedback/index.php @@ -1,4 +1,10 @@ - +

@@ -6,7 +12,7 @@

Gửi phản hồi của bạn đến Chị Kòi Quán

Bạn đang đăng nhập với người dùng: ' . $user_action['user_name'] . '

'; + echo '

Bạn đang đăng nhập với người dùng: ' . $userAction['user_name'] . '

'; } else { echo '

Bạn đã có tài khoản người dùng? Nhấn vào đây đăng nhập.

'; } ?> @@ -55,11 +61,11 @@
-

Bạn sẽ gửi phản hồi với tư cách là người dùng:

+

Bạn sẽ gửi phản hồi với tư cách là người dùng:

- - - + + +
diff --git a/content/views/forgot-password/change-password.php b/content/views/forgot-password/change-password.php index c2c10f3..610fdfc 100644 --- a/content/views/forgot-password/change-password.php +++ b/content/views/forgot-password/change-password.php @@ -1,4 +1,8 @@ © , Phát triển bởi TanHongIT
@@ -69,4 +73,4 @@ - \ No newline at end of file + diff --git a/content/views/forgot-password/index.php b/content/views/forgot-password/index.php index 9ec1f2b..8d6dacf 100644 --- a/content/views/forgot-password/index.php +++ b/content/views/forgot-password/index.php @@ -34,7 +34,7 @@
@@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/content/views/home/hotproduct.php b/content/views/home/hotproduct.php index a1d5520..435b7c6 100644 --- a/content/views/home/hotproduct.php +++ b/content/views/home/hotproduct.php @@ -8,43 +8,43 @@

Sản Phẩm Nổi Bật