X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fmain%2Fhandler%2Fchunks%2Fclass_ChunkHandler.php;h=a7708cf2f4fce359d1468bd9895b12fd33602f5f;hb=d5813b87cab5b1d9a704b99186ca45e628322e28;hp=5a188e5257160f1a479401c290bfc1e08d8246cd;hpb=2192ba1f52139fec86a3552dc66cd458ad42b3b1;p=hub.git diff --git a/application/hub/main/handler/chunks/class_ChunkHandler.php b/application/hub/main/handler/chunks/class_ChunkHandler.php index 5a188e525..a7708cf2f 100644 --- a/application/hub/main/handler/chunks/class_ChunkHandler.php +++ b/application/hub/main/handler/chunks/class_ChunkHandler.php @@ -129,7 +129,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable // ... and for the hashes 'hashes' => array(), // ... marker for that the final array is complete for assembling all chunks - 'is_complete' => false, + 'is_complete' => FALSE, // ... steps done to assemble all chunks 'assemble_steps' => 0, ); @@ -152,7 +152,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable */ private function isChunkHashValid (array $chunkSplits) { // Now hash the raw data again - $chunkHash = $this->getCryptoInstance()->hashString($chunkSplits[self::CHUNK_SPLITS_INDEX_RAW_DATA], $chunkSplits[self::CHUNK_SPLITS_INDEX_HASH], false); + $chunkHash = $this->getCryptoInstance()->hashString($chunkSplits[self::CHUNK_SPLITS_INDEX_RAW_DATA], $chunkSplits[self::CHUNK_SPLITS_INDEX_HASH], FALSE); // Debug output //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CHUNK-HANDLER[' . __LINE__ . ']: chunkHash=' . $chunkHash . ',chunkSplits[chunk_hash]=' . $chunkSplits[self::CHUNK_SPLITS_INDEX_HASH] . ',chunkSplits[serial]=' . $chunkSplits[self::CHUNK_SPLITS_INDEX_SERIAL] . ',chunkSplits[raw_data]=' . $chunkSplits[self::CHUNK_SPLITS_INDEX_RAW_DATA]); @@ -172,7 +172,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable */ private function isSerialNumberValid ($serialNumber) { // Check it - $isValid = ((strlen($serialNumber) == PackageFragmenter::MAX_SERIAL_LENGTH) && ($this->hexval($serialNumber, false) === $serialNumber)); + $isValid = ((strlen($serialNumber) == PackageFragmenter::MAX_SERIAL_LENGTH) && ($this->hexval($serialNumber, FALSE) === $serialNumber)); // Return result return $isValid; @@ -246,9 +246,9 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable * @return void */ private function preparePackageAssmble () { - // Make sure both arrays have same count (this however should always be true) + // Make sure both arrays have same count (this however should always be TRUE) assert(count($this->finalPackageChunks['hashes']) == count($this->finalPackageChunks['content'])); - //* DIE: */ exit(__METHOD__ . ':finalPackageChunks='.print_r($this->finalPackageChunks['content'],true)); + //* DIE: */ exit(__METHOD__ . ':finalPackageChunks='.print_r($this->finalPackageChunks['content'], TRUE)); /* * Remove last element (hash chunk) from 'hashes'. This hash will never @@ -316,7 +316,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable foreach ($this->finalPackageChunks['content'] as $serialNumber => $content) { // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CHUNK-HANDLER[' . __LINE__ . ']: serialNumber=' . $serialNumber . ' - validating ...'); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('finalPackageChunks=' . print_r($this->finalPackageChunks,true) . 'chunkHashes=' . print_r($this->chunkHashes,true)); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('finalPackageChunks=' . print_r($this->finalPackageChunks, TRUE) . 'chunkHashes=' . print_r($this->chunkHashes, TRUE)); // Is this chunk valid? This should be the case assert($this->isChunkHashValid(array( @@ -332,7 +332,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable } // END - foreach // Debug output - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CHUNK-HANDLER[' . __LINE__ . ']: eopChunk[1]=' . $this->eopChunk[1] . ',' . chr(10) . 'index=' . (count($this->chunkHashes) - 2) . ',' . chr(10) . 'chunkHashes='.print_r($this->chunkHashes,true)); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CHUNK-HANDLER[' . __LINE__ . ']: eopChunk[1]=' . $this->eopChunk[1] . ',' . chr(10) . 'index=' . (count($this->chunkHashes) - 2) . ',' . chr(10) . 'chunkHashes='.print_r($this->chunkHashes, TRUE)); // The last chunk hash must match with the one from eopChunk[1] assert($this->eopChunk[1] == $this->chunkHashes[count($this->chunkHashes) - 2]); @@ -346,7 +346,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable */ private function verifyRawPackageData () { // Hash the raw package data for final verification - $finalHash = $this->getCryptoInstance()->hashString($this->rawPackageData, $this->eopChunk[0], false); + $finalHash = $this->getCryptoInstance()->hashString($this->rawPackageData, $this->eopChunk[0], FALSE); // Is it the same? assert($finalHash == $this->eopChunk[0]); @@ -541,7 +541,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable /** * Checks whether the raw package data has been assembled back together. * This can be safely assumed when rawPackageData is not empty and the - * collection of all chunks is false (because initHandler() will reset it). + * collection of all chunks is FALSE (because initHandler() will reset it). * * @return $isRawPackageDataAvailable Whether raw package data is available */