From b162e611bd578029551db3a972b1b8bfbb78819a Mon Sep 17 00:00:00 2001 From: Aaron Junker Date: Sun, 24 Jan 2021 17:51:28 +0100 Subject: [PATCH 1/4] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 30d836325..2d647cfd3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -15,7 +15,7 @@ Useful simple open-source CMS -![](https://img.shields.io/badge/Version%20in%20developement%20in%20this%20branch-Pb2.4Bfx0-blue) +![](https://img.shields.io/badge/Version%20in%20developement%20in%20this%20branch-Pb2.5Bfx0-blue) From 570a1f68dee41d68bba4263f61c33f7ab9a0218c Mon Sep 17 00:00:00 2001 From: Aaron Junker Date: Sun, 24 Jan 2021 17:56:02 +0100 Subject: [PATCH 2/4] push --- docs/CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 87ad29b27..c613bc3fc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,8 @@ * Added a beautiful installer * Removed install.html * Added a hint in the admin area if the install folder still exists + +![](https://i.imgur.com/SVr1Apj.png) * ID selection on admin/pages/useredit.php now only allows range from lowest id to highest id * Added return declarations to functions * Added a backwards compatibility script @@ -99,7 +101,7 @@ * You can't edit yourself now * Shows now an error if the user doesn't exists * 2fa - * Code input is now styled and in `login .php` + * Code input is now styled and in `login.php` * You can now cancel code input * You can not login with a other account if you haven't finished login yet * Chenged order of items on `about.php` From 8f87f861bdc7c524f2ec16be0e8ea5fbcd97ebae Mon Sep 17 00:00:00 2001 From: Aaron Junker Date: Sun, 24 Jan 2021 19:18:37 +0100 Subject: [PATCH 3/4] push --- docs/CHANGELOG.md | 3 +++ docs/SECURITY.md | 2 +- plugins/images/index.php | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c613bc3fc..9caa2f03a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,9 @@ ## Fixed bugs * _ (#) --> +# Pb2.4Bfx1 +## Fixed bugs +* Some debug function were still in the image plugin # Pb2.4Bfx0 > USOC now supports PHP8. Through a backwards compatibity script it still supports PHP7.4. > The PHP7.4 support ends in the summer of 2020 diff --git a/docs/SECURITY.md b/docs/SECURITY.md index 86aad6dac..c458ab0a9 100644 --- a/docs/SECURITY.md +++ b/docs/SECURITY.md @@ -9,7 +9,7 @@ Old pre-alpha and pre-beta versions aren't supported with bugfixes. ### Pre-Beta | Version | Supported|Newest Version| | ------- | ---------|--------------| -| Pb2.4 | :x: | Pb2.4Bfx0 | +| Pb2.4 | :x: | Pb2.4Bfx1 | | Pb2.3 | :x: | Pb2.3Bfx0 | | Pb2.2 | :x: | Pb2.2Bfx0 | | Pb2.1 | :x: | Pb2.1Bfx0 | diff --git a/plugins/images/index.php b/plugins/images/index.php index cb32424e7..fdff363ef 100644 --- a/plugins/images/index.php +++ b/plugins/images/index.php @@ -25,18 +25,18 @@ function getLangImage($string){ } }, "DeleteHandler" => function (int $Id){}, "ShowHandler" => function ($code, $data){ - // $fileExtension = strtolower(pathinfo($data["Name"], PATHINFO_EXTENSION)); - // $width = (isset($_GET["width"]) ? $_GET["width"]."px" : ""); - // if($fileExtension == "jpg"){ - // $code = ""; - // }elseif($fileExtension == "png"){ - // $code = ""; - // }elseif($fileExtension == "jpeg"){ - // $code = ""; - // }elseif($fileExtension == "gif"){ - // $code = ""; - // } - header("Content-Type: image/jpg"); + $fileExtension = strtolower(pathinfo($data["Name"], PATHINFO_EXTENSION)); + $width = (isset($_GET["width"]) ? $_GET["width"]."px" : ""); + if($fileExtension == "jpg"){ + $code = ""; + }elseif($fileExtension == "png"){ + $code = ""; + }elseif($fileExtension == "jpeg"){ + $code = ""; + }elseif($fileExtension == "gif"){ + $code = ""; + } + //header("Content-Type: image/jpg"); return $code; }, "HTML" => False, "EditHandler" => function (int $Id, $data){}, "CreateNewContent" => True, "ContentCreateHandler" => "Upload", "ContentEditHandler" => "Upload"]; ?> \ No newline at end of file From d99a7163fa026f4c05bf597b355748d324362091 Mon Sep 17 00:00:00 2001 From: Aaron Junker Date: Sun, 24 Jan 2021 19:19:28 +0100 Subject: [PATCH 4/4] push --- includes/class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/class.inc.php b/includes/class.inc.php index 6a620f97f..fdd1fbfa2 100644 --- a/includes/class.inc.php +++ b/includes/class.inc.php @@ -41,7 +41,7 @@ class U{ * @since Pb2.4Bfx0 * @var int */ - public int $versionCode = 20240900; + public int $versionCode = 20240901; /** * True when USOC is modded * @since Pb2.0Bfx0RCA