From ec80c669d15856c9dc645245d8009d0486230e21 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Wed, 12 Oct 2022 20:35:23 +0800 Subject: [PATCH 01/13] feat(web): add image_hosting --- db/app_uoj233.sql | 30 +++++++++++++++++++ .../controllers/image_hosting/get_image.php | 6 ++++ web/app/controllers/image_hosting/index.php | 21 +++++++++++++ web/app/locale/basic/en.php | 2 ++ web/app/locale/basic/zh-cn.php | 2 ++ web/app/route.php | 5 ++++ web/app/storage/image_hosting/.gitkeep | 0 web/app/upgrade/4_image_hosting/README.md | 1 + web/app/upgrade/4_image_hosting/down.sql | 2 ++ web/app/upgrade/4_image_hosting/up.sql | 21 +++++++++++++ web/app/views/main-nav.php | 16 ++++++++++ web/install.sh | 1 + 12 files changed, 107 insertions(+) create mode 100644 web/app/controllers/image_hosting/get_image.php create mode 100644 web/app/controllers/image_hosting/index.php create mode 100644 web/app/storage/image_hosting/.gitkeep create mode 100644 web/app/upgrade/4_image_hosting/README.md create mode 100644 web/app/upgrade/4_image_hosting/down.sql create mode 100644 web/app/upgrade/4_image_hosting/up.sql diff --git a/db/app_uoj233.sql b/db/app_uoj233.sql index f49be87..cc468cb 100644 --- a/db/app_uoj233.sql +++ b/db/app_uoj233.sql @@ -815,6 +815,7 @@ CREATE TABLE `user_info` ( `motto` varchar(200) NOT NULL, `last_login` timestamp NOT NULL DEFAULT 0, `last_visited` timestamp NOT NULL DEFAULT 0, + `images_size_limit` int(11) UNSIGNED NOT NULL DEFAULT 104857600, /* 100 MiB */ PRIMARY KEY (`username`), KEY `ac_num` (`ac_num`,`username`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; @@ -829,6 +830,35 @@ LOCK TABLES `user_info` WRITE; /*!40000 ALTER TABLE `user_info` ENABLE KEYS */; UNLOCK TABLES; +-- +-- Table structure for table `users_images` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `users_images` ( + `id` varchar(30) NOT NULL, + `username` varchar(20) NOT NULL, + `width` int(11) NOT NULL, + `height` int(11) NOT NULL, + `upload_time` datetime NOT NULL, + `size` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `username` (`username`), + KEY `upload_time` (`upload_time`), + KEY `size` (`size`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `users_images` +-- + +LOCK TABLES `users_images` WRITE; +/*!40000 ALTER TABLE `users_images` DISABLE KEYS */; +/*!40000 ALTER TABLE `users_images` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Table structure for table `user_msg` -- diff --git a/web/app/controllers/image_hosting/get_image.php b/web/app/controllers/image_hosting/get_image.php new file mode 100644 index 0000000..e6e8fae --- /dev/null +++ b/web/app/controllers/image_hosting/get_image.php @@ -0,0 +1,6 @@ + + + + +

+ +

+ + diff --git a/web/app/locale/basic/en.php b/web/app/locale/basic/en.php index 44fd378..cb2bcd2 100644 --- a/web/app/locale/basic/en.php +++ b/web/app/locale/basic/en.php @@ -100,4 +100,6 @@ return [ 'last active at' => 'Last active at', 'online' => 'Online', 'offline' => 'Offline', + 'apps' => 'Apps', + 'image hosting' => 'Image Hosting', ]; diff --git a/web/app/locale/basic/zh-cn.php b/web/app/locale/basic/zh-cn.php index 133eeba..135b050 100644 --- a/web/app/locale/basic/zh-cn.php +++ b/web/app/locale/basic/zh-cn.php @@ -100,4 +100,6 @@ return [ 'online' => '在线', 'offline' => '离线', 'last active at' => '最后活动于', + 'apps' => '应用', + 'image hosting' => '图床', ]; diff --git a/web/app/route.php b/web/app/route.php index 3ea089e..3b89394 100644 --- a/web/app/route.php +++ b/web/app/route.php @@ -5,6 +5,7 @@ Route::pattern('id', '[1-9][0-9]{0,9}'); Route::pattern('contest_id', '[1-9][0-9]{0,9}'); Route::pattern('tab', '\S{1,20}'); Route::pattern('rand_str_id', '[0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]{20}'); +Route::pattern('image_name', '[0123456789abcdefghijklmnopqrstuvwxyz]{7}'); Route::pattern('upgrade_name', '[a-zA-Z0-9_]{1,50}'); Route::group([ @@ -78,6 +79,10 @@ Route::group([ Route::any('/download.php', '/download.php'); Route::any('/click-zan', '/click_zan.php'); + + // Image Hosting + Route::any('/image-hosting', '/image_hosting/index.php'); + Route::get('/image-hosting/{image_name}.png', '/image_hosting/get_image.php'); } ); diff --git a/web/app/storage/image_hosting/.gitkeep b/web/app/storage/image_hosting/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/web/app/upgrade/4_image_hosting/README.md b/web/app/upgrade/4_image_hosting/README.md new file mode 100644 index 0000000..a936858 --- /dev/null +++ b/web/app/upgrade/4_image_hosting/README.md @@ -0,0 +1 @@ +ref: https://github.com/renbaoshuo/S2OJ/issues/4 diff --git a/web/app/upgrade/4_image_hosting/down.sql b/web/app/upgrade/4_image_hosting/down.sql new file mode 100644 index 0000000..422652d --- /dev/null +++ b/web/app/upgrade/4_image_hosting/down.sql @@ -0,0 +1,2 @@ +ALTER TABLE `user_info` DROP COLUMN IF EXISTS `images_size_limit`; +DROP TABLE IF EXISTS `users_images`; diff --git a/web/app/upgrade/4_image_hosting/up.sql b/web/app/upgrade/4_image_hosting/up.sql new file mode 100644 index 0000000..5a64bd1 --- /dev/null +++ b/web/app/upgrade/4_image_hosting/up.sql @@ -0,0 +1,21 @@ +ALTER TABLE `user_info` ADD COLUMN `images_size_limit` int(11) UNSIGNED NOT NULL DEFAULT 104857600 /* 100 MiB */; + +-- +-- Table structure for table `users_images` +-- + +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE IF NOT EXISTS `users_images` ( + `id` varchar(30) NOT NULL, + `username` varchar(20) NOT NULL, + `width` int(11) NOT NULL, + `height` int(11) NOT NULL, + `upload_time` datetime NOT NULL, + `size` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `username` (`username`), + KEY `upload_time` (`upload_time`), + KEY `size` (`size`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; diff --git a/web/app/views/main-nav.php b/web/app/views/main-nav.php index eb6cc71..0ad8496 100644 --- a/web/app/views/main-nav.php +++ b/web/app/views/main-nav.php @@ -103,6 +103,22 @@ mb-4" role="navigation"> + +
  • + + +
    • +
  • diff --git a/web/install.sh b/web/install.sh index e86112f..c385272 100644 --- a/web/install.sh +++ b/web/install.sh @@ -89,6 +89,7 @@ initProgress(){ service apache2 restart mkdir -p /opt/uoj/web/app/storage/submission mkdir -p /opt/uoj/web/app/storage/tmp + mkdir -p /opt/uoj/web/app/storage/image_hosting chmod -R 777 /opt/uoj/web/app/storage #Using cli upgrade to latest php7.4 /var/www/uoj/app/cli.php upgrade:latest From 7c631ea72e2af73915f9ca9aa0888b0c083df5b8 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Wed, 12 Oct 2022 20:38:43 +0800 Subject: [PATCH 02/13] fix: style --- web/app/controllers/image_hosting/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/controllers/image_hosting/index.php b/web/app/controllers/image_hosting/index.php index c1baa23..ca06821 100644 --- a/web/app/controllers/image_hosting/index.php +++ b/web/app/controllers/image_hosting/index.php @@ -10,7 +10,7 @@ } $REQUIRE_LIB['bootstrap5'] = ''; -?> + ?> From 2d9d99e1a64367b79a7e4bd1875098b6114f43c8 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Wed, 12 Oct 2022 21:10:07 +0800 Subject: [PATCH 03/13] feat(web/image_hosting): get_image --- .../controllers/image_hosting/get_image.php | 18 ++++++++++++++++++ web/app/libs/uoj-rand-lib.php | 8 ++++---- web/app/libs/uoj-validate-lib.php | 4 ++++ web/app/route.php | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/web/app/controllers/image_hosting/get_image.php b/web/app/controllers/image_hosting/get_image.php index e6e8fae..1f53f04 100644 --- a/web/app/controllers/image_hosting/get_image.php +++ b/web/app/controllers/image_hosting/get_image.php @@ -4,3 +4,21 @@ if (!Auth::check() && UOJConfig::$data['switch']['force-login']) { redirectToLogin(); } + + $name = $_GET['image_name']; + if (!validateString($name)) { + become404Page(); + } + + $file_name = UOJContext::storagePath()."/image_hosting/$name.png"; + + $finfo = finfo_open(FILEINFO_MIME); + $mimetype = finfo_file($finfo, $file_name); + if ($mimetype === false) { + become404Page(); + } + finfo_close($finfo); + + header("X-Sendfile: $file_name"); + header("Content-type: $mimetype"); + header("Cache-Control: max-age=604800", true); diff --git a/web/app/libs/uoj-rand-lib.php b/web/app/libs/uoj-rand-lib.php index d39c527..5c40015 100644 --- a/web/app/libs/uoj-rand-lib.php +++ b/web/app/libs/uoj-rand-lib.php @@ -4,7 +4,7 @@ function uojRand($l, $r) { return mt_rand($l, $r); } -function uojRandString($len, $charset = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') { +function uojRandString($len, $charset = '0123456789abcdefghijklmnopqrstuvwxyz') { $n_chars = strlen($charset); $str = ''; for ($i = 0; $i < $len; $i++) { @@ -13,10 +13,10 @@ function uojRandString($len, $charset = '0123456789abcdefghijklmnopqrstuvwxyzABC return $str; } -function uojRandAvaiableFileName($dir) { +function uojRandAvaiableFileName($dir, $length = 20, $suffix = '') { do { - $fileName = $dir . uojRandString(20); - } while (file_exists(UOJContext::storagePath().$fileName)); + $fileName = $dir . uojRandString($length); + } while (file_exists(UOJContext::storagePath().$fileName.$suffix)); return $fileName; } diff --git a/web/app/libs/uoj-validate-lib.php b/web/app/libs/uoj-validate-lib.php index eb991a5..a685868 100644 --- a/web/app/libs/uoj-validate-lib.php +++ b/web/app/libs/uoj-validate-lib.php @@ -51,3 +51,7 @@ function validateIP($ip) { function validateURL($url) { return filter_var($url, FILTER_VALIDATE_URL) !== false; } + +function validateString($str) { + return preg_match('/[^0-9a-zA-Z]/', $str) !== true; +} diff --git a/web/app/route.php b/web/app/route.php index 3b89394..753207d 100644 --- a/web/app/route.php +++ b/web/app/route.php @@ -5,7 +5,7 @@ Route::pattern('id', '[1-9][0-9]{0,9}'); Route::pattern('contest_id', '[1-9][0-9]{0,9}'); Route::pattern('tab', '\S{1,20}'); Route::pattern('rand_str_id', '[0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]{20}'); -Route::pattern('image_name', '[0123456789abcdefghijklmnopqrstuvwxyz]{7}'); +Route::pattern('image_name', '[0-9a-z]{1,20}'); Route::pattern('upgrade_name', '[a-zA-Z0-9_]{1,50}'); Route::group([ From 0a7a6cbe9ec54a1ee9427a51794cb4fe1a2b27a0 Mon Sep 17 00:00:00 2001 From: Baoshuo Date: Thu, 13 Oct 2022 13:34:55 +0800 Subject: [PATCH 04/13] feat(web/image_hosting): image upload --- db/app_uoj233.sql | 12 +- docker-compose.development.yml | 8 + web/app/controllers/image_hosting/index.php | 266 +++++++++++++++++- web/app/libs/uoj-rand-lib.php | 2 +- web/app/route.php | 4 +- web/app/upgrade/4_image_hosting/up.sql | 14 +- web/app/views/main-nav.php | 2 +- web/fonts/roboto-mono/RobotoMono-Bold.ttf | Bin 0 -> 87008 bytes .../roboto-mono/RobotoMono-BoldItalic.ttf | Bin 0 -> 94148 bytes .../roboto-mono/RobotoMono-ExtraLight.ttf | Bin 0 -> 87788 bytes .../RobotoMono-ExtraLightItalic.ttf | Bin 0 -> 93408 bytes web/fonts/roboto-mono/RobotoMono-Italic.ttf | Bin 0 -> 93904 bytes web/fonts/roboto-mono/RobotoMono-Light.ttf | Bin 0 -> 87592 bytes .../roboto-mono/RobotoMono-LightItalic.ttf | Bin 0 -> 93760 bytes web/fonts/roboto-mono/RobotoMono-Medium.ttf | Bin 0 -> 86820 bytes .../roboto-mono/RobotoMono-MediumItalic.ttf | Bin 0 -> 93948 bytes web/fonts/roboto-mono/RobotoMono-Regular.ttf | Bin 0 -> 86908 bytes web/fonts/roboto-mono/RobotoMono-SemiBold.ttf | Bin 0 -> 87076 bytes .../roboto-mono/RobotoMono-SemiBoldItalic.ttf | Bin 0 -> 93940 bytes web/fonts/roboto-mono/RobotoMono-Thin.ttf | Bin 0 -> 87872 bytes .../roboto-mono/RobotoMono-ThinItalic.ttf | Bin 0 -> 93056 bytes 21 files changed, 291 insertions(+), 17 deletions(-) create mode 100644 web/fonts/roboto-mono/RobotoMono-Bold.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-BoldItalic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-ExtraLight.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-ExtraLightItalic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-Italic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-Light.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-LightItalic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-Medium.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-MediumItalic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-Regular.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-SemiBold.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-SemiBoldItalic.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-Thin.ttf create mode 100644 web/fonts/roboto-mono/RobotoMono-ThinItalic.ttf diff --git a/db/app_uoj233.sql b/db/app_uoj233.sql index cc468cb..bb96614 100644 --- a/db/app_uoj233.sql +++ b/db/app_uoj233.sql @@ -837,16 +837,20 @@ UNLOCK TABLES; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `users_images` ( - `id` varchar(30) NOT NULL, - `username` varchar(20) NOT NULL, + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `path` varchar(100) NOT NULL, + `uploader` varchar(20) NOT NULL, `width` int(11) NOT NULL, `height` int(11) NOT NULL, `upload_time` datetime NOT NULL, `size` int(11) NOT NULL, + `hash` varchar(70) NOT NULL, PRIMARY KEY (`id`), - KEY `username` (`username`), + KEY `uploader` (`uploader`), + KET `path` (`path`), KEY `upload_time` (`upload_time`), - KEY `size` (`size`) + KEY `size` (`size`), + KEY `hash` (`hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 531f1a5..2158beb 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -11,6 +11,14 @@ services: environment: - MYSQL_DATABASE=app_uoj233 - MYSQL_ROOT_PASSWORD=root + + phpmyadmin: + image: phpmyadmin + restart: always + ports: + - 28080:80 + environment: + - PMA_ARBITRARY=1 uoj-judger: build: diff --git a/web/app/controllers/image_hosting/index.php b/web/app/controllers/image_hosting/index.php index ca06821..d86685e 100644 --- a/web/app/controllers/image_hosting/index.php +++ b/web/app/controllers/image_hosting/index.php @@ -1,21 +1,279 @@ 'error', 'message' => $msg])); + } + + $allowedTypes = [IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF]; + if ($_POST['image_upload_file_submit'] == 'submit') { + header('Content-Type: application/json'); + + if (!crsf_check()) { + throwError('expired'); + } + + if (!isset($_SESSION['phrase']) || !PhraseBuilder::comparePhrases($_SESSION['phrase'], $_POST['captcha'])) { + throwError("bad_captcha"); + } + + if ($_FILES["image_upload_file"]["error"] > 0) { + throwError($_FILES["image_upload_file"]["error"]); + } + + if ($_FILES["image_upload_file"]["size"] > 5242880) { // 5 MB + throwError('too_large'); + } + + if ($used + $_FILES["image_upload_file"]["size"] > $limit) { + throwError('storage_limit_exceeded'); + } + + $size = getimagesize($_FILES['image_upload_file']['tmp_name']); + + if (!$size || !in_array($size[2], $allowedTypes)) { + throwError('not_a_image'); + } + + list($width, $height, $type) = $size; + $hash = hash_file("sha256", $_FILES['image_upload_file']['tmp_name']); + + $watermark_text = UOJConfig::$data['profile']['oj-name-short']; + if (isSuperUser($myUser) && $_POST['watermark'] == 'no_watermark') { + $watermark_text = ""; + $hash += "__no"; + } elseif ($_POST['watermark'] == 'site_shortname_and_username') { + $watermark_text .= ' @'.Auth::id(); + $hash += "__id"; + } + + $existing_image = DB::selectFirst("SELECT * FROM users_images WHERE `hash` = '$hash'"); + + if ($existing_image) { + die(json_encode(['status' => 'success', 'path' => $existing_image['path']])); + } + + $img = imagecreatefromstring(file_get_contents($_FILES["image_upload_file"]["tmp_name"])); + $white = imagecolorallocate($img, 255, 255, 255); + $black = imagecolorallocate($img, 150, 150, 150); + + imagettftext($img, '16', 0, 10 + 1, max(0, $height - 20) + 1, $black, UOJContext::documentRoot().'/fonts/roboto-mono/RobotoMono-Bold.ttf', $watermark_text); + imagettftext($img, '16', 0, 10, max(0, $height - 20), $white, UOJContext::documentRoot().'/fonts/roboto-mono/RobotoMono-Bold.ttf', $watermark_text); + imagepng($img, $_FILES["image_upload_file"]["tmp_name"]); + imagedestroy($img); + + $filename = uojRandAvaiableFileName('/image_hosting/', 10, '.png'); + if (!move_uploaded_file($_FILES["image_upload_file"]["tmp_name"], UOJContext::storagePath().$filename)) { + throwError('unknown error'); + } + + DB::insert("INSERT INTO users_images (`path`, uploader, width, height, upload_time, size, `hash`) VALUES ('$filename', '{$myUser['username']}', $width, $height, now(), {$_FILES["image_upload_file"]["size"]}, '$hash')"); + + die(json_encode(['status' => 'success', 'path' => $filename])); + } ?> + +

    +
    +
    +
    +
    + + 点击此处选择图片 +
    + + +
    +

    水印

    + +
    + + +
    + +
    + + +
    +
    + + +
    +
    +
    +

    上传须知

    +
      +
    • 上传的图片必须符合法律与社会道德；
      • +
    • 图床仅供 S2OJ 站内使用；
      • +
    • 在合适的地方插入图片即可引用。
      • +
    +
    +
    +
    +
    + + diff --git a/web/app/libs/uoj-rand-lib.php b/web/app/libs/uoj-rand-lib.php index 5c40015..838d777 100644 --- a/web/app/libs/uoj-rand-lib.php +++ b/web/app/libs/uoj-rand-lib.php @@ -17,7 +17,7 @@ function uojRandAvaiableFileName($dir, $length = 20, $suffix = '') { do { $fileName = $dir . uojRandString($length); } while (file_exists(UOJContext::storagePath().$fileName.$suffix)); - return $fileName; + return $fileName.$suffix; } function uojRandAvaiableTmpFileName() { diff --git a/web/app/route.php b/web/app/route.php index 753207d..43377cb 100644 --- a/web/app/route.php +++ b/web/app/route.php @@ -81,8 +81,8 @@ Route::group([ Route::any('/click-zan', '/click_zan.php'); // Image Hosting - Route::any('/image-hosting', '/image_hosting/index.php'); - Route::get('/image-hosting/{image_name}.png', '/image_hosting/get_image.php'); + Route::any('/image_hosting', '/image_hosting/index.php'); + Route::get('/image_hosting/{image_name}.png', '/image_hosting/get_image.php'); } ); diff --git a/web/app/upgrade/4_image_hosting/up.sql b/web/app/upgrade/4_image_hosting/up.sql index 5a64bd1..14a47f6 100644 --- a/web/app/upgrade/4_image_hosting/up.sql +++ b/web/app/upgrade/4_image_hosting/up.sql @@ -6,16 +6,20 @@ ALTER TABLE `user_info` ADD COLUMN `images_size_limit` int(11) UNSIGNED NOT NULL /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8mb4 */; -CREATE TABLE IF NOT EXISTS `users_images` ( - `id` varchar(30) NOT NULL, - `username` varchar(20) NOT NULL, +CREATE TABLE `users_images` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `path` varchar(100) NOT NULL, + `uploader` varchar(20) NOT NULL, `width` int(11) NOT NULL, `height` int(11) NOT NULL, `upload_time` datetime NOT NULL, `size` int(11) NOT NULL, + `hash` varchar(70) NOT NULL, PRIMARY KEY (`id`), - KEY `username` (`username`), + KEY `uploader` (`uploader`), + KEY `path` (`path`), KEY `upload_time` (`upload_time`), - KEY `size` (`size`) + KEY `size` (`size`), + KEY `hash` (`hash`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/web/app/views/main-nav.php b/web/app/views/main-nav.php index 0ad8496..ee77856 100644 --- a/web/app/views/main-nav.php +++ b/web/app/views/main-nav.php @@ -111,7 +111,7 @@ mb-4" role="navigation">