New flag and minor refactoring.

Changelog excerpt:
- Added a flag for successful hits against blacklisted filetypes (needed by
  the upload handler for a newly added configuration directive).
- Also did some very minor refactoring.

Author: Maikuolan

Changelog.md

@@ -51,3 +51,7 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
 [2021.05.28; Maikuolan]: Performed some minor refactoring.
 
 [2021.05.28; Bug-fix; Maikuolan]: Wrong casing used for some variables would cause undefined variable errors to occur; Fixed (#3).
+
+### v3.2.2
+
+[2021.06.10; Maikuolan]: Added a flag for successful hits against blacklisted filetypes (needed by the upload handler for a newly added configuration directive). Also did some very minor refactoring.

src/Scanner.php

@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: The scanner (last modified: 2021.05.28).
+ * This file: The scanner (last modified: 2021.06.10).
  */
 
 namespace phpMussel\Core;
@@ -497,6 +497,7 @@ private function recursor($Files = '', int $Depth = -1): void
                 $this->Loader->Configuration['files']['filetype_greylist']
             ], [$xt, $xts, $gzxt, $gzxts]))
         ) {
+            $this->Loader->InstanceCache['blacklist_triggered'] = true;
             $this->Loader->InstanceCache['ThisScanDone']++;
             $this->Loader->Events->fireEvent('countersChanged');
             $this->Loader->atHit('', $fS, $OriginalFilenameClean, sprintf(
@@ -2362,7 +2363,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
         /** Check whether Crx, and convert if necessary. */
         if ($this->convertCrx($Data)) {
-
             /** Reset the file pointer (because the content has been modified anyway). */
             $File = '';
         }
@@ -2433,7 +2433,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
         /** Handle zip files. */
         if ($Handler === 'ZipHandler') {
-
             /**
              * Encryption guard.
              * @link https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
@@ -2463,7 +2462,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
             /** ZipHandler needs a file pointer. */
             if (!$File || !is_readable($File)) {
-
                 /**
                  * File pointer not available. Probably already inside an
                  * archive. Let's create a temporary file for this.
@@ -2472,7 +2470,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
                 $Pointer = &$PointerObject->Filename;
                 $this->Loader->InstanceCache['tempfilesToDelete'][] = $Pointer;
             } else {
-
                 /** File pointer available. Let's reference it. */
                 $Pointer = &$File;
             }
@@ -2485,14 +2482,12 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
         /** Handle tar files. */
         if ($Handler === 'TarHandler') {
-
             /** TarHandler can work with data directly. */
             $ArchiveObject = new TarHandler($Data);
         }
 
         /** Handle rar files. */
         if ($Handler === 'RarHandler') {
-
             /** Guard. */
             if (!class_exists('\RarArchive') || !class_exists('\RarEntry')) {
                 if (!$this->Loader->Configuration['signatures']['fail_extensions_silently']) {
@@ -2503,7 +2498,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
             /** RarHandler needs a file pointer. */
             if (!$File || !is_readable($File)) {
-
                 /**
                  * File pointer not available. Probably already inside an
                  * archive. Let's create a temporary file for this.
@@ -2512,7 +2506,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
                 $Pointer = &$PointerObject->Filename;
                 $this->Loader->InstanceCache['tempfilesToDelete'][] = $Pointer;
             } else {
-
                 /** File pointer available. Let's reference it. */
                 $Pointer = &$File;
             }
@@ -2525,7 +2518,6 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
         /** Handle PDF files. */
         if ($Handler === 'PdfHandler') {
-
             /** Encryption guard. */
             if ($this->Loader->Configuration['files']['block_encrypted_archives']) {
                 if (($XPos = strrpos($Data, "\nxref")) !== false && strpos($Data, "\n/Encrypt", $XPos + 5) !== false) {
@@ -2547,16 +2539,13 @@ private function archiveRecursor(string $Data, string $File = '', int $ScanDepth
 
         /** Archive object has been instantiated. Let's proceed. */
         if (isset($ArchiveObject) && is_object($ArchiveObject)) {
-
             /** No errors reported. Let's try checking its contents. */
             if ($ArchiveObject->ErrorState === 0) {
-
                 /** Used to count the number of entries processed. */
                 $Processed = 0;
 
                 /** Iterate through the archive's contents. */
                 while ($ArchiveObject->EntryNext()) {
-
                     /** Skip directories (useless for scanning here). */
                     if ($ArchiveObject->EntryIsDirectory()) {
                         continue;
@@ -2983,11 +2972,10 @@ public function quarantine(string $In, string $Key, string $IP, string $ID): boo
             }
         }
         $Out =
-            "\x2f\x3d\x3d\x20phpMussel\x20Quarantined\x20File\x20Upload\x20\x3d" .
-            "\x3d\x5c\n\x7c\x20Time\x2fDate\x20Uploaded\x3a\x20" .
+            "\x2f\x3d\x3d phpMussel Quarantined File Upload \x3d\x3d\x5c\n\x7c Time\x2fDate Uploaded\x3a " .
             str_pad($this->Loader->Time, 18, ' ') .
-            "\x7c\n\x7c\x20Uploaded\x20From\x3a\x20" . str_pad($IP, 22, ' ') .
-            "\x20\x7c\n\x5c" . str_repeat("\x3d", 39) . "\x2f\n\n\n" . $Head . $Out;
+            "\x7c\n\x7c Uploaded From\x3a " . str_pad($IP, 22, ' ') .
+            " \x7c\n\x5c" . str_repeat("\x3d", 39) . "\x2f\n\n\n" . $Head . $Out;
         $UsedMemory = $this->memoryUse($this->Loader->QuarantinePath);
         $UsedMemory['Size'] += strlen($Out);
         $UsedMemory['Count']++;
@@ -3785,6 +3773,7 @@ private function metaDataScan(string $ItemRef, string $Filename, string &$Data,
                 !empty($this->Loader->Configuration['files']['filetype_greylist']) &&
                 $this->containsMustAssert([$this->Loader->Configuration['files']['filetype_greylist']], [$xt, $xts])
             )) {
+                $this->Loader->InstanceCache['blacklist_triggered'] = true;
                 $this->Loader->atHit($Checksum, $Filesize, $ItemRef, sprintf(
                     $this->Loader->L10N->getString('grammar_exclamation_mark'),
                     sprintf(