mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-70312 libraries: upgrade to version 2.3.5 of FPDI.

Browse Source
This commit is contained in:
Paul Holden 2020-12-16 11:55:44 +00:00
parent 56fd8c5125
commit a2a410fe09
50 changed files with 345 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/assign/feedback/editpdf/fpdi/FpdfTpl.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,10 +14,8 @@ namespace setasign\Fpdi;
* Class FpdfTpl
*
* This class adds a templating feature to FPDF.
*
* @package setasign\Fpdi
*/
class FpdfTpl extends \Fpdf
class FpdfTpl extends \FPDF
{
use FpdfTplTrait;
}

20
mod/assign/feedback/editpdf/fpdi/FpdfTplTrait.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ namespace setasign\Fpdi;
* Trait FpdfTplTrait
*
* This class adds a templating feature to tFPDF.
*
* @package setasign\Fpdi
*/
trait FpdfTplTrait
{
@ -61,7 +60,8 @@ trait FpdfTplTrait
$size = $this->_getpagesize($size);
if ($orientation != $this->CurOrientation
if (
$orientation != $this->CurOrientation
|| $size[0] != $this->CurPageSize[0]
|| $size[1] != $this->CurPageSize[1]
) {
@ -109,7 +109,7 @@ trait FpdfTplTrait
unset($x['tpl']);
\extract($x, EXTR_IF_EXISTS);
/** @noinspection NotOptimalIfConditionsInspection */
/** @noinspection CallableParameterUseCaseInTypeContextInspection */
/** @noinspection PhpConditionAlreadyCheckedInspection */
if (\is_array($x)) {
$x = 0;
}
@ -266,7 +266,7 @@ trait FpdfTplTrait
*/
public function endTemplate()
{
if (null === $this->currentTemplateId) {
if ($this->currentTemplateId === null) {
return false;
}
@ -418,7 +418,11 @@ trait FpdfTplTrait
$this->templates[$key]['objectNumber'] = $this->n;
$this->_put('<</Type /XObject /Subtype /Form /FormType 1');
$this->_put(\sprintf('/BBox[0 0 %.2F %.2F]', $template['width'] * $this->k, $template['height'] * $this->k));
$this->_put(\sprintf(
'/BBox[0 0 %.2F %.2F]',
$template['width'] * $this->k,
$template['height'] * $this->k
));
$this->_put('/Resources 2 0 R'); // default resources dictionary of FPDF
if ($this->compress) {
@ -463,4 +467,4 @@ trait FpdfTplTrait
parent::_out($s);
}
}
}
}

8
mod/assign/feedback/editpdf/fpdi/Fpdi.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -18,8 +19,6 @@ use setasign\Fpdi\PdfParser\Type\PdfNull;
* Class Fpdi
*
* This class let you import pages of existing PDF documents into a reusable structure for FPDF.
*
* @package setasign\Fpdi
*/
class Fpdi extends FpdfTpl
{
@ -30,7 +29,7 @@ class Fpdi extends FpdfTpl
*
* @string
*/
const VERSION = '2.2.0';
const VERSION = '2.3.5';
protected function _enddoc()
{
@ -113,7 +112,6 @@ class Fpdi extends FpdfTpl
while (($objectNumber = \array_pop($this->objectsToCopy[$readerId])) !== null) {
try {
$object = $parser->getIndirectObject($objectNumber);
} catch (CrossReferenceException $e) {
if ($e->getCode() === CrossReferenceException::OBJECT_NOT_FOUND) {
$object = PdfIndirectObject::create($objectNumber, 0, new PdfNull());

5
mod/assign/feedback/editpdf/fpdi/FpdiException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi;
/**
* Base exception class for the FPDI package.
*
* @package setasign\Fpdi
*/
class FpdiException extends \Exception
{

30
mod/assign/feedback/editpdf/fpdi/FpdiTrait.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -41,8 +42,6 @@ use /* This namespace/class is used by the commercial FPDI PDF-Parser add-on. */
*
* This trait offers the core functionalities of FPDI. By passing them to a trait we can reuse it with e.g. TCPDF in a
* very easy way.
*
* @package setasign\Fpdi
*/
trait FpdiTrait
{
@ -63,7 +62,7 @@ trait FpdiTrait
/**
* The current reader id.
*
* @var string
* @var string|null
*/
protected $currentReaderId;
@ -104,7 +103,7 @@ trait FpdiTrait
unset($this->readers[$id]);
}
$this->createdReaders= [];
$this->createdReaders = [];
}
/**
@ -128,6 +127,9 @@ trait FpdiTrait
*/
protected function getPdfParserInstance(StreamReader $streamReader)
{
// note: if you get an exception here - turn off errors/warnings on not found for your autoloader.
// psr-4 (https://www.php-fig.org/psr/psr-4/) says: Autoloader implementations MUST NOT throw
// exceptions, MUST NOT raise errors of any level, and SHOULD NOT return a value.
/** @noinspection PhpUndefinedClassInspection */
if (\class_exists(FpdiPdfParser::class)) {
/** @noinspection PhpUndefinedClassInspection */
@ -299,7 +301,7 @@ trait FpdiTrait
if ($rotation !== 0) {
$rotation *= -1;
$angle = $rotation * M_PI/180;
$angle = $rotation * M_PI / 180;
$a = \cos($angle);
$b = \sin($angle);
$c = -$b;
@ -336,7 +338,8 @@ trait FpdiTrait
$contents = PdfType::resolve($contentsObject, $reader->getParser());
// just copy the stream reference if it is only a single stream
if (($contentsIsStream = ($contents instanceof PdfStream))
if (
($contentsIsStream = ($contents instanceof PdfStream))
|| ($contents instanceof PdfArray && \count($contents->value) === 1)
) {
if ($contentsIsStream) {
@ -494,26 +497,20 @@ trait FpdiTrait
} else {
$this->_put(\rtrim(\rtrim(\sprintf('%.5F', $value->value), '0'), '.') . ' ', false);
}
} elseif ($value instanceof PdfName) {
$this->_put('/' . $value->value . ' ', false);
} elseif ($value instanceof PdfString) {
$this->_put('(' . $value->value . ')', false);
} elseif ($value instanceof PdfHexString) {
$this->_put('<' . $value->value . '>');
} elseif ($value instanceof PdfBoolean) {
$this->_put($value->value ? 'true ' : 'false ', false);
} elseif ($value instanceof PdfArray) {
$this->_put('[', false);
foreach ($value->value as $entry) {
$this->writePdfType($entry);
}
$this->_put(']');
} elseif ($value instanceof PdfDictionary) {
$this->_put('<<', false);
foreach ($value->value as $name => $entry) {
@ -521,13 +518,10 @@ trait FpdiTrait
$this->writePdfType($entry);
}
$this->_put('>>');
} elseif ($value instanceof PdfToken) {
$this->_put($value->value);
} elseif ($value instanceof PdfNull) {
$this->_put('null ');
} elseif ($value instanceof PdfStream) {
/**
* @var $value PdfStream
@ -536,7 +530,6 @@ trait FpdiTrait
$this->_put('stream');
$this->_put($value->getStream());
$this->_put('endstream');
} elseif ($value instanceof PdfIndirectObjectReference) {
if (!isset($this->objectMap[$this->currentReaderId])) {
$this->objectMap[$this->currentReaderId] = [];
@ -548,10 +541,9 @@ trait FpdiTrait
}
$this->_put($this->objectMap[$this->currentReaderId][$value->value] . ' 0 R ', false);
} elseif ($value instanceof PdfIndirectObject) {
/**
* @var $value PdfIndirectObject
* @var PdfIndirectObject $value
*/
$n = $this->objectMap[$this->currentReaderId][$value->objectNumber];
$this->_newobj($n);

5
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/AbstractReader.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -16,8 +17,6 @@ use setasign\Fpdi\PdfParser\Type\PdfTypeException;
/**
* Abstract class for cross-reference reader classes.
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
abstract class AbstractReader
{

20
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/CrossReference.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -21,8 +22,6 @@ use setasign\Fpdi\PdfParser\Type\PdfTypeException;
* Class CrossReference
*
* This class processes the standard cross reference of a PDF document.
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
class CrossReference
{
@ -31,7 +30,7 @@ class CrossReference
*
* @var int
*/
static public $trailerSearchLength = 5500;
public static $trailerSearchLength = 5500;
/**
* @var int
@ -206,7 +205,7 @@ class CrossReference
$this->parser->getStreamReader()->reset($offset);
$this->parser->getTokenizer()->clearStack();
$initValue = $this->parser->readValue();
return $this->initReaderInstance($initValue);
}
@ -235,8 +234,15 @@ class CrossReference
}
if ($initValue instanceof PdfIndirectObject) {
// check for encryption
$stream = PdfStream::ensure($initValue->value);
try {
$stream = PdfStream::ensure($initValue->value);
} catch (PdfTypeException $e) {
throw new CrossReferenceException(
'Invalid object type at xref reference offset.',
CrossReferenceException::INVALID_DATA,
$e
);
}
$type = PdfDictionary::get($stream->value, 'Type');
if ($type->value !== 'XRef') {

5
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/CrossReferenceException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\PdfParserException;
/**
* Exception used by the CrossReference and Reader classes.
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
class CrossReferenceException extends PdfParserException
{

9
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/FixedReader.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -17,8 +18,6 @@ use setasign\Fpdi\PdfParser\StreamReader;
*
* This reader allows a very less overhead parsing of single entries of the cross-reference, because the main entries
* are only read when needed and not in a single run.
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
class FixedReader extends AbstractReader implements ReaderInterface
{
@ -63,6 +62,10 @@ class FixedReader extends AbstractReader implements ReaderInterface
public function getOffsetFor($objectNumber)
{
foreach ($this->subSections as $offset => list($startObject, $objectCount)) {
/**
* @var int $startObject
* @var int $objectCount
*/
if ($objectNumber >= $startObject && $objectNumber < ($startObject + $objectCount)) {
$position = $offset + 20 * ($objectNumber - $startObject);
$this->reader->ensure($position, 20);

82
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/LineReader.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -17,8 +18,6 @@ use setasign\Fpdi\PdfParser\StreamReader;
*
* This reader class read all cross-reference entries in a single run.
* It supports reading cross-references with e.g. invalid data (e.g. entries with a length < or > 20 bytes).
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
class LineReader extends AbstractReader implements ReaderInterface
{
@ -72,18 +71,16 @@ class LineReader extends AbstractReader implements ReaderInterface
*/
protected function extract(StreamReader $reader)
{
$cycles = -1;
$bytesPerCycle = 100;
$reader->reset(null, $bytesPerCycle);
while (
($trailerPos = \strpos($reader->getBuffer(false), 'trailer', \max($bytesPerCycle * $cycles++, 0))) === false
) {
if ($reader->increaseLength($bytesPerCycle) === false) {
break;
}
}
$cycles = 0;
do {
// 6 = length of "trailer" - 1
$pos = \max(($bytesPerCycle * $cycles) - 6, 0);
$trailerPos = \strpos($reader->getBuffer(false), 'trailer', $pos);
$cycles++;
} while ($trailerPos === false && $reader->increaseLength($bytesPerCycle) !== false);
if ($trailerPos === false) {
throw new CrossReferenceException(
@ -127,44 +124,41 @@ class LineReader extends AbstractReader implements ReaderInterface
}
unset($differentLineEndings, $m);
$linesCount = \count($lines);
$start = null;
$entryCount = 0;
if (!\is_array($lines)) {
$this->offsets = [];
return;
}
$start = 0;
$offsets = [];
/** @noinspection ForeachInvariantsInspection */
for ($i = 0; $i < $linesCount; $i++) {
$line = \trim($lines[$i]);
if ($line) {
$pieces = \explode(' ', $line);
// trim all lines and remove empty lines
$lines = \array_filter(\array_map('\trim', $lines));
foreach ($lines as $line) {
$pieces = \explode(' ', $line);
$c = \count($pieces);
switch ($c) {
case 2:
$start = (int) $pieces[0];
$entryCount += (int) $pieces[1];
break;
switch (\count($pieces)) {
case 2:
$start = (int) $pieces[0];
break;
/** @noinspection PhpMissingBreakStatementInspection */
case 3:
switch ($pieces[2]) {
case 'n':
$offsets[$start] = [(int) $pieces[0], (int) $pieces[1]];
$start++;
break 2;
case 'f':
$start++;
break 2;
}
// fall through if pieces doesn't match
case 3:
switch ($pieces[2]) {
case 'n':
$offsets[$start] = [(int) $pieces[0], (int) $pieces[1]];
$start++;
break 2;
case 'f':
$start++;
break 2;
}
// fall through if pieces doesn't match
default:
throw new CrossReferenceException(
\sprintf('Unexpected data in xref table (%s)', \implode(' ', $pieces)),
CrossReferenceException::INVALID_DATA
);
}
default:
throw new CrossReferenceException(
\sprintf('Unexpected data in xref table (%s)', \implode(' ', $pieces)),
CrossReferenceException::INVALID_DATA
);
}
}

5
mod/assign/feedback/editpdf/fpdi/PdfParser/CrossReference/ReaderInterface.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\Type\PdfDictionary;
/**
* ReaderInterface for cross-reference readers.
*
* @package setasign\Fpdi\PdfParser\CrossReference
*/
interface ReaderInterface
{

14
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/Ascii85.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Class for handling ASCII base-85 encoded data
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class Ascii85 implements FilterInterface
{
@ -29,6 +28,8 @@ class Ascii85 implements FilterInterface
$state = 0;
$chn = null;
$data = \preg_replace('/\s/', '', $data);
$l = \strlen($data);
/** @noinspection ForeachInvariantsInspection */
@ -44,13 +45,12 @@ class Ascii85 implements FilterInterface
if ($ch === 126 && isset($data[$k + 1]) && (\ord($data[$k + 1]) & 0xFF) === 62) {
break;
}
if (\preg_match('/^\s$/', \chr($ch))) {
continue;
}
if ($ch === 122 /* z */ && $state === 0) {
$out .= \chr(0) . \chr(0) . \chr(0) . \chr(0);
continue;
}
if ($ch < 33 /* ! */ || $ch > 117 /* u */) {
throw new Ascii85Exception(
'Illegal character found while ASCII85 decode.',
@ -86,12 +86,10 @@ class Ascii85 implements FilterInterface
if ($state === 2) {
$r = $chn[0] * 85 * 85 * 85 * 85 + ($chn[1] + 1) * 85 * 85 * 85;
$out .= \chr($r >> 24);
} elseif ($state === 3) {
$r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85 + ($chn[2] + 1) * 85 * 85;
$out .= \chr($r >> 24);
$out .= \chr($r >> 16);
} elseif ($state === 4) {
$r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85 + $chn[2] * 85 * 85 + ($chn[3] + 1) * 85;
$out .= \chr($r >> 24);

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/Ascii85Exception.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Exception for Ascii85 filter class
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class Ascii85Exception extends FilterException
{

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/AsciiHex.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Class for handling ASCII hexadecimal encoded data
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class AsciiHex implements FilterInterface
{

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/FilterException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\PdfParserException;
/**
* Exception for filters
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class FilterException extends PdfParserException
{

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/FilterInterface.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Interface for filters
*
* @package setasign\Fpdi\PdfParser\Filter
*/
interface FilterInterface
{

40
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/Flate.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Class for handling zlib/deflate encoded data
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class Flate implements FilterInterface
{
@ -32,7 +31,7 @@ class Flate implements FilterInterface
/**
* Decodes a flate compressed string.
*
* @param string $data The input string
* @param string|false $data The input string
* @return string
* @throws FlateException
*/
@ -40,23 +39,32 @@ class Flate implements FilterInterface
{
if ($this->extensionLoaded()) {
$oData = $data;
$data = @((\strlen($data) > 0) ? \gzuncompress($data) : '');
$data = (($data !== '') ? @\gzuncompress($data) : '');
if ($data === false) {
// let's try if the checksum is CRC32
$fh = fopen('php://temp', 'w+b');
fwrite($fh, "\x1f\x8b\x08\x00\x00\x00\x00\x00" . $oData);
stream_filter_append($fh, 'zlib.inflate', STREAM_FILTER_READ, ['window' => 30]);
fseek($fh, 0);
$data = @stream_get_contents($fh);
fclose($fh);
if ($data) {
return $data;
}
// Try this fallback
$tries = 1;
while ($tries < 10 && ($data === false || \strlen($data) < (\strlen($oData) - $tries - 1))) {
$data = @(\gzinflate(\substr($oData, $tries)));
$tries = 0;
$oDataLen = strlen($oData);
while ($tries < 6 && ($data === false || (strlen($data) < ($oDataLen - $tries - 1)))) {
$data = @(gzinflate(substr($oData, $tries)));
$tries++;
}
if ($data === false) {
// let's try if the checksum is CRC32
$fh = fopen('php://temp', 'w+b');
\fwrite($fh, "\x1f\x8b\x08\x00\x00\x00\x00\x00" . $oData);
\stream_filter_append($fh, 'zlib.inflate', \STREAM_FILTER_READ, ['window' => 30]);
\fseek($fh, 0);
$data = \stream_get_contents($fh);
\fclose($fh);
// let's use this fallback only if the $data is longer than the original data
if (strlen($data) > ($oDataLen - $tries - 1)) {
return $data;
}
if (!$data) {

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/FlateException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Exception for flate filter class
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class FlateException extends FilterException
{

6
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/Lzw.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Class for handling LZW encoded data
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class Lzw implements FilterInterface
{
@ -103,7 +102,6 @@ class Lzw implements FilterInterface
$uncompData .= $this->sTable[$code];
$oldCode = $code;
} else {
if ($code < $this->tIdx) {
$string = $this->sTable[$code];

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Filter/LzwException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Filter;
/**
* Exception for LZW filter class
*
* @package setasign\Fpdi\PdfParser\Filter
*/
class LzwException extends FilterException
{

85
mod/assign/feedback/editpdf/fpdi/PdfParser/PdfParser.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -20,14 +21,13 @@ use setasign\Fpdi\PdfParser\Type\PdfIndirectObjectReference;
use setasign\Fpdi\PdfParser\Type\PdfName;
use setasign\Fpdi\PdfParser\Type\PdfNull;
use setasign\Fpdi\PdfParser\Type\PdfNumeric;
use setasign\Fpdi\PdfParser\Type\PdfStream;
use setasign\Fpdi\PdfParser\Type\PdfString;
use setasign\Fpdi\PdfParser\Type\PdfToken;
use setasign\Fpdi\PdfParser\Type\PdfType;
/**
* A PDF parser class
*
* @package setasign\Fpdi\PdfParser
*/
class PdfParser
{
@ -56,7 +56,7 @@ class PdfParser
protected $fileHeaderOffset;
/**
* @var CrossReference
* @var CrossReference|null
*/
protected $xref;
@ -121,7 +121,6 @@ class PdfParser
}
$this->streamReader->reset(0);
$offset = false;
$maxIterations = 1000;
while (true) {
$buffer = $this->streamReader->getBuffer(false);
@ -181,7 +180,10 @@ class PdfParser
$catalog = $this->getCatalog();
if (isset($catalog->value['Version'])) {
$versionParts = \explode('.', PdfName::unescape(PdfType::resolve($catalog->value['Version'], $this)->value));
$versionParts = \explode(
'.',
PdfName::unescape(PdfType::resolve($catalog->value['Version'], $this)->value)
);
if (count($versionParts) === 2) {
list($major, $minor) = $versionParts;
}
@ -200,8 +202,7 @@ class PdfParser
*/
public function getCatalog()
{
$xref = $this->getCrossReference();
$trailer = $xref->getTrailer();
$trailer = $this->getCrossReference()->getTrailer();
$catalog = PdfType::resolve(PdfDictionary::get($trailer, 'Root'), $this);
@ -224,8 +225,7 @@ class PdfParser
return $this->objects[$objectNumber];
}
$xref = $this->getCrossReference();
$object = $xref->getIndirectObject($objectNumber);
$object = $this->getCrossReference()->getIndirectObject($objectNumber);
if ($cache) {
$this->objects[$objectNumber] = $object;
@ -239,7 +239,7 @@ class PdfParser
*
* @param null|bool|string $token
* @param null|string $expectedType
* @return bool|PdfArray|PdfBoolean|PdfHexString|PdfName|PdfNull|PdfNumeric|PdfString|PdfToken|PdfIndirectObjectReference
* @return false|PdfArray|PdfBoolean|PdfDictionary|PdfHexString|PdfIndirectObject|PdfIndirectObjectReference|PdfName|PdfNull|PdfNumeric|PdfStream|PdfString|PdfToken
* @throws Type\PdfTypeException
*/
public function readValue($token = null, $expectedType = null)
@ -281,37 +281,38 @@ class PdfParser
default:
if (\is_numeric($token)) {
if (($token2 = $this->tokenizer->getNextToken()) !== false) {
if (\is_numeric($token2)) {
if (($token3 = $this->tokenizer->getNextToken()) !== false) {
switch ($token3) {
case 'obj':
if ($expectedType !== null && $expectedType !== PdfIndirectObject::class) {
throw new Type\PdfTypeException(
'Got unexpected token type.', Type\PdfTypeException::INVALID_DATA_TYPE
);
}
return PdfIndirectObject::parse(
$token,
$token2,
$this,
$this->tokenizer,
$this->streamReader
if (\is_numeric($token2) && ($token3 = $this->tokenizer->getNextToken()) !== false) {
switch ($token3) {
case 'obj':
if ($expectedType !== null && $expectedType !== PdfIndirectObject::class) {
throw new Type\PdfTypeException(
'Got unexpected token type.',
Type\PdfTypeException::INVALID_DATA_TYPE
);
case 'R':
if ($expectedType !== null &&
$expectedType !== PdfIndirectObjectReference::class
) {
throw new Type\PdfTypeException(
'Got unexpected token type.', Type\PdfTypeException::INVALID_DATA_TYPE
);
}
}
return PdfIndirectObjectReference::create($token, $token2);
}
return PdfIndirectObject::parse(
(int) $token,
(int) $token2,
$this,
$this->tokenizer,
$this->streamReader
);
case 'R':
if (
$expectedType !== null &&
$expectedType !== PdfIndirectObjectReference::class
) {
throw new Type\PdfTypeException(
'Got unexpected token type.',
Type\PdfTypeException::INVALID_DATA_TYPE
);
}
$this->tokenizer->pushStack($token3);
return PdfIndirectObjectReference::create((int) $token, (int) $token2);
}
$this->tokenizer->pushStack($token3);
}
$this->tokenizer->pushStack($token2);
@ -319,10 +320,11 @@ class PdfParser
if ($expectedType !== null && $expectedType !== PdfNumeric::class) {
throw new Type\PdfTypeException(
'Got unexpected token type.', Type\PdfTypeException::INVALID_DATA_TYPE
'Got unexpected token type.',
Type\PdfTypeException::INVALID_DATA_TYPE
);
}
return PdfNumeric::create($token);
return PdfNumeric::create($token + 0);
}
if ($token === 'true' || $token === 'false') {
@ -337,7 +339,8 @@ class PdfParser
if ($expectedType !== null && $expectedType !== PdfToken::class) {
throw new Type\PdfTypeException(
'Got unexpected token type.', Type\PdfTypeException::INVALID_DATA_TYPE
'Got unexpected token type.',
Type\PdfTypeException::INVALID_DATA_TYPE
);
}

5
mod/assign/feedback/editpdf/fpdi/PdfParser/PdfParserException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\FpdiException;
/**
* Exception for the pdf parser class
*
* @package setasign\Fpdi\PdfParser
*/
class PdfParserException extends FpdiException
{

25
mod/assign/feedback/editpdf/fpdi/PdfParser/StreamReader.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser;
/**
* A stream reader class
*
* @package setasign\Fpdi\PdfParser
*/
class StreamReader
{
@ -192,8 +191,9 @@ class StreamReader
public function getByte($position = null)
{
$position = (int) ($position !== null ? $position : $this->offset);
if ($position >= $this->bufferLength &&
(!$this->increaseLength() || $position >= $this->bufferLength)
if (
$position >= $this->bufferLength
&& (!$this->increaseLength() || $position >= $this->bufferLength)
) {
return false;
}
@ -226,8 +226,9 @@ class StreamReader
$offset = $this->offset;
}
if ($offset >= $this->bufferLength &&
((!$this->increaseLength()) || $offset >= $this->bufferLength)
if (
$offset >= $this->bufferLength
&& ((!$this->increaseLength()) || $offset >= $this->bufferLength)
) {
return false;
}
@ -245,7 +246,7 @@ class StreamReader
*
* @param int $length
* @param int|null $position
* @return string
* @return string|false
*/
public function readBytes($length, $position = null)
{
@ -262,8 +263,9 @@ class StreamReader
$offset = $this->offset;
}
if (($offset + $length) > $this->bufferLength &&
((!$this->increaseLength($length)) || ($offset + $length) > $this->bufferLength)
if (
($offset + $length) > $this->bufferLength
&& ((!$this->increaseLength($length)) || ($offset + $length) > $this->bufferLength)
) {
return false;
}
@ -433,7 +435,8 @@ class StreamReader
*/
public function ensure($pos, $length)
{
if ($pos >= $this->position
if (
$pos >= $this->position
&& $pos < ($this->position + $this->bufferLength)
&& ($this->position + $this->bufferLength) >= ($pos + $length)
) {

13
mod/assign/feedback/editpdf/fpdi/PdfParser/Tokenizer.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser;
/**
* A tokenizer class.
*
* @package setasign\Fpdi\PdfParser
*/
class Tokenizer
{
@ -82,13 +81,7 @@ class Tokenizer
return false;
}
if ($byte === "\x20" ||
$byte === "\x0A" ||
$byte === "\x0D" ||
$byte === "\x0C" ||
$byte === "\x09" ||
$byte === "\x00"
) {
if (\in_array($byte, ["\x20", "\x0A", "\x0D", "\x0C", "\x09", "\x00"], true)) {
if ($this->leapWhiteSpaces() === false) {
return false;
}

8
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfArray.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -15,7 +16,6 @@ use setasign\Fpdi\PdfParser\Tokenizer;
/**
* Class representing a PDF array object
*
* @package setasign\Fpdi\PdfParser\Type
* @property array $value The value of the PDF type.
*/
class PdfArray extends PdfType
@ -41,7 +41,7 @@ class PdfArray extends PdfType
$result[] = $value;
}
$v = new self;
$v = new self();
$v->value = $result;
return $v;
@ -55,7 +55,7 @@ class PdfArray extends PdfType
*/
public static function create(array $values = [])
{
$v = new self;
$v = new self();
$v->value = $values;
return $v;

9
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfBoolean.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Type;
/**
* Class representing a boolean PDF object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfBoolean extends PdfType
{
@ -24,8 +23,8 @@ class PdfBoolean extends PdfType
*/
public static function create($value)
{
$v = new self;
$v->value = (boolean) $value;
$v = new self();
$v->value = (bool) $value;
return $v;
}

11
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfDictionary.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -15,8 +16,6 @@ use setasign\Fpdi\PdfParser\Tokenizer;
/**
* Class representing a PDF dictionary object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfDictionary extends PdfType
{
@ -79,7 +78,7 @@ class PdfDictionary extends PdfType
$entries[$key->value] = $value;
}
$v = new self;
$v = new self();
$v->value = $entries;
return $v;
@ -93,7 +92,7 @@ class PdfDictionary extends PdfType
*/
public static function create(array $entries = [])
{
$v = new self;
$v = new self();
$v->value = $entries;
return $v;
@ -104,7 +103,7 @@ class PdfDictionary extends PdfType
*
* @param mixed $dictionary
* @param string $key
* @param PdfType|mixed|null $default
* @param PdfType|null $default
* @return PdfNull|PdfType
* @throws PdfTypeException
*/

13
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfHexString.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\StreamReader;
/**
* Class representing a hexadecimal encoded PDF string object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfHexString extends PdfType
{
@ -28,10 +27,6 @@ class PdfHexString extends PdfType
{
$bufferOffset = $streamReader->getOffset();
/**
* @var string $buffer
* @var int $pos
*/
while (true) {
$buffer = $streamReader->getBuffer(false);
$pos = \strpos($buffer, '>', $bufferOffset);
@ -48,7 +43,7 @@ class PdfHexString extends PdfType
$result = \substr($buffer, $bufferOffset, $pos - $bufferOffset);
$streamReader->setOffset($pos + 1);
$v = new self;
$v = new self();
$v->value = $result;
return $v;
@ -62,7 +57,7 @@ class PdfHexString extends PdfType
*/
public static function create($string)
{
$v = new self;
$v = new self();
$v->value = $string;
return $v;

9
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfIndirectObject.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -15,8 +16,6 @@ use setasign\Fpdi\PdfParser\Tokenizer;
/**
* Class representing an indirect object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfIndirectObject extends PdfType
{
@ -50,7 +49,7 @@ class PdfIndirectObject extends PdfType
$tokenizer->pushStack($nextToken);
}
$v = new self;
$v = new self();
$v->objectNumber = (int) $objectNumberToken;
$v->generationNumber = (int) $objectGenerationNumberToken;
$v->value = $value;
@ -68,7 +67,7 @@ class PdfIndirectObject extends PdfType
*/
public static function create($objectNumber, $generationNumber, PdfType $value)
{
$v = new self;
$v = new self();
$v->objectNumber = (int) $objectNumber;
$v->generationNumber = (int) $generationNumber;
$v->value = $value;

7
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfIndirectObjectReference.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Type;
/**
* Class representing an indirect object reference
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfIndirectObjectReference extends PdfType
{
@ -25,7 +24,7 @@ class PdfIndirectObjectReference extends PdfType
*/
public static function create($objectNumber, $generationNumber)
{
$v = new self;
$v = new self();
$v->value = (int) $objectNumber;
$v->generationNumber = (int) $generationNumber;

18
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfName.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -14,8 +15,6 @@ use setasign\Fpdi\PdfParser\Tokenizer;
/**
* Class representing a PDF name object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfName extends PdfType
{
@ -28,7 +27,7 @@ class PdfName extends PdfType
*/
public static function parse(Tokenizer $tokenizer, StreamReader $streamReader)
{
$v = new self;
$v = new self();
if (\strspn($streamReader->getByte(), "\x00\x09\x0A\x0C\x0D\x20()<>[]{}/%") === 0) {
$v->value = (string) $tokenizer->getNextToken();
return $v;
@ -44,13 +43,14 @@ class PdfName extends PdfType
* @param string $value
* @return string
*/
static public function unescape($value)
public static function unescape($value)
{
if (strpos($value, '#') === false)
if (strpos($value, '#') === false) {
return $value;
}
return preg_replace_callback('/#[a-fA-F\d]{2}/', function($matches) {
return chr(hexdec($matches[0]));
return preg_replace_callback('/#([a-fA-F\d]{2})/', function ($matches) {
return chr(hexdec($matches[1]));
}, $value);
}
@ -62,7 +62,7 @@ class PdfName extends PdfType
*/
public static function create($string)
{
$v = new self;
$v = new self();
$v->value = $string;
return $v;

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfNull.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Type;
/**
* Class representing a PDF null object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfNull extends PdfType
{

7
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfNumeric.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Type;
/**
* Class representing a numeric PDF object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfNumeric extends PdfType
{
@ -24,7 +23,7 @@ class PdfNumeric extends PdfType
*/
public static function create($value)
{
$v = new self;
$v = new self();
$v->value = $value + 0;
return $v;

20
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfStream.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -22,8 +23,6 @@ use setasign\FpdiPdfParser\PdfParser\Filter\Predictor;
/**
* Class representing a PDF stream object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfStream extends PdfType
{
@ -38,7 +37,7 @@ class PdfStream extends PdfType
*/
public static function parse(PdfDictionary $dictionary, StreamReader $reader, PdfParser $parser = null)
{
$v = new self;
$v = new self();
$v->value = $dictionary;
$v->reader = $reader;
$v->parser = $parser;
@ -54,7 +53,7 @@ class PdfStream extends PdfType
}
}
if (false === $firstByte) {
if ($firstByte === false) {
throw new PdfTypeException(
'Unable to parse stream data. No newline after the stream keyword found.',
PdfTypeException::NO_NEWLINE_AFTER_STREAM_KEYWORD
@ -86,7 +85,7 @@ class PdfStream extends PdfType
*/
public static function create(PdfDictionary $dictionary, $stream)
{
$v = new self;
$v = new self();
$v->value = $dictionary;
$v->stream = (string) $stream;
@ -115,7 +114,7 @@ class PdfStream extends PdfType
/**
* The stream reader instance.
*
* @var StreamReader
* @var StreamReader|null
*/
protected $reader;
@ -208,6 +207,13 @@ class PdfStream extends PdfType
}
}
// There are streams in the wild, which have only white signs in them but need to be parsed manually due
// to a problem encountered before (e.g. Length === 0). We should set them to empty streams to avoid problems
// in further processing (e.g. applying of filters).
if (trim($buffer) === '') {
$buffer = '';
}
return $buffer;
}

26
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfString.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\StreamReader;
/**
* Class representing a PDF string object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfString extends PdfType
{
@ -47,7 +46,7 @@ class PdfString extends PdfType
$result = \substr($buffer, $startPos, $openBrackets + $pos - $startPos - 1);
$streamReader->setOffset($pos);
$v = new self;
$v = new self();
$v->value = $result;
return $v;
@ -61,7 +60,7 @@ class PdfString extends PdfType
*/
public static function create($value)
{
$v = new self;
$v = new self();
$v->value = $value;
return $v;
@ -138,22 +137,23 @@ class PdfString extends PdfType
$actualChar = \ord($s[$count]);
// ascii 48 = number 0
// ascii 57 = number 9
if ($actualChar >= 48 &&
$actualChar <= 57) {
if ($actualChar >= 48 && $actualChar <= 57) {
$oct = '' . $s[$count];
/** @noinspection NotOptimalIfConditionsInspection */
if ($count + 1 < $n &&
\ord($s[$count + 1]) >= 48 &&
\ord($s[$count + 1]) <= 57
if (
$count + 1 < $n
&& \ord($s[$count + 1]) >= 48
&& \ord($s[$count + 1]) <= 57
) {
$count++;
$oct .= $s[$count];
/** @noinspection NotOptimalIfConditionsInspection */
if ($count + 1 < $n &&
\ord($s[$count + 1]) >= 48 &&
\ord($s[$count + 1]) <= 57
if (
$count + 1 < $n
&& \ord($s[$count + 1]) >= 48
&& \ord($s[$count + 1]) <= 57
) {
$oct .= $s[++$count];
}

7
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfToken.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfParser\Type;
/**
* Class representing PDF token object
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfToken extends PdfType
{
@ -24,7 +23,7 @@ class PdfToken extends PdfType
*/
public static function create($token)
{
$v = new self;
$v = new self();
$v->value = $token;
return $v;

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfType.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -15,8 +16,6 @@ use setasign\Fpdi\PdfParser\PdfParserException;
/**
* A class defining a PDF data type
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfType
{

5
mod/assign/feedback/editpdf/fpdi/PdfParser/Type/PdfTypeException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\PdfParser\PdfParserException;
/**
* Exception class for pdf type classes
*
* @package setasign\Fpdi\PdfParser\Type
*/
class PdfTypeException extends PdfParserException
{

5
mod/assign/feedback/editpdf/fpdi/PdfReader/DataStructure/Rectangle.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -19,8 +20,6 @@ use setasign\Fpdi\PdfParser\Type\PdfTypeException;
/**
* Class representing a rectangle
*
* @package setasign\Fpdi\PdfReader\DataStructure
*/
class Rectangle
{

5
mod/assign/feedback/editpdf/fpdi/PdfReader/Page.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -25,8 +26,6 @@ use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
/**
* Class representing a page of a PDF document
*
* @package setasign\Fpdi\PdfReader
*/
class Page
{

5
mod/assign/feedback/editpdf/fpdi/PdfReader/PageBoundaries.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -11,8 +12,6 @@ namespace setasign\Fpdi\PdfReader;
/**
* An abstract class for page boundary constants and some helper methods
*
* @package setasign\Fpdi\PdfReader
*/
abstract class PageBoundaries
{

35
mod/assign/feedback/editpdf/fpdi/PdfReader/PdfReader.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -14,6 +15,7 @@ use setasign\Fpdi\PdfParser\PdfParser;
use setasign\Fpdi\PdfParser\PdfParserException;
use setasign\Fpdi\PdfParser\Type\PdfArray;
use setasign\Fpdi\PdfParser\Type\PdfDictionary;
use setasign\Fpdi\PdfParser\Type\PdfIndirectObject;
use setasign\Fpdi\PdfParser\Type\PdfIndirectObjectReference;
use setasign\Fpdi\PdfParser\Type\PdfNumeric;
use setasign\Fpdi\PdfParser\Type\PdfType;
@ -21,8 +23,6 @@ use setasign\Fpdi\PdfParser\Type\PdfTypeException;
/**
* A PDF reader class
*
* @package setasign\Fpdi\PdfReader
*/
class PdfReader
{
@ -39,7 +39,7 @@ class PdfReader
/**
* Indirect objects of resolved pages.
*
* @var PdfIndirectObjectReference[]
* @var PdfIndirectObjectReference[]|PdfIndirectObject[]
*/
protected $pages = [];
@ -59,7 +59,6 @@ class PdfReader
public function __destruct()
{
if ($this->parser !== null) {
/** @noinspection PhpInternalEntityUsedInspection */
$this->parser->cleanUp();
}
}
@ -165,9 +164,22 @@ class PdfReader
$page = $this->parser->getIndirectObject($page->value);
$dict = PdfType::resolve($page, $this->parser);
$type = PdfDictionary::get($dict, 'Type');
if ($type->value === 'Pages') {
$kids = PdfType::resolve(PdfDictionary::get($dict, 'Kids'), $this->parser);
$page = $this->pages[$pageNumber - 1] = $readPages($kids);
try {
$page = $this->pages[$pageNumber - 1] = $readPages($kids);
} catch (PdfReaderException $e) {
if ($e->getCode() !== PdfReaderException::KIDS_EMPTY) {
throw $e;
}
// let's reset the pages array and read all page objects
$this->pages = [];
$this->readPages(true);
// @phpstan-ignore-next-line
$page = $this->pages[$pageNumber - 1];
}
} else {
$this->pages[$pageNumber - 1] = $page;
}
@ -179,24 +191,25 @@ class PdfReader
/**
* Walk the page tree and resolve all indirect objects of all pages.
*
* @throws PdfTypeException
* @param bool $readAll
* @throws CrossReferenceException
* @throws PdfParserException
* @throws PdfTypeException
*/
protected function readPages()
protected function readPages($readAll = false)
{
if (\count($this->pages) > 0) {
return;
}
$readPages = function ($kids, $count) use (&$readPages) {
$readPages = function ($kids, $count) use (&$readPages, $readAll) {
$kids = PdfArray::ensure($kids);
$isLeaf = $count->value === \count($kids->value);
$isLeaf = ($count->value === \count($kids->value));
foreach ($kids->value as $reference) {
$reference = PdfIndirectObjectReference::ensure($reference);
if ($isLeaf) {
if (!$readAll && $isLeaf) {
$this->pages[] = $reference;
continue;
}

5
mod/assign/feedback/editpdf/fpdi/PdfReader/PdfReaderException.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -13,8 +14,6 @@ use setasign\Fpdi\FpdiException;
/**
* Exception for the pdf reader class
*
* @package setasign\Fpdi\PdfReader
*/
class PdfReaderException extends FpdiException
{

22
mod/assign/feedback/editpdf/fpdi/Tcpdf/Fpdi.php
View File

@ -1,5 +1,13 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
namespace setasign\Fpdi\Tcpdf;
use setasign\Fpdi\FpdiTrait;
@ -20,7 +28,7 @@ use setasign\Fpdi\PdfParser\Type\PdfTypeException;
*
* This class let you import pages of existing PDF documents into a reusable structure for TCPDF.
*
* @package setasign\Fpdi
* @method _encrypt_data(int $n, string $s) string
*/
class Fpdi extends \pdf
{
@ -34,7 +42,7 @@ class Fpdi extends \pdf
*
* @string
*/
const VERSION = '2.2.0';
const VERSION = '2.3.5';
/**
* A counter for template ids.
@ -46,7 +54,7 @@ class Fpdi extends \pdf
/**
* The currently used object number.
*
* @var int
* @var int|null
*/
protected $currentObjectNumber;
@ -166,7 +174,6 @@ class Fpdi extends \pdf
while (($objectNumber = \array_pop($this->objectsToCopy[$readerId])) !== null) {
try {
$object = $parser->getIndirectObject($objectNumber);
} catch (CrossReferenceException $e) {
if ($e->getCode() === CrossReferenceException::OBJECT_NOT_FOUND) {
$object = PdfIndirectObject::create($objectNumber, 0, new PdfNull());
@ -240,27 +247,24 @@ class Fpdi extends \pdf
$string = PdfString::unescape($value->value);
$string = $this->_encrypt_data($this->currentObjectNumber, $string);
$value->value = \TCPDF_STATIC::_escape($string);
} elseif ($value instanceof PdfHexString) {
$filter = new AsciiHex();
$string = $filter->decode($value->value);
$string = $this->_encrypt_data($this->currentObjectNumber, $string);
$value->value = $filter->encode($string, true);
} elseif ($value instanceof PdfStream) {
$stream = $value->getStream();
$stream = $this->_encrypt_data($this->currentObjectNumber, $stream);
$dictionary = $value->value;
$dictionary->value['Length'] = PdfNumeric::create(\strlen($stream));
$value = PdfStream::create($dictionary, $stream);
} elseif ($value instanceof PdfIndirectObject) {
/**
* @var $value PdfIndirectObject
* @var PdfIndirectObject $value
*/
$this->currentObjectNumber = $this->objectMap[$this->currentReaderId][$value->objectNumber];
}
$this->fpdiWritePdfType($value);
}
}
}

4
mod/assign/feedback/editpdf/fpdi/TcpdfFpdi.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -14,7 +15,6 @@ namespace setasign\Fpdi;
*
* This class let you import pages of existing PDF documents into a reusable structure for TCPDF.
*
* @package setasign\Fpdi
* @deprecated Class was moved to \setasign\Fpdi\Tcpdf\Fpdi
*/
class TcpdfFpdi extends \setasign\Fpdi\Tcpdf\Fpdi

84
mod/assign/feedback/editpdf/fpdi/Tfpdf/FpdfTpl.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -15,85 +16,8 @@ use setasign\Fpdi\FpdfTplTrait;
* Class FpdfTpl
*
* We need to change some access levels and implement the setPageFormat() method to bring back compatibility to tFPDF.
*
* @package setasign\Fpdi\Tfpdf
*/
class FpdfTpl extends \tFPDF
{
use FpdfTplTrait {
_putimages as _protectedPutimages;
_putxobjectdict as _protectedPutxobjectdict;
}
/**
* Make the method public as in tFPDF.
*/
public function _putimages()
{
$this->_protectedPutimages();
}
/**
* Make the method public as in tFPDF.
*/
public function _putxobjectdict()
{
$this->_protectedPutxobjectdict();
}
/**
* Set the page format of the current page.
*
* @param array $size An array with two values defining the size.
* @param string $orientation "L" for landscape, "P" for portrait.
* @throws \BadMethodCallException
*/
public function setPageFormat($size, $orientation)
{
if ($this->currentTemplateId !== null) {
throw new \BadMethodCallException('The page format cannot be changed when writing to a template.');
}
if (!\in_array($orientation, ['P', 'L'], true)) {
throw new \InvalidArgumentException(\sprintf(
'Invalid page orientation "%s"! Only "P" and "L" are allowed!',
$orientation
));
}
$size = $this->_getpagesize($size);
if ($orientation != $this->CurOrientation
|| $size[0] != $this->CurPageSize[0]
|| $size[1] != $this->CurPageSize[1]
) {
// New size or orientation
if ($orientation === 'P') {
$this->w = $size[0];
$this->h = $size[1];
} else {
$this->w = $size[1];
$this->h = $size[0];
}
$this->wPt = $this->w * $this->k;
$this->hPt = $this->h * $this->k;
$this->PageBreakTrigger = $this->h - $this->bMargin;
$this->CurOrientation = $orientation;
$this->CurPageSize = $size;
$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
}
}
/**
* @inheritdoc
*/
protected function _put($s, $newLine = true)
{
if ($newLine) {
$this->buffer .= $s . "\n";
} else {
$this->buffer .= $s;
}
}
}
use FpdfTplTrait;
}

32
mod/assign/feedback/editpdf/fpdi/Tfpdf/Fpdi.php
View File

@ -1,9 +1,10 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
@ -19,8 +20,6 @@ use setasign\Fpdi\PdfParser\Type\PdfNull;
* Class Fpdi
*
* This class let you import pages of existing PDF documents into a reusable structure for tFPDF.
*
* @package setasign\Fpdi
*/
class Fpdi extends FpdfTpl
{
@ -31,7 +30,7 @@ class Fpdi extends FpdfTpl
*
* @string
*/
const VERSION = '2.2.0';
const VERSION = '2.3.5';
public function _enddoc()
{
@ -114,7 +113,6 @@ class Fpdi extends FpdfTpl
while (($objectNumber = \array_pop($this->objectsToCopy[$readerId])) !== null) {
try {
$object = $parser->getIndirectObject($objectNumber);
} catch (CrossReferenceException $e) {
if ($e->getCode() === CrossReferenceException::OBJECT_NOT_FOUND) {
$object = PdfIndirectObject::create($objectNumber, 0, new PdfNull());
@ -133,7 +131,7 @@ class Fpdi extends FpdfTpl
/**
* @inheritdoc
*/
public function _putxobjectdict()
protected function _putxobjectdict()
{
foreach ($this->importedPages as $key => $pageData) {
$this->_put('/' . $pageData['id'] . ' ' . $pageData['objectNumber'] . ' 0 R');
@ -145,20 +143,12 @@ class Fpdi extends FpdfTpl
/**
* @inheritdoc
*/
public function _newobj($n = null)
protected function _put($s, $newLine = true)
{
// Begin a new object
if($n === null)
$n = ++$this->n;
$this->offsets[$n] = $this->_getoffset();
$this->_put($n.' 0 obj');
if ($newLine) {
$this->buffer .= $s . "\n";
} else {
$this->buffer .= $s;
}
}
/**
* @inheritdoc
*/
protected function _getoffset()
{
return strlen($this->buffer);
}
}
}

6
mod/assign/feedback/editpdf/fpdi/autoload.php
View File

@ -1,18 +1,20 @@
<?php
/**
* This file is part of FPDI
*
* @package setasign\Fpdi
* @copyright Copyright (c) 2019 Setasign - Jan Slabon (https://www.setasign.com)
* @copyright Copyright (c) 2020 Setasign GmbH & Co. KG (https://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
*/
// @phpstan-ignore-next-line
spl_autoload_register(function ($class) {
if (strpos($class, 'setasign\Fpdi\\') === 0) {
$filename = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 14)) . '.php';
$fullpath = __DIR__ . DIRECTORY_SEPARATOR . $filename;
if (file_exists($fullpath)) {
if (is_file($fullpath)) {
/** @noinspection PhpIncludeInspection */
require_once $fullpath;
}

6
mod/assign/feedback/editpdf/fpdi/readme_moodle.txt
View File

@ -19,6 +19,12 @@ Installation
3) Update mod/assign/feedback/editpdf/fpdi/Tcpdf/Fpdi.php(or whichever file it has been replaced with) to extend 'pdf' instead of 'TCPDF'.
4) Make a note below of any changes made.
2020/12/16
----------
1/ Updated to 2.3.5
Updated by Paul Holden (MDL-70312)
2019/06/18
----------
1/ Updated to 2.2.0

2
mod/assign/feedback/editpdf/thirdpartylibs.xml
View File

@ -4,7 +4,7 @@
<location>fpdi</location>
<name>FPDI</name>
<license>MIT</license>
<version>2.2.0</version>
<version>2.3.5</version>
<licenseversion></licenseversion>
</library>
</libraries>