move fonts/ out of classes/ and into the root

OPSnet · Nov 4, 2020 · e3eda7b · e3eda7b
1 parent 91f9d6e
commit e3eda7b
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → fonts/ARIBLK.TTF b/classes/fonts/ARIBLK.TTF → fonts/ARIBLK.TTF
diff --git a/classes/fonts/COMIC.TTF → fonts/COMIC.TTF b/classes/fonts/COMIC.TTF → fonts/COMIC.TTF
diff --git a/classes/fonts/COMICBD.TTF → fonts/COMICBD.TTF b/classes/fonts/COMICBD.TTF → fonts/COMICBD.TTF
diff --git a/classes/fonts/GEORGIA.TTF → fonts/GEORGIA.TTF b/classes/fonts/GEORGIA.TTF → fonts/GEORGIA.TTF
diff --git a/classes/fonts/GEORGIAB.TTF → fonts/GEORGIAB.TTF b/classes/fonts/GEORGIAB.TTF → fonts/GEORGIAB.TTF
diff --git a/classes/fonts/GEORGIAI.TTF → fonts/GEORGIAI.TTF b/classes/fonts/GEORGIAI.TTF → fonts/GEORGIAI.TTF
diff --git a/classes/fonts/GEORGIAZ.TTF → fonts/GEORGIAZ.TTF b/classes/fonts/GEORGIAZ.TTF → fonts/GEORGIAZ.TTF
diff --git a/classes/fonts/IMPACT.TTF → fonts/IMPACT.TTF b/classes/fonts/IMPACT.TTF → fonts/IMPACT.TTF
diff --git a/classes/fonts/MISTRAL.TTF → fonts/MISTRAL.TTF b/classes/fonts/MISTRAL.TTF → fonts/MISTRAL.TTF
diff --git a/classes/fonts/README.TXT → fonts/README.TXT b/classes/fonts/README.TXT → fonts/README.TXT
diff --git a/classes/fonts/TREBUC.TTF → fonts/TREBUC.TTF b/classes/fonts/TREBUC.TTF → fonts/TREBUC.TTF
diff --git a/classes/fonts/TREBUCBD.TTF → fonts/TREBUCBD.TTF b/classes/fonts/TREBUCBD.TTF → fonts/TREBUCBD.TTF
diff --git a/classes/fonts/TREBUCBI.TTF → fonts/TREBUCBI.TTF b/classes/fonts/TREBUCBI.TTF → fonts/TREBUCBI.TTF
diff --git a/classes/fonts/TREBUCIT.TTF → fonts/TREBUCIT.TTF b/classes/fonts/TREBUCIT.TTF → fonts/TREBUCIT.TTF
diff --git a/classes/fonts/VERDANA.TTF → fonts/VERDANA.TTF b/classes/fonts/VERDANA.TTF → fonts/VERDANA.TTF
diff --git a/classes/fonts/VERDANAB.TTF → fonts/VERDANAB.TTF b/classes/fonts/VERDANAB.TTF → fonts/VERDANAB.TTF
diff --git a/classes/fonts/VERDANAI.TTF → fonts/VERDANAI.TTF b/classes/fonts/VERDANAI.TTF → fonts/VERDANAI.TTF
diff --git a/classes/fonts/VERDANAZ.TTF → fonts/VERDANAZ.TTF b/classes/fonts/VERDANAZ.TTF → fonts/VERDANAZ.TTF
diff --git 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
@@ -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() {