From e3eda7b7cc98f99275f80d3d11cec424845a358c Mon Sep 17 00:00:00 2001 From: Spine Date: Wed, 28 Oct 2020 23:12:41 +0000 Subject: [PATCH] move fonts/ out of classes/ and into the root --- .vagrant/config.php | 2 +- app/Image.php | 2 +- classes/config.template.php | 2 +- classes/image.class.php | 2 +- {classes/fonts => fonts}/ARIBLK.TTF | Bin {classes/fonts => fonts}/COMIC.TTF | Bin {classes/fonts => fonts}/COMICBD.TTF | Bin {classes/fonts => fonts}/GEORGIA.TTF | Bin {classes/fonts => fonts}/GEORGIAB.TTF | Bin {classes/fonts => fonts}/GEORGIAI.TTF | Bin {classes/fonts => fonts}/GEORGIAZ.TTF | Bin {classes/fonts => fonts}/IMPACT.TTF | Bin {classes/fonts => fonts}/MISTRAL.TTF | Bin {classes/fonts => fonts}/README.TXT | 0 {classes/fonts => fonts}/TREBUC.TTF | Bin {classes/fonts => fonts}/TREBUCBD.TTF | Bin {classes/fonts => fonts}/TREBUCBI.TTF | Bin {classes/fonts => fonts}/TREBUCIT.TTF | Bin {classes/fonts => fonts}/VERDANA.TTF | Bin {classes/fonts => fonts}/VERDANAB.TTF | Bin {classes/fonts => fonts}/VERDANAI.TTF | Bin {classes/fonts => fonts}/VERDANAZ.TTF | Bin phpstan.neon | 40 ++++++++++++++------------ sections/captcha/index.php | 2 +- 24 files changed, 27 insertions(+), 23 deletions(-) rename {classes/fonts => fonts}/ARIBLK.TTF (100%) rename {classes/fonts => fonts}/COMIC.TTF (100%) rename {classes/fonts => fonts}/COMICBD.TTF (100%) rename {classes/fonts => fonts}/GEORGIA.TTF (100%) rename {classes/fonts => fonts}/GEORGIAB.TTF (100%) rename {classes/fonts => fonts}/GEORGIAI.TTF (100%) rename {classes/fonts => fonts}/GEORGIAZ.TTF (100%) rename {classes/fonts => fonts}/IMPACT.TTF (100%) rename {classes/fonts => fonts}/MISTRAL.TTF (100%) rename {classes/fonts => fonts}/README.TXT (100%) rename {classes/fonts => fonts}/TREBUC.TTF (100%) rename {classes/fonts => fonts}/TREBUCBD.TTF (100%) rename {classes/fonts => fonts}/TREBUCBI.TTF (100%) rename {classes/fonts => fonts}/TREBUCIT.TTF (100%) rename {classes/fonts => fonts}/VERDANA.TTF (100%) rename {classes/fonts => fonts}/VERDANAB.TTF (100%) rename {classes/fonts => fonts}/VERDANAI.TTF (100%) rename {classes/fonts => fonts}/VERDANAZ.TTF (100%) diff --git a/.vagrant/config.php b/.vagrant/config.php index 86eecfe6f..ef884cb71 100644 --- a/.vagrant/config.php +++ b/.vagrant/config.php @@ -219,7 +219,7 @@ [5 * 1024 * 1024 * 1024, 0.15, date('Y-m-d H:i:s', time() - (60 * 60 * 24 * 14))] ]; -//Captcha fonts should be located in /classes/fonts +//Captcha fonts are located in ./fonts $CaptchaFonts = [ 'ARIBLK.TTF', 'IMPACT.TTF', diff --git a/app/Image.php b/app/Image.php index 49f648c9f..101337d26 100644 --- a/app/Image.php +++ b/app/Image.php @@ -75,7 +75,7 @@ public function verysmall(): bool { * Build and emit an image containing a simple text message. */ public static function render(string $text) { - $font = realpath(__DIR__ . '/../classes/fonts/VERDANAB.TTF'); + $font = realpath(__DIR__ . '/../fonts/VERDANAB.TTF'); $pointSize = 40.0; while (true) { [$left,, $right] = imageftbbox($pointSize, 0, $font, $text); diff --git a/classes/config.template.php b/classes/config.template.php index f2979115a..8b0a4b315 100644 --- a/classes/config.template.php +++ b/classes/config.template.php @@ -316,7 +316,7 @@ [5 * 1024 * 1024 * 1024, 0.15, date('Y-m-d H:i:s', time() - (60 * 60 * 24 * 14))] ]; -//Captcha fonts should be located in /classes/fonts +//Captcha fonts are located in ./fonts $CaptchaFonts = [ 'ARIBLK.TTF', 'IMPACT.TTF', diff --git a/classes/image.class.php b/classes/image.class.php index a00b452d9..6a6a6854d 100644 --- a/classes/image.class.php +++ b/classes/image.class.php @@ -11,7 +11,7 @@ class IMAGE { function create($Width, $Height) { $this->Image = imagecreate($Width, $Height); - $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF'; + $this->Font = __DIR__ . '/../fonts/VERDANA.TTF'; if (function_exists('imageantialias')) { imageantialias($this->Image, true); } diff --git a/classes/fonts/ARIBLK.TTF b/fonts/ARIBLK.TTF similarity index 100% rename from classes/fonts/ARIBLK.TTF rename to fonts/ARIBLK.TTF diff --git a/classes/fonts/COMIC.TTF b/fonts/COMIC.TTF similarity index 100% rename from classes/fonts/COMIC.TTF rename to fonts/COMIC.TTF diff --git a/classes/fonts/COMICBD.TTF b/fonts/COMICBD.TTF similarity index 100% rename from classes/fonts/COMICBD.TTF rename to fonts/COMICBD.TTF diff --git a/classes/fonts/GEORGIA.TTF b/fonts/GEORGIA.TTF similarity index 100% rename from classes/fonts/GEORGIA.TTF rename to fonts/GEORGIA.TTF diff --git a/classes/fonts/GEORGIAB.TTF b/fonts/GEORGIAB.TTF similarity index 100% rename from classes/fonts/GEORGIAB.TTF rename to fonts/GEORGIAB.TTF diff --git a/classes/fonts/GEORGIAI.TTF b/fonts/GEORGIAI.TTF similarity index 100% rename from classes/fonts/GEORGIAI.TTF rename to fonts/GEORGIAI.TTF diff --git a/classes/fonts/GEORGIAZ.TTF b/fonts/GEORGIAZ.TTF similarity index 100% rename from classes/fonts/GEORGIAZ.TTF rename to fonts/GEORGIAZ.TTF diff --git a/classes/fonts/IMPACT.TTF b/fonts/IMPACT.TTF similarity index 100% rename from classes/fonts/IMPACT.TTF rename to fonts/IMPACT.TTF diff --git a/classes/fonts/MISTRAL.TTF b/fonts/MISTRAL.TTF similarity index 100% rename from classes/fonts/MISTRAL.TTF rename to fonts/MISTRAL.TTF diff --git a/classes/fonts/README.TXT b/fonts/README.TXT similarity index 100% rename from classes/fonts/README.TXT rename to fonts/README.TXT diff --git a/classes/fonts/TREBUC.TTF b/fonts/TREBUC.TTF similarity index 100% rename from classes/fonts/TREBUC.TTF rename to fonts/TREBUC.TTF diff --git a/classes/fonts/TREBUCBD.TTF b/fonts/TREBUCBD.TTF similarity index 100% rename from classes/fonts/TREBUCBD.TTF rename to fonts/TREBUCBD.TTF diff --git a/classes/fonts/TREBUCBI.TTF b/fonts/TREBUCBI.TTF similarity index 100% rename from classes/fonts/TREBUCBI.TTF rename to fonts/TREBUCBI.TTF diff --git a/classes/fonts/TREBUCIT.TTF b/fonts/TREBUCIT.TTF similarity index 100% rename from classes/fonts/TREBUCIT.TTF rename to fonts/TREBUCIT.TTF diff --git a/classes/fonts/VERDANA.TTF b/fonts/VERDANA.TTF similarity index 100% rename from classes/fonts/VERDANA.TTF rename to fonts/VERDANA.TTF diff --git a/classes/fonts/VERDANAB.TTF b/fonts/VERDANAB.TTF similarity index 100% rename from classes/fonts/VERDANAB.TTF rename to fonts/VERDANAB.TTF diff --git a/classes/fonts/VERDANAI.TTF b/fonts/VERDANAI.TTF similarity index 100% rename from classes/fonts/VERDANAI.TTF rename to fonts/VERDANAI.TTF diff --git a/classes/fonts/VERDANAZ.TTF b/fonts/VERDANAZ.TTF similarity index 100% rename from classes/fonts/VERDANAZ.TTF rename to fonts/VERDANAZ.TTF diff --git a/phpstan.neon b/phpstan.neon index 717504853..5fa3d951e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,19 +1,23 @@ parameters: - level: 1 - bootstrapFiles: - - classes/config.template.php - scanFiles: - - classes/paranoia.class.php - - classes/proxies.class.php - - classes/time.class.php - - classes/util.php - - sections/artist/index.php - - sections/torrents/functions.php - paths: - - app - - classes - excludes_analyse: - - classes/pushserver.class.php - - sections - parallel: - maximumNumberOfProcesses: 1 + level: 1 + bootstrapFiles: + - classes/config.template.php + scanFiles: + - classes/paranoia.class.php + - classes/proxies.class.php + - classes/time.class.php + - classes/util.php + - sections/artist/index.php + - sections/torrents/functions.php + paths: + - app + - classes + excludes_analyse: + - classes/pushserver.class.php + - sections + parallel: + maximumNumberOfProcesses: 1 + ignoreErrors: + - + message: '/(Constant IMG_BMP|Function imagebmp) not found\./' + path: app/Image.php diff --git a/sections/captcha/index.php b/sections/captcha/index.php index e7dd79db9..4c1e4e05d 100644 --- a/sections/captcha/index.php +++ b/sections/captcha/index.php @@ -5,7 +5,7 @@ function get_font() { global $CaptchaFonts; - return __DIR__.'/../../classes/fonts/'.$CaptchaFonts[mt_rand(0, count($CaptchaFonts) - 1)]; + return __DIR__ . '/../../fonts/' . $CaptchaFonts[mt_rand(0, count($CaptchaFonts) - 1)]; } function make_captcha_img() {