From a4a6e36b3efdef2b0a7d20b11aa1bd3bc421b5c8 Mon Sep 17 00:00:00 2001
From: Aleksandr Shelkovin
Date: Wed, 22 Jan 2025 22:23:09 +0300
Subject: [PATCH] some lesson
---
engine/app/assets/css/styles.css | 22 +++----
engine/app/controller/AboutController.php | 4 +-
engine/app/controller/AdminController.php | 6 +-
engine/app/controller/AuthController.php | 11 ++--
engine/app/controller/MainController.php | 5 +-
engine/app/controller/UploadController.php | 35 +++++++++++
.../model/{AboutModule.php => MusicModel.php} | 6 +-
engine/app/template/form_file_upload.html | 13 ----
engine/app/template/index_tpl.php | 47 ++++++++++++++-
.../template/{admin.php => layout_admin.php} | 31 ++++------
engine/app/template/login.php | 4 +-
engine/app/template/tpl_layout.php | 57 +++++++++++-------
engine/app/template/upload_tpl.php | 11 ++++
engine/routes.php | 5 +-
...e_uvertyura_k_opere_legkaya_kavaleriya.mp3 | Bin
...n_bah_i_sharlj_guno__sotis_ave_mariya_.mp3 | Bin
.../Bolshoi_sekret_dlya_malenkoi.mp3 | Bin
.../CHesnya_chernogo_kota.mp3 | Bin
engine/{upload => uploads}/Oblaka_-.mp3 | Bin
... Катастрофа сознания.mp3 | Bin
engine/uploads/Схема Rally.pdf | Bin 0 -> 202761 bytes
21 files changed, 172 insertions(+), 85 deletions(-)
create mode 100644 engine/app/controller/UploadController.php
rename engine/app/model/{AboutModule.php => MusicModel.php} (72%)
delete mode 100644 engine/app/template/form_file_upload.html
rename engine/app/template/{admin.php => layout_admin.php} (86%)
create mode 100644 engine/app/template/upload_tpl.php
rename engine/{upload => uploads}/107_zuppe_uvertyura_k_opere_legkaya_kavaleriya.mp3 (100%)
rename engine/{upload => uploads}/65_iogann_sebastjyan_bah_i_sharlj_guno__sotis_ave_mariya_.mp3 (100%)
rename engine/{upload => uploads}/Bolshoi_sekret_dlya_malenkoi.mp3 (100%)
rename engine/{upload => uploads}/CHesnya_chernogo_kota.mp3 (100%)
rename engine/{upload => uploads}/Oblaka_-.mp3 (100%)
rename engine/{upload => uploads}/Корпорация Монстров — Катастрофа сознания.mp3 (100%)
create mode 100644 engine/uploads/Схема Rally.pdf
diff --git a/engine/app/assets/css/styles.css b/engine/app/assets/css/styles.css
index 6a65300..fbd53f5 100644
--- a/engine/app/assets/css/styles.css
+++ b/engine/app/assets/css/styles.css
@@ -570,10 +570,6 @@ video {
position: fixed;
}
-.relative {
- position: relative;
-}
-
.left-0 {
left: 0px;
}
@@ -699,10 +695,6 @@ video {
height: 100vh;
}
-.min-h-screen {
- min-height: 100vh;
-}
-
.w-10 {
width: 2.5rem;
}
@@ -814,10 +806,6 @@ video {
align-self: center;
}
-.overflow-hidden {
- overflow: hidden;
-}
-
.overflow-y-auto {
overflow-y: auto;
}
@@ -883,6 +871,11 @@ video {
background-color: rgb(219 234 254 / var(--tw-bg-opacity, 1));
}
+.bg-blue-500 {
+ --tw-bg-opacity: 1;
+ background-color: rgb(59 130 246 / var(--tw-bg-opacity, 1));
+}
+
.bg-blue-700 {
--tw-bg-opacity: 1;
background-color: rgb(29 78 216 / var(--tw-bg-opacity, 1));
@@ -1107,6 +1100,11 @@ video {
transition-duration: 75ms;
}
+.hover\:bg-blue-700:hover {
+ --tw-bg-opacity: 1;
+ background-color: rgb(29 78 216 / var(--tw-bg-opacity, 1));
+}
+
.hover\:bg-gray-100:hover {
--tw-bg-opacity: 1;
background-color: rgb(243 244 246 / var(--tw-bg-opacity, 1));
diff --git a/engine/app/controller/AboutController.php b/engine/app/controller/AboutController.php
index c6b24c9..355700a 100644
--- a/engine/app/controller/AboutController.php
+++ b/engine/app/controller/AboutController.php
@@ -1,12 +1,12 @@
$result,
diff --git a/engine/app/controller/AdminController.php b/engine/app/controller/AdminController.php
index 8ce4a84..cefff06 100644
--- a/engine/app/controller/AdminController.php
+++ b/engine/app/controller/AdminController.php
@@ -1,9 +1,7 @@
''], 'layout_admin.php'));
} else {
header("Location:http://localhost:8000/login");
};
diff --git a/engine/app/controller/AuthController.php b/engine/app/controller/AuthController.php
index 51ca9d0..7499f91 100644
--- a/engine/app/controller/AuthController.php
+++ b/engine/app/controller/AuthController.php
@@ -6,7 +6,7 @@ class AuthController
{
const PASSWD = 123;
const LOGIN = 'none@none.ru';
- const DOMAIN = 'http://localhost:8000/admin';
+ const DOMAIN = 'http://localhost:8000/';
public $login = null;
public $password = null;
@@ -26,10 +26,10 @@ class AuthController
// setcookie("password", $this->password, time() + 3600); // Истекает через 1 час
// header("Set-Cookie: login=$login; Secure; Path=/; SameSite=None; Partitioned;");
// header("Set-Cookie: passwd=$password; Secure; Path=/; SameSite=None; Partitioned;");
- header("Location:". self::DOMAIN);
+ header("Location:". self::DOMAIN."admin");
} else {
// редирект на форму логина с предупреждением
- header("Location:http://localhost:8000/login");
+ header("Location:". self::DOMAIN."login");
}
@@ -40,6 +40,9 @@ class AuthController
public function actionLogout()
{
- echo ('print Logout');
+ // echo ('print Logout');
+ session_unset();
+ session_destroy();
+ header("Location:". self::DOMAIN);
}
}
diff --git a/engine/app/controller/MainController.php b/engine/app/controller/MainController.php
index 9674ca6..3d697a1 100644
--- a/engine/app/controller/MainController.php
+++ b/engine/app/controller/MainController.php
@@ -1,12 +1,13 @@
$result], 'index_tpl.php'));
}
diff --git a/engine/app/controller/UploadController.php b/engine/app/controller/UploadController.php
new file mode 100644
index 0000000..7a5aee3
--- /dev/null
+++ b/engine/app/controller/UploadController.php
@@ -0,0 +1,35 @@
+ $portial], 'layout_admin.php'));
+ } else {
+ header("Location:http://localhost:8000/login");
+ };
+ }
+
+ public function actionAddfile()
+ {
+ $uploaddir = 'C:\\Lerning\\itmo-php-course\\engine\\uploads\\';
+ $uploadfile = $uploaddir . basename($_FILES['userfile']['name']);
+
+ echo '';
+ if (move_uploaded_file($_FILES['userfile']['tmp_name'], $uploadfile)) {
+ echo "Файл не содержит ошибок и успешно загрузился на сервер.\n";
+ } else {
+ echo "Возможная атака на сервер через загрузку файла!\n";
+ }
+ }
+}
diff --git a/engine/app/model/AboutModule.php b/engine/app/model/MusicModel.php
similarity index 72%
rename from engine/app/model/AboutModule.php
rename to engine/app/model/MusicModel.php
index 0a9e8e7..d9dac6e 100644
--- a/engine/app/model/AboutModule.php
+++ b/engine/app/model/MusicModel.php
@@ -1,16 +1,16 @@
- Поле MAX_FILE_SIZE требуется указывать перед полем загрузки файла
-
- Название элемента input определяет название элемента в суперглобальном массиве $_FILES
- Отправить файл:
-
-
-
-Upload file
-
-SVG, PNG, JPG or GIF (MAX. 800x400px).
diff --git a/engine/app/template/index_tpl.php b/engine/app/template/index_tpl.php
index 2284b61..95497b6 100644
--- a/engine/app/template/index_tpl.php
+++ b/engine/app/template/index_tpl.php
@@ -29,11 +29,56 @@
Login
-
+
+
+ Classic
+ Jazz
+ Rock
+
+
+
+
+
+
+
+
+
+ Содержимое вкладки 2
+
+
+ Содержимое вкладки 3
+
+
+
+
diff --git a/engine/app/template/admin.php b/engine/app/template/layout_admin.php
similarity index 86%
rename from engine/app/template/admin.php
rename to engine/app/template/layout_admin.php
index 6bd6007..ba2b849 100644
--- a/engine/app/template/admin.php
+++ b/engine/app/template/layout_admin.php
@@ -4,7 +4,8 @@
+
@@ -112,9 +104,12 @@
diff --git a/engine/app/template/login.php b/engine/app/template/login.php
index c2b852d..e04f0f2 100644
--- a/engine/app/template/login.php
+++ b/engine/app/template/login.php
@@ -28,8 +28,8 @@