--- a/intranet/vendor/setasign/fpdf/tutorial/tuto6.php +++ b/intranet/vendor/setasign/fpdf/tutorial/tuto6.php @@ -1,6 +1,7 @@ getWorkbookBaseName($zip); $wbRels = simplexml_load_string( - $this->securityScanner->scan($this->getFromZipArchive($zip, "xl/_rels/${workbookBasename}.rels")), + $this->securityScanner->scan($this->getFromZipArchive($zip, "xl/_rels/{$workbookBasename}.rels")), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions() ); --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Csv.php @@ -277,8 +277,8 @@ */ public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): Spreadsheet { - $lineEnding = ini_get('auto_detect_line_endings') ?: '0'; - ini_set('auto_detect_line_endings', '1'); + $lineEnding = '0' ?: '0'; + false; // Open file $this->openFileOrMemory($pFilename); @@ -326,7 +326,7 @@ // Close file fclose($fileHandle); - ini_set('auto_detect_line_endings', $lineEnding); + false; // Return return $spreadsheet; --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Theme.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx; +#[\AllowDynamicProperties] class Theme { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php @@ -71,21 +71,12 @@ private function disableEntityLoaderCheck(): void { - if (Settings::getLibXmlDisableEntityLoader() && \PHP_VERSION_ID < 80000) { - $libxmlDisableEntityLoaderValue = libxml_disable_entity_loader(true); - - if (self::$libxmlDisableEntityLoaderValue === null) { - self::$libxmlDisableEntityLoaderValue = $libxmlDisableEntityLoaderValue; - } - } + // PHP 8 uses libxml with external entity loading disabled by default. } public static function shutdown(): void { - if (self::$libxmlDisableEntityLoaderValue !== null && \PHP_VERSION_ID < 80000) { - libxml_disable_entity_loader(self::$libxmlDisableEntityLoaderValue); - self::$libxmlDisableEntityLoaderValue = null; - } + self::$libxmlDisableEntityLoaderValue = null; } public function __destruct() --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Conditional.php @@ -5,6 +5,7 @@ use PhpOffice\PhpSpreadsheet\IComparable; use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalDataBar; +#[\AllowDynamicProperties] class Conditional implements IComparable { // Condition types --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Supervisor.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +#[\AllowDynamicProperties] abstract class Supervisor implements IComparable { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Html.php @@ -10,6 +10,7 @@ use PhpOffice\PhpSpreadsheet\Style\Color; use PhpOffice\PhpSpreadsheet\Style\Font; +#[\AllowDynamicProperties] class Html { protected static $colourMap = [ --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/RichText.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Cell\DataType; use PhpOffice\PhpSpreadsheet\IComparable; +#[\AllowDynamicProperties] class RichText implements IComparable { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/RichText/TextElement.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\RichText; +#[\AllowDynamicProperties] class TextElement implements ITextElement { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/DataValidation.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Cell; +#[\AllowDynamicProperties] class DataValidation { // Data validation types --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Cell/Cell.php @@ -10,6 +10,7 @@ use PhpOffice\PhpSpreadsheet\Style\Style; use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; +#[\AllowDynamicProperties] class Cell { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Iterator.php @@ -66,7 +66,7 @@ * * @return bool */ - public function valid() + public function valid(): bool { return $this->position < $this->subject->getSheetCount() && $this->position >= 0; } --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/HeaderFooter.php @@ -63,6 +63,7 @@ * &H - code for "shadow style" * */ +#[\AllowDynamicProperties] class HeaderFooter { // Header/footer image location --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowCellIterator.php @@ -156,7 +156,7 @@ * * @return bool */ - public function valid() + public function valid(): bool { return $this->currentColumnIndex <= $this->endColumnIndex && $this->currentColumnIndex >= $this->startColumnIndex; } --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageMargins.php @@ -2,6 +2,7 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet; +#[\AllowDynamicProperties] class PageMargins { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Protection.php @@ -4,6 +4,7 @@ use PhpOffice\PhpSpreadsheet\Shared\PasswordHasher; +#[\AllowDynamicProperties] class Protection { const ALGORITHM_MD2 = 'MD2'; --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Dimension.php @@ -4,6 +4,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; +#[\AllowDynamicProperties] abstract class Dimension { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/BaseDrawing.php @@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\IComparable; +#[\AllowDynamicProperties] class BaseDrawing implements IComparable { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter.php @@ -9,6 +9,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\Shared\Date; +#[\AllowDynamicProperties] class AutoFilter { /** --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/RowIterator.php @@ -118,7 +118,7 @@ * * @return Row */ - public function current() + public function current(): mixed { return new Row($this->subject, $this->position); } --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/SheetView.php @@ -4,6 +4,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; +#[\AllowDynamicProperties] class SheetView { // Sheet View types --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Worksheet.php @@ -25,6 +25,7 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat; use PhpOffice\PhpSpreadsheet\Style\Style; +#[\AllowDynamicProperties] class Worksheet implements IComparable { // Break types --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/PageSetup.php @@ -77,6 +77,7 @@ * 68 = A3 extra transverse paper (322 mm by 445 mm) * */ +#[\AllowDynamicProperties] class PageSetup { // Paper size --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/ColumnIterator.php @@ -134,7 +134,7 @@ * * @return Column */ - public function current() + public function current(): mixed { return new Column($this->worksheet, Coordinate::stringFromColumnIndex($this->currentColumnIndex)); } --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php @@ -5,6 +5,7 @@ use PhpOffice\PhpSpreadsheet\IComparable; use PhpOffice\PhpSpreadsheet\Style\Color; +#[\AllowDynamicProperties] class Shadow implements IComparable { // Shadow alignment --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php @@ -5,6 +5,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter; +#[\AllowDynamicProperties] class Column { const AUTOFILTER_FILTERTYPE_FILTER = 'filters'; --- a/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php +++ b/intranet/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php @@ -5,6 +5,7 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException; use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column; +#[\AllowDynamicProperties] class Rule { const AUTOFILTER_RULETYPE_FILTER = 'filter'; --- a/intranet/vendor/composer/html2pdf-5.2.4/src/MyPdf.php +++ b/intranet/vendor/composer/html2pdf-5.2.4/src/MyPdf.php @@ -16,6 +16,9 @@ class MyPdf extends \TCPDF { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $ws; + protected $_footerParam = array(); protected $_transf = array(); protected $_myLastPageGroup = null; --- a/intranet/vendor/composer/html2pdf-5.2.4/src/Html2Pdf.php +++ b/intranet/vendor/composer/html2pdf-5.2.4/src/Html2Pdf.php @@ -31,6 +31,9 @@ class Html2Pdf { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_pdfa; + /** * myPdf object, extends from TCPDF * @var MyPdf --- a/intranet/vendor/tecnickcom/tcpdf/tcpdf.php +++ b/intranet/vendor/tecnickcom/tcpdf/tcpdf.php @@ -134,6 +134,7 @@ * @IgnoreAnnotation("public") * @IgnoreAnnotation("pre") */ +#[\AllowDynamicProperties] class TCPDF { // Protected properties @@ -11005,14 +11006,11 @@ $this->encryptdata['StrF'] = 'StdCF'; } if ($mode > 1) { // AES - if (!extension_loaded('openssl') && !extension_loaded('mcrypt')) { - $this->Error('AES encryption requires openssl or mcrypt extension (http://www.php.net/manual/en/mcrypt.requirements.php).'); + if (!extension_loaded('openssl')) { + $this->Error('AES encryption requires the OpenSSL extension.'); } if (extension_loaded('openssl') && !in_array('aes-256-cbc', openssl_get_cipher_methods())) { $this->Error('AES encryption requires openssl/aes-256-cbc cypher.'); - } - if (extension_loaded('mcrypt') && mcrypt_get_cipher_name(MCRYPT_RIJNDAEL_128) === false) { - $this->Error('AES encryption requires MCRYPT_RIJNDAEL_128 cypher.'); } if (($mode == 3) AND !function_exists('hash')) { // the Hash extension requires no external libraries and is enabled by default as of PHP 5.1.2. @@ -16500,7 +16498,7 @@ // define self-closing tags $selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta'); // remove all unsupported tags (the line below lists all supported tags) - $html = strip_tags($html, '


    • ... Outputs block margin/border and padding - if (count($this->textbuffer) && $this->textbuffer[count($this->textbuffer)-1]) { - if (substr($this->textbuffer[count($this->textbuffer)-1][0],0,3) != "\xbb\xa4\xac") { // not special content + if (count(($this->textbuffer ?? [])) && $this->textbuffer[count(($this->textbuffer ?? []))-1]) { + if (substr(($this->textbuffer[count(($this->textbuffer ?? []))-1][0] ?? ''),0,3) != "\xbb\xa4\xac") { // not special content // Right trim last content and adjust OTLdata - if (preg_match('/[ ]+$/',$this->textbuffer[count($this->textbuffer)-1][0], $m)) { - $strip = strlen($m[0]); - $this->textbuffer[count($this->textbuffer)-1][0] = substr($this->textbuffer[count($this->textbuffer)-1][0],0,(strlen($this->textbuffer[count($this->textbuffer)-1][0])-$strip)); + if (preg_match('/[ ]+$/',($this->textbuffer[count(($this->textbuffer ?? []))-1][0] ?? ''), $m)) { + $strip = strlen(($m[0] ?? '')); + $this->textbuffer[count(($this->textbuffer ?? []))-1][0] = substr(($this->textbuffer[count(($this->textbuffer ?? []))-1][0] ?? ''),0,(strlen(($this->textbuffer[count(($this->textbuffer ?? []))-1][0] ?? ''))-$strip)); /*-- OTL --*/ if (isset($this->CurrentFont['useOTL']) && $this->CurrentFont['useOTL']) { - $this->otl->trimOTLdata($this->textbuffer[count($this->textbuffer)-1][18], false, true); // mPDF 6 ZZZ99K + $this->otl->trimOTLdata($this->textbuffer[count(($this->textbuffer ?? []))-1][18], false, true); // mPDF 6 ZZZ99K } /*-- END OTL --*/ } } } - if (count($this->textbuffer) == 0 && $this->lastblocklevelchange != 0) { + if (count(($this->textbuffer ?? [])) == 0 && $this->lastblocklevelchange != 0) { //$this->newFlowingBlock( $this->blk[$this->blklvl]['width'],$this->lineheight,'',false,2,true, (isset($this->blk[$this->blklvl]['direction']) ? $this->blk[$this->blklvl]['direction'] : 'ltr')); $this->newFlowingBlock( $this->blk[$this->blklvl]['width'],$this->lineheight,'',false,$blockstate,true, (isset($this->blk[$this->blklvl]['direction']) ? $this->blk[$this->blklvl]['direction'] : 'ltr')); $this->finishFlowingBlock(true); // true = END of flowing block @@ -20003,7 +20020,7 @@ // If width not set, here would need to adjust and output buffer $s = $this->PrintPageBackgrounds(); // Writes after the marker so not overwritten later by page background etc. - $this->pages[$this->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->pages[$this->page]); + $this->pages[$this->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->pages[$this->page] ?? '')); $this->pageBackgrounds = array(); $this->Reset(); $this->pageoutput[$this->page] = array(); @@ -20035,7 +20052,7 @@ // If width not set, here would need to adjust and output buffer $s = $this->PrintPageBackgrounds(); // Writes after the marker so not overwritten later by page background etc. - $this->pages[$this->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->pages[$this->page]); + $this->pages[$this->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->pages[$this->page] ?? '')); $this->pageBackgrounds = array(); $this->Reset(); $this->pageoutput[$this->page] = array(); @@ -20198,7 +20215,7 @@ } // Remove last
    if at end of cell - if (isset($this->cell[$this->row][$this->col]['textbuffer'])) { $ntb = count($this->cell[$this->row][$this->col]['textbuffer']); } + if (isset($this->cell[$this->row][$this->col]['textbuffer'])) { $ntb = count(($this->cell[$this->row][$this->col]['textbuffer'] ?? [])); } else { $ntb = 0; } if ($ntb>1 && $this->cell[$this->row][$this->col]['textbuffer'][$ntb-1][0] == "\n") { unset($this->cell[$this->row][$this->col]['textbuffer'][$ntb-1]); @@ -20326,7 +20343,7 @@ $this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['hr'] = array_pad(array(),$this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['nr'],0); // Move table footer row to end of table - if (isset($this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot']) && count($this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot'])) { + if (isset($this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot']) && count(($this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot'] ?? []))) { $tfrows = array(); foreach($this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot'] AS $r=>$val) { if ($val) { $tfrows[] = $r; } @@ -20342,13 +20359,13 @@ } } $this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot'] = array(); - for($i=count($temp) ; $i<(count($temp)+count($temptf)); $i++) { + for($i=count(($temp ?? [])) ; $i<(count(($temp ?? []))+count(($temptf ?? []))); $i++) { $this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['is_tfoot'][$i] = true; } // Update nestedpos row references - if (isset($this->table[($this->tableLevel+1)]) && count($this->table[($this->tableLevel+1)])) { + if (isset($this->table[($this->tableLevel+1)]) && count(($this->table[($this->tableLevel+1)] ?? []))) { foreach($this->table[($this->tableLevel+1)] AS $nid=>$nested) { - $this->table[($this->tableLevel+1)][$nid]['nestedpos'][0] -= count($temptf); + $this->table[($this->tableLevel+1)][$nid]['nestedpos'][0] -= count(($temptf ?? [])); } } $this->table[$this->tableLevel][$this->tbctr[$this->tableLevel]]['cells'] = array_merge($temp, $temptf); @@ -21015,7 +21032,7 @@ // If Kerning set for OTL, and useOTL has positive value, but has not set for this particular script, // set for kerning via kern table // e.g. Latin script when useOTL set as 0x80 - if (isset($this->OTLtags['Plus']) && strpos($this->OTLtags['Plus'],'kern')!==false && empty($this->OTLdata['GPOSinfo'])) { + if (isset($this->OTLtags['Plus']) && strpos(($this->OTLtags['Plus'] ?? ''),'kern')!==false && empty($this->OTLdata['GPOSinfo'])) { $this->textvar = ($this->textvar | FC_KERNING); } $arr[8] = $this->textvar; // mPDF 5.7.1 @@ -21050,7 +21067,7 @@ // If Kerning set for OTL, and useOTL has positive value, but has not set for this particular script, // set for kerning via kern table // e.g. Latin script when useOTL set as 0x80 - if (isset($this->OTLtags['Plus']) && strpos($this->OTLtags['Plus'],'kern')!==false && empty($this->OTLdata['GPOSinfo'])) { + if (isset($this->OTLtags['Plus']) && strpos(($this->OTLtags['Plus'] ?? ''),'kern')!==false && empty($this->OTLdata['GPOSinfo'])) { $this->textvar = ($this->textvar | FC_KERNING); } $arr[8] = $this->textvar; // mPDF 5.7.1 @@ -21080,7 +21097,7 @@ $this->spanborddet = array(); $paint_ht_corr = 0; /*-- CSS-FLOAT --*/ - if (count($this->floatDivs)) { + if (count(($this->floatDivs ?? []))) { list($l_exists, $r_exists, $l_max, $r_max, $l_width, $r_width) = $this->GetFloatDivInfo($this->blklvl); if (($this->blk[$this->blklvl]['inner_width']-$l_width-$r_width) < (2*$this->GetCharWidth('W',false))) { // Too narrow to fit - try to move down past L or R float @@ -21125,7 +21142,7 @@ $this->newFlowingBlock( $this->divwidth,$this->divheight,$align,$is_table,$blockstate,true,$blockdir,$table_draft); - $array_size = count($arrayaux); + $array_size = count(($arrayaux ?? [])); // Added - Otherwise

    did not output top margins/padding for 1st/2nd div if ($array_size == 0) { $this->finishFlowingBlock(true); } // true = END of flowing block @@ -21135,7 +21152,7 @@ // First make sure each element/chunk has the OTLdata for Bidi set. for($i=0;$i < $array_size; $i++) { if (empty($arrayaux[$i][18])) { - if (substr($arrayaux[$i][0],0,3) == "\xbb\xa4\xac") { // object identifier has been identified! + if (substr(($arrayaux[$i][0] ?? ''),0,3) == "\xbb\xa4\xac") { // object identifier has been identified! $unicode = array(0xFFFC); // Object replacement character } else { $unicode = $this->UTF8StringToArray($arrayaux[$i][0], false); } @@ -21153,7 +21170,7 @@ if (!class_exists('otl', false)) { include(_MPDF_PATH.'classes/otl.php'); } if (empty($this->otl)) { $this->otl = new otl($this); } $this->otl->_bidiPrepare($arrayaux, $blockdir); - $array_size = count($arrayaux); + $array_size = count(($arrayaux ?? [])); } @@ -21192,7 +21209,7 @@ $oldcolumn = $this->CurrCol; $vetor = $arrayaux[$i]; if ($i == 0 and $vetor[0] != "\n" and !$this->ispre) { - $vetor[0] = ltrim($vetor[0]); + $vetor[0] = ltrim(($vetor[0] ?? '')); if (!empty($vetor[18])) { $this->otl->trimOTLdata($vetor[18], true, false); } // *OTL* } @@ -21224,13 +21241,13 @@ if(isset($vetor[15])) { // Word spacing $this->wSpacingCSS = $vetor[15]; - if ($this->wSpacingCSS && strtoupper($this->wSpacingCSS) != 'NORMAL') { + if ($this->wSpacingCSS && strtoupper(($this->wSpacingCSS ?? '')) != 'NORMAL') { $this->minwSpacing = $this->ConvertSize($this->wSpacingCSS,$this->FontSize)/$this->shrin_k; // mPDF 5.7.3 } } if(isset($vetor[14])) { // Letter spacing $this->lSpacingCSS = $vetor[14]; - if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper($this->lSpacingCSS) != 'NORMAL') { + if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper(($this->lSpacingCSS ?? '')) != 'NORMAL') { $this->fixedlSpacing = $this->ConvertSize($this->lSpacingCSS,$this->FontSize)/$this->shrin_k; // mPDF 5.7.3 } } @@ -21291,7 +21308,7 @@ } if(isset($vetor[1]) and $vetor[1] != '') //LINK { - if (strpos($vetor[1],".") === false && strpos($vetor[1],"@") !== 0) //assuming every external link has a dot indicating extension (e.g: .html .txt .zip www.somewhere.com etc.) + if (strpos(($vetor[1] ?? ''),".") === false && strpos(($vetor[1] ?? ''),"@") !== 0) //assuming every external link has a dot indicating extension (e.g: .html .txt .zip www.somewhere.com etc.) { //Repeated reference to same anchor? while(array_key_exists($vetor[1],$this->internallink)) $vetor[1]="#".$vetor[1]; @@ -21304,7 +21321,7 @@ // SPECIAL CONTENT - IMAGES & FORM OBJECTS //Print-out special content - if (substr($vetor[0],0,3) == "\xbb\xa4\xac") { //identifier has been identified! + if (substr(($vetor[0] ?? ''),0,3) == "\xbb\xa4\xac") { //identifier has been identified! $objattr = $this->_getObjAttr($vetor[0]); @@ -21408,7 +21425,7 @@ // Added to correct Images already set on line before page advanced // i.e. if second inline image on line is higher than first and forces new page - if (count($this->objectbuffer)) { + if (count(($this->objectbuffer ?? []))) { $yadj = $iby - $this->y; foreach($this->objectbuffer AS $ib=>$val) { if ($this->objectbuffer[$ib]['OUTER-Y'] ) $this->objectbuffer[$ib]['OUTER-Y'] -= $yadj; @@ -21520,7 +21537,7 @@ $this->floatmargins['R']['y1'] = $fy + $h; if ($skipln == 1) { $this->floatmargins['R']['skipline'] = true; - $this->floatmargins['R']['id'] = count($this->floatbuffer)+0; + $this->floatmargins['R']['id'] = count(($this->floatbuffer ?? []))+0; $objattr['skipline'] = true; } $this->floatbuffer[] = $objattr; @@ -21533,7 +21550,7 @@ $this->floatmargins['R']['y1'] = $fy + $h; if ($skipln == 1) { $this->floatmargins['R']['skipline'] = true; - $this->floatmargins['R']['id'] = count($this->floatbuffer)+0; + $this->floatmargins['R']['id'] = count(($this->floatbuffer ?? []))+0; $objattr['skipline'] = true; } $this->floatbuffer[] = $objattr; @@ -21560,7 +21577,7 @@ $this->floatmargins['L']['y1'] = $fy + $h; if ($skipln == 1) { $this->floatmargins['L']['skipline'] = true; - $this->floatmargins['L']['id'] = count($this->floatbuffer)+0; + $this->floatmargins['L']['id'] = count(($this->floatbuffer ?? []))+0; $objattr['skipline'] = true; } $this->floatbuffer[] = $objattr; @@ -21573,7 +21590,7 @@ $this->floatmargins['L']['y1'] = $fy + $h; if ($skipln == 1) { $this->floatmargins['L']['skipline'] = true; - $this->floatmargins['L']['id'] = count($this->floatbuffer)+0; + $this->floatmargins['L']['id'] = count(($this->floatbuffer ?? []))+0; $objattr['skipline'] = true; } $this->floatbuffer[] = $objattr; @@ -21792,10 +21809,10 @@ $this->SetLineWidth($b['w']/$k); $this->SetDColor($b['c']); if ($b['c'][0]==5) { // RGBa - $this->SetAlpha(ord($b['c'][4])/100, 'Normal', false, 'S')."\n"; // mPDF 5.7.2 + $this->SetAlpha(ord(($b['c'][4] ?? ''))/100, 'Normal', false, 'S')."\n"; // mPDF 5.7.2 } else if ($b['c'][0]==6) { // CMYKa - $this->SetAlpha(ord($b['c'][5])/100, 'Normal', false, 'S')."\n"; // mPDF 5.7.2 + $this->SetAlpha(ord(($b['c'][5] ?? ''))/100, 'Normal', false, 'S')."\n"; // mPDF 5.7.2 } } @@ -21916,7 +21933,7 @@ // BORDER LEGEND if (isset($this->blk[$blvl]['border_legend']) && $this->blk[$blvl]['border_legend']) { $legend = $this->blk[$blvl]['border_legend']; // Same structure array as textbuffer - $txt = $legend[0] = ltrim($legend[0]); + $txt = $legend[0] = ltrim(($legend[0] ?? '')); if (!empty($legend[18])) { $this->otl->trimOTLdata($legend[18], true, false); } // *OTL* //Set font, size, style, color @@ -22344,23 +22361,23 @@ if (isset($this->blk[$blvl]['box_shadow']) && $this->blk[$blvl]['box_shadow'] && $h > 0) { foreach($this->blk[$blvl]['box_shadow'] AS $sh) { // Colors - if ($sh['col']{0}==1) { + if ($sh['col'][0]==1) { $colspace = 'Gray'; - if ($sh['col']{2}==1) { $col1 = '1'.$sh['col'][1].'1'.$sh['col'][3]; } + if ($sh['col'][2]==1) { $col1 = '1'.$sh['col'][1].'1'.$sh['col'][3]; } else { $col1 = '1'.$sh['col'][1].'1'.chr(100); } $col2 = '1'.$sh['col'][1].'1'.chr(0); } - else if ($sh['col']{0}==4) { // CMYK + else if ($sh['col'][0]==4) { // CMYK $colspace = 'CMYK'; $col1 = '6'.$sh['col'][1].$sh['col'][2].$sh['col'][3].$sh['col'][4].chr(100); $col2 = '6'.$sh['col'][1].$sh['col'][2].$sh['col'][3].$sh['col'][4].chr(0); } - else if ($sh['col']{0}==5) { // RGBa + else if ($sh['col'][0]==5) { // RGBa $colspace = 'RGB'; $col1 = '5'.$sh['col'][1].$sh['col'][2].$sh['col'][3].$sh['col'][4]; $col2 = '5'.$sh['col'][1].$sh['col'][2].$sh['col'][3].chr(0); } - else if ($sh['col']{0}==6) { // CMYKa + else if ($sh['col'][0]==6) { // CMYKa $colspace = 'CMYK'; $col1 = '6'.$sh['col'][1].$sh['col'][2].$sh['col'][3].$sh['col'][4].$sh['col'][5]; $col2 = '6'.$sh['col'][1].$sh['col'][2].$sh['col'][3].$sh['col'][4].chr(0); @@ -22389,14 +22406,14 @@ // Set path for INNER shadow $shadow .= ' q 0 w '; $shadow .= $this->SetFColor($col1, true)."\n"; - if ($col1{0}==5 && ord($col1{4})<100) { // RGBa - $shadow .= $this->SetAlpha(ord($col1{4})/100, 'Normal', true, 'F')."\n"; - } - else if ($col1{0}==6 && ord($col1{5})<100) { // CMYKa - $shadow .= $this->SetAlpha(ord($col1{5})/100, 'Normal', true, 'F')."\n"; - } - else if ($col1{0}==1 && $col1{2}==1 && ord($col1{3})<100) { // Gray - $shadow .= $this->SetAlpha(ord($col1{3})/100, 'Normal', true, 'F')."\n"; + if ($col1[0]==5 && ord(($col1[4] ?? ''))<100) { // RGBa + $shadow .= $this->SetAlpha(ord(($col1[4] ?? ''))/100, 'Normal', true, 'F')."\n"; + } + else if ($col1[0]==6 && ord(($col1[5] ?? ''))<100) { // CMYKa + $shadow .= $this->SetAlpha(ord(($col1[5] ?? ''))/100, 'Normal', true, 'F')."\n"; + } + else if ($col1[0]==1 && $col1[2]==1 && ord(($col1[3] ?? ''))<100) { // Gray + $shadow .= $this->SetAlpha(ord(($col1[3] ?? ''))/100, 'Normal', true, 'F')."\n"; } // Blur edges @@ -22656,7 +22673,7 @@ } } if (isset($this->blk[$blvl]['background-image'])) { - if (isset($this->blk[$blvl]['background-image']['gradient']) && $this->blk[$blvl]['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', $this->blk[$blvl]['background-image']['gradient'] )) { + if (isset($this->blk[$blvl]['background-image']['gradient']) && $this->blk[$blvl]['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', ($this->blk[$blvl]['background-image']['gradient'] ?? '') )) { $g = $this->grad->parseMozGradient( $this->blk[$blvl]['background-image']['gradient'] ); if ($g) { $gx = $x0; @@ -22824,7 +22841,7 @@ -function PaintDivLnBorder($state=0,$blvl=0,$h) { +function PaintDivLnBorder($state,$blvl,$h) { // $state = 0 normal; 1 top; 2 bottom; 3 top and bottom $this->ColDetails[$this->CurrCol]['bottom_margin'] = $this->y + $h; @@ -23062,17 +23079,17 @@ function ReadMetaTags($html) { // changes anykey=anyvalue to anykey="anyvalue" (only do this when this happens inside tags) $regexp = '/ (\\w+?)=([^\\s>"]+)/si'; - $html = preg_replace($regexp," \$1=\"\$2\"",$html); - if (preg_match('/(.*?)<\/title>/si',$html,$m)) { + $html = preg_replace(($regexp ?? '')," \$1=\"\$2\"",($html ?? '')); + if (preg_match('/<title>(.*?)<\/title>/si',($html ?? ''),$m)) { $this->SetTitle($m[1]); } - preg_match_all('/<meta [^>]*?(name|content)="([^>]*?)" [^>]*?(name|content)="([^>]*?)".*?>/si',$html,$aux); + preg_match_all('/<meta [^>]*?(name|content)="([^>]*?)" [^>]*?(name|content)="([^>]*?)".*?>/si',($html ?? ''),$aux); $firstattr = $aux[1]; $secondattr = $aux[3]; - for( $i = 0 ; $i < count($aux[0]) ; $i++) { - - $name = ( strtoupper($firstattr[$i]) == "NAME" )? strtoupper($aux[2][$i]) : strtoupper($aux[4][$i]); - $content = ( strtoupper($firstattr[$i]) == "CONTENT" )? $aux[2][$i] : $aux[4][$i]; + for( $i = 0 ; $i < count(($aux[0] ?? [])) ; $i++) { + + $name = ( strtoupper(($firstattr[$i] ?? '')) == "NAME" )? strtoupper(($aux[2][$i] ?? '')) : strtoupper(($aux[4][$i] ?? '')); + $content = ( strtoupper(($firstattr[$i] ?? '')) == "CONTENT" )? $aux[2][$i] : $aux[4][$i]; switch($name) { case "KEYWORDS": $this->SetKeywords($content); break; case "AUTHOR": $this->SetAuthor($content); break; @@ -23085,9 +23102,9 @@ function ReadCharset($html) { // Charset conversion if ($this->allow_charset_conversion) { - if (preg_match('/<head.*charset=([^\'\"\s]*).*<\/head>/si',$html,$m)) { - if (strtoupper($m[1]) != 'UTF-8') { - $this->charset_in = strtoupper($m[1]); + if (preg_match('/<head.*charset=([^\'\"\s]*).*<\/head>/si',($html ?? ''),$m)) { + if (strtoupper(($m[1] ?? '')) != 'UTF-8') { + $this->charset_in = strtoupper(($m[1] ?? '')); } } } @@ -23120,7 +23137,7 @@ $this->SetFontSize( $mmsize*(_MPDFK),false ); //Get size in points (pt) } else{ - $v = strtoupper($v); + $v = strtoupper(($v ?? '')); if (isset($this->fontsizes[$v])) { $this->SetFontSize( $this->fontsizes[$v]* $this->default_font_size,false); } @@ -23144,13 +23161,13 @@ if (isset($arrayaux['FONT-FAMILY'])) { $v = $arrayaux['FONT-FAMILY']; //If it is a font list, get all font types - $aux_fontlist = explode(",",$v); + $aux_fontlist = explode(",",($v ?? '')); $found = 0; foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->fonttrans[$v]) && $this->fonttrans[$v]) { $v = $this->fonttrans[$v]; } if ((!$this->onlyCoreFonts && in_array($v,$this->available_unifonts)) || in_array($v,array('ccourier','ctimes','chelvetica')) || @@ -23163,10 +23180,10 @@ } if (!$found) { foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->fonttrans[$v]) && $this->fonttrans[$v]) { $v = $this->fonttrans[$v]; } if (in_array($v,$this->sans_fonts) || in_array($v,$this->serif_fonts) || in_array($v,$this->mono_fonts) ) { $fonttype = $v; @@ -23283,23 +23300,23 @@ break; case 'BACKGROUND-CLIP': - if (strtoupper($v) == 'PADDING-BOX') { $this->blk[$this->blklvl]['background_clip'] = 'padding-box'; } - else if (strtoupper($v) == 'CONTENT-BOX') { $this->blk[$this->blklvl]['background_clip'] = 'content-box'; } + if (strtoupper(($v ?? '')) == 'PADDING-BOX') { $this->blk[$this->blklvl]['background_clip'] = 'padding-box'; } + else if (strtoupper(($v ?? '')) == 'CONTENT-BOX') { $this->blk[$this->blklvl]['background_clip'] = 'content-box'; } break; case 'PAGE-BREAK-AFTER': - if (strtoupper($v) == 'AVOID') { $this->blk[$this->blklvl]['page_break_after_avoid'] = true; } - else if (strtoupper($v) == 'ALWAYS' || strtoupper($v) == 'LEFT' || strtoupper($v) == 'RIGHT') { $this->blk[$this->blklvl]['page_break_after'] = strtoupper($v) ; } + if (strtoupper(($v ?? '')) == 'AVOID') { $this->blk[$this->blklvl]['page_break_after_avoid'] = true; } + else if (strtoupper(($v ?? '')) == 'ALWAYS' || strtoupper(($v ?? '')) == 'LEFT' || strtoupper(($v ?? '')) == 'RIGHT') { $this->blk[$this->blklvl]['page_break_after'] = strtoupper(($v ?? '')) ; } break; // mPDF 6 pagebreaktype case 'BOX-DECORATION-BREAK': - if (strtoupper($v) == 'CLONE') { $this->blk[$this->blklvl]['box_decoration_break'] = 'clone'; } - else if (strtoupper($v) == 'SLICE') { $this->blk[$this->blklvl]['box_decoration_break'] = 'slice'; } + if (strtoupper(($v ?? '')) == 'CLONE') { $this->blk[$this->blklvl]['box_decoration_break'] = 'clone'; } + else if (strtoupper(($v ?? '')) == 'SLICE') { $this->blk[$this->blklvl]['box_decoration_break'] = 'slice'; } break; case 'WIDTH': - if (strtoupper($v) != 'AUTO') { + if (strtoupper(($v ?? '')) != 'AUTO') { $this->blk[$this->blklvl]['css_set_width'] = $this->ConvertSize($v,$this->blk[$prevlevel]['inner_width'],$this->FontSize,false); } break; @@ -23307,13 +23324,13 @@ // mPDF 6 Lists // LISTS case 'LIST-STYLE-TYPE': - $this->blk[$this->blklvl]['list_style_type'] = strtolower($v); + $this->blk[$this->blklvl]['list_style_type'] = strtolower(($v ?? '')); break; case 'LIST-STYLE-IMAGE': - $this->blk[$this->blklvl]['list_style_image'] = strtolower($v); + $this->blk[$this->blklvl]['list_style_image'] = strtolower(($v ?? '')); break; case 'LIST-STYLE-POSITION': - $this->blk[$this->blklvl]['list_style_position'] = strtolower($v); + $this->blk[$this->blklvl]['list_style_position'] = strtolower(($v ?? '')); break; @@ -23330,7 +23347,7 @@ break; case 'MARGIN-COLLAPSE': // Custom tag to collapse margins at top and bottom of page - if (strtoupper($v) == 'COLLAPSE') { $this->blk[$this->blklvl]['margin_collapse'] = true; } + if (strtoupper(($v ?? '')) == 'COLLAPSE') { $this->blk[$this->blklvl]['margin_collapse'] = true; } break; case 'LINE-HEIGHT': @@ -23340,15 +23357,15 @@ // mPDF 6 case 'LINE-STACKING-STRATEGY': - $this->blk[$this->blklvl]['line_stacking_strategy'] = strtolower($v); + $this->blk[$this->blklvl]['line_stacking_strategy'] = strtolower(($v ?? '')); break; case 'LINE-STACKING-SHIFT': - $this->blk[$this->blklvl]['line_stacking_shift'] = strtolower($v); + $this->blk[$this->blklvl]['line_stacking_shift'] = strtolower(($v ?? '')); break; case 'TEXT-ALIGN': //left right center justify - switch (strtoupper($v)) { + switch (strtoupper(($v ?? ''))) { case 'LEFT': $this->blk[$this->blklvl]['align']="L"; break; @@ -23373,7 +23390,7 @@ /*-- END BACKGROUNDS --*/ case 'DIRECTION': - if ($v) { $this->blk[$this->blklvl]['direction'] = strtolower($v); } + if ($v) { $this->blk[$this->blklvl]['direction'] = strtolower(($v ?? '')); } break; }//end of switch($k) @@ -23383,7 +23400,7 @@ if ($type == 'INLINE') { switch($k){ case 'DISPLAY': - if (strtoupper($v) == 'NONE') { $this->inlineDisplayOff = true; } + if (strtoupper(($v ?? '')) == 'NONE') { $this->inlineDisplayOff = true; } break; case 'DIRECTION': break; @@ -23414,7 +23431,7 @@ $spanbordset = true; break; case 'VISIBILITY': // block is set in OpenTag - $v = strtolower($v); + $v = strtolower(($v ?? '')); if ($v == 'visible' || $v == 'hidden' || $v == 'printonly' || $v == 'screenonly') { $this->textparam['visibility'] = $v; } @@ -23426,7 +23443,7 @@ // FOR INLINE and BLOCK switch($k){ case 'TEXT-ALIGN': //left right center justify - if (strtoupper($v) == 'NOJUSTIFY' && $this->blk[$this->blklvl]['align']=="J") { + if (strtoupper(($v ?? '')) == 'NOJUSTIFY' && $this->blk[$this->blklvl]['align']=="J") { $this->blk[$this->blklvl]['align']=""; } break; @@ -23457,7 +23474,7 @@ break; case 'VERTICAL-ALIGN': //super and sub only dealt with here e.g. <SUB> and <SUP> - switch (strtoupper($v)) { + switch (strtoupper(($v ?? ''))) { case 'SUPER': $this->textvar = ($this->textvar | FA_SUPERSCRIPT); // mPDF 5.7.1 $this->textvar = ($this->textvar & ~FA_SUBSCRIPT); @@ -23505,20 +23522,20 @@ switch($k){ case 'LETTER-SPACING': $this->lSpacingCSS = $v; - if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper($this->lSpacingCSS) != 'NORMAL') { + if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper(($this->lSpacingCSS ?? '')) != 'NORMAL') { $this->fixedlSpacing = $this->ConvertSize($this->lSpacingCSS,$this->FontSize); } break; case 'WORD-SPACING': $this->wSpacingCSS = $v; - if ($this->wSpacingCSS && strtoupper($this->wSpacingCSS) != 'NORMAL') { + if ($this->wSpacingCSS && strtoupper(($this->wSpacingCSS ?? '')) != 'NORMAL') { $this->minwSpacing = $this->ConvertSize($this->wSpacingCSS,$this->FontSize); } break; case 'FONT-STYLE': // italic normal oblique - switch (strtoupper($v)) { + switch (strtoupper(($v ?? ''))) { case 'ITALIC': case 'OBLIQUE': $this->SetStyle('I',true); @@ -23530,7 +23547,7 @@ break; case 'FONT-WEIGHT': // normal bold //Does not support: bolder, lighter, 100..900(step value=100) - switch (strtoupper($v)) { + switch (strtoupper(($v ?? ''))) { case 'BOLD': $this->SetStyle('B',true); break; @@ -23541,7 +23558,7 @@ break; case 'FONT-KERNING': - if (strtoupper($v) == 'NORMAL' || (strtoupper($v) == 'AUTO' && $this->useKerning)) { + if (strtoupper(($v ?? '')) == 'NORMAL' || (strtoupper(($v ?? '')) == 'AUTO' && $this->useKerning)) { /*-- OTL --*/ if ($this->CurrentFont['haskernGPOS']) { if (isset($this->OTLtags['Plus'])) { $this->OTLtags['Plus'] .= ' kern'; } @@ -23552,24 +23569,24 @@ $this->textvar = ($this->textvar | FC_KERNING); } // *OTL* } - else if (strtoupper($v) == 'NONE' || (strtoupper($v) == 'AUTO' && !$this->useKerning)) { - if (isset($this->OTLtags['Plus'])) $this->OTLtags['Plus'] = str_replace('kern','', $this->OTLtags['Plus'] ); // *OTL* - if (isset($this->OTLtags['FFPlus'])) $this->OTLtags['FFPlus'] = preg_replace('/kern[\d]*/', '', $this->OTLtags['FFPlus'] ); + else if (strtoupper(($v ?? '')) == 'NONE' || (strtoupper(($v ?? '')) == 'AUTO' && !$this->useKerning)) { + if (isset($this->OTLtags['Plus'])) $this->OTLtags['Plus'] = str_replace('kern','', ($this->OTLtags['Plus'] ?? '') ); // *OTL* + if (isset($this->OTLtags['FFPlus'])) $this->OTLtags['FFPlus'] = preg_replace('/kern[\d]*/', '', ($this->OTLtags['FFPlus'] ?? '') ); $this->textvar = ($this->textvar & ~FC_KERNING); } break; /*-- OTL --*/ case 'FONT-LANGUAGE-OVERRIDE': - $v =strtoupper($v); - if (strpos($v, 'NORMAL')!==false) { $this->fontLanguageOverride = ''; } - else { $this->fontLanguageOverride = trim($v); } + $v =strtoupper(($v ?? '')); + if (strpos(($v ?? ''), 'NORMAL')!==false) { $this->fontLanguageOverride = ''; } + else { $this->fontLanguageOverride = trim(($v ?? '')); } break; case 'FONT-VARIANT-POSITION': - if (isset($this->OTLtags['Plus'])) $this->OTLtags['Plus'] = str_replace(array('sups','subs'),'', $this->OTLtags['Plus']); - switch (strtoupper($v)) { + if (isset($this->OTLtags['Plus'])) $this->OTLtags['Plus'] = str_replace(array('sups','subs'),'', ($this->OTLtags['Plus'] ?? '')); + switch (strtoupper(($v ?? ''))) { case 'SUPER': $this->OTLtags['Plus'] .= ' sups'; break; @@ -23582,90 +23599,90 @@ break; case 'FONT-VARIANT-CAPS': - $v =strtoupper($v); + $v =strtoupper(($v ?? '')); if (!isset($this->OTLtags['Plus'])) { $this->OTLtags['Plus'] = ''; } - $this->OTLtags['Plus'] = str_replace(array('c2sc','smcp','c2pc','pcap','unic','titl'),'', $this->OTLtags['Plus']); + $this->OTLtags['Plus'] = str_replace(array('c2sc','smcp','c2pc','pcap','unic','titl'),'', ($this->OTLtags['Plus'] ?? '')); $this->textvar = ($this->textvar & ~FC_SMALLCAPS); // ?????????????? <small-caps> - if (strpos($v, 'ALL-SMALL-CAPS')!==false) { $this->OTLtags['Plus'] .= ' c2sc smcp'; } - else if (strpos($v, 'SMALL-CAPS')!==false) { + if (strpos(($v ?? ''), 'ALL-SMALL-CAPS')!==false) { $this->OTLtags['Plus'] .= ' c2sc smcp'; } + else if (strpos(($v ?? ''), 'SMALL-CAPS')!==false) { if (isset($this->CurrentFont['hassmallcapsGSUB']) && $this->CurrentFont['hassmallcapsGSUB']) { $this->OTLtags['Plus'] .= ' smcp'; } else { $this->textvar = ($this->textvar | FC_SMALLCAPS); } } - else if (strpos($v, 'ALL-PETITE-CAPS')!==false) { $this->OTLtags['Plus'] .= ' c2pc pcap'; } - else if (strpos($v, 'PETITE-CAPS')!==false) { $this->OTLtags['Plus'] .= ' pcap'; } - else if (strpos($v, 'UNICASE')!==false) { $this->OTLtags['Plus'] .= ' unic'; } - else if (strpos($v, 'TITLING-CAPS')!==false) { $this->OTLtags['Plus'] .= ' titl'; } + else if (strpos(($v ?? ''), 'ALL-PETITE-CAPS')!==false) { $this->OTLtags['Plus'] .= ' c2pc pcap'; } + else if (strpos(($v ?? ''), 'PETITE-CAPS')!==false) { $this->OTLtags['Plus'] .= ' pcap'; } + else if (strpos(($v ?? ''), 'UNICASE')!==false) { $this->OTLtags['Plus'] .= ' unic'; } + else if (strpos(($v ?? ''), 'TITLING-CAPS')!==false) { $this->OTLtags['Plus'] .= ' titl'; } break; case 'FONT-VARIANT-LIGATURES': - $v =strtoupper($v); + $v =strtoupper(($v ?? '')); if (!isset($this->OTLtags['Plus'])) { $this->OTLtags['Plus'] = ''; } if (!isset($this->OTLtags['Minus'])) { $this->OTLtags['Minus'] = ''; } - if (strpos($v, 'NORMAL')!==false) { - $this->OTLtags['Minus'] = str_replace(array('liga','clig','calt'),'', $this->OTLtags['Minus']); - $this->OTLtags['Plus'] = str_replace(array('dlig','hlig'),'', $this->OTLtags['Plus']); - } - else if (strpos($v, 'NONE')!==false) { + if (strpos(($v ?? ''), 'NORMAL')!==false) { + $this->OTLtags['Minus'] = str_replace(array('liga','clig','calt'),'', ($this->OTLtags['Minus'] ?? '')); + $this->OTLtags['Plus'] = str_replace(array('dlig','hlig'),'', ($this->OTLtags['Plus'] ?? '')); + } + else if (strpos(($v ?? ''), 'NONE')!==false) { $this->OTLtags['Minus'] .= ' liga clig calt'; - $this->OTLtags['Plus'] = str_replace(array('dlig','hlig'),'', $this->OTLtags['Plus']); - } - if (strpos($v, 'NO-COMMON-LIGATURES')!==false) { $this->OTLtags['Minus'] .= ' liga clig'; } - else if (strpos($v, 'COMMON-LIGATURES')!==false) { $this->OTLtags['Minus'] = str_replace(array('liga','clig'),'', $this->OTLtags['Minus']); } - if (strpos($v, 'NO-CONTEXTUAL')!==false) { $this->OTLtags['Minus'] .= ' calt'; } - else if (strpos($v, 'CONTEXTUAL')!==false) { $this->OTLtags['Minus'] = str_replace('calt','', $this->OTLtags['Minus']); } - if (strpos($v, 'NO-DISCRETIONARY-LIGATURES')!==false) { $this->OTLtags['Plus'] = str_replace('dlig','', $this->OTLtags['Plus'] ); } - else if (strpos($v, 'DISCRETIONARY-LIGATURES')!==false) { $this->OTLtags['Plus'] .= ' dlig'; } - if (strpos($v, 'NO-HISTORICAL-LIGATURES')!==false) { $this->OTLtags['Plus'] = str_replace('hlig','', $this->OTLtags['Plus'] ); } - else if (strpos($v, 'HISTORICAL-LIGATURES')!==false) { $this->OTLtags['Plus'] .= ' hlig'; } + $this->OTLtags['Plus'] = str_replace(array('dlig','hlig'),'', ($this->OTLtags['Plus'] ?? '')); + } + if (strpos(($v ?? ''), 'NO-COMMON-LIGATURES')!==false) { $this->OTLtags['Minus'] .= ' liga clig'; } + else if (strpos(($v ?? ''), 'COMMON-LIGATURES')!==false) { $this->OTLtags['Minus'] = str_replace(array('liga','clig'),'', ($this->OTLtags['Minus'] ?? '')); } + if (strpos(($v ?? ''), 'NO-CONTEXTUAL')!==false) { $this->OTLtags['Minus'] .= ' calt'; } + else if (strpos(($v ?? ''), 'CONTEXTUAL')!==false) { $this->OTLtags['Minus'] = str_replace('calt','', ($this->OTLtags['Minus'] ?? '')); } + if (strpos(($v ?? ''), 'NO-DISCRETIONARY-LIGATURES')!==false) { $this->OTLtags['Plus'] = str_replace('dlig','', ($this->OTLtags['Plus'] ?? '') ); } + else if (strpos(($v ?? ''), 'DISCRETIONARY-LIGATURES')!==false) { $this->OTLtags['Plus'] .= ' dlig'; } + if (strpos(($v ?? ''), 'NO-HISTORICAL-LIGATURES')!==false) { $this->OTLtags['Plus'] = str_replace('hlig','', ($this->OTLtags['Plus'] ?? '') ); } + else if (strpos(($v ?? ''), 'HISTORICAL-LIGATURES')!==false) { $this->OTLtags['Plus'] .= ' hlig'; } break; case 'FONT-VARIANT-NUMERIC': - $v =strtoupper($v); + $v =strtoupper(($v ?? '')); if (!isset($this->OTLtags['Plus'])) { $this->OTLtags['Plus'] = ''; } - if (strpos($v, 'NORMAL')!==false) { - $this->OTLtags['Plus'] = str_replace(array('ordn','zero','lnum','onum','pnum','tnum','frac','afrc'),'', $this->OTLtags['Plus']); - } - if (strpos($v, 'ORDINAL')!==false) { $this->OTLtags['Plus'] .= ' ordn'; } - if (strpos($v, 'SLASHED-ZERO')!==false) { $this->OTLtags['Plus'] .= ' zero'; } - if (strpos($v, 'LINING-NUMS')!==false) { $this->OTLtags['Plus'] .= ' lnum'; $this->OTLtags['Plus'] = str_replace('onum','', $this->OTLtags['Plus'] ); } - else if (strpos($v, 'OLDSTYLE-NUMS')!==false) { $this->OTLtags['Plus'] .= ' onum'; $this->OTLtags['Plus'] = str_replace('lnum','', $this->OTLtags['Plus'] ); } - if (strpos($v, 'PROPORTIONAL-NUMS')!==false) { $this->OTLtags['Plus'] .= ' pnum'; $this->OTLtags['Plus'] = str_replace('tnum','', $this->OTLtags['Plus'] ); } - else if (strpos($v, 'TABULAR-NUMS')!==false) { $this->OTLtags['Plus'] .= ' tnum'; $this->OTLtags['Plus'] = str_replace('pnum','', $this->OTLtags['Plus'] ); } - if (strpos($v, 'DIAGONAL-FRACTIONS')!==false) { $this->OTLtags['Plus'] .= ' frac'; $this->OTLtags['Plus'] = str_replace('afrc','', $this->OTLtags['Plus'] ); } - else if (strpos($v, 'STACKED-FRACTIONS')!==false) { $this->OTLtags['Plus'] .= ' afrc'; $this->OTLtags['Plus'] = str_replace('frac','', $this->OTLtags['Plus'] ); } + if (strpos(($v ?? ''), 'NORMAL')!==false) { + $this->OTLtags['Plus'] = str_replace(array('ordn','zero','lnum','onum','pnum','tnum','frac','afrc'),'', ($this->OTLtags['Plus'] ?? '')); + } + if (strpos(($v ?? ''), 'ORDINAL')!==false) { $this->OTLtags['Plus'] .= ' ordn'; } + if (strpos(($v ?? ''), 'SLASHED-ZERO')!==false) { $this->OTLtags['Plus'] .= ' zero'; } + if (strpos(($v ?? ''), 'LINING-NUMS')!==false) { $this->OTLtags['Plus'] .= ' lnum'; $this->OTLtags['Plus'] = str_replace('onum','', ($this->OTLtags['Plus'] ?? '') ); } + else if (strpos(($v ?? ''), 'OLDSTYLE-NUMS')!==false) { $this->OTLtags['Plus'] .= ' onum'; $this->OTLtags['Plus'] = str_replace('lnum','', ($this->OTLtags['Plus'] ?? '') ); } + if (strpos(($v ?? ''), 'PROPORTIONAL-NUMS')!==false) { $this->OTLtags['Plus'] .= ' pnum'; $this->OTLtags['Plus'] = str_replace('tnum','', ($this->OTLtags['Plus'] ?? '') ); } + else if (strpos(($v ?? ''), 'TABULAR-NUMS')!==false) { $this->OTLtags['Plus'] .= ' tnum'; $this->OTLtags['Plus'] = str_replace('pnum','', ($this->OTLtags['Plus'] ?? '') ); } + if (strpos(($v ?? ''), 'DIAGONAL-FRACTIONS')!==false) { $this->OTLtags['Plus'] .= ' frac'; $this->OTLtags['Plus'] = str_replace('afrc','', ($this->OTLtags['Plus'] ?? '') ); } + else if (strpos(($v ?? ''), 'STACKED-FRACTIONS')!==false) { $this->OTLtags['Plus'] .= ' afrc'; $this->OTLtags['Plus'] = str_replace('frac','', ($this->OTLtags['Plus'] ?? '') ); } break; case 'FONT-VARIANT-ALTERNATES': // Only supports historical-forms - $v =strtoupper($v); + $v =strtoupper(($v ?? '')); if (!isset($this->OTLtags['Plus'])) { $this->OTLtags['Plus'] = ''; } - if (strpos($v, 'NORMAL')!==false) { - $this->OTLtags['Plus'] = str_replace('hist','', $this->OTLtags['Plus']); + if (strpos(($v ?? ''), 'NORMAL')!==false) { + $this->OTLtags['Plus'] = str_replace('hist','', ($this->OTLtags['Plus'] ?? '')); } - if (strpos($v, 'HISTORICAL-FORMS')!==false) { $this->OTLtags['Plus'] .= ' hist'; } + if (strpos(($v ?? ''), 'HISTORICAL-FORMS')!==false) { $this->OTLtags['Plus'] .= ' hist'; } break; case 'FONT-FEATURE-SETTINGS': - $v =strtolower($v); - if (strpos($v, 'normal')!==false) { + $v =strtolower(($v ?? '')); + if (strpos(($v ?? ''), 'normal')!==false) { $this->OTLtags['FFMinus'] = ''; $this->OTLtags['FFPlus'] = ''; } else { if (!isset($this->OTLtags['FFPlus'])) { $this->OTLtags['FFPlus'] = ''; } if (!isset($this->OTLtags['FFMinus'])) { $this->OTLtags['FFMinus'] = ''; } - $tags = preg_split('/[,]/',$v); + $tags = preg_split('/[,]/',($v ?? '')); foreach($tags AS $t) { - if(preg_match('/[\"\']([a-zA-Z0-9]{4})[\"\']\s*(on|off|\d*){0,1}/', $t, $m)) { + if(preg_match('/[\"\']([a-zA-Z0-9]{4})[\"\']\s*(on|off|\d*){0,1}/', ($t ?? ''), $m)) { if ($m[2]=='off' || $m[2]==='0') { - if (strpos($this->OTLtags['FFMinus'],$m[1])===false) { $this->OTLtags['FFMinus'] .= ' '.$m[1]; } - $this->OTLtags['FFPlus'] = preg_replace('/'.$m[1].'[\d]*/', '', $this->OTLtags['FFPlus'] ); + if (strpos(($this->OTLtags['FFMinus'] ?? ''),($m[1] ?? ''))===false) { $this->OTLtags['FFMinus'] .= ' '.$m[1]; } + $this->OTLtags['FFPlus'] = preg_replace('/'.$m[1].'[\d]*/', '', ($this->OTLtags['FFPlus'] ?? '') ); } else { if ($m[2]=='on') { $m[2] = '1'; } - if (strpos($this->OTLtags['FFPlus'],$m[1])===false) { $this->OTLtags['FFPlus'] .= ' '.$m[1].$m[2]; } - $this->OTLtags['FFMinus'] = str_replace($m[1],'', $this->OTLtags['FFMinus'] ); + if (strpos(($this->OTLtags['FFPlus'] ?? ''),($m[1] ?? ''))===false) { $this->OTLtags['FFPlus'] .= ' '.$m[1].$m[2]; } + $this->OTLtags['FFMinus'] = str_replace(($m[1] ?? ''),'', ($this->OTLtags['FFMinus'] ?? '') ); } } } @@ -23675,7 +23692,7 @@ case 'TEXT-TRANSFORM': // none uppercase lowercase //Does support: capitalize - switch (strtoupper($v)) { //Not working 100% + switch (strtoupper(($v ?? ''))) { //Not working 100% case 'CAPITALIZE': $this->textvar = ($this->textvar | FT_CAPITALIZE); // mPDF 5.7.1 $this->textvar = ($this->textvar & ~FT_UPPERCASE); // mPDF 5.7.1 @@ -23704,26 +23721,26 @@ break; case 'HYPHENS': - if (strtoupper($v)=='NONE') { + if (strtoupper(($v ?? ''))=='NONE') { $this->textparam['hyphens'] = 2; } - else if (strtoupper($v)=='AUTO') { + else if (strtoupper(($v ?? ''))=='AUTO') { $this->textparam['hyphens'] = 1; } - else if (strtoupper($v)=='MANUAL') { + else if (strtoupper(($v ?? ''))=='MANUAL') { $this->textparam['hyphens'] = 0; } break; case 'TEXT-OUTLINE': - if (strtoupper($v)=='NONE') { + if (strtoupper(($v ?? ''))=='NONE') { $this->textparam['outline-s'] = false; } break; case 'TEXT-OUTLINE-WIDTH': case 'OUTLINE-WIDTH': - switch(strtoupper($v)) { + switch(strtoupper(($v ?? ''))) { case 'THIN': $v = '0.03em'; break; case 'MEDIUM': $v = '0.05em'; break; case 'THICK': $v = '0.07em'; break; @@ -23738,7 +23755,7 @@ case 'TEXT-OUTLINE-COLOR': case 'OUTLINE-COLOR': - if (strtoupper($v) == 'INVERT') { + if (strtoupper(($v ?? '')) == 'INVERT') { if ($this->colorarray) { $cor = $this->colorarray; $this->textparam['outline-COLOR'] = $this->_invertColor($cor); @@ -23778,7 +23795,7 @@ else { $this->textparam['s-decoration']['baseline'] = 0; } $this->textparam['s-decoration']['fontkey'] = $this->FontFamily . $this->FontStyle; $this->textparam['s-decoration']['fontsize'] = $this->FontSize; - $this->textparam['s-decoration']['color'] = strtoupper($this->TextColor); // change 0 0 0 rg to 0 0 0 RG + $this->textparam['s-decoration']['color'] = strtoupper(($this->TextColor ?? '')); // change 0 0 0 rg to 0 0 0 RG } if (stristr($v,'UNDERLINE')) { $this->textvar = ($this->textvar | FD_UNDERLINE); @@ -23787,7 +23804,7 @@ else { $this->textparam['u-decoration']['baseline'] = 0; } $this->textparam['u-decoration']['fontkey'] = $this->FontFamily . $this->FontStyle; $this->textparam['u-decoration']['fontsize'] = $this->FontSize; - $this->textparam['u-decoration']['color'] = strtoupper($this->TextColor); // change 0 0 0 rg to 0 0 0 RG + $this->textparam['u-decoration']['color'] = strtoupper(($this->TextColor ?? '')); // change 0 0 0 rg to 0 0 0 RG } if (stristr($v,'OVERLINE')) { $this->textvar = ($this->textvar | FD_OVERLINE); @@ -23796,7 +23813,7 @@ else { $this->textparam['o-decoration']['baseline'] = 0; } $this->textparam['o-decoration']['fontkey'] = $this->FontFamily . $this->FontStyle; $this->textparam['o-decoration']['fontsize'] = $this->FontSize; - $this->textparam['o-decoration']['color'] = strtoupper($this->TextColor); // change 0 0 0 rg to 0 0 0 RG + $this->textparam['o-decoration']['color'] = strtoupper(($this->TextColor ?? '')); // change 0 0 0 rg to 0 0 0 RG } if (stristr($v,'NONE')) { $this->textvar = ($this->textvar & ~FD_UNDERLINE); @@ -23861,7 +23878,7 @@ function SetStyles($str) { $style=''; foreach(array('B','I') as $s) { - if (strpos($str,$s) !== false) { + if (strpos(($str ?? ''),($s ?? '')) !== false) { $this->$s = true; $style.=$s; } @@ -23886,20 +23903,20 @@ $this->enabledtags = "<a><acronym><address><article><aside><b><bdi><bdo><big><blockquote><br><caption><center><cite><code><del><details><dd><div><dl><dt><em><fieldset><figcaption><figure><font><form><h1><h2><h3><h4><h5><h6><hgroup><hr><i><img><input><ins><kbd><legend><li><main><mark><meter><nav><ol><option><p><pre><progress><q><s><samp><section><select><small><span><strike><strong><sub><summary><sup><table><tbody><td><template><textarea><tfoot><th><thead><time><tr><tt><u><ul><var><footer><header><annotation><bookmark><jpgraph><textcircle><barcode><dottab><indexentry><indexinsert><watermarktext><watermarkimage><tts><ttz><tta><column_break><columnbreak><newcolumn><newpage><page_break><pagebreak><formfeed><columns><toc><tocentry><tocpagebreak><pageheader><pagefooter><setpageheader><setpagefooter><sethtmlpageheader><sethtmlpagefooter>"; } else { - $str = explode(",",$str); - foreach($str as $v) $this->enabledtags = str_replace(trim($v),'',$this->enabledtags); + $str = explode(",",($str ?? '')); + foreach($str as $v) $this->enabledtags = str_replace((trim(($v ?? '')) ?? ''),'',($this->enabledtags ?? '')); } } /*-- TABLES --*/ -function TableCheckMinWidth($maxwidth, $forcewrap = 0, $textbuffer, $checkletter=false) { // mPDF 6 +function TableCheckMinWidth($maxwidth, $forcewrap, $textbuffer, $checkletter=false) { // mPDF 6 $acclength = 0; // mPDF 6 (accumulated length across > 1 chunk) $acclongest = 0; // mPDF 6 (accumulated length max across > 1 chunk) $biggestword=0; $toonarrow=false; - if ((count($textbuffer) == 0) or ((count($textbuffer) == 1) && ($textbuffer[0][0] == ''))) { return 0; } + if ((count(($textbuffer ?? [])) == 0) or ((count(($textbuffer ?? [])) == 1) && ($textbuffer[0][0] == ''))) { return 0; } foreach ($textbuffer as $chunk) { @@ -23907,10 +23924,10 @@ $OTLdata = (isset($chunk[18]) ? $chunk[18] : NULL); // mPDF ITERATION - if ($this->iterationCounter) $line = preg_replace('/{iteration ([a-zA-Z0-9_]+)}/','\\1', $line); + if ($this->iterationCounter) $line = preg_replace('/{iteration ([a-zA-Z0-9_]+)}/','\\1', ($line ?? '')); // IMAGES & FORM ELEMENTS - if (substr($line,0,3) == "\xbb\xa4\xac") { //inline object - FORM element or IMAGE! + if (substr(($line ?? ''),0,3) == "\xbb\xa4\xac") { //inline object - FORM element or IMAGE! $objattr = $this->_getObjAttr($line); if ($objattr['type']!='hr' && isset($objattr['width']) && ($objattr['width']/$this->shrin_k) > ($maxwidth + 0.0001) ) { if (($objattr['width']/$this->shrin_k) > $biggestword) { $biggestword = ($objattr['width']/$this->shrin_k); } @@ -23923,7 +23940,7 @@ $acclength = 0; // mPDF 6 (accumulated length across > 1 chunk) continue; } - $line = trim($line ); + $line = trim(($line ?? '') ); if (!empty($OTLdata)) { $this->otl->trimOTLdata($OTLdata, true, true); } // *OTL* // SET FONT SIZE/STYLE from $chunk[n] @@ -23951,13 +23968,13 @@ } if(isset($chunk[15])) { // Word spacing $this->wSpacingCSS = $chunk[15]; - if ($this->wSpacingCSS && strtoupper($this->wSpacingCSS) != 'NORMAL') { + if ($this->wSpacingCSS && strtoupper(($this->wSpacingCSS ?? '')) != 'NORMAL') { $this->minwSpacing = $this->ConvertSize($this->wSpacingCSS,$this->FontSize)/$this->shrin_k; // mPDF 5.7.3 } } if(isset($chunk[14])) { // Letter spacing $this->lSpacingCSS = $chunk[14]; - if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper($this->lSpacingCSS) != 'NORMAL') { + if (($this->lSpacingCSS || $this->lSpacingCSS==='0') && strtoupper(($this->lSpacingCSS ?? '')) != 'NORMAL') { $this->fixedlSpacing = $this->ConvertSize($this->lSpacingCSS,$this->FontSize)/$this->shrin_k; // mPDF 5.7.3 } } @@ -23967,23 +23984,23 @@ // mPDF 6 // If overflow==wrap ($checkletter) OR (No word breaks and contains CJK) - if ($checkletter || (!preg_match('/(\xe2\x80\x8b| )/', trim($line)) && preg_match("/([".$this->pregCJKchars."])/u", $line) ) ) { - if (preg_match("/([".$this->pregCJKchars."])/u", $line) ) { $checkCJK = true; } + if ($checkletter || (!preg_match('/(\xe2\x80\x8b| )/', (trim(($line ?? '')) ?? '')) && preg_match("/([".$this->pregCJKchars."])/u", ($line ?? '')) ) ) { + if (preg_match("/([".$this->pregCJKchars."])/u", ($line ?? '')) ) { $checkCJK = true; } else { $checkCJK = false; } - $letters = preg_split('//u', $line); + $letters = preg_split('//u', ($line ?? '')); foreach ($letters as $k=>$letter) { // mPDF 6 if ($checkCJK) { - if (preg_match("/[".$this->CJKleading."]/u", $letter) && $k>0) { $letter = $letters[$k-1].$letter; } - if (preg_match("/[".$this->CJKfollowing."]/u", $letter) && $k<(count($letters)-1)) { $letter = $letter.$letters[$k+1]; } + if (preg_match("/[".$this->CJKleading."]/u", ($letter ?? '')) && $k>0) { $letter = $letters[$k-1].$letter; } + if (preg_match("/[".$this->CJKfollowing."]/u", ($letter ?? '')) && $k<(count(($letters ?? []))-1)) { $letter = $letter.$letters[$k+1]; } } $letterwidth = $this->GetStringWidth($letter, false, false, $chunk[8]); // Pass $textvar ($chunk[8]), but do OTLdata here // so don't have to split OTLdata for each word if ($k==0) { $letterwidth += $lbw; } - if ($k==(count($letters)-1)) { $letterwidth += $rbw; } + if ($k==(count(($letters ?? []))-1)) { $letterwidth += $rbw; } //Warn user that maxwidth is insufficient if ($letterwidth > $maxwidth + 0.0001) { @@ -23998,7 +24015,7 @@ // Need to account for any XAdvance in GPOSinfo (OTLdata = $chunk[18]) $wordXAdvance = array(); if (isset($chunk[18]) && $chunk[18]) { - preg_match_all ( '/(\xe2\x80\x8b| )/', $line, $spaces, PREG_OFFSET_CAPTURE ); // U+200B Zero Width word boundary, or space + preg_match_all ( '/(\xe2\x80\x8b| )/', ($line ?? ''), $spaces, PREG_OFFSET_CAPTURE ); // U+200B Zero Width word boundary, or space $lastoffset = 0; $k = -1; // Added so that if no spaces found, "last word" later is calculated for the one and only word foreach ($spaces[0] as $k=>$m) { @@ -24023,22 +24040,22 @@ } } - $words = preg_split('/(\xe2\x80\x8b| )/', $line); // U+200B Zero Width word boundary, or space + $words = preg_split('/(\xe2\x80\x8b| )/', ($line ?? '')); // U+200B Zero Width word boundary, or space foreach ($words as $k=>$word) { - $word = trim($word); + $word = trim(($word ?? '')); $wordwidth = $this->GetStringWidth($word, false, false, $chunk[8]); // Pass $textvar ($chunk[8]), but do OTLdata here // so don't have to split OTLdata for each word if (isset($wordXAdvance[$k])) { $wordwidth += ($wordXAdvance[$k]* 1000/$this->CurrentFont['unitsPerEm']) * ($this->FontSize/ 1000); } if ($k==0) { $wordwidth += $lbw; } - if ($k==(count($words)-1)) { $wordwidth += $rbw; } + if ($k==(count(($words ?? []))-1)) { $wordwidth += $rbw; } // mPDF 6 - if ( count($words)==1 && substr($chunk[0],0,1)!=' ') { $acclength += $wordwidth; } - else if (count($words)>1 && $k==0 && substr($chunk[0],0,1)!=' ') { $acclength += $wordwidth; } + if ( count(($words ?? []))==1 && substr(($chunk[0] ?? ''),0,1)!=' ') { $acclength += $wordwidth; } + else if (count(($words ?? []))>1 && $k==0 && substr(($chunk[0] ?? ''),0,1)!=' ') { $acclength += $wordwidth; } else { $acclength = $wordwidth; } $acclongest = max($acclongest,$acclength); - if (count($words)==1 && substr($chunk[0],-1,1)==' ') { $acclength = 0; } - else if (count($words)>1 && ($k!=(count($words)-1) || substr($chunk[0],-1,1)==' ')) { $acclength = 0; } + if (count(($words ?? []))==1 && substr(($chunk[0] ?? ''),-1,1)==' ') { $acclength = 0; } + else if (count(($words ?? []))>1 && ($k!=(count(($words ?? []))-1) || substr(($chunk[0] ?? ''),-1,1)==' ')) { $acclength = 0; } //Warn user that maxwidth is insufficient if ($wordwidth > $maxwidth + 0.0001) { @@ -24194,7 +24211,7 @@ function read_short(&$fh) { $s = fread($fh,2); - $a = (ord($s[0])<<8) + ord($s[1]); + $a = (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -24271,26 +24288,26 @@ $cell['border'] = $bd['bord']; $cell['border_details']['R']['s'] = $bd['rs']; $cell['border_details']['R']['w'] = $bd['rw']; - $cell['border_details']['R']['c'] = str_pad($bd['rca'], 6, "\x00"); - $cell['border_details']['R']['style'] = trim($bd['rst']); + $cell['border_details']['R']['c'] = str_pad(($bd['rca'] ?? ''), 6, "\x00"); + $cell['border_details']['R']['style'] = trim(($bd['rst'] ?? '')); $cell['border_details']['R']['dom'] = $bd['rd']; $cell['border_details']['L']['s'] = $bd['ls']; $cell['border_details']['L']['w'] = $bd['lw']; - $cell['border_details']['L']['c'] = str_pad($bd['lca'], 6, "\x00"); - $cell['border_details']['L']['style'] = trim($bd['lst']); + $cell['border_details']['L']['c'] = str_pad(($bd['lca'] ?? ''), 6, "\x00"); + $cell['border_details']['L']['style'] = trim(($bd['lst'] ?? '')); $cell['border_details']['L']['dom'] = $bd['ld']; $cell['border_details']['T']['s'] = $bd['ts']; $cell['border_details']['T']['w'] = $bd['tw']; - $cell['border_details']['T']['c'] = str_pad($bd['tca'], 6, "\x00"); - $cell['border_details']['T']['style'] = trim($bd['tst']); + $cell['border_details']['T']['c'] = str_pad(($bd['tca'] ?? ''), 6, "\x00"); + $cell['border_details']['T']['style'] = trim(($bd['tst'] ?? '')); $cell['border_details']['T']['dom'] = $bd['td']; $cell['border_details']['B']['s'] = $bd['bs']; $cell['border_details']['B']['w'] = $bd['bw']; - $cell['border_details']['B']['c'] = str_pad($bd['bca'], 6, "\x00"); - $cell['border_details']['B']['style'] = trim($bd['bst']); + $cell['border_details']['B']['c'] = str_pad(($bd['bca'] ?? ''), 6, "\x00"); + $cell['border_details']['B']['style'] = trim(($bd['bst'] ?? '')); $cell['border_details']['B']['dom'] = $bd['bd']; $cell['border_details']['mbw']['BL'] = $bd['mbl']; @@ -24366,7 +24383,7 @@ //$mw = $this->GetStringWidth('W') + $extrcw ; $mw = $extrcw ; // mPDF 6 - if(substr($c['a'],0,1) == 'D') { + if(substr(($c['a'] ?? ''),0,1) == 'D') { $mw = $table['decimal_align'][$j]['maxs0'] + $table['decimal_align'][$j]['maxs1'] + $extrcw ; } @@ -24528,7 +24545,7 @@ if (!$wis) { for($k=$j;$k<$lc;$k++) { $wc[$k]['miw'] = $c['miw']/$c['colspan']; } } - else if (!count($list)) { + else if (!count(($list ?? []))) { $wi = $c['miw'] - $wis; for($k=$j;$k<$lc;$k++) { $wc[$k]['miw'] += ($wc[$k]['miw']/$wis)*$wi; } } @@ -24543,7 +24560,7 @@ if (!$wis) { for($k=$j;$k<$lc;$k++) { $wc[$k]['maw'] = $c['maw']/$c['colspan']; } } - else if (!count($list)) { + else if (!count(($list ?? []))) { $wi = $c['maw'] - $was; for($k=$j;$k<$lc;$k++) { $wc[$k]['maw'] += ($wc[$k]['maw']/$was)*$wi; } } @@ -24551,7 +24568,7 @@ $wi = $c['maw'] - $was; // mPDF 5.7.4 Extra max width distributed evenly to all cells in colspan without a specified width // cf. http://www.mpdf1.com/forum/discussion/2221/colspan-bug - foreach ($list as $k) { $wc[$k]['maw'] += $wi/count($list); } + foreach ($list as $k) { $wc[$k]['maw'] += $wi/count(($list ?? [])); } } } unset($c); @@ -24809,7 +24826,7 @@ } // Now allocate surplus up to maximum width of each column $surplus = 0; $ttl = 0; // number of surplus columns - if (!count($list)) { + if (!count(($list ?? []))) { $wi = ($table['w']-($wis + $tblbw)); // i.e. extra space to distribute for($k=0;$k<$numcols;$k++) { $spareratio = ($table['l'][$k] / $totaltextlength); // gives ratio to divide up free space @@ -24845,15 +24862,15 @@ // If surplus still left over apportion it across columns if ($surplus) { // if some are set only add to remaining - otherwise add to all of them - if (count($notsetlist) && count($notsetlist) < $numcols) { + if (count(($notsetlist ?? [])) && count(($notsetlist ?? [])) < $numcols) { foreach ($notsetlist AS $i) { if ($ttl) $widthcols[$i]['miw'] += $surplus * $table['l'][$i] / $ttl ; } } // If some widths are defined, and others have been added up to their maxmum - else if (count($list) && count($list) < $numcols) { + else if (count(($list ?? [])) && count(($list ?? [])) < $numcols) { foreach ($list AS $i) { - $widthcols[$i]['miw'] += $surplus / count($list) ; + $widthcols[$i]['miw'] += $surplus / count(($list ?? [])) ; } } else if ($numcols) { // If all columns @@ -25031,7 +25048,7 @@ if ($c['R'] && isset($c['textbuffer'])) { $str = ''; foreach($c['textbuffer'] AS $t) { $str .= $t[0].' '; } - $str = rtrim($str); + $str = rtrim(($str ?? '')); $s_fs = $this->FontSizePt; $s_f = $this->FontFamily; $s_st = $this->FontStyle; @@ -25166,13 +25183,13 @@ if (!$hs) { for($k=$i;$k<$lr;$k++) $heightrow[$k] = $c['mih']/$c['rowspan']; } - elseif (!count($list)) { // no rows in the rowspan have a height specified, so share amongst all rows equally + elseif (!count(($list ?? []))) { // no rows in the rowspan have a height specified, so share amongst all rows equally $hi = $c['mih'] - $hs; for($k=$i;$k<$lr;$k++) $heightrow[$k] += ($heightrow[$k]/$hs)*$hi; } else { $hi = $c['mih'] - $hs; // mPDF 6 - foreach ($list as $k) $heightrow[$k] += $hi/(count($list)); // mPDF 6 + foreach ($list as $k) $heightrow[$k] += $hi/(count(($list ?? []))); // mPDF 6 } } unset($c); @@ -25354,7 +25371,7 @@ else if ($bord){ if (!$bSeparate && $buffer) { $priority = 'LRTB'; - for($p=0;$p<strlen($priority);$p++) { + for($p=0;$p<strlen(($priority ?? ''));$p++) { $side = $priority[$p]; $details['p'] = $side ; @@ -25366,8 +25383,8 @@ // Precedence to darker colours at joins $coldom = 0; if (isset($details[$side]['c']) && is_array($details[$side]['c'])) { - if ($details[$side]['c']{0}==3) { // RGB - $coldom = 10-(((ord($details[$side]['c']{1})*1.00)+(ord($details[$side]['c']{2})*1.00)+(ord($details[$side]['c']{3})*1.00))/76.5); + if ($details[$side]['c'][0]==3) { // RGB + $coldom = 10-(((ord(($details[$side]['c'][1] ?? ''))*1.00)+(ord(($details[$side]['c'][2] ?? ''))*1.00)+(ord(($details[$side]['c'][3] ?? ''))*1.00))/76.5); } } // 10 black - 0 white if ($coldom) { $dom += $coldom; } @@ -25382,9 +25399,9 @@ if ($save) { $this->cellBorderBuffer[] = pack("A16nCnda6A10d14", - str_pad(sprintf("%08.7f", $dom),16,"0",STR_PAD_LEFT), + str_pad((sprintf("%08.7f", $dom) ?? ''),16,"0",STR_PAD_LEFT), $cbord, - ord($side), + ord(($side ?? '')), $details[$side]['s'], $details[$side]['w'], $details[$side]['c'], @@ -25404,9 +25421,9 @@ if ($details[$side]['style'] == 'ridge' || $details[$side]['style'] == 'groove' || $details[$side]['style'] == 'inset' || $details[$side]['style'] == 'outset' || $details[$side]['style'] == 'double' ) { $details[$side]['overlay'] = true; $this->cellBorderBuffer[] = pack("A16nCnda6A10d14", - str_pad(sprintf("%08.7f", ($dom+4)),16,"0",STR_PAD_LEFT), + str_pad((sprintf("%08.7f", ($dom+4)) ?? ''),16,"0",STR_PAD_LEFT), $cbord, - ord($side), + ord(($side ?? '')), $details[$side]['s'], $details[$side]['w'], $details[$side]['c'], @@ -25429,7 +25446,7 @@ return; } - if (isset($details['p']) && strlen($details['p'])>1) { $priority = $details['p']; } + if (isset($details['p']) && strlen(($details['p'] ?? ''))>1) { $priority = $details['p']; } else { $priority='LTRB'; } $Tw = 0; $Rw = 0; @@ -25443,7 +25460,7 @@ $x2 = $x + $w; $y2 = $y + $h; $oldlinewidth = $this->LineWidth; - for($p=0;$p<strlen($priority);$p++) { + for($p=0;$p<strlen(($priority ?? ''));$p++) { $side = $priority[$p]; $xadj = 0; $xadj2 = 0; @@ -25456,12 +25473,12 @@ $lx1 = $x; $lx2 = $x2; $this->SetLineWidth($Tw); - if ($cort == 'cell' || strpos($tablecorner,'L')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'L')!==false) { if ($Tw > $Lw) $xadj = ($Tw - $Lw)/2; if ($Tw < $Lw) $xadj = ($Tw + $Lw)/2; } else { $xadj = $Tw/2 - $bsh/2; } - if ($cort == 'cell' || strpos($tablecorner,'R')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'R')!==false) { if ($Tw > $Rw) $xadj2 = ($Tw - $Rw)/2; if ($Tw < $Rw) $xadj2 = ($Tw + $Rw)/2; } @@ -25480,12 +25497,12 @@ $lx1 = $x; $lx2 = $x; $this->SetLineWidth($Lw); - if ($cort == 'cell' || strpos($tablecorner,'T')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'T')!==false) { if ($Lw > $Tw) $yadj = ($Lw - $Tw)/2; if ($Lw < $Tw) $yadj = ($Lw + $Tw)/2; } else { $yadj = $Lw/2 - $bsv/2; } - if ($cort == 'cell' || strpos($tablecorner,'B')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'B')!==false) { if ($Lw > $Bw) $yadj2 = ($Lw - $Bw)/2; if ($Lw < $Bw) $yadj2 = ($Lw + $Bw)/2; } @@ -25504,13 +25521,13 @@ $lx1 = $x2; $lx2 = $x2; $this->SetLineWidth($Rw); - if ($cort == 'cell' || strpos($tablecorner,'T')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'T')!==false) { if ($Rw < $Tw) $yadj = ($Rw + $Tw)/2; if ($Rw > $Tw) $yadj = ($Rw - $Tw)/2; } else { $yadj = $Rw/2 - $bsv/2; } - if ($cort == 'cell' || strpos($tablecorner,'B')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'B')!==false) { if ($Rw > $Bw) $yadj2 = ($Rw - $Bw)/2; if ($Rw < $Bw) $yadj2 = ($Rw + $Bw)/2; } @@ -25530,12 +25547,12 @@ $lx1 = $x; $lx2 = $x2; $this->SetLineWidth($Bw); - if ($cort == 'cell' || strpos($tablecorner,'L')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'L')!==false) { if ($Bw > $Lw) $xadj = ($Bw - $Lw)/2; if ($Bw < $Lw) $xadj = ($Bw + $Lw)/2; } else { $xadj = $Bw/2 - $bsh/2; } - if ($cort == 'cell' || strpos($tablecorner,'R')!==false) { + if ($cort == 'cell' || strpos(($tablecorner ?? ''),'R')!==false) { if ($Bw > $Rw) $xadj2 = ($Bw - $Rw)/2; if ($Bw < $Rw) $xadj2 = ($Bw + $Rw)/2; } @@ -25798,7 +25815,7 @@ } } - if ($bSeparate && count($cellBorderOverlay)) { + if ($bSeparate && count(($cellBorderOverlay ?? []))) { foreach($cellBorderOverlay AS $cbo) { $this->SetLineWidth($cbo['lw']); $this->SetDColor($cbo['col']); @@ -25816,17 +25833,17 @@ /*-- TABLES-ADVANCED-BORDERS --*/ function _lightenColor($c) { if (is_array($c)) { die('Color error in _lightencolor'); } - if ($c{0}==3 || $c{0}==5) { // RGB - list($h,$s,$l) = $this->rgb2hsl(ord($c{1})/255,ord($c{2})/255,ord($c{3})/255); + if ($c[0]==3 || $c[0]==5) { // RGB + list($h,$s,$l) = $this->rgb2hsl(ord(($c[1] ?? ''))/255,ord(($c[2] ?? ''))/255,ord(($c[3] ?? ''))/255); $l += ((1 - $l)*0.8); list($r,$g,$b) = $this->hsl2rgb($h,$s,$l); $ret = array(3,$r,$g,$b); } - else if ($c{0}==4 || $c{0}==6) { // CMYK - $ret = array(4, max(0,(ord($c{1})-20)), max(0,(ord($c{2})-20)), max(0,(ord($c{3})-20)), max(0,(ord($c{4})-20)) ); - } - else if ($c{0}==1) { // Grayscale - $ret = array(1,min(255,(ord($c{1})+32))); + else if ($c[0]==4 || $c[0]==6) { // CMYK + $ret = array(4, max(0,(ord(($c[1] ?? ''))-20)), max(0,(ord(($c[2] ?? ''))-20)), max(0,(ord(($c[3] ?? ''))-20)), max(0,(ord(($c[4] ?? ''))-20)) ); + } + else if ($c[0]==1) { // Grayscale + $ret = array(1,min(255,(ord(($c[1] ?? ''))+32))); } $c = array_pad($ret, 6, 0); $cstr = pack("a1ccccc", $c[0], ($c[1] & 0xFF), ($c[2] & 0xFF), ($c[3] & 0xFF), ($c[4] & 0xFF), ($c[5] & 0xFF) ); @@ -25836,18 +25853,18 @@ function _darkenColor($c) { if (is_array($c)) { die('Color error in _darkenColor'); } - if ($c{0}==3 || $c{0}==5) { // RGB - list($h,$s,$l) = $this->rgb2hsl(ord($c{1})/255,ord($c{2})/255,ord($c{3})/255); + if ($c[0]==3 || $c[0]==5) { // RGB + list($h,$s,$l) = $this->rgb2hsl(ord(($c[1] ?? ''))/255,ord(($c[2] ?? ''))/255,ord(($c[3] ?? ''))/255); $s *= 0.25; $l *= 0.75; list($r,$g,$b) = $this->hsl2rgb($h,$s,$l); $ret = array(3,$r,$g,$b); } - else if ($c{0}==4 || $c{0}==6) { // CMYK - $ret = array(4, min(100,(ord($c{1})+20)), min(100,(ord($c{2})+20)), min(100,(ord($c{3})+20)), min(100,(ord($c{4})+20)) ); + else if ($c[0]==4 || $c[0]==6) { // CMYK + $ret = array(4, min(100,(ord(($c[1] ?? ''))+20)), min(100,(ord(($c[2] ?? ''))+20)), min(100,(ord(($c[3] ?? ''))+20)), min(100,(ord(($c[4] ?? ''))+20)) ); } - else if ($c{0}==1) { // Grayscale - $ret = array(1,max(0,(ord($c{1})-32))); + else if ($c[0]==1) { // Grayscale + $ret = array(1,max(0,(ord(($c[1] ?? ''))-32))); } $c = array_pad($ret, 6, 0); $cstr = pack("a1ccccc", $c[0], ($c[1] & 0xFF), ($c[2] & 0xFF), ($c[3] & 0xFF), ($c[4] & 0xFF), ($c[5] & 0xFF) ); @@ -26303,9 +26320,9 @@ if (isset($cell['colspan']) && $cell['colspan'] > 1) { $col -= ($cell['colspan']-1); } // Nested content if (isset($cell['textbuffer'])) { - for ($n=0; $n < count($cell['textbuffer']); $n++) { + for ($n=0; $n < count(($cell['textbuffer'] ?? [])); $n++) { $t = $cell['textbuffer'][$n][0]; - if (substr($t,0,19) == "\xbb\xa4\xactype=nestedtable") { + if (substr(($t ?? ''),0,19) == "\xbb\xa4\xactype=nestedtable") { $objattr = $this->_getObjAttr($t); $objattr['col'] = $col; $cell['textbuffer'][$n][0] = "\xbb\xa4\xactype=nestedtable,objattr=".serialize($objattr)."\xbb\xa4\xac"; @@ -26347,7 +26364,7 @@ } // Advance down page by half width of top border if ($table['borders_separate']) { - if ($startrow>0 && (!isset($table['is_thead']) || count($table['is_thead'])==0)) + if ($startrow>0 && (!isset($table['is_thead']) || count(($table['is_thead'] ?? []))==0)) $adv = $table['border_spacing_V']/2; else $adv = $table['padding']['T'] + $table['border_details']['T']['w'] + $table['border_spacing_V']/2; @@ -26505,7 +26522,7 @@ //Draw Table Contents and Borders for( $i = 0; $i < $numrows ; $i++ ) { //Rows if ($split && $startrow > 0) { - $thnr = (isset($table['is_thead']) ? count($table['is_thead']) : 0); + $thnr = (isset($table['is_thead']) ? count(($table['is_thead'] ?? [])) : 0); if ($i >= $thnr && $i < $startrow) { continue; } if ($i == $startrow){ $returny = $rety - $tableheaderrowheight; } } @@ -26719,7 +26736,7 @@ } if (isset($table['background-image'])) { - if ($table['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', $table['background-image']['gradient'] )) { + if ($table['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', ($table['background-image']['gradient'] ?? '') )) { $g = $this->grad->parseMozGradient( $table['background-image']['gradient'] ); if ($g) { $this->tableBackgrounds[$level*9+1][] = array('gradient'=>true, 'x'=>$bx, 'y'=>$by, 'w'=>$bw, 'h'=>$bh, 'gradtype'=>$g['type'], 'stops'=>$g['stops'], 'colorspace'=>$g['colorspace'], 'coords'=>$g['coords'], 'extend'=>$g['extend'], 'clippath'=>''); @@ -26746,12 +26763,12 @@ if ($this->tableBackgrounds) { $s = $this->PrintTableBackgrounds(); if ($this->bufferoutput) { - $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->headerbuffer); - $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", $this->headerbuffer ); + $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->headerbuffer ?? '')); + $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", ($this->headerbuffer ?? '') ); } else { - $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->pages[$this->page]); - $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", $this->pages[$this->page]); + $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->pages[$this->page] ?? '')); + $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", ($this->pages[$this->page] ?? '')); } $this->tableBackgrounds = array(); } @@ -27082,7 +27099,7 @@ } if (isset($cell['background-image']) && $paintcell) { - if (isset($cell['background-image']['gradient']) && $cell['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', $cell['background-image']['gradient'] )) { + if (isset($cell['background-image']['gradient']) && $cell['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', ($cell['background-image']['gradient'] ?? '') )) { $g = $this->grad->parseMozGradient( $cell['background-image']['gradient'] ); if ($g) { if ($table['borders_separate']) { @@ -27106,7 +27123,7 @@ } } else if (isset($cell['background-image']['image_id']) && $cell['background-image']['image_id']) { // Background pattern - $n = count($this->patterns)+1; + $n = count(($this->patterns ?? []))+1; if ($table['borders_separate']) { $px = $x+ ($table['border_spacing_H']/2); $py = $y+ ($table['border_spacing_V']/2); @@ -27231,25 +27248,25 @@ $this->cellLineStackingShift = $cell['cellLineStackingShift']; if ($level==1) { if (isset($table['is_tfoot'][$i]) && $table['is_tfoot'][$i]) { - if (preg_match('/{colsum([0-9]*)[_]*}/', $cell['textbuffer'][0][0], $m)) { + if (preg_match('/{colsum([0-9]*)[_]*}/', ($cell['textbuffer'][0][0] ?? ''), $m)) { $rep = sprintf("%01.".intval($m[1])."f", $this->colsums[$j]); - $cell['textbuffer'][0][0] = preg_replace('/{colsum[0-9_]*}/', $rep ,$cell['textbuffer'][0][0]); + $cell['textbuffer'][0][0] = preg_replace('/{colsum[0-9_]*}/', ($rep ?? '') ,($cell['textbuffer'][0][0] ?? '')); } } else if (!isset($table['is_thead'][$i])) { - if (isset($this->colsums[$j])) { $this->colsums[$j] += floatval(preg_replace('/^[^0-9\.\,]*/','',$cell['textbuffer'][0][0])); } - else { $this->colsums[$j] = floatval(preg_replace('/^[^0-9\.\,]*/','',$cell['textbuffer'][0][0])); } + if (isset($this->colsums[$j])) { $this->colsums[$j] += floatval(preg_replace('/^[^0-9\.\,]*/','',($cell['textbuffer'][0][0] ?? ''))); } + else { $this->colsums[$j] = floatval(preg_replace('/^[^0-9\.\,]*/','',($cell['textbuffer'][0][0] ?? ''))); } } } $opy = $this->y; // mPDF ITERATION if ($this->iterationCounter) { foreach($cell['textbuffer'] AS $k=>$t) { - if (preg_match('/{iteration ([a-zA-Z0-9_]+)}/',$t[0], $m)) { + if (preg_match('/{iteration ([a-zA-Z0-9_]+)}/',($t[0] ?? ''), $m)) { $vname = '__'.$m[1].'_'; if (!isset($this->$vname)) { $this->$vname = 1; } else { $this->$vname++; } - $cell['textbuffer'][$k][0] = preg_replace('/{iteration '.$m[1].'}/', $this->$vname, $cell['textbuffer'][$k][0]); + $cell['textbuffer'][$k][0] = preg_replace('/{iteration '.$m[1].'}/', ($this->$vname ?? ''), ($cell['textbuffer'][$k][0] ?? '')); } } } @@ -27277,7 +27294,7 @@ } $str = ''; foreach($cell['textbuffer'] AS $t) { $str .= $t[0].' '; } - $str = rtrim($str); + $str = rtrim(($str ?? '')); if (!isset($cell['va']) || $cell['va']=='M') { $this->y -= ($h-$cell['mih'])/2; //Undo what was added earlier VERTICAL ALIGN if ($angle > 0) { $this->y += (($h-$cell['mih'])/2) + $cell['padding']['T'] + ($cell['mih']-($cell['padding']['T'] + $cell['padding']['B'])); } @@ -27346,16 +27363,16 @@ } } $this->decimal_offset = 0; - if(substr($cell['a'],0,1) == 'D') { - if (isset($cell['colspan']) && $cell['colspan'] > 1) { $this->cellTextAlign = $c['a'] = substr($cell['a'],2,1); } + if(substr(($cell['a'] ?? ''),0,1) == 'D') { + if (isset($cell['colspan']) && $cell['colspan'] > 1) { $this->cellTextAlign = $c['a'] = substr(($cell['a'] ?? ''),2,1); } else { $smax = $table['decimal_align'][$j]['maxs0']; $d_content = $table['decimal_align'][$j]['maxs0'] + $table['decimal_align'][$j]['maxs1']; $this->decimal_offset = $smax; $extra = ($w - $d_content - $wadj); if ($extra > 0) { - if(substr($cell['a'],2,1) == 'R') { $this->decimal_offset += $extra; } - else if(substr($cell['a'],2,1) == 'C') { $this->decimal_offset += ($extra)/2; } + if(substr(($cell['a'] ?? ''),2,1) == 'R') { $this->decimal_offset += $extra; } + else if(substr(($cell['a'] ?? ''),2,1) == 'C') { $this->decimal_offset += ($extra)/2; } } } } @@ -27393,7 +27410,7 @@ } } if (isset($table['trbackground-images'][$i]) && ($j==0 || $table['borders_separate'])) { - if (isset($table['trbackground-images'][$i]['gradient']) && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', $table['trbackground-images'][$i]['gradient'] )) { + if (isset($table['trbackground-images'][$i]['gradient']) && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', ($table['trbackground-images'][$i]['gradient'] ?? '') )) { $g = $this->grad->parseMozGradient( $table['trbackground-images'][$i]['gradient'] ); if ($g) { $gx = $x0; @@ -27501,7 +27518,7 @@ /*-- COLUMNS --*/ if ($this->ColActive) { if (!$this->table_keep_together && $i < $numrows-1 && $level==1) { $this->breakpoints[$this->CurrCol][] = $y + $h; } // mPDF 6 - if (count($this->cellBorderBuffer)) { $this->printcellbuffer(); } + if (count(($this->cellBorderBuffer ?? []))) { $this->printcellbuffer(); } } /*-- END COLUMNS --*/ @@ -27516,7 +27533,7 @@ if ($this->progressBar) { $this->UpdateProgressBar(7,70,' '); } // *PROGRESS-BAR* - if (count($this->cellBorderBuffer)) { $this->printcellbuffer(); } + if (count(($this->cellBorderBuffer ?? []))) { $this->printcellbuffer(); } if ($this->tableClipPath ) { $this->_out("Q"); } @@ -27592,7 +27609,7 @@ } if (isset($table['background-image'])) { - if (isset($table['background-image']['gradient']) && $table['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', $table['background-image']['gradient'] )) { + if (isset($table['background-image']['gradient']) && $table['background-image']['gradient'] && preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient/', ($table['background-image']['gradient'] ?? '') )) { $g = $this->grad->parseMozGradient( $table['background-image']['gradient'] ); if ($g) { $this->tableBackgrounds[$level*9+1][] = array('gradient'=>true, 'x'=>$bx, 'y'=>$by, 'w'=>$bw, 'h'=>$bh, 'gradtype'=>$g['type'], 'stops'=>$g['stops'], 'colorspace'=>$g['colorspace'], 'coords'=>$g['coords'], 'extend'=>$g['extend'], 'clippath'=>''); @@ -27618,16 +27635,16 @@ if ($this->tableBackgrounds && $level == 1) { $s = $this->PrintTableBackgrounds(); if ($this->table_rotate && !$this->processingHeader && !$this->processingFooter) { - $this->tablebuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->tablebuffer); - if ($level == 1) { $this->tablebuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", $this->tablebuffer); } + $this->tablebuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->tablebuffer ?? '')); + if ($level == 1) { $this->tablebuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", ($this->tablebuffer ?? '')); } } else if ($this->bufferoutput) { - $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->headerbuffer); - if ($level == 1) { $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", $this->headerbuffer ); } + $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->headerbuffer ?? '')); + if ($level == 1) { $this->headerbuffer = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", ($this->headerbuffer ?? '') ); } } else { - $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", $this->pages[$this->page]); - if ($level == 1) { $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", $this->pages[$this->page]); } + $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', '\\1'."\n".$s."\n", ($this->pages[$this->page] ?? '')); + if ($level == 1) { $this->pages[$this->page] = preg_replace('/(___TABLE___BACKGROUNDS'.$this->uniqstr.')/', " ", ($this->pages[$this->page] ?? '')); } } $this->tableBackgrounds = array(); } @@ -27664,7 +27681,7 @@ /*-- END TABLES --*/ function _putextgstates() { - for ($i = 1; $i <= count($this->extgstates); $i++) { + for ($i = 1; $i <= count(($this->extgstates ?? [])); $i++) { $this->_newobj(); $this->extgstates[$i]['n'] = $this->n; $this->_out('<</Type /ExtGState'); @@ -27693,7 +27710,7 @@ $this->_out('/Usage <</Print <</PrintState /OFF>> /View <</ViewState /OFF>>>>>>'); $this->_out('endobj'); } - if (count($this->layers)) { + if (count(($this->layers ?? []))) { ksort($this->layers); foreach($this->layers as $id=>$layer) { $this->_newobj(); @@ -27713,7 +27730,7 @@ // from mPDFI function _putimportedobjects() { - if (is_array($this->parsers) && count($this->parsers) > 0) { + if (is_array($this->parsers) && count(($this->parsers ?? [])) > 0) { foreach($this->parsers AS $filename => $p) { $this->current_parser =& $this->parsers[$filename]; if (is_array($this->_obj_stack[$filename])) { @@ -27765,21 +27782,21 @@ $this->pdf_write_value($tpl['resources']); } else { $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'); - if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) { + if (isset($this->_res['tpl'][$tplidx]['fonts']) && count(($this->_res['tpl'][$tplidx]['fonts'] ?? []))) { $this->_out('/Font <<'); foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) $this->_out('/F'.$font['i'].' '.$font['n'].' 0 R'); $this->_out('>>'); } - if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || - isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) + if(isset($this->_res['tpl'][$tplidx]['images']) && count(($this->_res['tpl'][$tplidx]['images'] ?? [])) || + isset($this->_res['tpl'][$tplidx]['tpls']) && count(($this->_res['tpl'][$tplidx]['tpls'] ?? []))) { $this->_out('/XObject <<'); - if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) { + if (isset($this->_res['tpl'][$tplidx]['images']) && count(($this->_res['tpl'][$tplidx]['images'] ?? []))) { foreach($this->_res['tpl'][$tplidx]['images'] as $image) $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R'); } - if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) { + if (isset($this->_res['tpl'][$tplidx]['tpls']) && count(($this->_res['tpl'][$tplidx]['tpls'] ?? []))) { foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $itpl) $this->_out($this->tplprefix.$i.' '.$itpl['n'].' 0 R'); } @@ -27788,7 +27805,7 @@ $this->_out('>>'); } - $this->_out('/Length '.strlen($p).' >>'); + $this->_out('/Length '.strlen(($p ?? '')).' >>'); $this->_putstream($p); $this->_out('endobj'); } @@ -27798,7 +27815,7 @@ function _putpatterns() { - for ($i = 1; $i <= count($this->patterns); $i++) { + for ($i = 1; $i <= count(($this->patterns ?? [])); $i++) { $x = $this->patterns[$i]['x']; $y = $this->patterns[$i]['y']; $w = $this->patterns[$i]['w']; @@ -27861,7 +27878,7 @@ // Set in classes/svg array['fo'] = true // Required that _putshaders comes before _putpatterns in _putresources // This adds any resources associated with any FormObject to every Formobject - overkill but works! - if (count($this->extgstates)) { + if (count(($this->extgstates ?? []))) { $this->_out('/ExtGState <<'); foreach($this->extgstates as $k=>$extgstate) if (isset($extgstate['fo']) && $extgstate['fo']) { @@ -27871,7 +27888,7 @@ $this->_out('>>'); } /*-- BACKGROUNDS --*/ - if (isset($this->gradients) AND (count($this->gradients) > 0)) { + if (isset($this->gradients) AND (count(($this->gradients ?? [])) > 0)) { $this->_out('/Shading <<'); foreach ($this->gradients as $id => $grad) { if (isset($grad['fo']) && $grad['fo']) { @@ -27927,7 +27944,7 @@ $this->_out('/Filter /FlateDecode'); $s = gzcompress($s); } - $this->_out('/Length '.strlen($s).'>>'); + $this->_out('/Length '.strlen(($s ?? '')).'>>'); $this->_putstream($s); $this->_out('endobj'); } @@ -27935,7 +27952,7 @@ /*-- BACKGROUNDS --*/ function _putshaders() { - $maxid = count($this->gradients); //index for transparency gradients + $maxid = count(($this->gradients ?? [])); //index for transparency gradients foreach ($this->gradients as $id => $grad) { if (($grad['type'] == 2 || $grad['type'] == 3) && empty($grad['is_mask'])) { $this->_newobj(); @@ -27945,7 +27962,7 @@ $fn = array(); $bd = array(); $en = array(); - for($i=0; $i<(count($grad['stops'])-1); $i++) { + for($i=0; $i<(count(($grad['stops'] ?? []))-1); $i++) { $fn[] = ($this->n+1+$i).' 0 R'; $en[] = '0 1'; if ($i>0) { $bd[] = sprintf('%.3F', $grad['stops'][$i]['offset']); } @@ -27956,7 +27973,7 @@ $this->_out('>>'); $this->_out('endobj'); $f1 = $this->n; - for($i=0; $i<(count($grad['stops'])-1); $i++) { + for($i=0; $i<(count(($grad['stops'] ?? []))-1); $i++) { $this->_newobj(); $this->_out('<<'); $this->_out('/FunctionType 2'); @@ -27977,7 +27994,7 @@ $fn = array(); $bd = array(); $en = array(); - for($i=0; $i<(count($grad['stops'])-1); $i++) { + for($i=0; $i<(count(($grad['stops'] ?? []))-1); $i++) { $fn[] = ($this->n+1+$i).' 0 R'; $en[] = '0 1'; if ($i>0) { $bd[] = sprintf('%.3F', $grad['stops'][$i]['offset']); } @@ -27988,7 +28005,7 @@ $this->_out('>>'); $this->_out('endobj'); $f2 = $this->n; - for($i=0; $i<(count($grad['stops'])-1); $i++) { + for($i=0; $i<(count(($grad['stops'] ?? []))-1); $i++) { $this->_newobj(); $this->_out('<<'); $this->_out('/FunctionType 2'); @@ -28034,7 +28051,7 @@ else if ($grad['colorspace'] == 'Gray') { $this->_out('/Decode[0 1 0 1 0 1]'); } else { $this->_out('/Decode[0 1 0 1 0 1 0 1 0 1]'); } $this->_out('/BitsPerFlag 8'); - $this->_out('/Length '.strlen($grad['stream'])); + $this->_out('/Length '.strlen(($grad['stream'] ?? ''))); $this->_out('>>'); $this->_putstream($grad['stream']); } @@ -28082,7 +28099,7 @@ $this->_out('/BitsPerComponent 8'); $this->_out('/Decode[0 1 0 1 0 1]'); $this->_out('/BitsPerFlag 8'); - $this->_out('/Length '.strlen($grad['stream_trans'])); + $this->_out('/Length '.strlen(($grad['stream_trans'] ?? ''))); $this->_out('>>'); $this->_putstream($grad['stream_trans']); } @@ -28101,7 +28118,7 @@ $filter=($this->compress) ? '/Filter /FlateDecode ' : ''; $p=($this->compress) ? gzcompress($str) : $str; $this->_out('<< /Type /XObject /Subtype /Form /FormType 1 '.$filter); - $this->_out('/Length '.strlen($p)); + $this->_out('/Length '.strlen(($p ?? ''))); $this->_out('/BBox [-'.($this->wPt/2).' -'.($this->hPt/2).' '.(2*$this->wPt).' '.(2*$this->hPt).']'); $this->_out('/Group << /Type /Group /S /Transparency /CS /DeviceGray >>'); $this->_out('/Resources <<'); @@ -28125,7 +28142,7 @@ function _putspotcolors() { foreach($this->spotColors as $name=>$color) { $this->_newobj(); - $this->_out('[/Separation /'.str_replace(' ','#20',$name)); + $this->_out('[/Separation /'.str_replace(' ','#20',($name ?? ''))); $this->_out('/DeviceCMYK <<'); $this->_out('/Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0] '); $this->_out(sprintf('/C1 [%.3F %.3F %.3F %.3F] ',$color['c']/100,$color['m']/100,$color['y']/100,$color['k']/100)); @@ -28137,7 +28154,7 @@ function _putresources() { - if ($this->hasOC || count($this->layers)) + if ($this->hasOC || count(($this->layers ?? []))) $this->_putocg(); $this->_putextgstates(); $this->_putspotcolors(); @@ -28161,7 +28178,7 @@ //Resource dictionary - $this->offsets[2]=strlen($this->buffer); + $this->offsets[2]=strlen(($this->buffer ?? '')); $this->_out('2 0 obj'); $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'); @@ -28179,14 +28196,14 @@ } $this->_out('>>'); - if (count($this->spotColors)) { + if (count(($this->spotColors ?? []))) { $this->_out('/ColorSpace <<'); foreach($this->spotColors as $color) $this->_out('/CS'.$color['i'].' '.$color['n'].' 0 R'); $this->_out('>>'); } - if (count($this->extgstates)) { + if (count(($this->extgstates ?? []))) { $this->_out('/ExtGState <<'); foreach($this->extgstates as $k=>$extgstate) if (isset($extgstate['trans'])) $this->_out('/'.$extgstate['trans'].' '.$extgstate['n'].' 0 R'); @@ -28195,7 +28212,7 @@ } /*-- BACKGROUNDS --*/ - if ((isset($this->gradients) AND (count($this->gradients) > 0)) || ($this->enableImports && count($this->tpls))) { // mPDF 5.7.3 + if ((isset($this->gradients) AND (count(($this->gradients ?? [])) > 0)) || ($this->enableImports && count(($this->tpls ?? [])))) { // mPDF 5.7.3 $this->_out('/Shading <<'); foreach ($this->gradients as $id => $grad) { $this->_out('/Sh'.$id.' '.$grad['id'].' 0 R'); @@ -28204,14 +28221,14 @@ // If a shading dictionary is in an object (tpl) imported from another PDF, it needs to be included // in the document resources, as well as the object resources // Otherwise get an error in some PDF viewers - if ($this->enableImports && count($this->tpls)) { + if ($this->enableImports && count(($this->tpls ?? []))) { foreach($this->tpls as $tplidx => $tpl) { if (isset($tpl['resources'])) { $this->current_parser =& $tpl['parser']; reset ($tpl['resources'][1]); - while (list($k, $v) = each($tpl['resources'][1])) { + foreach ($tpl['resources'][1] as $k => $v) { if ($k == '/Shading') { - while (list($k2, $v2) = each($v[1])) { + foreach ($v[1] as $k2 => $v2) { $this->_out($k2 . " ",false); $this->pdf_write_value($v2); } @@ -28236,14 +28253,14 @@ /*-- END BACKGROUNDS --*/ - if(count($this->images) || count($this->formobjects) || ($this->enableImports && count($this->tpls))) { + if(count(($this->images ?? [])) || count(($this->formobjects ?? [])) || ($this->enableImports && count(($this->tpls ?? [])))) { $this->_out('/XObject <<'); foreach($this->images as $image) $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R'); foreach($this->formobjects as $formobject) $this->_out('/FO'.$formobject['i'].' '.$formobject['n'].' 0 R'); /*-- IMPORTS --*/ - if ($this->enableImports && count($this->tpls)) { + if ($this->enableImports && count(($this->tpls ?? []))) { foreach($this->tpls as $tplidx => $tpl) { $this->_out($this->tplprefix.$tplidx.' '.$tpl['n'].' 0 R'); } @@ -28254,7 +28271,7 @@ /*-- BACKGROUNDS --*/ - if (count($this->patterns)) { + if (count(($this->patterns ?? []))) { $this->_out('/Pattern <<'); foreach($this->patterns as $k=>$patterns) $this->_out('/P'.$k.' '.$patterns['n'].' 0 R'); @@ -28262,12 +28279,12 @@ } /*-- END BACKGROUNDS --*/ - if ($this->hasOC || count($this->layers)) { + if ($this->hasOC || count(($this->layers ?? []))) { $this->_out('/Properties <<'); if ($this->hasOC) { $this->_out('/OC1 '.$this->n_ocg_print.' 0 R /OC2 '.$this->n_ocg_view.' 0 R /OC3 '.$this->n_ocg_hidden.' 0 R '); } - if (count($this->layers)) { + if (count(($this->layers ?? []))) { foreach($this->layers as $id=>$layer) $this->_out('/ZI'.$id.' '.$layer['n'].' 0 R'); } @@ -28354,7 +28371,7 @@ /*-- ENCRYPTION --*/ function SetProtection($permissions=array(),$user_pass='',$owner_pass=null, $length=40) { $this->encrypted=false; - if (is_string($permissions) && strlen($permissions)>0) { $permissions = array($permissions); } + if (is_string($permissions) && strlen(($permissions ?? ''))>0) { $permissions = array($permissions); } else if (!is_array($permissions)) { return 0; } $this->last_rc4_key=''; $this->padding="\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08". @@ -28395,18 +28412,18 @@ $len = 16; else $len = 10; - return substr($this->_md5_16($this->encryption_key.pack('VXxx',$n)),0,$len); + return substr(($this->_md5_16($this->encryption_key.pack('VXxx',$n)) ?? ''),0,$len); } // RC4 is the standard encryption algorithm used in PDF format function _RC4($key, $text) { if ($this->last_rc4_key != $key) { - $k = str_repeat($key, 256/strlen($key)+1); + $k = str_repeat(($key ?? ''), 256/strlen(($key ?? ''))+1); $rc4 = range(0,255); $j = 0; for ($i=0; $i<256; $i++){ $t = $rc4[$i]; - $j = ($j + $t + ord($k[$i])) % 256; + $j = ($j + $t + ord(($k[$i] ?? ''))) % 256; $rc4[$i] = $rc4[$j]; $rc4[$j] = $t; } @@ -28416,7 +28433,7 @@ $rc4 = $this->last_rc4_key_c; } - $len = strlen($text); + $len = strlen(($text ?? '')); $a = 0; $b = 0; $out = ''; @@ -28427,14 +28444,14 @@ $rc4[$a] = $rc4[$b]; $rc4[$b] = $t; $k = $rc4[($rc4[$a]+$rc4[$b])%256]; - $out.= chr(ord($text[$i]) ^ $k); + $out.= chr((int) (ord(($text[$i] ?? '')) ^ $k)); } return $out; } // Get MD5 as binary string function _md5_16($string) { - return pack('H*',md5($string)); + return pack('H*',md5(($string ?? ''))); } // Compute O value @@ -28449,14 +28466,14 @@ $keybytelen = (128 / 8); else $keybytelen = (40 / 8); - $owner_RC4_key = substr($tmp,0,$keybytelen); + $owner_RC4_key = substr(($tmp ?? ''),0,$keybytelen); $enc = $this->_RC4($owner_RC4_key, $user_pass); if ($this->useRC128encryption) { - $len = strlen($owner_RC4_key); + $len = strlen(($owner_RC4_key ?? '')); for ($i = 1; $i <= 19; ++$i) { $key = ''; for ($j = 0; $j < $len; ++$j) { - $key .= chr(ord($owner_RC4_key{$j}) ^ $i); + $key .= chr((int) (ord(($owner_RC4_key[$j] ?? '')) ^ $i)); } $enc = $this->_RC4($key, $enc); } @@ -28469,16 +28486,16 @@ if ($this->useRC128encryption) { $tmp = $this->_md5_16($this->padding.$this->_hexToString($this->uniqid)); $enc = $this->_RC4($this->encryption_key, $tmp); - $len = strlen($tmp); + $len = strlen(($tmp ?? '')); for ($i=1; $i<=19; ++$i) { $key = ''; for ($j=0; $j<$len; ++$j) { - $key .= chr(ord($this->encryption_key{$j}) ^ $i); + $key .= chr((int) (ord(($this->encryption_key[$j] ?? '')) ^ $i)); } $enc = $this->_RC4($key, $enc); } $enc .= str_repeat("\x00", 16); - return substr($enc, 0, 32); + return substr(($enc ?? ''), 0, 32); } else { return $this->_RC4($this->encryption_key, $this->padding); @@ -28492,8 +28509,8 @@ $owner_pass = substr($owner_pass.$this->padding,0,32); $chars = 'ABCDEF1234567890'; $id = ''; - for ($i=0; $i<32; $i++) { $id .= $chars{rand(0, 15)}; } - $this->uniqid = md5($id); + for ($i=0; $i<32; $i++) { $id .= $chars[rand(0, 15)]; } + $this->uniqid = md5(($id ?? '')); // Compute O value $this->Ovalue = $this->_Ovalue($user_pass,$owner_pass); // Compute encyption key @@ -28502,17 +28519,17 @@ else $keybytelen = (40/8); $prot = sprintf('%032b', $protection); - $perms = chr(bindec(substr($prot,24,8))); - $perms .= chr(bindec(substr($prot,16,8))); - $perms .= chr(bindec(substr($prot,8,8))); - $perms .= chr(bindec(substr($prot,0,8))); + $perms = chr((int) (bindec(substr(($prot ?? ''),24,8)))); + $perms .= chr((int) (bindec(substr(($prot ?? ''),16,8)))); + $perms .= chr((int) (bindec(substr(($prot ?? ''),8,8)))); + $perms .= chr((int) (bindec(substr(($prot ?? ''),0,8)))); $tmp = $this->_md5_16($user_pass.$this->Ovalue.$perms.$this->_hexToString($this->uniqid)); if ($this->useRC128encryption) { for ($i=0; $i<50; ++$i) { - $tmp = $this->_md5_16(substr($tmp, 0, $keybytelen)); - } - } - $this->encryption_key = substr($tmp,0,$keybytelen); + $tmp = $this->_md5_16(substr(($tmp ?? ''), 0, $keybytelen)); + } + } + $this->encryption_key = substr(($tmp ?? ''),0,$keybytelen); // Compute U value $this->Uvalue = $this->_Uvalue(); // Compute P value @@ -28522,13 +28539,13 @@ function _hexToString($hs) { $s = ''; - $len = strlen($hs); + $len = strlen(($hs ?? '')); if (($len % 2) != 0) { $hs .= '0'; ++$len; } for ($i = 0; $i < $len; $i += 2) { - $s .= chr(hexdec($hs{$i}.$hs{($i + 1)})); + $s .= chr((int) (hexdec($hs[$i].$hs[($i + 1)]))); } return $s; } @@ -28573,14 +28590,14 @@ function _putbookmarks() { - $nb=count($this->BMoutlines); + $nb=count(($this->BMoutlines ?? [])); if($nb==0) return; $bmo = $this->BMoutlines; $this->BMoutlines = array(); $lastlevel = -1; - for($i=0;$i<count($bmo);$i++) { + for($i=0;$i<count(($bmo ?? []));$i++) { if ($bmo[$i]['l']>0) { while($bmo[$i]['l']-$lastlevel > 1) { // If jump down more than one level, insert a new entry $new = $bmo[$i]; @@ -28593,7 +28610,7 @@ $this->BMoutlines[] = $bmo[$i]; $lastlevel = $bmo[$i]['l']; } - $nb=count($this->BMoutlines); + $nb=count(($this->BMoutlines ?? [])); $lru=array(); $level=0; @@ -28646,12 +28663,12 @@ // font style $bms = $this->bookmarkStyles[$o['l']]['style']; $style = 0; - if (strpos($bms,'B') !== false) { $style += 2; } - if (strpos($bms,'I') !== false) { $style += 1; } + if (strpos(($bms ?? ''),'B') !== false) { $style += 2; } + if (strpos(($bms ?? ''),'I') !== false) { $style += 1; } $this->_out(sprintf('/F %d', $style)); // Colour $col = $this->bookmarkStyles[$o['l']]['color']; - if (isset($col) && is_array($col) && count($col)==3) { + if (isset($col) && is_array($col) && count(($col ?? []))==3) { $this->_out(sprintf('/C [%.3F %.3F %.3F]', ($col[0]/255), ($col[1]/255), ($col[2]/255))); } } @@ -28744,7 +28761,7 @@ if($this->state==0) $this->AddPage(); if ($this->y == $this->tMargin && (!$this->mirrorMargins ||($this->mirrorMargins && $this->page % 2==1))) { // Don't add a page - if ($this->page==1 && count($this->PageNumSubstitutions)==0) { + if ($this->page==1 && count(($this->PageNumSubstitutions ?? []))==0) { if (!$suppress) { $suppress = 'off'; } //$this->PageNumSubstitutions[] = array('from'=>1, 'reset'=> $resetpagenum, 'type'=>$pagenumstyle, 'suppress'=> $suppress); } @@ -28770,9 +28787,9 @@ $this->internallink['#'.$uid] = $linkn; $this->SetLink($linkn,$ily,$this->page); - if (strtoupper($toc_id)=='ALL') { $toc_id = '_mpdf_all'; } + if (strtoupper(($toc_id ?? ''))=='ALL') { $toc_id = '_mpdf_all'; } else if (!$toc_id) { $toc_id = 0; } - else { $toc_id = strtolower($toc_id); } + else { $toc_id = strtolower(($toc_id ?? '')); } $btoc = array('t'=>$txt,'l'=>$level,'p'=>$this->page, 'link'=>$linkn, 'toc_id'=>$toc_id); if ($this->keep_block_together) { // do nothing @@ -28802,7 +28819,7 @@ $n_toc = $end_page - $start_page + 1; // Set/Update PageNumSubstitutions changes before moving anything - if (count($this->PageNumSubstitutions)) { + if (count(($this->PageNumSubstitutions ?? []))) { $tp_present = false; $sp_present = false; $ep_present = false; @@ -28862,12 +28879,12 @@ /*-- END BOOKMARKS --*/ // Update Page Links - if (count($this->PageLinks)) { + if (count(($this->PageLinks ?? []))) { $newarr = array(); foreach($this->PageLinks as $i=>$o) { foreach($this->PageLinks[$i] as $key => $pl) { - if (strpos($pl[4],'@')===0) { - $p=substr($pl[4],1); + if (strpos(($pl[4] ?? ''),'@')===0) { + $p=substr(($pl[4] ?? ''),1); if($p>=$start_page && $p<=$end_page) { $this->PageLinks[$i][$key][4] = '@'.($p + ($target_page - $start_page)); } @@ -28890,7 +28907,7 @@ } // OrientationChanges - if (count($this->OrientationChanges)) { + if (count(($this->OrientationChanges ?? []))) { $newarr = array(); foreach($this->OrientationChanges AS $p=>$v) { if($p>=$start_page && $p<=$end_page) { $newarr[($p + ($target_page - $start_page))] = $this->OrientationChanges[$p]; } @@ -28902,7 +28919,7 @@ } // Page Dimensions - if (count($this->pageDim)) { + if (count(($this->pageDim ?? []))) { $newarr = array(); foreach($this->pageDim AS $p=>$v) { if($p>=$start_page && $p<=$end_page) { $newarr[($p + ($target_page - $start_page))] = $this->pageDim[$p]; } @@ -28914,7 +28931,7 @@ } // HTML Headers & Footers - if (count($this->saveHTMLHeader)) { + if (count(($this->saveHTMLHeader ?? []))) { $newarr = array(); foreach($this->saveHTMLHeader AS $p=>$v) { if($p>=$start_page && $p<=$end_page) { $newarr[($p + ($target_page - $start_page))] = $this->saveHTMLHeader[$p]; } @@ -28924,7 +28941,7 @@ ksort($newarr); $this->saveHTMLHeader = $newarr; } - if (count($this->saveHTMLFooter)) { + if (count(($this->saveHTMLFooter ?? []))) { $newarr = array(); foreach($this->saveHTMLFooter AS $p=>$v) { if($p>=$start_page && $p<=$end_page) { $newarr[($p + ($target_page - $start_page))] = $this->saveHTMLFooter[$p]; } @@ -28936,7 +28953,7 @@ } // Update Internal Links - if (count($this->internallink)) { + if (count(($this->internallink ?? []))) { foreach($this->internallink as $key=>$o) { if($o['PAGE']>=$start_page && $o['PAGE']<=$end_page) { $this->internallink[$key]['PAGE'] += ($target_page - $start_page); @@ -28948,7 +28965,7 @@ } // Update Links - if (count($this->links)) { + if (count(($this->links ?? []))) { foreach($this->links as $key=>$o) { if($o[0]>=$start_page && $o[0]<=$end_page) { $this->links[$key][0] += ($target_page - $start_page); @@ -28960,7 +28977,7 @@ } // Update Form fields - if (count($this->mpdfform->forms)) { + if (count(($this->mpdfform->forms ?? []))) { foreach($this->mpdfform->forms as $key=>$f) { if($f['page']>=$start_page && $f['page']<=$end_page) { $this->mpdfform->forms[$key]['page'] += ($target_page - $start_page); @@ -28973,7 +28990,7 @@ /*-- ANNOTATIONS --*/ // Update Annotations - if (count($this->PageAnnots)) { + if (count(($this->PageAnnots ?? []))) { $newarr = array(); foreach($this->PageAnnots as $p=>$anno) { if($p>=$start_page && $p<=$end_page) { @@ -28998,7 +29015,7 @@ /*-- END ANNOTATIONS --*/ // Update PageNumSubstitutions - if (count($this->PageNumSubstitutions)) { + if (count(($this->PageNumSubstitutions ?? []))) { $newarr = array(); foreach($this->PageNumSubstitutions AS $k=>$v) { if($this->PageNumSubstitutions[$k]['from']>=$start_page && $this->PageNumSubstitutions[$k]['from']<=$end_page) { @@ -29020,7 +29037,7 @@ if (!$tp_present) { $newarr[($target_page + $n_toc)] = array('from'=>($target_page+$n_toc), 'suppress'=>$tp_suppress, 'reset'=>$tp_reset, 'type'=>$tp_type); } - if (!$ep_present && $end_page>count($this->pages)) { + if (!$ep_present && $end_page>count(($this->pages ?? []))) { $newarr[($end_page+1)] = array('from'=>($end_page+1), 'suppress'=>$ep_suppress, 'reset'=>$ep_reset, 'type'=>$ep_type); } ksort($newarr); @@ -29036,7 +29053,7 @@ // move a page/pages EARLIER in the document if ($end_page<1) { $end_page = $start_page; } $n_tod = $end_page - $start_page + 1; - $last_page = count($this->pages); + $last_page = count(($this->pages ?? [])); $n_atend = $last_page - $end_page + 1; //move pages @@ -29057,12 +29074,12 @@ /*-- END BOOKMARKS --*/ // Update Page Links - if (count($this->PageLinks)) { + if (count(($this->PageLinks ?? []))) { $newarr = array(); foreach($this->PageLinks as $i=>$o) { foreach($this->PageLinks[$i] as $key => $pl) { - if (strpos($pl[4],'@')===0) { - $p=substr($pl[4],1); + if (strpos(($pl[4] ?? ''),'@')===0) { + $p=substr(($pl[4] ?? ''),1); if($p>$end_page) { $this->PageLinks[$i][$key][4] = '@'.($p - $n_tod); } else if($p<$start_page) { unset($this->PageLinks[$i][$key]); } } @@ -29074,7 +29091,7 @@ } // OrientationChanges - if (count($this->OrientationChanges)) { + if (count(($this->OrientationChanges ?? []))) { $newarr = array(); foreach($this->OrientationChanges AS $p=>$v) { if($p>$end_page) { $newarr[($p - $t_tod)] = $this->OrientationChanges[$p]; } @@ -29085,7 +29102,7 @@ } // Page Dimensions - if (count($this->pageDim)) { + if (count(($this->pageDim ?? []))) { $newarr = array(); foreach($this->pageDim AS $p=>$v) { if($p>$end_page) { $newarr[($p - $n_tod)] = $this->pageDim[$p]; } @@ -29096,7 +29113,7 @@ } // HTML Headers & Footers - if (count($this->saveHTMLHeader)) { + if (count(($this->saveHTMLHeader ?? []))) { foreach($this->saveHTMLHeader AS $p=>$v) { if($p>$end_page) { $newarr[($p - $n_tod)] = $this->saveHTMLHeader[$p]; } // mPDF 5.7.3 else if($p<$start_page) { $newarr[$p] = $this->saveHTMLHeader[$p]; } @@ -29104,7 +29121,7 @@ ksort($newarr); $this->saveHTMLHeader = $newarr; } - if (count($this->saveHTMLFooter)) { + if (count(($this->saveHTMLFooter ?? []))) { $newarr = array(); foreach($this->saveHTMLFooter AS $p=>$v) { if($p>$end_page) { $newarr[($p - $n_tod)] = $this->saveHTMLFooter[$p]; } @@ -29134,7 +29151,7 @@ /*-- ANNOTATIONS --*/ // Update Annotations - if (count($this->PageAnnots)) { + if (count(($this->PageAnnots ?? []))) { $newarr = array(); foreach($this->PageAnnots as $p=>$anno) { if($p>$end_page) { foreach($anno as $o) { $newarr[($p - $n_tod)][] = $o; } } @@ -29152,7 +29169,7 @@ } unset($newarr); - $this->page = count($this->pages); + $this->page = count(($this->pages ?? [])); } @@ -29174,7 +29191,7 @@ } /*-- TABLES --*/ else if ($this->kwt) { - $size=count($this->kwt_Reference); + $size=count(($this->kwt_Reference ?? [])); for ($i=0;$i<$size;$i++){ if (isset($this->kwt_Reference[$i]['t']) && $this->kwt_Reference[$i]['t']==$txt){ $Present = true; @@ -29189,7 +29206,7 @@ } /*-- END TABLES --*/ else { - $size=count($this->Reference); + $size=count(($this->Reference ?? [])); for ($i=0;$i<$size;$i++){ if (isset($this->Reference[$i]['t']) && $this->Reference[$i]['t']==$txt){ $Present = true; @@ -29209,19 +29226,19 @@ function IndexEntrySee($txta,$txtb) { if ($this->directionality == 'rtl') { // *OTL* // ONLY DO THIS IF NOT IN TAGS - if ($txta == strip_tags($txta)) $txta = str_replace(':',' - ',$txta); // *OTL* - if ($txtb == strip_tags($txtb)) $txtb = str_replace(':',' - ',$txtb); // *OTL* + if ($txta == strip_tags($txta)) $txta = str_replace(':',' - ',($txta ?? '')); // *OTL* + if ($txtb == strip_tags($txtb)) $txtb = str_replace(':',' - ',($txtb ?? '')); // *OTL* } // *OTL* else { // *OTL* - if ($txta == strip_tags($txta)) $txta = str_replace(':',', ',$txta); - if ($txtb == strip_tags($txtb)) $txtb = str_replace(':',', ',$txtb); + if ($txta == strip_tags($txta)) $txta = str_replace(':',', ',($txta ?? '')); + if ($txtb == strip_tags($txtb)) $txtb = str_replace(':',', ',($txtb ?? '')); } // *OTL* $this->Reference[]=array('t'=>$txta.' - see '.$txtb,'p'=>array()); } function InsertIndex($usedivletters=1, $useLinking=false, $indexCollationLocale='', $indexCollationGroup='') { - $size=count($this->Reference); + $size=count(($this->Reference ?? [])); if ($size == 0) { return false; } // $spacer used after named entry @@ -29251,7 +29268,7 @@ else { $collation = array(); } for ($i=0;$i<$size;$i++){ if ($this->Reference[$i]['uf']) { - $l = mb_substr($this->Reference[$i]['uf'],0,1,'UTF-8'); + $l = mb_substr(($this->Reference[$i]['uf'] ?? ''),0,1,'UTF-8'); if (isset($this->indexCollationGroup) && $this->indexCollationGroup) { $uni = $this->UTF8StringToArray($l); $ucode = $uni[0]; @@ -29265,7 +29282,7 @@ if (!function_exists('cmp')) { function cmp ($a, $b) { - return strcoll(strtolower($a['uf']), strtolower($b['uf'])); + return strcoll(strtolower(($a['uf'] ?? '')), strtolower(($b['uf'] ?? ''))); } } //Alphabetic sort of the references @@ -29289,17 +29306,17 @@ // Sub-entries e.g. Mammals:elephant // But allow for tags e.g. <b>Mammal</b>:elephants - $a=preg_split('/(<.*?>)/',$txt,-1,PREG_SPLIT_DELIM_CAPTURE); + $a=preg_split('/(<.*?>)/',($txt ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); $txt = ''; $marker = false; foreach($a as $k => $e) { if($k%2==0 && !$marker) { - if (strpos($e, ':')!==false) { // == SubEntry + if (strpos(($e ?? ''), ':')!==false) { // == SubEntry if ($this->indexUseSubentries) { // If the Main entry does not have any page numbers associated with it // create and insert an entry - list($txtmain,$sub) = preg_split('/[:]/', $e, 2); + list($txtmain,$sub) = preg_split('/[:]/', ($e ?? ''), 2); if (strip_tags($txt.$txtmain) != $mainentry) { $html .= '<div class="mpdf_index_entry">'.$txt.$txtmain.'</div>'; $mainentry = strip_tags($txt.$txtmain); @@ -29309,7 +29326,7 @@ $e = $sub; // Only replace first one } else { - $e = preg_replace('/[:]/', $subEntrySeparator, $e, 1); // Only replace first one + $e = preg_replace('/[:]/', ($subEntrySeparator ?? ''), ($e ?? ''), 1); // Only replace first one } $marker = true; // Don't replace any more once the subentry marker has been found } @@ -29322,7 +29339,7 @@ $html .= '<div class="mpdf_index_entry">'; $html .= $txt; $ppp = $this->Reference[$i]['p']; // = array of page numbers to point to - if (count($ppp)) { + if (count(($ppp ?? []))) { sort($ppp); $newarr = array(); $range_start = $ppp[0]; @@ -29330,7 +29347,7 @@ $html .= $spacer; - for ($zi=1;$zi<count($ppp);$zi++) { + for ($zi=1;$zi<count(($ppp ?? []));$zi++) { if ($ppp[$zi] == ($ppp[($zi-1)]+1)) { $range_end = $ppp[$zi]; } @@ -29377,8 +29394,8 @@ } else { - if ($useLinking) { $html .= '<a class="mpdf_index_link" href="@'.$ppp[(count($ppp)-1)].'">'; } - $html .= $this->docPageNum($ppp[(count($ppp)-1)]); + if ($useLinking) { $html .= '<a class="mpdf_index_link" href="@'.$ppp[(count(($ppp ?? []))-1)].'">'; } + $html .= $this->docPageNum($ppp[(count(($ppp ?? []))-1)]); if ($useLinking) { $html .= '</a>'; } } } @@ -29397,7 +29414,7 @@ function AcceptPageBreak() { - if (count($this->cellBorderBuffer)) { $this->printcellbuffer(); } // *TABLES* + if (count(($this->cellBorderBuffer ?? []))) { $this->printcellbuffer(); } // *TABLES* /*-- COLUMNS --*/ if ($this->ColActive==1) { if($this->CurrCol<$this->NbCol-1) { @@ -29414,7 +29431,7 @@ } else { //Go back to the first column - NEW PAGE - if (count($this->columnbuffer)) { $this->printcolumnbuffer(); } + if (count(($this->columnbuffer ?? []))) { $this->printcolumnbuffer(); } $this->SetCol(0); $this->y0 = $this->tMargin; $this->ChangeColumn= -($this->NbCol-1); @@ -29448,7 +29465,7 @@ if ($NbCol<2) { // SET COLUMNS OFF if ($this->ColActive) { $this->ColActive=0; - if (count($this->columnbuffer)) { $this->printcolumnbuffer(); } + if (count(($this->columnbuffer ?? []))) { $this->printcolumnbuffer(); } $this->NbCol=1; $this->ResetMargins(); $this->pgwidth = $this->w - $this->lMargin - $this->rMargin; @@ -29468,7 +29485,7 @@ else { // SET COLUMNS ON if ($this->ColActive) { $this->ColActive=0; - if (count($this->columnbuffer)) { $this->printcolumnbuffer(); } + if (count(($this->columnbuffer ?? []))) { $this->printcolumnbuffer(); } $this->ResetMargins(); } if (isset($this->y) && $this->y>$this->tMargin) $this->Ln(); @@ -29485,7 +29502,7 @@ $this->col_BMoutlines = array(); $this->col_toc = array(); $this->breakpoints = array(); - if ((strtoupper($vAlign) == 'J') || (strtoupper($vAlign) == 'JUSTIFY')) { $vAlign = 'J'; } + if ((strtoupper(($vAlign ?? '')) == 'J') || (strtoupper(($vAlign ?? '')) == 'JUSTIFY')) { $vAlign = 'J'; } else { $vAlign = ''; } $this->colvAlign = $vAlign; //Save the ordinate @@ -29548,7 +29565,7 @@ else { //Go back to the first column //Page break - if (count($this->columnbuffer)) { $this->printcolumnbuffer(); } + if (count(($this->columnbuffer ?? []))) { $this->printcolumnbuffer(); } $this->AddPage($this->CurOrientation); $this->SetCol(0); $this->y0 = $this->tMargin; @@ -29584,22 +29601,22 @@ $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; $this->columnbuffer[$key]['s'] = ''; } - else if (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',$t)) { + else if (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } - else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',$t)) { + else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } - else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',$t)) { + else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } - else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',$t)) { + else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } - else if (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',$t)) { + else if (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } - else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',$t)) { + else if (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',($t ?? ''))) { $this->columnbuffer[$key]['rel_y'] = $s['y'] + $this->ColDetails[$s['col']]['add_y'] - $this->y0; } } @@ -29830,11 +29847,11 @@ foreach($this->columnbuffer AS $key=>$s) { // Only process output data $t = $s['s']; - if ($t == 'ACROFORM' || (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',$t)) || (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',$t)) || - (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',$t)) ) { + if ($t == 'ACROFORM' || (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',($t ?? ''))) || (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',($t ?? ''))) || + (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',($t ?? ''))) ) { $clb = $s['y'] + $s['h']; if ((isset($this->ColDetails[$s['col']]['max_bottom']) && $clb > $this->ColDetails[$s['col']]['max_bottom']) || !isset($this->ColDetails[$s['col']]['max_bottom'])) { $this->ColDetails[$s['col']]['max_bottom'] = $clb; } @@ -29934,11 +29951,11 @@ foreach($this->columnbuffer AS $key=>$s) { // Only process output data $t = $s['s']; - if ($t == 'ACROFORM' || (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',$t)) || (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',$t)) || - (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',$t)) || - (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',$t)) ) { + if ($t == 'ACROFORM' || (preg_match('/BT \d+\.\d\d+ (\d+\.\d\d+) Td/',($t ?? ''))) || (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ [\-]{0,1}\d+\.\d\d+ re/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) l/',($t ?? ''))) || + (preg_match('/q \d+\.\d\d+ 0 0 \d+\.\d\d+ \d+\.\d\d+ (\d+\.\d\d+) cm \/(I|FO)\d+ Do Q/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) m/',($t ?? ''))) || + (preg_match('/\d+\.\d\d+ (\d+\.\d\d+) \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ \d+\.\d\d+ c/',($t ?? ''))) ) { $clb = $s['y'] + $s['h']; if ($clb > $this->ColDetails[$s['col']]['max_bottom']) { $this->ColDetails[$s['col']]['max_bottom'] = $clb; } @@ -29982,13 +29999,13 @@ // mPDF 5.7+ function columnAdjustPregReplace($type, $xadj, $yadj, $pattern, $subject) { - preg_match($pattern, $subject, $matches); - if (!count($matches)) { return $subject; } + preg_match(($pattern ?? ''), ($subject ?? ''), $matches); + if (!count(($matches ?? []))) { return $subject; } if (!isset($matches[3])) { $matches[3] = 0; } if (!isset($matches[4])) { $matches[4] = 0; } if (!isset($matches[5])) { $matches[5] = 0; } if (!isset($matches[6])) { $matches[6] = 0; } - return str_replace($matches[0], $this->columnAdjustAdd($type, _MPDFK, $xadj, $yadj, $matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[6]), $subject); + return str_replace(($matches[0] ?? ''), ($this->columnAdjustAdd($type, _MPDFK, $xadj, $yadj, $matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[6]) ?? ''), ($subject ?? '')); } /*-- END COLUMNS --*/ @@ -29997,18 +30014,18 @@ //================================================================== /*-- TABLES --*/ function printcellbuffer() { - if (count($this->cellBorderBuffer )) { + if (count(($this->cellBorderBuffer ?? []) )) { sort($this->cellBorderBuffer); foreach($this->cellBorderBuffer AS $cbb) { $cba = unpack("A16dom/nbord/A1side/ns/dbw/a6ca/A10style/dx/dy/dw/dh/dmbl/dmbr/dmrt/dmrb/dmtl/dmtr/dmlt/dmlb/dcpd/dover/", $cbb); $side = $cba['side']; - $color = str_pad($cba['ca'], 6, "\x00"); + $color = str_pad(($cba['ca'] ?? ''), 6, "\x00"); $details = array(); $details[$side]['dom'] = (float) $cba['dom']; $details[$side]['s'] = $cba['s']; $details[$side]['w'] = $cba['bw']; $details[$side]['c'] = $color; - $details[$side]['style'] = trim($cba['style']); + $details[$side]['style'] = trim(($cba['style'] ?? '')); $details['mbw']['BL'] = $cba['mbl']; $details['mbw']['BR'] = $cba['mbr']; $details['mbw']['RT'] = $cba['mrt']; @@ -30218,7 +30235,7 @@ // Output Reference (index) foreach($this->kwt_Reference AS $v) { $Present=0; - for ($i=0;$i<count($this->Reference);$i++){ + for ($i=0;$i<count(($this->Reference ?? []));$i++){ if ($this->Reference[$i]['t']==$v['t']){ $Present=1; if (!in_array($v['op'],$this->Reference[$i]['p'])) { @@ -30314,7 +30331,7 @@ foreach($this->kwt_Reference AS $v) { $Present=0; //Search the reference (AND Ref/PageNo) in the array - for ($i=0;$i<count($this->Reference);$i++){ + for ($i=0;$i<count(($this->Reference ?? []));$i++){ if ($this->Reference[$i]['t']==$v['t']){ $Present=1; if (!in_array($this->page,$this->Reference[$i]['p'])) { @@ -30360,7 +30377,7 @@ //================================================================== function printfloatbuffer() { - if (count($this->floatbuffer)) { + if (count(($this->floatbuffer ?? []))) { $this->objectbuffer = $this->floatbuffer; $this->printobjectbuffer(false); $this->objectbuffer = array(); @@ -30403,10 +30420,10 @@ if ($this->text_input_as_HTML) { $text = $this->all_entities_to_utf8($text); } - if ($this->usingCoreFont) { $text = mb_convert_encoding($text,$this->mb_enc,'UTF-8'); } + if ($this->usingCoreFont) { $text = mb_convert_encoding(($text ?? ''),($this->mb_enc ?? ''),'UTF-8'); } // DIRECTIONALITY - if (preg_match("/([".$this->pregRTLchars."])/u", $text)) { $this->biDirectional = true; } // *OTL* + if (preg_match("/([".$this->pregRTLchars."])/u", ($text ?? ''))) { $this->biDirectional = true; } // *OTL* $textvar = 0; $save_OTLtags = $this->OTLtags; @@ -30458,7 +30475,7 @@ // including any added from OTL tables (in PUA) $pregRTLchars = $this->pregRTLchars; if (isset($this->CurrentFont['rtlPUAstr']) && $this->CurrentFont['rtlPUAstr']) { $pregRTLchars .= $this->CurrentFont['rtlPUAstr']; } - if (!preg_match("/[".$pregRTLchars."]/u",$chunk) && $dir!='rtl') { return 0; } // Chunk doesn't contain RTL characters + if (!preg_match("/[".$pregRTLchars."]/u",($chunk ?? '')) && $dir!='rtl') { return 0; } // Chunk doesn't contain RTL characters $unicode = $this->UTF8StringToArray($chunk, false); @@ -30495,22 +30512,22 @@ } } -function _setBidiCodes($mode='start', $bdf) { +function _setBidiCodes($mode, $bdf) { $s = ''; if ($mode=='end') { // PDF comes before PDI to close isolate-override (e.g. "LRILROPDFPDI") - if (strpos($bdf, 'PDF')!==false) { $s .= code2utf(0x202C); } // POP DIRECTIONAL FORMATTING - if (strpos($bdf, 'PDI')!==false) { $s .= code2utf(0x2069); } // POP DIRECTIONAL ISOLATE + if (strpos(($bdf ?? ''), 'PDF')!==false) { $s .= code2utf(0x202C); } // POP DIRECTIONAL FORMATTING + if (strpos(($bdf ?? ''), 'PDI')!==false) { $s .= code2utf(0x2069); } // POP DIRECTIONAL ISOLATE } else if ($mode=='start') { // LRI comes before LRO to open isolate-override (e.g. "LRILROPDFPDI") - if (strpos($bdf, 'LRI')!==false) { $s .= code2utf(0x2066); } // U+2066 LRI - else if (strpos($bdf, 'RLI')!==false) { $s .= code2utf(0x2067); } // U+2067 RLI - else if (strpos($bdf, 'FSI')!==false) { $s .= code2utf(0x2068); } // U+2068 FSI - if (strpos($bdf, 'LRO')!==false) { $s .= code2utf(0x202D); } // U+202D LRO - else if (strpos($bdf, 'RLO')!==false) { $s .= code2utf(0x202E); } // U+202E RLO - else if (strpos($bdf, 'LRE')!==false) { $s .= code2utf(0x202A); } // U+202A LRE - else if (strpos($bdf, 'RLE')!==false) { $s .= code2utf(0x202B); } // U+202B RLE + if (strpos(($bdf ?? ''), 'LRI')!==false) { $s .= code2utf(0x2066); } // U+2066 LRI + else if (strpos(($bdf ?? ''), 'RLI')!==false) { $s .= code2utf(0x2067); } // U+2067 RLI + else if (strpos(($bdf ?? ''), 'FSI')!==false) { $s .= code2utf(0x2068); } // U+2068 FSI + if (strpos(($bdf ?? ''), 'LRO')!==false) { $s .= code2utf(0x202D); } // U+202D LRO + else if (strpos(($bdf ?? ''), 'RLO')!==false) { $s .= code2utf(0x202E); } // U+202E RLO + else if (strpos(($bdf ?? ''), 'LRE')!==false) { $s .= code2utf(0x202A); } // U+202A LRE + else if (strpos(($bdf ?? ''), 'RLE')!==false) { $s .= code2utf(0x202B); } // U+202B RLE } return $s; } @@ -30535,12 +30552,12 @@ function SubstituteChars($html) { // only substitute characters between tags - if (count($this->substitute)) { - $a=preg_split('/(<.*?>)/ms',$html,-1,PREG_SPLIT_DELIM_CAPTURE); + if (count(($this->substitute ?? []))) { + $a=preg_split('/(<.*?>)/ms',($html ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); $html = ''; foreach($a as $i => $e) { if($i%2==0) { - $e = strtr($e, $this->substitute); + $e = strtr(($e ?? ''), ($this->substitute ?? '')); } $html .= $e; } @@ -30550,7 +30567,7 @@ function SubstituteCharsSIP(&$writehtml_a, &$writehtml_i, &$writehtml_e) { - if (preg_match("/^(.*?)([\x{20000}-\x{2FFFF}]+)(.*)/u", $writehtml_e, $m)) { + if (preg_match("/^(.*?)([\x{20000}-\x{2FFFF}]+)(.*)/u", ($writehtml_e ?? ''), $m)) { if (isset($this->CurrentFont['sipext']) && $this->CurrentFont['sipext']) { $font = $this->CurrentFont['sipext']; if (!in_array($font, $this->available_unifonts)) { return 0; } @@ -30566,8 +30583,8 @@ // If core font is selected in document which is not onlyCoreFonts - substitute with non-core font function SubstituteCharsNonCore(&$writehtml_a, &$writehtml_i, &$writehtml_e) { // Ignore if in Textarea - if ($writehtml_i > 0 && strtolower(substr($writehtml_a[$writehtml_i-1],0,8)) == 'textarea') { return 0; } - if (mb_convert_encoding(mb_convert_encoding($writehtml_e, $this->mb_enc, "UTF-8"), "UTF-8", $this->mb_enc) == $writehtml_e) { + if ($writehtml_i > 0 && strtolower((substr(($writehtml_a[$writehtml_i-1] ?? ''),0,8) ?? '')) == 'textarea') { return 0; } + if (mb_convert_encoding((mb_convert_encoding(($writehtml_e ?? ''), ($this->mb_enc ?? ''), "UTF-8") ?? ''), "UTF-8", $this->mb_enc) == $writehtml_e) { return 0; } $cw = &$this->CurrentFont['cw']; @@ -30591,7 +30608,7 @@ } else if ($flag>0) { $end=$c-1; break; } } - if ($flag>0 && !$end) { $end=count($unicode)-1; } + if ($flag>0 && !$end) { $end=count(($unicode ?? []))-1; } if ($start==-1) { return 0; } // TRY IN BACKUP SUBS FONT if (!is_array($this->backupSubsFont)) { $this->backupSubsFont = array("$this->backupSubsFont"); } @@ -30618,9 +30635,9 @@ $l++; } else { - if ($l==0 && $bsfctr == (count($this->backupSubsFont)-1)) { // Not found even in last backup font - $cont = mb_substr($writehtml_e, $start+1); - $writehtml_e = mb_substr($writehtml_e, 0, $start+1, 'UTF-8'); + if ($l==0 && $bsfctr == (count(($this->backupSubsFont ?? []))-1)) { // Not found even in last backup font + $cont = mb_substr(($writehtml_e ?? ''), $start+1); + $writehtml_e = mb_substr(($writehtml_e ?? ''), 0, $start+1, 'UTF-8'); array_splice($writehtml_a, $writehtml_i+1, 0, array('', $cont)); $this->subPos = $writehtml_i+1; return 2; @@ -30629,8 +30646,8 @@ } } if ($l > 0) { - $patt = mb_substr($writehtml_e, $start, $l, 'UTF-8'); - if (preg_match("/(.*?)(".preg_quote($patt,'/').")(.*)/u", $writehtml_e, $m)) { + $patt = mb_substr(($writehtml_e ?? ''), $start, $l, 'UTF-8'); + if (preg_match("/(.*?)(".preg_quote(($patt ?? ''),'/').")(.*)/u", ($writehtml_e ?? ''), $m)) { $writehtml_e = $m[1]; array_splice($writehtml_a, $writehtml_i+1, 0, array('span style="font-family: '.$font.'"', $m[2], '/span', $m[3])); $this->subPos = $writehtml_i+3; @@ -30646,7 +30663,7 @@ function SubstituteCharsMB(&$writehtml_a, &$writehtml_i, &$writehtml_e) { // Ignore if in Textarea - if ($writehtml_i > 0 && strtolower(substr($writehtml_a[$writehtml_i-1],0,8)) == 'textarea') { return 0; } + if ($writehtml_i > 0 && strtolower((substr(($writehtml_a[$writehtml_i-1] ?? ''),0,8) ?? '')) == 'textarea') { return 0; } $cw = &$this->CurrentFont['cw']; $unicode = $this->UTF8StringToArray($writehtml_e, false); $start = -1; @@ -30669,7 +30686,7 @@ } else if ($flag>0) { $end=$c-1; break; } } - if ($flag>0 && !$end) { $end=count($unicode)-1; } + if ($flag>0 && !$end) { $end=count(($unicode ?? []))-1; } if ($start==-1) { return 0; } if ($flag == 2) { // SIP // Check if current CJK font has a ext-B related font @@ -30696,8 +30713,8 @@ else { break; } } if ($l > 0) { - $patt = mb_substr($writehtml_e, $start, $l); - if (preg_match("/(.*?)(".preg_quote($patt,'/').")(.*)/u", $writehtml_e, $m)) { + $patt = mb_substr(($writehtml_e ?? ''), $start, $l); + if (preg_match("/(.*?)(".preg_quote(($patt ?? ''),'/').")(.*)/u", ($writehtml_e ?? ''), $m)) { $writehtml_e = $m[1]; array_splice($writehtml_a, $writehtml_i+1, 0, array('span style="font-family: '.$font.'"', $m[2], '/span', $m[3])); $this->subPos = $writehtml_i+3; @@ -30730,8 +30747,8 @@ else { break; } } if ($l > 0) { - $patt = mb_substr($writehtml_e, $start, $l); - if (preg_match("/(.*?)(".preg_quote($patt,'/').")(.*)/u", $writehtml_e, $m)) { + $patt = mb_substr(($writehtml_e ?? ''), $start, $l); + if (preg_match("/(.*?)(".preg_quote(($patt ?? ''),'/').")(.*)/u", ($writehtml_e ?? ''), $m)) { $writehtml_e = $m[1]; array_splice($writehtml_a, $writehtml_i+1, 0, array('span style="font-family: '.$font.'"', $m[2], '/span', $m[3])); $this->subPos = $writehtml_i+3; @@ -30774,8 +30791,8 @@ } } if ($ftype=='C') { - $patt = mb_substr($writehtml_e, $start, count($repl)); - if (preg_match("/(.*?)(".preg_quote($patt,'/').")(.*)/u", $writehtml_e, $m)) { + $patt = mb_substr(($writehtml_e ?? ''), $start, count(($repl ?? []))); + if (preg_match("/(.*?)(".preg_quote(($patt ?? ''),'/').")(.*)/u", ($writehtml_e ?? ''), $m)) { $writehtml_e = $m[1]; array_splice($writehtml_a, $writehtml_i+1, 0, array($font, implode('|', $repl), '/'.$font, $m[3])); // e.g. <tts> $this->subPos = $writehtml_i+3; @@ -30809,9 +30826,9 @@ $l++; } else { - if ($l==0 && $bsfctr == (count($this->backupSubsFont)-1)) { // Not found even in last backup font - $cont = mb_substr($writehtml_e, $start+1); - $writehtml_e = mb_substr($writehtml_e, 0, $start+1); + if ($l==0 && $bsfctr == (count(($this->backupSubsFont ?? []))-1)) { // Not found even in last backup font + $cont = mb_substr(($writehtml_e ?? ''), $start+1); + $writehtml_e = mb_substr(($writehtml_e ?? ''), 0, $start+1); array_splice($writehtml_a, $writehtml_i+1, 0, array('', $cont)); $this->subPos = $writehtml_i+1; return 2; @@ -30820,8 +30837,8 @@ } } if ($l > 0) { - $patt = mb_substr($writehtml_e, $start, $l); - if (preg_match("/(.*?)(".preg_quote($patt,'/').")(.*)/u", $writehtml_e, $m)) { + $patt = mb_substr(($writehtml_e ?? ''), $start, $l); + if (preg_match("/(.*?)(".preg_quote(($patt ?? ''),'/').")(.*)/u", ($writehtml_e ?? ''), $m)) { $writehtml_e = $m[1]; array_splice($writehtml_a, $writehtml_i+1, 0, array('span style="font-family: '.$font.'"', $m[2], '/span', $m[3])); $this->subPos = $writehtml_i+3; @@ -30882,8 +30899,8 @@ function SubstituteHiEntities($html) { // converts html_entities > ASCII 127 to unicode // Leaves in particular < to distinguish from tag marker - if (count($this->entsearch)) { - $html = str_replace($this->entsearch,$this->entsubstitute,$html); + if (count(($this->entsearch ?? []))) { + $html = str_replace(($this->entsearch ?? ''),($this->entsubstitute ?? ''),($html ?? '')); } return $html; } @@ -30891,12 +30908,12 @@ // Edited v1.2 Pass by reference; option to continue if invalid UTF-8 chars function is_utf8(&$string) { - if ($string === mb_convert_encoding(mb_convert_encoding($string, "UTF-32", "UTF-8"), "UTF-8", "UTF-32")) { + if ($string === mb_convert_encoding((mb_convert_encoding(($string ?? ''), "UTF-32", "UTF-8") ?? ''), "UTF-8", "UTF-32")) { return true; } else { if ($this->ignore_invalid_utf8) { - $string = mb_convert_encoding(mb_convert_encoding($string, "UTF-32", "UTF-8"), "UTF-8", "UTF-32") ; + $string = mb_convert_encoding((mb_convert_encoding(($string ?? ''), "UTF-32", "UTF-8") ?? ''), "UTF-8", "UTF-32") ; return true; } else { @@ -30914,22 +30931,22 @@ // Leaves in particular < to distinguish from tag marker if (!$this->is_utf8($html)) { echo "<p><b>HTML contains invalid UTF-8 character(s)</b></p>"; - while (mb_convert_encoding(mb_convert_encoding($html, "UTF-32", "UTF-8"), "UTF-8", "UTF-32") != $html) { - $a = iconv('UTF-8', 'UTF-8', $html); + while (mb_convert_encoding((mb_convert_encoding(($html ?? ''), "UTF-32", "UTF-8") ?? ''), "UTF-8", "UTF-32") != $html) { + $a = iconv('UTF-8', 'UTF-8', ($html ?? '')); echo ($a); - $pos = $start = strlen($a); + $pos = $start = strlen(($a ?? '')); $err = ''; - while ( ord(substr($html,$pos,1)) > 128 ) { - $err .= '[[#'.ord(substr($html,$pos,1)).']]'; + while ( ord((substr(($html ?? ''),$pos,1) ?? '')) > 128 ) { + $err .= '[[#'.ord((substr(($html ?? ''),$pos,1) ?? '')).']]'; $pos++; } echo '<span style="color:red; font-weight:bold">'.$err.'</span>'; - $html = substr($html, $pos); + $html = substr(($html ?? ''), $pos); } echo $html; $this->Error(""); } - $html = preg_replace("/\r/", "", $html ); + $html = preg_replace("/\r/", "", ($html ?? '') ); // converts html_entities > ASCII 127 to UTF-8 // Leaves in particular < to distinguish from tag marker @@ -30946,7 +30963,7 @@ // Make sure UTF-8 string of characters if (!$this->is_utf8($txt)) { $this->Error("Text contains invalid UTF-8 character(s)"); } - $txt = preg_replace("/\r/", "", $txt ); + $txt = preg_replace("/\r/", "", ($txt ?? '') ); return ($txt); } @@ -30973,7 +30990,7 @@ return; } $codestr = $code; - $code = preg_replace('/\-/','',$code); + $code = preg_replace('/\-/','',($code ?? '')); if (!class_exists('PDFBarcode', false)) { include(_MPDF_PATH.'classes/barcode.php'); @@ -30985,8 +31002,8 @@ else { $arrcode = $this->barcode->getBarcodeArray($code, $btype); } if ($arrcode === false) { $this->Error('Error in barcode string: '.$codestr); } - if((($btype=='EAN13' || $btype=='ISBN' || $btype=='ISSN') && strlen($code) == 12) || ($btype=='UPCA' && strlen($code) == 11) - || ($btype=='UPCE' && strlen($code) == 11) || ($btype=='EAN8' && strlen($code) == 7)) { + if((($btype=='EAN13' || $btype=='ISBN' || $btype=='ISSN') && strlen(($code ?? '')) == 12) || ($btype=='UPCA' && strlen(($code ?? '')) == 11) + || ($btype=='UPCE' && strlen(($code ?? '')) == 11) || ($btype=='EAN8' && strlen(($code ?? '')) == 7)) { $code .= $arrcode['checkdigit']; if (stristr($codestr,'-')) { $codestr .= '-' . $arrcode['checkdigit']; } else { $codestr .= $arrcode['checkdigit']; } @@ -31101,7 +31118,7 @@ // WORD SPACING if ($fbwi > $sz) { $xtra = $fbwi - $sz; - $charspacing = $xtra / (strlen($codestr)-1); + $charspacing = $xtra / (strlen(($codestr ?? ''))-1); if ($charspacing) { $this->_out(sprintf('BT %.3F Tc ET',$charspacing*_MPDFK)); } } $this->y = $y + $paddingT - ($codestr_fontsize ) - $tisbnm ; @@ -31127,9 +31144,9 @@ $innerp = $xres * 2.5; $textw = ($bcw*0.5) - $outerp - $innerp; $chars = 6; // number of numerals in each half - $charLO = substr($code,0,1); // Left Outer - $charLI = substr($code,1,6); // Left Inner - $charRI = substr($code,7,6); // Right Inner + $charLO = substr(($code ?? ''),0,1); // Left Outer + $charLI = substr(($code ?? ''),1,6); // Left Inner + $charRI = substr(($code ?? ''),7,6); // Right Inner if (!$supplement) $charRO = '>'; // Right Outer } else if ($btype=='UPCA') { @@ -31138,10 +31155,10 @@ $innerp = $xres * 2.5; $textw = ($bcw*0.5) - $outerp - $innerp; $chars = 5; - $charLO = substr($code,0,1); // Left Outer - $charLI = substr($code,1,5); // Left Inner - $charRI = substr($code,6,5); // Right Inner - $charRO = substr($code,11,1); // Right Outer + $charLO = substr(($code ?? ''),0,1); // Left Outer + $charLI = substr(($code ?? ''),1,5); // Left Inner + $charRI = substr(($code ?? ''),6,5); // Right Inner + $charRO = substr(($code ?? ''),11,1); // Right Outer } else if ($btype=='UPCE') { $outerfontsize = 2.3; // Inner fontsize = 3 @@ -31150,10 +31167,10 @@ $textw = ($bcw*0.5) - $outerp - $innerp; $chars = 3; $upce_code = $arrcode['code']; - $charLO = substr($code,0,1); // Left Outer - $charLI = substr($upce_code,0,3); // Left Inner - $charRI = substr($upce_code,3,3); // Right Inner - $charRO = substr($code,11,1); // Right Outer + $charLO = substr(($code ?? ''),0,1); // Left Outer + $charLI = substr(($upce_code ?? ''),0,3); // Left Inner + $charRI = substr(($upce_code ?? ''),3,3); // Right Inner + $charRO = substr(($code ?? ''),11,1); // Right Outer } else if ($btype=='EAN8') { $outerfontsize = 3; // Inner fontsize = 3 @@ -31162,8 +31179,8 @@ $textw = ($bcw*0.5) - $outerp - $innerp; $chars = 4; $charLO = '<'; // Left Outer - $charLI = substr($code,0,4); // Left Inner - $charRI = substr($code,4,4); // Right Inner + $charLI = substr(($code ?? ''),0,4); // Left Inner + $charRI = substr(($code ?? ''),4,4); // Right Inner if (!$supplement) $charRO = '>'; // Right Outer } @@ -31213,7 +31230,7 @@ // PRINT BARS $supparrcode = $this->barcode->getBarcodeArray($supplement_code, 'EAN'.$supplement); if ($supparrcode === false) { $this->Error('Error in barcode string (supplement): '.$codestr.' '.$supplement_code); } - if(strlen($supplement_code) != $supplement) { + if(strlen(($supplement_code ?? '')) != $supplement) { $this->Error('Barcode supplement incorrect: '.$supplement_code); } $llm = $fbw - (($arrcode['lightmR'] - $supparrcode['sepM']) * $arrcode['nom-X'] * $size); // Left Light margin @@ -31471,11 +31488,11 @@ } $n = ''; - $a=preg_split('/<(.*?)>/ms',$html,-1,PREG_SPLIT_DELIM_CAPTURE); + $a=preg_split('/<(.*?)>/ms',($html ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); foreach($a as $i => $e) { if($i%2==0) { //ignore if in Textarea - if ($i > 0 && strtolower(substr($a[$i-1],1,8)) == 'textarea') { $a[$i] = $e; continue; } + if ($i > 0 && strtolower((substr(($a[$i-1] ?? ''),1,8) ?? '')) == 'textarea') { $a[$i] = $e; continue; } $e = strcode2utf($e); $e = $this->lesser_entity_decode($e); @@ -31513,7 +31530,7 @@ // Move common script from end of x to start of x+1 for($sch=0;$sch<$subchunk;$sch++) { if ($scriptblocks[$sch] > 0 && $scriptblocks[$sch] != $this->baseScript && $scriptblocks[$sch+1] == $this->baseScript) { - $end = count($chardata[$sch])-1; + $end = count(($chardata[$sch] ?? []))-1; while($chardata[$sch][$end]['script'] == 0 && $end > 1) { // common script $tmp = array_pop($chardata[$sch]); array_unshift($chardata[$sch+1],$tmp); @@ -31526,30 +31543,30 @@ for($sch=0;$sch<=$subchunk;$sch++) { if (isset($chardata[$sch])) { $s = ''; - for ($j=0;$j<count($chardata[$sch]);$j++) { + for ($j=0;$j<count(($chardata[$sch] ?? []));$j++) { $s.=code2utf($chardata[$sch][$j]['uni']); } // ZZZ99 Undo lesser_entity_decode as above - but only for <>& - $s = str_replace("&","&",$s); - $s = str_replace("<","<",$s); - $s = str_replace(">",">",$s); + $s = str_replace("&","&",($s ?? '')); + $s = str_replace("<","<",($s ?? '')); + $s = str_replace(">",">",($s ?? '')); // Check Vietnamese if Latin script - even if Basescript - if ($scriptblocks[$sch] == UCDN::SCRIPT_LATIN && $this->autoVietnamese && preg_match("/([".$this->viet."])/u", $s)) { + if ($scriptblocks[$sch] == UCDN::SCRIPT_LATIN && $this->autoVietnamese && preg_match("/([".$this->viet."])/u", ($s ?? ''))) { $o .= '<span lang="vi" class="lang_vi">'.$s.'</span>'; } // Check Arabic for different languages if Arabic script - even if Basescript else if ($scriptblocks[$sch] == UCDN::SCRIPT_ARABIC && $this->autoArabic) { - if (preg_match("/[".$this->sindhi ."]/u", $s) ) { + if (preg_match("/[".$this->sindhi ."]/u", ($s ?? '')) ) { $o .= '<span lang="sd" class="lang_sd">'.$s.'</span>'; } - else if (preg_match("/[".$this->urdu ."]/u", $s) ) { + else if (preg_match("/[".$this->urdu ."]/u", ($s ?? '')) ) { $o .= '<span lang="ur" class="lang_ur">'.$s.'</span>'; } - else if (preg_match("/[".$this->pashto ."]/u", $s) ) { + else if (preg_match("/[".$this->pashto ."]/u", ($s ?? '')) ) { $o .= '<span lang="ps" class="lang_ps">'.$s.'</span>'; } - else if (preg_match("/[".$this->persian ."]/u", $s) ) { + else if (preg_match("/[".$this->persian ."]/u", ($s ?? '')) ) { $o .= '<span lang="fa" class="lang_fa">'.$s.'</span>'; } else if ($this->baseScript != UCDN::SCRIPT_ARABIC && isset($this->script2lang[$scriptblocks[$sch]])) { @@ -31597,7 +31614,7 @@ } function mb_strrev($str, $enc = 'utf-8'){ $ch = array(); - $ch = preg_split('//u',$str); + $ch = preg_split('//u',($str ?? '')); $revch = array_reverse($ch); return implode('',$revch); } @@ -31645,28 +31662,28 @@ function ConvertColor($color="#000000"){ - $color = trim(strtolower($color)); + $color = trim((strtolower(($color ?? '')) ?? '')); $c = false; $cstr = ''; if ($color=='transparent') { return false; } else if ($color=='inherit') { return false; } else if (isset($this->SVGcolors[$color])) $color = $this->SVGcolors[$color]; - if (preg_match('/^[\d]+$/',$color)) { $c = (array(1,$color)); } // i.e. integer only + if (preg_match('/^[\d]+$/',($color ?? ''))) { $c = (array(1,$color)); } // i.e. integer only else if ($color[0] == '#') { //case of #nnnnnn or #nnn - $cor = preg_replace('/\s+.*/','',$color); // in case of Background: #CCC url() x-repeat etc. - if (strlen($cor) == 4) { // Turn #RGB into #RRGGBB + $cor = preg_replace('/\s+.*/','',($color ?? '')); // in case of Background: #CCC url() x-repeat etc. + if (strlen(($cor ?? '')) == 4) { // Turn #RGB into #RRGGBB $cor = "#" . $cor[1] . $cor[1] . $cor[2] . $cor[2] . $cor[3] . $cor[3]; } - $r = hexdec(substr($cor, 1, 2)); - $g = hexdec(substr($cor, 3, 2)); - $b = hexdec(substr($cor, 5, 2)); + $r = hexdec(substr(($cor ?? ''), 1, 2)); + $g = hexdec(substr(($cor ?? ''), 3, 2)); + $b = hexdec(substr(($cor ?? ''), 5, 2)); $c = array(3,$r,$g,$b); } - else if (preg_match('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\((.*?)\)/',$color,$m)) { + else if (preg_match('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\((.*?)\)/',($color ?? ''),$m)) { $type= $m[1]; - $cores = explode(",", $m[2]); - $ncores = count($cores); + $cores = explode(",", ($m[2] ?? '')); + $ncores = count(($cores ?? [])); if (stristr($cores[0],'%') ) { $cores[0] += 0; if ($type=='rgb' || $type=='rgba') { $cores[0] = intval($cores[0]*255/100); } @@ -31695,7 +31712,7 @@ else if ($type=='hsla') { $c = array(5,$conv[0],$conv[1],$conv[2],$cores[3]*100); } } else if ($type=='spot') { - $name = strtoupper(trim($cores[0])); + $name = strtoupper((trim(($cores[0] ?? '')) ?? '')); if(!isset($this->spotColors[$name])) { if (isset($cores[5])) { $this->AddSpotColor($cores[0],$cores[2],$cores[3],$cores[4],$cores[5]); } else { $this->Error('Undefined spot color: '.$name); } @@ -31889,12 +31906,12 @@ function _colAtoString($cor) { $s = ''; - if ($cor{0}==1) $s = 'rgb('.ord($cor{1}).','.ord($cor{1}).','.ord($cor{1}).')'; - else if ($cor{0}==2) $s = 'spot('.ord($cor{1}).','.ord($cor{2}).')'; // SPOT COLOR - else if ($cor{0}==3) $s = 'rgb('.ord($cor{1}).','.ord($cor{2}).','.ord($cor{3}).')'; - else if ($cor{0}==4) $s = 'cmyk('.ord($cor{1}).','.ord($cor{2}).','.ord($cor{3}).','.ord($cor{4}).')'; - else if ($cor{0}==5) $s = 'rgba('.ord($cor{1}).','.ord($cor{2}).','.ord($cor{3}).','.sprintf('%0.2F',ord($cor{4})/100).')'; - else if ($cor{0}==6) $s = 'cmyka('.ord($cor{1}).','.ord($cor{2}).','.ord($cor{3}).','.ord($cor{4}).','.sprintf('%0.2F',ord($cor{5})/100).')'; + if ($cor[0]==1) $s = 'rgb('.ord(($cor[1] ?? '')).','.ord(($cor[1] ?? '')).','.ord(($cor[1] ?? '')).')'; + else if ($cor[0]==2) $s = 'spot('.ord(($cor[1] ?? '')).','.ord(($cor[2] ?? '')).')'; // SPOT COLOR + else if ($cor[0]==3) $s = 'rgb('.ord(($cor[1] ?? '')).','.ord(($cor[2] ?? '')).','.ord(($cor[3] ?? '')).')'; + else if ($cor[0]==4) $s = 'cmyk('.ord(($cor[1] ?? '')).','.ord(($cor[2] ?? '')).','.ord(($cor[3] ?? '')).','.ord(($cor[4] ?? '')).')'; + else if ($cor[0]==5) $s = 'rgba('.ord(($cor[1] ?? '')).','.ord(($cor[2] ?? '')).','.ord(($cor[3] ?? '')).','.sprintf('%0.2F',ord(($cor[4] ?? ''))/100).')'; + else if ($cor[0]==6) $s = 'cmyka('.ord(($cor[1] ?? '')).','.ord(($cor[2] ?? '')).','.ord(($cor[3] ?? '')).','.ord(($cor[4] ?? '')).','.sprintf('%0.2F',ord(($cor[5] ?? ''))/100).')'; return $s; } @@ -31904,76 +31921,76 @@ // For text $maxsize = Fontsize // Setting e.g. margin % will use maxsize (pagewidth) and em will use fontsize // Returns values using 'mm' units - $size = trim(strtolower($size)); + $size = trim((strtolower((string) $size) ?? '')); if ( $size == 'thin' ) $size = 1*(25.4/$this->dpi); //1 pixel width for table borders - elseif ( stristr($size,'px') ) $size *= (25.4/$this->dpi); //pixels - elseif ( stristr($size,'cm') ) $size *= 10; //centimeters - elseif ( stristr($size,'mm') ) $size += 0; //millimeters - elseif ( stristr($size,'pt') ) $size *= 25.4/72; //72 pts/inch + elseif ( stristr($size,'px') ) $size = (float) $size * (25.4/$this->dpi); //pixels + elseif ( stristr($size,'cm') ) $size = (float) $size * 10; //centimeters + elseif ( stristr($size,'mm') ) $size = (float) $size; //millimeters + elseif ( stristr($size,'pt') ) $size = (float) $size * 25.4/72; //72 pts/inch elseif ( stristr($size,'rem') ) { - $size += 0; //make "0.83rem" become simply "0.83" - $size *= ($this->default_font_size / _MPDFK); + $size = (float) $size; //make "0.83rem" become simply "0.83" + $size = (float) $size * ($this->default_font_size / _MPDFK); } elseif ( stristr($size,'em') ) { - $size += 0; //make "0.83em" become simply "0.83" - if ($fontsize) { $size *= $fontsize; } - else { $size *= $maxsize; } + $size = (float) $size; //make "0.83em" become simply "0.83" + if ($fontsize) { $size = (float) $size * $fontsize; } + else { $size = (float) $size * $maxsize; } } elseif ( stristr($size,'%') ) { - $size += 0; //make "90%" become simply "90" - if ($fontsize && $usefontsize) { $size *= $fontsize/100; } - else { $size *= $maxsize/100; } + $size = (float) $size; //make "90%" become simply "90" + if ($fontsize && $usefontsize) { $size = (float) $size * $fontsize/100; } + else { $size = (float) $size * $maxsize/100; } } - elseif ( stristr($size,'in') ) $size *= 25.4; //inches - elseif ( stristr($size,'pc') ) $size *= 38.1/9; //PostScript picas + elseif ( stristr($size,'in') ) $size = (float) $size * 25.4; //inches + elseif ( stristr($size,'pc') ) $size = (float) $size * 38.1/9; //PostScript picas elseif ( stristr($size,'ex') ) { // Approximates "ex" as half of font height - $size += 0; //make "3.5ex" become simply "3.5" - if ($fontsize) { $size *= $fontsize/2; } - else { $size *= $maxsize/2; } + $size = (float) $size; //make "3.5ex" become simply "3.5" + if ($fontsize) { $size = (float) $size * $fontsize/2; } + else { $size = (float) $size * $maxsize/2; } } elseif ( $size == 'medium' ) $size = 3*(25.4/$this->dpi); //3 pixel width for table borders elseif ( $size == 'thick' ) $size = 5*(25.4/$this->dpi); //5 pixel width for table borders elseif ($size == 'xx-small') { - if ($fontsize) { $size *= $fontsize*0.7; } - else { $size *= $maxsize*0.7; } + if ($fontsize) { $size = (float) $size * $fontsize*0.7; } + else { $size = (float) $size * $maxsize*0.7; } } elseif ($size == 'x-small') { - if ($fontsize) { $size *= $fontsize*0.77; } - else { $size *= $maxsize*0.77; } + if ($fontsize) { $size = (float) $size * $fontsize*0.77; } + else { $size = (float) $size * $maxsize*0.77; } } elseif ($size == 'small') { - if ($fontsize) { $size *= $fontsize*0.86; } - else { $size *= $maxsize*0.86; } + if ($fontsize) { $size = (float) $size * $fontsize*0.86; } + else { $size = (float) $size * $maxsize*0.86; } } elseif ($size == 'medium') { - if ($fontsize) { $size *= $fontsize; } - else { $size *= $maxsize; } + if ($fontsize) { $size = (float) $size * $fontsize; } + else { $size = (float) $size * $maxsize; } } elseif ($size == 'large') { - if ($fontsize) { $size *= $fontsize*1.2; } - else { $size *= $maxsize*1.2; } + if ($fontsize) { $size = (float) $size * $fontsize*1.2; } + else { $size = (float) $size * $maxsize*1.2; } } elseif ($size == 'x-large') { - if ($fontsize) { $size *= $fontsize*1.5; } - else { $size *= $maxsize*1.5; } + if ($fontsize) { $size = (float) $size * $fontsize*1.5; } + else { $size = (float) $size * $maxsize*1.5; } } elseif ($size == 'xx-large') { - if ($fontsize) { $size *= $fontsize*2; } - else { $size *= $maxsize*2; } + if ($fontsize) { $size = (float) $size * $fontsize*2; } + else { $size = (float) $size * $maxsize*2; } } - else $size *= (25.4/$this->dpi); //nothing == px + else $size = (float) $size * (25.4/$this->dpi); //nothing == px return $size; } // mPDF 5.7.3 TRANSFORMS function ConvertAngle($s, $makepositive=true) { - if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',$s,$m)) { + if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',($s ?? ''),$m)) { $angle = $m[1] + 0; - if (strtolower($m[2])=='deg') { $angle = $angle; } - else if (strtolower($m[2])=='grad') { $angle *= (360/400); } - else if (strtolower($m[2])=='rad') { $angle = rad2deg($angle); } + if (strtolower(($m[2] ?? ''))=='deg') { $angle = $angle; } + else if (strtolower(($m[2] ?? ''))=='grad') { $angle *= (360/400); } + else if (strtolower(($m[2] ?? ''))=='rad') { $angle = rad2deg($angle); } while($angle >= 360) { $angle -= 360; } while($angle <= -360) { $angle += 360; } if ($makepositive) { // always returns an angle between 0 and 360deg @@ -31986,161 +32003,161 @@ function lesser_entity_decode($html) { //supports the most used entity codes (only does ascii safe characters) - $html = str_replace("<","<",$html); - $html = str_replace(">",">",$html); - - $html = str_replace("'","'",$html); - $html = str_replace(""",'"',$html); - $html = str_replace("&","&",$html); + $html = str_replace("<","<",($html ?? '')); + $html = str_replace(">",">",($html ?? '')); + + $html = str_replace("'","'",($html ?? '')); + $html = str_replace(""",'"',($html ?? '')); + $html = str_replace("&","&",($html ?? '')); return $html; } function AdjustHTML($html, $tabSpaces=8) { //Try to make the html text more manageable (turning it into XHTML) if (PHP_VERSION_ID < 50307) { - if (strlen($html) > 100000) { + if (strlen(($html ?? '')) > 100000) { if (PHP_VERSION_ID < 50200) $this->Error("The HTML code is more than 100,000 characters. You should use WriteHTML() with smaller string lengths."); else ini_set("pcre.backtrack_limit","1000000"); } } /*-- ANNOTATIONS --*/ - preg_match_all("/(<annotation.*?>)/si", $html, $m); - if (count($m[1])) { - for($i=0;$i<count($m[1]);$i++) { - $sub = preg_replace("/\n/si", "\xbb\xa4\xac", $m[1][$i]); - $html = preg_replace('/'.preg_quote($m[1][$i], '/').'/si', $sub, $html); + preg_match_all("/(<annotation.*?>)/si", ($html ?? ''), $m); + if (count(($m[1] ?? []))) { + for($i=0;$i<count(($m[1] ?? []));$i++) { + $sub = preg_replace("/\n/si", "\xbb\xa4\xac", ($m[1][$i] ?? '')); + $html = preg_replace('/'.preg_quote(($m[1][$i] ?? ''), '/').'/si', ($sub ?? ''), ($html ?? '')); } } /*-- END ANNOTATIONS --*/ - preg_match_all("/(<svg.*?<\/svg>)/si", $html, $svgi); - if (count($svgi[0])) { - for($i=0;$i<count($svgi[0]);$i++) { + preg_match_all("/(<svg.*?<\/svg>)/si", ($html ?? ''), $svgi); + if (count(($svgi[0] ?? []))) { + for($i=0;$i<count(($svgi[0] ?? []));$i++) { $file = _MPDF_TEMP_PATH.'_tempSVG'.uniqid(rand(1,100000),true).'_'.$i.'.svg'; //Save to local file file_put_contents($file, $svgi[0][$i]); - $html = str_replace($svgi[0][$i], '<img src="'.$file.'" />', $html); + $html = str_replace(($svgi[0][$i] ?? ''), '<img src="'.$file.'" />', ($html ?? '')); } } //Remove javascript code from HTML (should not appear in the PDF file) - $html = preg_replace('/<script.*?<\/script>/is','',$html); + $html = preg_replace('/<script.*?<\/script>/is','',($html ?? '')); //Remove special comments - $html = preg_replace('/<!--mpdf/i','',$html); - $html = preg_replace('/mpdf-->/i','',$html); + $html = preg_replace('/<!--mpdf/i','',($html ?? '')); + $html = preg_replace('/mpdf-->/i','',($html ?? '')); //Remove comments from HTML (should not appear in the PDF file) - $html = preg_replace('/<!--.*?-->/s','',$html); - - $html = preg_replace('/\f/','',$html); //replace formfeed by nothing - $html = preg_replace('/\r/','',$html); //replace carriage return by nothing + $html = preg_replace('/<!--.*?-->/s','',($html ?? '')); + + $html = preg_replace('/\f/','',($html ?? '')); //replace formfeed by nothing + $html = preg_replace('/\r/','',($html ?? '')); //replace carriage return by nothing // Well formed XHTML end tags - $html = preg_replace('/<(br|hr)>/i',"<\\1 />",$html); // mPDF 6 - $html = preg_replace('/<(br|hr)\/>/i',"<\\1 />",$html); + $html = preg_replace('/<(br|hr)>/i',"<\\1 />",($html ?? '')); // mPDF 6 + $html = preg_replace('/<(br|hr)\/>/i',"<\\1 />",($html ?? '')); // Get rid of empty <thead></thead> etc - $html = preg_replace('/<tr>\s*<\/tr>/i','',$html); - $html = preg_replace('/<thead>\s*<\/thead>/i','',$html); - $html = preg_replace('/<tfoot>\s*<\/tfoot>/i','',$html); - $html = preg_replace('/<table[^>]*>\s*<\/table>/i','',$html); + $html = preg_replace('/<tr>\s*<\/tr>/i','',($html ?? '')); + $html = preg_replace('/<thead>\s*<\/thead>/i','',($html ?? '')); + $html = preg_replace('/<tfoot>\s*<\/tfoot>/i','',($html ?? '')); + $html = preg_replace('/<table[^>]*>\s*<\/table>/i','',($html ?? '')); // Remove spaces at end of table cells - $html = preg_replace("/[ \n\r]+<\/t(d|h)/",'</t\\1',$html); - - $html = preg_replace("/[ ]*<dottab\s*[\/]*>[ ]*/",'<dottab />',$html); + $html = preg_replace("/[ \n\r]+<\/t(d|h)/",'</t\\1',($html ?? '')); + + $html = preg_replace("/[ ]*<dottab\s*[\/]*>[ ]*/",'<dottab />',($html ?? '')); // Concatenates any Substitute characters from symbols/dingbats - $html = str_replace('</tts><tts>','|',$html); - $html = str_replace('</ttz><ttz>','|',$html); - $html = str_replace('</tta><tta>','|',$html); - - $html = preg_replace('/<br \/>\s*/is',"<br />",$html); - - $html = preg_replace('/<wbr[ \/]*>\s*/is',"­",$html); + $html = str_replace('</tts><tts>','|',($html ?? '')); + $html = str_replace('</ttz><ttz>','|',($html ?? '')); + $html = str_replace('</tta><tta>','|',($html ?? '')); + + $html = preg_replace('/<br \/>\s*/is',"<br />",($html ?? '')); + + $html = preg_replace('/<wbr[ \/]*>\s*/is',"­",($html ?? '')); // Preserve '\n's in content between the tags <pre> and </pre> - if (preg_match('/<pre/',$html)) { - $html_a = preg_split('/(\<\/?pre[^\>]*\>)/', $html, -1, 2); + if (preg_match('/<pre/',($html ?? ''))) { + $html_a = preg_split('/(\<\/?pre[^\>]*\>)/', ($html ?? ''), -1, 2); $h = array(); $c=0; foreach($html_a AS $s) { - if ($c>1 && preg_match('/^<\/pre/i',$s)) { $c--; $s=preg_replace('/<\/pre/i','</innerpre',$s); } - else if ($c>0 && preg_match('/^<pre/i',$s)) { $c++; $s=preg_replace('/<pre/i','<innerpre',$s); } - else if (preg_match('/^<pre/i',$s)) { $c++; } - else if (preg_match('/^<\/pre/i',$s)) { $c--; } + if ($c>1 && preg_match('/^<\/pre/i',($s ?? ''))) { $c--; $s=preg_replace('/<\/pre/i','</innerpre',($s ?? '')); } + else if ($c>0 && preg_match('/^<pre/i',($s ?? ''))) { $c++; $s=preg_replace('/<pre/i','<innerpre',($s ?? '')); } + else if (preg_match('/^<pre/i',($s ?? ''))) { $c++; } + else if (preg_match('/^<\/pre/i',($s ?? ''))) { $c--; } array_push($h, $s); } $html = implode("", $h); } - $thereispre = preg_match_all('#<pre(.*?)>(.*?)</pre>#si',$html,$temp); + $thereispre = preg_match_all('#<pre(.*?)>(.*?)</pre>#si',($html ?? ''),$temp); // Preserve '\n's in content between the tags <textarea> and </textarea> - $thereistextarea = preg_match_all('#<textarea(.*?)>(.*?)</textarea>#si',$html,$temp2); - $html = preg_replace('/[\n]/',' ',$html); //replace linefeed by spaces - $html = preg_replace('/[\t]/',' ',$html); //replace tabs by spaces + $thereistextarea = preg_match_all('#<textarea(.*?)>(.*?)</textarea>#si',($html ?? ''),$temp2); + $html = preg_replace('/[\n]/',' ',($html ?? '')); //replace linefeed by spaces + $html = preg_replace('/[\t]/',' ',($html ?? '')); //replace tabs by spaces // Converts < to < when not a tag - $html = preg_replace('/<([^!\/a-zA-Z_:])/i','<\\1',$html); // mPDF 5.7.3 - $html = preg_replace("/[ ]+/",' ',$html); - - $html = preg_replace('/\/li>\s+<\/(u|o)l/i','/li></\\1l',$html); - $html = preg_replace('/\/(u|o)l>\s+<\/li/i','/\\1l></li',$html); - $html = preg_replace('/\/li>\s+<\/(u|o)l/i','/li></\\1l',$html); - $html = preg_replace('/\/li>\s+<li/i','/li><li',$html); - $html = preg_replace('/<(u|o)l([^>]*)>[ ]+/i','<\\1l\\2>',$html); - $html = preg_replace('/[ ]+<(u|o)l/i','<\\1l',$html); + $html = preg_replace('/<([^!\/a-zA-Z_:])/i','<\\1',($html ?? '')); // mPDF 5.7.3 + $html = preg_replace("/[ ]+/",' ',($html ?? '')); + + $html = preg_replace('/\/li>\s+<\/(u|o)l/i','/li></\\1l',($html ?? '')); + $html = preg_replace('/\/(u|o)l>\s+<\/li/i','/\\1l></li',($html ?? '')); + $html = preg_replace('/\/li>\s+<\/(u|o)l/i','/li></\\1l',($html ?? '')); + $html = preg_replace('/\/li>\s+<li/i','/li><li',($html ?? '')); + $html = preg_replace('/<(u|o)l([^>]*)>[ ]+/i','<\\1l\\2>',($html ?? '')); + $html = preg_replace('/[ ]+<(u|o)l/i','<\\1l',($html ?? '')); // Make self closing tabs valid XHTML // Tags which are self-closing: 1) Replaceable and 2) Non-replaced items $selftabs = 'input|hr|img|br|jpgraph|barcode|dottab'; $selftabs2 = 'indexentry|indexinsert|bookmark|watermarktext|watermarkimage|column_break|columnbreak|newcolumn|newpage|page_break|pagebreak|formfeed|columns|toc|tocpagebreak|setpageheader|setpagefooter|sethtmlpageheader|sethtmlpagefooter|annotation'; - $html = preg_replace('/(<('.$selftabs.'|'.$selftabs2.')[^>\/]*)>/i','\\1 />',$html); + $html = preg_replace('/(<('.$selftabs.'|'.$selftabs2.')[^>\/]*)>/i','\\1 />',($html ?? '')); $iterator = 0; while($thereispre) //Recover <pre attributes>content</pre> { - $temp[2][$iterator] = preg_replace('/<([^!\/a-zA-Z_:])/','<\\1',$temp[2][$iterator]); // mPDF 5.7.2 // mPDF 5.7.3 - - $temp[2][$iterator] = preg_replace_callback("/^([^\n\t]*?)\t/m", array($this, 'tabs2spaces_callback'), $temp[2][$iterator]); // mPDF 5.7+ - $temp[2][$iterator] = preg_replace('/\t/',str_repeat(" ",$tabSpaces),$temp[2][$iterator]); - - $temp[2][$iterator] = preg_replace('/\n/',"<br />",$temp[2][$iterator]); - $temp[2][$iterator] = str_replace('\\',"\\\\",$temp[2][$iterator]); + $temp[2][$iterator] = preg_replace('/<([^!\/a-zA-Z_:])/','<\\1',($temp[2][$iterator] ?? '')); // mPDF 5.7.2 // mPDF 5.7.3 + + $temp[2][$iterator] = preg_replace_callback("/^([^\n\t]*?)\t/m", array($this, 'tabs2spaces_callback'), ($temp[2][$iterator] ?? '')); // mPDF 5.7+ + $temp[2][$iterator] = preg_replace('/\t/',(str_repeat(" ",$tabSpaces) ?? ''),($temp[2][$iterator] ?? '')); + + $temp[2][$iterator] = preg_replace('/\n/',"<br />",($temp[2][$iterator] ?? '')); + $temp[2][$iterator] = str_replace('\\',"\\\\",($temp[2][$iterator] ?? '')); //$html = preg_replace('#<pre(.*?)>(.*?)</pre>#si','<erp'.$temp[1][$iterator].'>'.$temp[2][$iterator].'</erp>',$html,1); - $html = preg_replace('#<pre(.*?)>(.*?)</pre>#si','<erp'.$temp[1][$iterator].'>'.str_replace('$','\$',$temp[2][$iterator]).'</erp>',$html,1); // mPDF 5.7+ + $html = preg_replace('#<pre(.*?)>(.*?)</pre>#si','<erp'.$temp[1][$iterator].'>'.str_replace('$','\$',($temp[2][$iterator] ?? '')).'</erp>',($html ?? ''),1); // mPDF 5.7+ $thereispre--; $iterator++; } $iterator = 0; while($thereistextarea) //Recover <textarea attributes>content</textarea> { - $temp2[2][$iterator] = preg_replace('/\t/',str_repeat(" ",$tabSpaces),$temp2[2][$iterator]); - $temp2[2][$iterator] = str_replace('\\',"\\\\",$temp2[2][$iterator]); - $html = preg_replace('#<textarea(.*?)>(.*?)</textarea>#si','<aeratxet'.$temp2[1][$iterator].'>'.trim($temp2[2][$iterator]) .'</aeratxet>',$html,1); + $temp2[2][$iterator] = preg_replace('/\t/',(str_repeat(" ",$tabSpaces) ?? ''),($temp2[2][$iterator] ?? '')); + $temp2[2][$iterator] = str_replace('\\',"\\\\",($temp2[2][$iterator] ?? '')); + $html = preg_replace('#<textarea(.*?)>(.*?)</textarea>#si','<aeratxet'.$temp2[1][$iterator].'>'.trim(($temp2[2][$iterator] ?? '')) .'</aeratxet>',($html ?? ''),1); $thereistextarea--; $iterator++; } //Restore original tag names - $html = str_replace("<erp","<pre",$html); - $html = str_replace("</erp>","</pre>",$html); - $html = str_replace("<aeratxet","<textarea",$html); - $html = str_replace("</aeratxet>","</textarea>",$html); - $html = str_replace("</innerpre","</pre",$html); - $html = str_replace("<innerpre","<pre",$html); - - $html = preg_replace('/<textarea([^>]*)><\/textarea>/si','<textarea\\1> </textarea>',$html); - $html = preg_replace('/(<table[^>]*>)\s*(<caption)(.*?<\/caption>)(.*?<\/table>)/si','\\2 position="top"\\3\\1\\4\\2 position="bottom"\\3',$html); // *TABLES* - $html = preg_replace('/<(h[1-6])([^>]*)(>(?:(?!h[1-6]).)*?<\/\\1>\s*<table)/si','<\\1\\2 keep-with-table="1"\\3',$html); // *TABLES* - $html = preg_replace("/\xbb\xa4\xac/", "\n", $html); + $html = str_replace("<erp","<pre",($html ?? '')); + $html = str_replace("</erp>","</pre>",($html ?? '')); + $html = str_replace("<aeratxet","<textarea",($html ?? '')); + $html = str_replace("</aeratxet>","</textarea>",($html ?? '')); + $html = str_replace("</innerpre","</pre",($html ?? '')); + $html = str_replace("<innerpre","<pre",($html ?? '')); + + $html = preg_replace('/<textarea([^>]*)><\/textarea>/si','<textarea\\1> </textarea>',($html ?? '')); + $html = preg_replace('/(<table[^>]*>)\s*(<caption)(.*?<\/caption>)(.*?<\/table>)/si','\\2 position="top"\\3\\1\\4\\2 position="bottom"\\3',($html ?? '')); // *TABLES* + $html = preg_replace('/<(h[1-6])([^>]*)(>(?:(?!h[1-6]).)*?<\/\\1>\s*<table)/si','<\\1\\2 keep-with-table="1"\\3',($html ?? '')); // *TABLES* + $html = preg_replace("/\xbb\xa4\xac/", "\n", ($html ?? '')); // Fixes <p>₹</p> which browser copes with even though it is wrong! - $html = preg_replace("/(&#[x]{0,1}[0-9a-f]{1,5})</i", "\\1;<", $html); + $html = preg_replace("/(&#[x]{0,1}[0-9a-f]{1,5})</i", "\\1;<", ($html ?? '')); return $html; } // mPDF 5.7+ function tabs2spaces_callback($matches) { - return (stripslashes($matches[1]) . str_repeat(' ', $this->tabSpaces - (mb_strlen(stripslashes($matches[1])) % $this->tabSpaces))); + return (stripslashes($matches[1]) . str_repeat(' ', $this->tabSpaces - (mb_strlen((stripslashes($matches[1]) ?? '')) % $this->tabSpaces))); } // mPDF 5.7+ function date_callback($matches) { @@ -32153,7 +32170,7 @@ // From docPageNum: font is not set, so no check $nstr = (string) $num; $rnum = ''; - for ($i=0;$i<strlen($nstr);$i++) { + for ($i=0;$i<strlen(($nstr ?? ''));$i++) { if (!$check || $this->_charDefined($this->CurrentFont['cw'],$cp+intval($nstr[$i]))) { $rnum .= code2utf($cp+intval($nstr[$i])); } @@ -32166,7 +32183,7 @@ $nstr = (string) $num; $rnum = ''; $glyphs = array(0x3007, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D); - for ($i=0;$i<strlen($nstr);$i++) { + for ($i=0;$i<strlen(($nstr ?? ''));$i++) { $rnum .= code2utf($glyphs[intval($nstr[$i])]); } return $rnum; @@ -32193,10 +32210,10 @@ { $c1 = (64 + $valor); } - $alpha = chr($c1); - if ($c2 != '') $alpha .= chr($c2); - if ($c3 != '') $alpha .= chr($c3); - if (!$toupper) $alpha = strtolower($alpha); + $alpha = chr((int) ($c1)); + if ($c2 != '') $alpha .= chr((int) ($c2)); + if ($c3 != '') $alpha .= chr((int) ($c3)); + if (!$toupper) $alpha = strtolower(($alpha ?? '')); return $alpha; } @@ -32219,7 +32236,7 @@ if ($i==0) { return '0'; } // Otherwise, while I is greater than 0 and there are elements left in the glyph list: - for ($t=0; $t<count($additive_nums); $t++) { + for ($t=0; $t<count(($additive_nums ?? [])); $t++) { // Pop the first additive tuple from the glyph list. This is the current tuple. $ct = $additive_nums[$t]; @@ -32305,7 +32322,7 @@ default: break; } $roman = $r1.$r2.$r3.$r4; - if (!$toupper) $roman = strtolower($roman); + if (!$toupper) $roman = strtolower(($roman ?? '')); return $roman; } @@ -32313,7 +32330,7 @@ /*-- IMPORTS --*/ function SetImportUse() { $this->enableImports = true; - ini_set('auto_detect_line_endings',1); + false; require_once(_MPDF_PATH."mpdfi/pdf_context.php"); require_once(_MPDF_PATH."mpdfi/pdf_parser.php"); require_once(_MPDF_PATH."mpdfi/fpdi_pdf_parser.php"); @@ -32321,7 +32338,7 @@ // from mPDFI function hex2str($hex) { - return pack("H*", str_replace(array("\r","\n"," "),"", $hex)); + return pack("H*", str_replace(array("\r","\n"," "),"", ($hex ?? ''))); } function str2hex($str) { @@ -32342,7 +32359,7 @@ // An array. Output the proper // structure and move on. $this->_out("[",false); - for ($i = 0; $i < count($value[1]); $i++) { + for ($i = 0; $i < count(($value[1] ?? [])); $i++) { $this->pdf_write_value($value[1][$i]); } $this->_out("]"); @@ -32352,7 +32369,7 @@ // A dictionary. $this->_out("<<",false); reset ($value[1]); - while (list($k, $v) = each($value[1])) { + foreach ($value[1] as $k => $v) { $this->_out($k . " ",false); $this->pdf_write_value($v); } @@ -32413,7 +32430,7 @@ // ========== OVERWRITE SEARCH STRING IN A PDF FILE ================ function OverWrite($file_in, $search, $replacement, $dest="D", $file_out="mpdf" ) { - $pdf = file_get_contents($file_in); + $pdf = file_get_contents(($file_in ?? '')); if (!is_array($search)) { $x = $search; @@ -32434,30 +32451,30 @@ } else { foreach($replacement AS $k=>$val) { - $replacement[$k] = mb_convert_encoding($replacement[$k],$this->mb_enc,'utf-8'); + $replacement[$k] = mb_convert_encoding(($replacement[$k] ?? ''),($this->mb_enc ?? ''),'utf-8'); $replacement[$k] = $this->_escape($replacement[$k]); } } // Get xref into array $xref = array(); - preg_match("/xref\n0 (\d+)\n(.*?)\ntrailer/s",$pdf,$m); + preg_match("/xref\n0 (\d+)\n(.*?)\ntrailer/s",($pdf ?? ''),$m); $xref_objid = $m[1]; - preg_match_all('/(\d{10}) (\d{5}) (f|n)/',$m[2],$x); - for($i=0; $i<count($x[0]); $i++) { + preg_match_all('/(\d{10}) (\d{5}) (f|n)/',($m[2] ?? ''),$x); + for($i=0; $i<count(($x[0] ?? [])); $i++) { $xref[] = array(intval($x[1][$i]), $x[2][$i], $x[3][$i]); } $changes = array(); - preg_match("/<<\s*\/Type\s*\/Pages\s*\/Kids\s*\[(.*?)\]\s*\/Count/s",$pdf,$m); - preg_match_all("/(\d+) 0 R /s",$m[1],$o); + preg_match("/<<\s*\/Type\s*\/Pages\s*\/Kids\s*\[(.*?)\]\s*\/Count/s",($pdf ?? ''),$m); + preg_match_all("/(\d+) 0 R /s",($m[1] ?? ''),$o); $objlist = $o[1]; foreach($objlist AS $obj) { if ($this->compress) { - preg_match("/".($obj+1)." 0 obj\n<<\s*\/Filter\s*\/FlateDecode\s*\/Length (\d+)>>\nstream\n(.*?)\nendstream\n/s",$pdf,$m); + preg_match("/".($obj+1)." 0 obj\n<<\s*\/Filter\s*\/FlateDecode\s*\/Length (\d+)>>\nstream\n(.*?)\nendstream\n/s",($pdf ?? ''),$m); } else { - preg_match("/".($obj+1)." 0 obj\n<<\s*\/Length (\d+)>>\nstream\n(.*?)\nendstream\n/s",$pdf,$m); + preg_match("/".($obj+1)." 0 obj\n<<\s*\/Length (\d+)>>\nstream\n(.*?)\nendstream\n/s",($pdf ?? ''),$m); } $s = $m[2]; if (!$s) { continue; } @@ -32469,7 +32486,7 @@ $s = gzuncompress($s); } foreach($search AS $k=>$val) { - $s = str_replace($search[$k],$replacement[$k],$s); + $s = str_replace(($search[$k] ?? ''),($replacement[$k] ?? ''),($s ?? '')); } if ($this->compress) { $s = gzcompress($s); @@ -32477,15 +32494,15 @@ if ($this->encrypted) { $s = $this->_RC4($this->_objectkey($obj+1), $s); } - $newlen = strlen($s); - $changes[($xref[$obj+1][0])] = ($newlen - $oldlen) + (strlen($newlen) - strlen($oldlen )); + $newlen = strlen(($s ?? '')); + $changes[($xref[$obj+1][0])] = ($newlen - $oldlen) + (strlen(($newlen ?? '')) - strlen(($oldlen ?? '') )); if ($this->compress) { $newstr = ($obj+1) . " 0 obj\n<</Filter /FlateDecode /Length ".$newlen.">>\nstream\n".$s."\nendstream\n"; } else { $newstr = ($obj+1) . " 0 obj\n<</Length ".$newlen.">>\nstream\n".$s."\nendstream\n"; } - $pdf = str_replace($m[0],$newstr,$pdf); + $pdf = str_replace(($m[0] ?? ''),($newstr ?? ''),($pdf ?? '')); } // Update xref in PDF @@ -32498,13 +32515,13 @@ $newxref .= sprintf('%010d',$v[0]) . ' ' . $v[1] . ' ' .$v[2] . " \n"; } $newxref .= "trailer"; - $pdf = preg_replace("/xref\n0 \d+\n.*?\ntrailer/s",$newxref,$pdf); + $pdf = preg_replace("/xref\n0 \d+\n.*?\ntrailer/s",($newxref ?? ''),($pdf ?? '')); // Update startxref in PDF - preg_match("/startxref\n(\d+)\n%%EOF/s", $pdf, $m); + preg_match("/startxref\n(\d+)\n%%EOF/s", ($pdf ?? ''), $m); $startxref = $m[1]; $startxref += array_sum($changes); - $pdf = preg_replace("/startxref\n(\d+)\n%%EOF/s","startxref\n".$startxref."\n%%EOF",$pdf); + $pdf = preg_replace("/startxref\n(\d+)\n%%EOF/s","startxref\n".$startxref."\n%%EOF",($pdf ?? '')); // OUTPUT switch($dest) { @@ -32514,7 +32531,7 @@ { //We send to a browser Header('Content-Type: application/pdf'); - Header('Content-Length: '.strlen($pdf)); + Header('Content-Length: '.strlen(($pdf ?? ''))); Header('Content-disposition: inline; filename='.$file_out); } echo $pdf; @@ -32524,7 +32541,7 @@ if (!$file_out) { $file_out = 'mpdf.pdf'; } $f=fopen($file_out,'wb'); if(!$f) die('Unable to create output file: '.$file_out); - fwrite($f,$pdf,strlen($pdf)); + fwrite($f,$pdf,strlen(($pdf ?? ''))); fclose($f); break; case 'S': @@ -32533,11 +32550,11 @@ case 'D': default: //Download file - if(isset($_SERVER['HTTP_USER_AGENT']) and strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) + if(isset($_SERVER['HTTP_USER_AGENT']) and strpos(($_SERVER['HTTP_USER_AGENT'] ?? ''),'MSIE')) Header('Content-Type: application/force-download'); else Header('Content-Type: application/octet-stream'); - Header('Content-Length: '.strlen($pdf)); + Header('Content-Length: '.strlen(($pdf ?? ''))); Header('Content-disposition: attachment; filename='.$file_out); echo $pdf; break; --- a/intranet/mpdf60/graph.php +++ b/intranet/mpdf60/graph.php @@ -56,7 +56,7 @@ $hide_grid = false; $hide_y_axis = false; - if (isset($g['attr']['TYPE']) && $g['attr']['TYPE']) { $type = strtolower($g['attr']['TYPE']); } + if (isset($g['attr']['TYPE']) && $g['attr']['TYPE']) { $type = strtolower(($g['attr']['TYPE'] ?? '')); } if (!in_array($type,array('bar','horiz_bar','line','radar','pie','pie3d','xy','scatter'))) { $type = 'bar'; } // Default=bar if (isset($g['attr']['STACKED']) && $g['attr']['STACKED']) { $stacked = true; } // stacked for bar or horiz_bar @@ -95,11 +95,11 @@ if (isset($g['attr']['LABEL-X']) && $g['attr']['LABEL-X']) { $xlabel = $g['attr']['LABEL-X']; } // NOT IMPLEMENTED?????? if (isset($g['attr']['LABEL-Y']) && $g['attr']['LABEL-Y']) { $ylabel = $g['attr']['LABEL-Y']; } - if (isset($g['attr']['AXIS-X']) && $g['attr']['AXIS-X']) { $xaxis = strtolower($g['attr']['AXIS-X']); } + if (isset($g['attr']['AXIS-X']) && $g['attr']['AXIS-X']) { $xaxis = strtolower(($g['attr']['AXIS-X'] ?? '')); } if (!in_array($xaxis,array('text','lin','linear','log'))) { $xaxis = 'text'; } // Default=text if ($xaxis == 'linear') { $xaxis = 'lin'; } - if (isset($g['attr']['AXIS-Y']) && $g['attr']['AXIS-Y']) { $yaxis = strtolower($g['attr']['AXIS-Y']); } + if (isset($g['attr']['AXIS-Y']) && $g['attr']['AXIS-Y']) { $yaxis = strtolower(($g['attr']['AXIS-Y'] ?? '')); } if (!in_array($yaxis,array('lin','linear','log','percent'))) { $yaxis = 'lin'; } // Default=lin if ($yaxis == 'percent') { $show_percent = true; $yaxis = 'lin'; } // Show percent sign on scales if ($yaxis == 'linear') { $yaxis = 'lin'; } @@ -112,7 +112,7 @@ if (isset($g['attr']['cHEIGHT']) && $g['attr']['cHEIGHT']) { $h=($g['attr']['cHEIGHT'] / 0.2645); } - if (isset($g['attr']['SERIES']) && strtolower($g['attr']['SERIES']) == 'rows') { $dataseries = 'rows'; } + if (isset($g['attr']['SERIES']) && strtolower(($g['attr']['SERIES'] ?? '')) == 'rows') { $dataseries = 'rows'; } else { $dataseries = 'cols'; } // Defaults - define data @@ -132,7 +132,7 @@ if (isset($g['attr']['DATA-ROW-END']) && ($g['attr']['DATA-ROW-END'] === '0' || $g['attr']['DATA-ROW-END'] <> 0)) { $rowend = $g['attr']['DATA-ROW-END']; } if (isset($g['attr']['DATA-COL-END']) && ($g['attr']['DATA-COL-END'] === '0' || $g['attr']['DATA-COL-END'] <> 0)) { $colend = $g['attr']['DATA-COL-END']; } - $nr = count($g['data']); + $nr = count(($g['data'] ?? [])); $nc = 0; foreach($g['data'] AS $r) { $cc=0; @@ -170,8 +170,8 @@ } // PERCENT if ($percent && $type != 'pie' && $type != 'pie3d') { - for ($r=0;$r<count($data);$r++) { - for ($c=0;$c<count($data[$r]);$c++) { + for ($r=0;$r<count(($data ?? []));$r++) { + for ($c=0;$c<count(($data[$r] ?? []));$c++) { $data[$r][$c] = $data[$r][$c]/$totals[$r] * 100; } } @@ -185,13 +185,13 @@ if ($colbegin>1) { for ($r=($rowbegin-1);$r<$rowend;$r++) { $legends[($r+1-$rowbegin)] = $g['data'][$r][0] ; - $longestlegend = max($longestlegend, strlen( $g['data'][$r][0] )); + $longestlegend = max($longestlegend, strlen( ($g['data'][$r][0] ?? '') )); } } if ($rowbegin>1) { for ($c=($colbegin-1);$c<$colend;$c++) { $labels[($c+1-$colbegin)] = $g['data'][0][$c] ; - $longestlabel = max($longestlabel , strlen( $g['data'][0][$c] )); + $longestlabel = max($longestlabel , strlen( ($g['data'][0][$c] ?? '') )); } } } @@ -199,13 +199,13 @@ if ($colbegin>1) { for ($r=($rowbegin-1);$r<$rowend;$r++) { $labels[($r+1-$rowbegin)] = $g['data'][$r][0] ; - $longestlabel = max($longestlabel , strlen( $g['data'][$r][0] )); + $longestlabel = max($longestlabel , strlen( ($g['data'][$r][0] ?? '') )); } } if ($rowbegin>1) { for ($c=($colbegin-1);$c<$colend;$c++) { $legends[($c+1-$colbegin)] = $g['data'][0][$c] ; - $longestlegend = max($longestlegend, strlen( $g['data'][0][$c] )); + $longestlegend = max($longestlegend, strlen( ($g['data'][0][$c] ?? '') )); } } } @@ -227,7 +227,7 @@ if (!$h && !$w) { $w = $defsize[$type]['w']; $h = $defsize[$type]['h']; } - if (count($data)>0 && $type) { + if (count(($data ?? []))>0 && $type) { $figure_file = "graph_cache/".rand(11111,999999999).".".$img_type; if ($bandw) { $colours = array('snow1','black','snow4','snow3','snow2','cadetblue4','cadetblue3','cadetblue1','bisque4','bisque2','beige'); } else { $colours = array('cyan','darkorchid4','cadetblue3','khaki1','darkolivegreen2','cadetblue4','coral','cyan4','rosybrown3','wheat1'); } @@ -298,7 +298,7 @@ $pmb = 50; $xlangle = 0; $ll = ($longestlegend * 5); // 45 degrees 8pt fontsize - if ($ll > 5 || ($ll>3 && count($data)>10)) { + if ($ll > 5 || ($ll>3 && count(($data ?? []))>10)) { $pmb = max($pmb, $ll + 30); $xlangle = 50; } @@ -395,7 +395,7 @@ foreach($data AS $series => $dat) { $rdata = array(); foreach($data[$series] AS $row) { $rdata[] = $row; } - if (count($rdata)<3) { die("ERROR::Graph::Cannot create a Radar Plot with less than 3 data points."); } + if (count(($rdata ?? []))<3) { die("ERROR::Graph::Cannot create a Radar Plot with less than 3 data points."); } // Create the radar plot $bplot = new RadarPlot($rdata); $bplot->mark->SetType($markers[$series]); @@ -605,7 +605,7 @@ $group[] = $bplot; } - if (count($data)==1) { + if (count(($data ?? []))==1) { $graph->Add($group[0]); } else { @@ -689,7 +689,7 @@ $group[] = $bplot; } - if (count($data)==1) { + if (count(($data ?? []))==1) { $graph->Add($group[0]); } else { @@ -705,7 +705,7 @@ } if ($graph) { $graph->Stroke( _MPDF_PATH.$figure_file); - $srcpath = str_replace("\\","/",dirname(__FILE__)) . "/"; + $srcpath = str_replace("\\","/",(dirname(__FILE__) ?? '')) . "/"; $srcpath .= $figure_file; return array('file'=>$srcpath, 'w'=>$w, 'h'=>$h); } --- a/intranet/mpdf60/qrcode/qrcode.class.php +++ b/intranet/mpdf60/qrcode/qrcode.class.php @@ -65,7 +65,7 @@ if (!in_array($level, array('L', 'M', 'Q', 'H'))) $this->ERROR('ECC non reconnu : L, M, Q, H'); - $this->length = strlen($value); + $this->length = strlen(($value ?? '')); if (!$this->length) $this->ERROR('pas de data...'); @@ -201,19 +201,19 @@ $s = $size/($s_max-$s_min); // rectangle de fond - $im = imagecreatetruecolor($size,$size); - $c_case = imagecolorallocate($im,$color[0],$color[1],$color[2]); - $c_back = imagecolorallocate($im,$background[0],$background[1],$background[2]); - imagefilledrectangle($im,0,0,$size,$size,$c_back); + $im = imagecreatetruecolor((int) ($size),(int) ($size)); + $c_case = imagecolorallocate($im,(int) ($color[0]),(int) ($color[1]),(int) ($color[2])); + $c_back = imagecolorallocate($im,(int) ($background[0]),(int) ($background[1]),(int) ($background[2])); + imagefilledrectangle($im,0,0,(int) ($size),(int) ($size),(int) ($c_back)); for($j=$s_min; $j<$s_max; $j++) for($i=$s_min; $i<$s_max; $i++) if ($this->final[$i + $j*$this->qr_size+1]) - imagefilledrectangle($im,($i-$s_min)*$s,($j-$s_min)*$s,($i-$s_min+1)*$s-1,($j-$s_min+1)*$s-1,$c_case); + imagefilledrectangle($im,(int) (($i-$s_min)*$s),(int) (($j-$s_min)*$s),(int) (($i-$s_min+1)*$s-1),(int) (($j-$s_min+1)*$s-1),(int) ($c_case)); if ($filename) { - imagepng($im, $filename, $quality); + imagepng($im, $filename, (int) ($quality)); } else { @@ -248,9 +248,9 @@ private function encode() { // conversion des datas - if (preg_match('/[^0-9]/',$this->value)) - { - if (preg_match('/[^0-9A-Z \$\*\%\+\-\.\/\:]/',$this->value)) + if (preg_match('/[^0-9]/',($this->value ?? ''))) + { + if (preg_match('/[^0-9A-Z \$\*\%\+\-\.\/\:]/',($this->value ?? ''))) { // type : bin $this->type = 'bin'; @@ -262,7 +262,7 @@ // datas for ($i=0; $i<$this->length; $i++) - $this->addData(ord(substr($this->value, $i, 1)), 8); + $this->addData(ord((substr(($this->value ?? ''), $i, 1) ?? '')), 8); } else { @@ -284,9 +284,9 @@ for ($i=0; $i<$this->length; $i++) { if (($i %2)==0) - $this->addData($an_hash[substr($this->value,$i,1)], 6, false); + $this->addData($an_hash[substr(($this->value ?? ''),$i,1)], 6, false); else - $this->addData($this->data_val[$this->data_cur]*45+$an_hash[substr($this->value,$i,1)], 11, true); + $this->addData($this->data_val[$this->data_cur]*45+$an_hash[substr(($this->value ?? ''),$i,1)], 11, true); } unset($an_hash); @@ -308,11 +308,11 @@ for ($i=0; $i<$this->length; $i++) { if (($i % 3)==0) - $this->addData(substr($this->value,$i,1), 4, false); + $this->addData(substr(($this->value ?? ''),$i,1), 4, false); else if (($i % 3)==1) - $this->addData($this->data_val[$this->data_cur]*10+substr($this->value,$i,1), 7, false); + $this->addData($this->data_val[$this->data_cur]*10+substr(($this->value ?? ''),$i,1), 7, false); else - $this->addData($this->data_val[$this->data_cur]*10+substr($this->value,$i,1), 10); + $this->addData($this->data_val[$this->data_cur]*10+substr(($this->value ?? ''),$i,1), 10); } if (isset($this->data_bit[$this->data_cur])) @@ -464,7 +464,7 @@ $this->mask_array = unpack("C*", fread($fp1,$this->byte_num)); $this->format_information_x2 = unpack("C*", fread($fp1,15)); $this->format_information_y2 = unpack("C*", fread($fp1,15)); - $this->rs_ecc_codewords = ord(fread($fp1,1)); + $this->rs_ecc_codewords = ord((fread($fp1,1) ?? '')); $this->rs_block_order = unpack("C*", fread($fp1,128)); fclose($fp1); $this->format_information_x1 = array(0,1,2,3,4,5,7,8,8,8,8,8,8,8,8); @@ -482,7 +482,7 @@ $rs_cal_table_array[$i]=fread ($fp0,$this->rs_ecc_codewords); fclose ($fp0); - $max_data_codewords = count($this->data_word); + $max_data_codewords = count(($this->data_word ?? [])); // preparation $j=0; @@ -490,7 +490,7 @@ $rs_temp[0]=""; for($i=0; $i<$max_data_codewords; $i++) { - $rs_temp[$rs_block_number].=chr($this->data_word[$i]); + $rs_temp[$rs_block_number].=chr((int) ($this->data_word[$i])); $j++; if ($j>=$this->rs_block_order[$rs_block_number+1]-$this->rs_ecc_codewords) { @@ -501,29 +501,29 @@ } // make - $rs_block_order_num=count($this->rs_block_order); + $rs_block_order_num=count(($this->rs_block_order ?? [])); for($rs_block_number=0; $rs_block_number<$rs_block_order_num; $rs_block_number++) { $rs_codewords=$this->rs_block_order[$rs_block_number+1]; $rs_data_codewords=$rs_codewords-$this->rs_ecc_codewords; - $rstemp=$rs_temp[$rs_block_number].str_repeat(chr(0),$this->rs_ecc_codewords); - $padding_data=str_repeat(chr(0),$rs_data_codewords); + $rstemp=$rs_temp[$rs_block_number].str_repeat((chr(0) ?? ''),$this->rs_ecc_codewords); + $padding_data=str_repeat((chr(0) ?? ''),$rs_data_codewords); $j=$rs_data_codewords; while($j>0) { - $first=ord(substr($rstemp,0,1)); + $first=ord((substr(($rstemp ?? ''),0,1) ?? '')); if ($first) { - $left_chr=substr($rstemp,1); + $left_chr=substr(($rstemp ?? ''),1); $cal=$rs_cal_table_array[$first].$padding_data; $rstemp=$left_chr ^ $cal; } else - $rstemp=substr($rstemp,1); + $rstemp=substr(($rstemp ?? ''),1); $j--; } @@ -564,8 +564,8 @@ $l=0; while($l<$this->size) { - $hor_master=$hor_master.chr($this->matrix[$l][$k]); - $ver_master=$ver_master.chr($this->matrix[$k][$l]); + $hor_master=$hor_master.chr((int) ($this->matrix[$l][$k])); + $ver_master=$ver_master.chr((int) ($this->matrix[$k][$l])); $l++; } $k++; @@ -580,14 +580,14 @@ $ptn_temp=array(); $bit= 1<< $i; $bit_r=(~$bit)&255; - $bit_mask=str_repeat(chr($bit),$all_matrix); + $bit_mask=str_repeat((chr((int) ($bit)) ?? ''),$all_matrix); $hor = $hor_master & $bit_mask; $ver = $ver_master & $bit_mask; - $ver_shift1=$ver.str_repeat(chr(170),$this->size); - $ver_shift2=str_repeat(chr(170),$this->size).$ver; - $ver_shift1_0=$ver.str_repeat(chr(0),$this->size); - $ver_shift2_0=str_repeat(chr(0),$this->size).$ver; + $ver_shift1=$ver.str_repeat((chr(170) ?? ''),$this->size); + $ver_shift2=str_repeat((chr(170) ?? ''),$this->size).$ver; + $ver_shift1_0=$ver.str_repeat((chr(0) ?? ''),$this->size); + $ver_shift2_0=str_repeat((chr(0) ?? ''),$this->size).$ver; $ver_or=chunk_split(~($ver_shift1 | $ver_shift2),$this->size,chr(170)); $ver_and=chunk_split(~($ver_shift1_0 & $ver_shift2_0),$this->size,chr(170)); @@ -595,34 +595,34 @@ $ver=chunk_split(~$ver,$this->size,chr(170)); $hor=$hor.chr(170).$ver; - $n1_search="/".str_repeat(chr(255),5)."+|".str_repeat(chr($bit_r),5)."+/"; - $n3_search=chr($bit_r).chr(255).chr($bit_r).chr($bit_r).chr($bit_r).chr(255).chr($bit_r); + $n1_search="/".str_repeat((chr(255) ?? ''),5)."+|".str_repeat((chr((int) ($bit_r)) ?? ''),5)."+/"; + $n3_search=chr((int) ($bit_r)).chr(255).chr((int) ($bit_r)).chr((int) ($bit_r)).chr((int) ($bit_r)).chr(255).chr((int) ($bit_r)); $demerit_n3=substr_count($hor,$n3_search)*40; - $demerit_n4=floor(abs(( (100* (substr_count($ver,chr($bit_r))/($this->byte_num)) )-50)/5))*10; - - $n2_search1="/".chr($bit_r).chr($bit_r)."+/"; + $demerit_n4=floor(abs(( (100* (substr_count($ver,chr((int) ($bit_r)))/($this->byte_num)) )-50)/5))*10; + + $n2_search1="/".chr((int) ($bit_r)).chr((int) ($bit_r))."+/"; $n2_search2="/".chr(255).chr(255)."+/"; $demerit_n2=0; - preg_match_all($n2_search1,$ver_and,$ptn_temp); + preg_match_all(($n2_search1 ?? ''),($ver_and ?? ''),$ptn_temp); foreach($ptn_temp[0] as $str_temp) { - $demerit_n2+=(strlen($str_temp)-1); + $demerit_n2+=(strlen(($str_temp ?? ''))-1); } $ptn_temp=array(); - preg_match_all($n2_search2,$ver_or,$ptn_temp); + preg_match_all(($n2_search2 ?? ''),($ver_or ?? ''),$ptn_temp); foreach($ptn_temp[0] as $str_temp) { - $demerit_n2+=(strlen($str_temp)-1); + $demerit_n2+=(strlen(($str_temp ?? ''))-1); } $demerit_n2*=3; $ptn_temp=array(); - preg_match_all($n1_search,$hor,$ptn_temp); + preg_match_all(($n1_search ?? ''),($hor ?? ''),$ptn_temp); foreach($ptn_temp[0] as $str_temp) { - $demerit_n1+=(strlen($str_temp)-2); + $demerit_n1+=(strlen(($str_temp ?? ''))-2); } $demerit_score=$demerit_n1+$demerit_n2+$demerit_n3+$demerit_n4; @@ -650,7 +650,7 @@ for($i=0; $i<15; $i++) { - $content=substr($format_information_array[$format_information_value],$i,1); + $content=substr(($format_information_array[$format_information_value] ?? ''),$i,1); $this->matrix[$this->format_information_x1[$i]][$this->format_information_y1[$i]]=$content * 255; $this->matrix[$this->format_information_x2[$i+1]][$this->format_information_y2[$i+1]]=$content * 255; --- a/intranet/mpdf60/qrcode/image.php +++ b/intranet/mpdf60/qrcode/image.php @@ -8,7 +8,7 @@ require_once('qrcode.class.php'); - $qrcode = new QRcode(utf8_encode($msg), $err); + $qrcode = new QRcode(mb_convert_encoding(($msg ?? ''), 'UTF-8', 'ISO-8859-1'), $err); $qrcode->disableBorder(); $qrcode->displayPNG(200); ?> \ No newline at end of file --- a/intranet/mpdf60/qrcode/index.php +++ b/intranet/mpdf60/qrcode/index.php @@ -44,7 +44,7 @@ <body> <center> <form method="GET" action=""> - <textarea name="msg" cols="40" rows="7"><?php echo htmlentities($msg); ?></textarea><br> + <textarea name="msg" cols="40" rows="7"><?php echo htmlentities(($msg ?? '')); ?></textarea><br> Correction d'erreur : <select name="err"> <option value="L" <?php echo $err=='L' ? 'selected' : ''; ?>>L</option> @@ -57,12 +57,12 @@ <hr> Gnration d'un tableau HTML :<br> <?php - $qrcode = new QRcode(utf8_encode($msg), $err); + $qrcode = new QRcode(mb_convert_encoding(($msg ?? ''), 'UTF-8', 'ISO-8859-1'), $err); $qrcode->displayHTML(); ?> <br> Gnration d'une image PNG : <br> - <img src="./image.php?msg=<?php echo urlencode($msg); ?>&err=<?php echo urlencode($err); ?>" alt="generation qr-code" style="border: solid 1px black;"> + <img src="./image.php?msg=<?php echo urlencode(($msg ?? '')); ?>&err=<?php echo urlencode(($err ?? '')); ?>" alt="generation qr-code" style="border: solid 1px black;"> </center> </body> </html> \ No newline at end of file --- a/intranet/mpdf60/includes/functions.php +++ b/intranet/mpdf60/includes/functions.php @@ -8,9 +8,9 @@ if(imageistruecolor($src)) { return(true); } - $dst = imagecreatetruecolor(imagesx($src), imagesy($src)); + $dst = imagecreatetruecolor((int) (imagesx($src)), (int) (imagesy($src))); - imagecopy($dst, $src, 0, 0, 0, 0, imagesx($src), imagesy($src)); + imagecopy($dst, $src, 0, 0, 0, 0, (int) (imagesx($src)), (int) (imagesy($src))); imagedestroy($src); $src = $dst; @@ -31,7 +31,7 @@ if (is_array($array)) { $array = array_values($array); $offset = intval($offset); - if ($offset < 0 || $offset >= count($array)) { array_push($array, $value); } + if ($offset < 0 || $offset >= count(($array ?? []))) { array_push($array, $value); } else if ($offset == 0) { array_unshift($array, $value); } else { $temp = array_slice($array, 0, $offset); @@ -41,20 +41,20 @@ } } else { $array = array($value); } - return count($array); + return count(($array ?? [])); } // mPDF 5.7.4 URLs function urldecode_parts($url) { $file=$url; $query=''; - if (preg_match('/[?]/',$url)) { - $bits = preg_split('/[?]/',$url,2); + if (preg_match('/[?]/',($url ?? ''))) { + $bits = preg_split('/[?]/',($url ?? ''),2); $file=$bits[0]; $query='?'.$bits[1]; } - $file = rawurldecode($file); - $query = urldecode($query); + $file = rawurldecode(($file ?? '')); + $query = urldecode(($query ?? '')); return $file.$query; } @@ -89,9 +89,9 @@ function _fgets (&$h, $force=false) { $startpos = ftell($h); $s = fgets($h, 1024); - if ($force && preg_match("/^([^\r\n]*[\r\n]{1,2})(.)/",trim($s), $ns)) { + if ($force && preg_match("/^([^\r\n]*[\r\n]{1,2})(.)/",(trim(($s ?? '')) ?? ''), $ns)) { $s = $ns[1]; - fseek($h,$startpos+strlen($s)); + fseek($h,$startpos+strlen(($s ?? ''))); } return $s; } @@ -100,19 +100,19 @@ // For PHP4 compatability if(!function_exists('str_ireplace')) { function str_ireplace($search,$replace,$subject) { - $search = preg_quote($search, "/"); - return preg_replace("/".$search."/i", $replace, $subject); + $search = preg_quote(($search ?? ''), "/"); + return preg_replace("/".$search."/i", ($replace ?? ''), ($subject ?? '')); } } if(!function_exists('htmlspecialchars_decode')) { function htmlspecialchars_decode ($str) { - return strtr($str, array_flip(get_html_translation_table(HTML_SPECIALCHARS))); + return strtr(($str ?? ''), (array_flip(get_html_translation_table(HTML_SPECIALCHARS)) ?? '')); } } function PreparePreText($text,$ff='//FF//') { - $text = htmlspecialchars($text); - if ($ff) { $text = str_replace($ff,'</pre><formfeed /><pre>',$text); } + $text = htmlspecialchars(($text ?? '')); + if ($ff) { $text = str_replace(($ff ?? ''),'</pre><formfeed /><pre>',($text ?? '')); } return ('<pre>'.$text.'</pre>'); } @@ -121,12 +121,12 @@ //converts all the &#nnn; and &#xhhh; in a string to Unicode // mPDF 5.7 if ($lo) { - $str = preg_replace_callback('/\&\#([0-9]+)\;/m', 'code2utf_lo_callback', $str); - $str = preg_replace_callback('/\&\#x([0-9a-fA-F]+)\;/m', 'codeHex2utf_lo_callback', $str); + $str = preg_replace_callback('/\&\#([0-9]+)\;/m', 'code2utf_lo_callback', ($str ?? '')); + $str = preg_replace_callback('/\&\#x([0-9a-fA-F]+)\;/m', 'codeHex2utf_lo_callback', ($str ?? '')); } else { - $str = preg_replace_callback('/\&\#([0-9]+)\;/m', 'code2utf_callback', $str); - $str = preg_replace_callback('/\&\#x([0-9a-fA-F]+)\;/m', 'codeHex2utf_callback', $str); + $str = preg_replace_callback('/\&\#([0-9]+)\;/m', 'code2utf_callback', ($str ?? '')); + $str = preg_replace_callback('/\&\#x([0-9a-fA-F]+)\;/m', 'codeHex2utf_callback', ($str ?? '')); } return $str; } @@ -149,12 +149,12 @@ function code2utf($num,$lo=true){ //Returns the utf string corresponding to the unicode value if ($num<128) { - if ($lo) return chr($num); + if ($lo) return chr((int) ($num)); else return '&#'.$num.';'; } - if ($num<2048) return chr(($num>>6)+192).chr(($num&63)+128); - if ($num<65536) return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128); - if ($num<2097152) return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128) .chr(($num&63)+128); + if ($num<2048) return chr((int) (($num>>6)+192)).chr((int) (($num&63)+128)); + if ($num<65536) return chr((int) (($num>>12)+224)).chr((int) ((($num>>6)&63)+128)).chr((int) (($num&63)+128)); + if ($num<2097152) return chr((int) (($num>>18)+240)).chr((int) ((($num>>12)&63)+128)).chr((int) ((($num>>6)&63)+128)) .chr((int) (($num&63)+128)); return '?'; } } --- a/intranet/mpdf60/classes/tocontents.php +++ b/intranet/mpdf60/classes/tocontents.php @@ -1,6 +1,9 @@ <?php class tocontents { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $TOCsheetsize; + var $mpdf = null; var $_toc; @@ -32,7 +35,7 @@ var $TOC_suppress; // mPDF 6 var $m_TOC; -function tocontents(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; $this->_toc=array(); $this->TOCmark = 0; @@ -40,11 +43,11 @@ } function TOCpagebreak($tocfont='', $tocfontsize='', $tocindent='', $TOCusePaging=true, $TOCuseLinking='', $toc_orientation='', $toc_mgl='',$toc_mgr='',$toc_mgt='',$toc_mgb='',$toc_mgh='',$toc_mgf='',$toc_ohname='',$toc_ehname='',$toc_ofname='',$toc_efname='',$toc_ohvalue=0,$toc_ehvalue=0,$toc_ofvalue=0, $toc_efvalue=0, $toc_preHTML='', $toc_postHTML='', $toc_bookmarkText='', $resetpagenum='', $pagenumstyle='', $suppress='', $orientation='', $mgl='',$mgr='',$mgt='',$mgb='',$mgh='',$mgf='',$ohname='',$ehname='',$ofname='',$efname='',$ohvalue=0,$ehvalue=0,$ofvalue=0,$efvalue=0, $toc_id=0, $pagesel='', $toc_pagesel='', $sheetsize='', $toc_sheetsize='', $tocoutdent='', $toc_resetpagenum='', $toc_pagenumstyle='', $toc_suppress='') { // mPDF 5.6.19 // mPDF 6 - if (strtoupper($toc_id)=='ALL') { $toc_id = '_mpdf_all'; } + if (strtoupper(($toc_id ?? ''))=='ALL') { $toc_id = '_mpdf_all'; } else if (!$toc_id) { $toc_id = 0; } - else { $toc_id = strtolower($toc_id); } - - if ($TOCusePaging === false || strtolower($TOCusePaging) == "off" || $TOCusePaging === 0 || $TOCusePaging === "0" || $TOCusePaging === "") { $TOCusePaging = false; } + else { $toc_id = strtolower(($toc_id ?? '')); } + + if ($TOCusePaging === false || strtolower(($TOCusePaging ?? '')) == "off" || $TOCusePaging === 0 || $TOCusePaging === "0" || $TOCusePaging === "") { $TOCusePaging = false; } else { $TOCusePaging = true; } if (!$TOCuseLinking) { $TOCuseLinking = false; } if ($toc_id) { @@ -113,14 +116,14 @@ // Initiate, and Mark a place for the Table of Contents to be inserted function TOC($tocfont='', $tocfontsize=0, $tocindent=0, $resetpagenum='', $pagenumstyle='', $suppress='', $toc_orientation='', $TOCusePaging=true, $TOCuseLinking=false, $toc_id=0, $tocoutdent='', $toc_resetpagenum='', $toc_pagenumstyle='', $toc_suppress='') { // mPDF 5.6.19 // mPDF 6 - if (strtoupper($toc_id)=='ALL') { $toc_id = '_mpdf_all'; } + if (strtoupper(($toc_id ?? ''))=='ALL') { $toc_id = '_mpdf_all'; } else if (!$toc_id) { $toc_id = 0; } - else { $toc_id = strtolower($toc_id); } + else { $toc_id = strtolower(($toc_id ?? '')); } // To use odd and even pages // Cannot start table of contents on an even page if (($this->mpdf->mirrorMargins) && (($this->mpdf->page)%2==0)) { // EVEN if ($this->mpdf->ColActive) { - if (count($this->mpdf->columnbuffer)) { $this->mpdf->printcolumnbuffer(); } + if (count(($this->mpdf->columnbuffer ?? []))) { $this->mpdf->printcolumnbuffer(); } } $this->mpdf->AddPage($this->mpdf->CurOrientation,'',$resetpagenum, $pagenumstyle, $suppress); } @@ -153,11 +156,11 @@ function insertTOC() { $notocs = 0; if ($this->TOCmark) { $notocs = 1; } - $notocs += count($this->m_TOC); + $notocs += count(($this->m_TOC ?? [])); if ($notocs==0) { return; } - if (count($this->m_TOC)) { reset($this->m_TOC); } + if (count(($this->m_TOC ?? []))) { reset($this->m_TOC); } $added_toc_pages = 0; if ($this->mpdf->ColActive) { $this->mpdf->SetColumns(0); } @@ -250,7 +253,7 @@ $this->mpdf->writingToC = true; // mPDF 5.6.38 // mPDF 5.6.31 - $tocstart=count($this->mpdf->pages); + $tocstart=count(($this->mpdf->pages ?? [])); if (isset($toc_preHTML) && $toc_preHTML) { $this->mpdf->WriteHTML($toc_preHTML); } @@ -297,7 +300,7 @@ $s .= $this->mpdf->PrintBodyBackgrounds(); $s .= $this->mpdf->PrintPageBackgrounds(); - $this->mpdf->pages[$this->mpdf->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->mpdf->uniqstr.')/', "\n".$s."\n".'\\1', $this->mpdf->pages[$this->mpdf->page]); + $this->mpdf->pages[$this->mpdf->page] = preg_replace('/(___BACKGROUND___PATTERNS'.$this->mpdf->uniqstr.')/', "\n".$s."\n".'\\1', ($this->mpdf->pages[$this->mpdf->page] ?? '')); $this->mpdf->pageBackgrounds = array(); //Page footer @@ -307,7 +310,7 @@ // 2nd time through to move pages etc. $added_toc_pages = 0; - if (count($this->m_TOC)) { reset($this->m_TOC); } + if (count(($this->m_TOC ?? []))) { reset($this->m_TOC); } for ($toci = 0; $toci<$notocs; $toci++) { if ($toci==0 && $this->TOCmark) { @@ -367,7 +370,7 @@ // Delete empty page that was inserted earlier if ($extrapage) { - unset($this->mpdf->pages[count($this->mpdf->pages)]); + unset($this->mpdf->pages[count(($this->mpdf->pages ?? []))]); $this->mpdf->page--; // Reset page pointer } @@ -381,23 +384,23 @@ if (isset($attr['PAGENUMSTYLE']) && $attr['PAGENUMSTYLE']) { $pagenumstyle = $attr['PAGENUMSTYLE']; } else { $pagenumstyle= ''; } if (isset($attr['SUPPRESS']) && $attr['SUPPRESS']) { $suppress = $attr['SUPPRESS']; } else { $suppress = ''; } if (isset($attr['TOC-ORIENTATION']) && $attr['TOC-ORIENTATION']) { $toc_orientation = $attr['TOC-ORIENTATION']; } else { $toc_orientation = ''; } - if (isset($attr['PAGING']) && (strtoupper($attr['PAGING'])=='OFF' || $attr['PAGING']==='0')) { $paging = false; } + if (isset($attr['PAGING']) && (strtoupper(($attr['PAGING'] ?? ''))=='OFF' || $attr['PAGING']==='0')) { $paging = false; } else { $paging = true; } - if (isset($attr['LINKS']) && (strtoupper($attr['LINKS'])=='ON' || $attr['LINKS']==1)) { $links = true; } + if (isset($attr['LINKS']) && (strtoupper(($attr['LINKS'] ?? ''))=='ON' || $attr['LINKS']==1)) { $links = true; } else { $links = false; } - if (isset($attr['NAME']) && $attr['NAME']) { $toc_id = strtolower($attr['NAME']); } else { $toc_id = 0; } + if (isset($attr['NAME']) && $attr['NAME']) { $toc_id = strtolower(($attr['NAME'] ?? '')); } else { $toc_id = 0; } $this->TOC('',0,0,$resetpagenum, $pagenumstyle, $suppress, $toc_orientation, $paging, $links, $toc_id, $tocoutdent); // mPDF 5.6.19 5.6.31 } function openTagTOCPAGEBREAK($attr) { - if (isset($attr['NAME']) && $attr['NAME']) { $toc_id = strtolower($attr['NAME']); } else { $toc_id = 0; } + if (isset($attr['NAME']) && $attr['NAME']) { $toc_id = strtolower(($attr['NAME'] ?? '')); } else { $toc_id = 0; } if ($toc_id) { if (isset($attr['OUTDENT']) && $attr['OUTDENT']) { $this->m_TOC[$toc_id]['TOCoutdent'] = $attr['OUTDENT']; } else { $this->m_TOC[$toc_id]['TOCoutdent'] = ''; } // mPDF 5.6.19 if (isset($attr['TOC-ORIENTATION']) && $attr['TOC-ORIENTATION']) { $this->m_TOC[$toc_id]['TOCorientation'] = $attr['TOC-ORIENTATION']; } else { $this->m_TOC[$toc_id]['TOCorientation'] = ''; } - if (isset($attr['PAGING']) && (strtoupper($attr['PAGING'])=='OFF' || $attr['PAGING']==='0')) { $this->m_TOC[$toc_id]['TOCusePaging'] = false; } + if (isset($attr['PAGING']) && (strtoupper(($attr['PAGING'] ?? ''))=='OFF' || $attr['PAGING']==='0')) { $this->m_TOC[$toc_id]['TOCusePaging'] = false; } else { $this->m_TOC[$toc_id]['TOCusePaging'] = true; } - if (isset($attr['LINKS']) && (strtoupper($attr['LINKS'])=='ON' || $attr['LINKS']==1)) { $this->m_TOC[$toc_id]['TOCuseLinking'] = true; } + if (isset($attr['LINKS']) && (strtoupper(($attr['LINKS'] ?? ''))=='ON' || $attr['LINKS']==1)) { $this->m_TOC[$toc_id]['TOCuseLinking'] = true; } else { $this->m_TOC[$toc_id]['TOCuseLinking'] = false; } $this->m_TOC[$toc_id]['TOC_margin_left'] = $this->m_TOC[$toc_id]['TOC_margin_right'] = $this->m_TOC[$toc_id]['TOC_margin_top'] = $this->m_TOC[$toc_id]['TOC_margin_bottom'] = $this->m_TOC[$toc_id]['TOC_margin_header'] = $this->m_TOC[$toc_id]['TOC_margin_footer'] = ''; @@ -413,14 +416,14 @@ if (isset($attr['TOC-ODD-FOOTER-NAME']) && $attr['TOC-ODD-FOOTER-NAME']) { $this->m_TOC[$toc_id]['TOC_odd_footer_name'] = $attr['TOC-ODD-FOOTER-NAME']; } if (isset($attr['TOC-EVEN-FOOTER-NAME']) && $attr['TOC-EVEN-FOOTER-NAME']) { $this->m_TOC[$toc_id]['TOC_even_footer_name'] = $attr['TOC-EVEN-FOOTER-NAME']; } $this->m_TOC[$toc_id]['TOC_odd_header_value'] = $this->m_TOC[$toc_id]['TOC_even_header_value'] = $this->m_TOC[$toc_id]['TOC_odd_footer_value'] = $this->m_TOC[$toc_id]['TOC_even_footer_value'] = 0; - if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='1' || strtoupper($attr['TOC-ODD-HEADER-VALUE'])=='ON')) { $this->m_TOC[$toc_id]['TOC_odd_header_value'] = 1; } - else if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='-1' || strtoupper($attr['TOC-ODD-HEADER-VALUE'])=='OFF')) { $this->m_TOC[$toc_id]['TOC_odd_header_value'] = -1; } - if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='1' || strtoupper($attr['TOC-EVEN-HEADER-VALUE'])=='ON')) { $this->m_TOC[$toc_id]['TOC_even_header_value'] = 1; } - else if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='-1' || strtoupper($attr['TOC-EVEN-HEADER-VALUE'])=='OFF')) { $this->m_TOC[$toc_id]['TOC_even_header_value'] = -1; } - if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='1' || strtoupper($attr['TOC-ODD-FOOTER-VALUE'])=='ON')) { $this->m_TOC[$toc_id]['TOC_odd_footer_value'] = 1; } - else if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='-1' || strtoupper($attr['TOC-ODD-FOOTER-VALUE'])=='OFF')) { $this->m_TOC[$toc_id]['TOC_odd_footer_value'] = -1; } - if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='1' || strtoupper($attr['TOC-EVEN-FOOTER-VALUE'])=='ON')) { $this->m_TOC[$toc_id]['TOC_even_footer_value'] = 1; } - else if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='-1' || strtoupper($attr['TOC-EVEN-FOOTER-VALUE'])=='OFF')) { $this->m_TOC[$toc_id]['TOC_even_footer_value'] = -1; } + if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='1' || strtoupper(($attr['TOC-ODD-HEADER-VALUE'] ?? ''))=='ON')) { $this->m_TOC[$toc_id]['TOC_odd_header_value'] = 1; } + else if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='-1' || strtoupper(($attr['TOC-ODD-HEADER-VALUE'] ?? ''))=='OFF')) { $this->m_TOC[$toc_id]['TOC_odd_header_value'] = -1; } + if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='1' || strtoupper(($attr['TOC-EVEN-HEADER-VALUE'] ?? ''))=='ON')) { $this->m_TOC[$toc_id]['TOC_even_header_value'] = 1; } + else if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='-1' || strtoupper(($attr['TOC-EVEN-HEADER-VALUE'] ?? ''))=='OFF')) { $this->m_TOC[$toc_id]['TOC_even_header_value'] = -1; } + if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='1' || strtoupper(($attr['TOC-ODD-FOOTER-VALUE'] ?? ''))=='ON')) { $this->m_TOC[$toc_id]['TOC_odd_footer_value'] = 1; } + else if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='-1' || strtoupper(($attr['TOC-ODD-FOOTER-VALUE'] ?? ''))=='OFF')) { $this->m_TOC[$toc_id]['TOC_odd_footer_value'] = -1; } + if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='1' || strtoupper(($attr['TOC-EVEN-FOOTER-VALUE'] ?? ''))=='ON')) { $this->m_TOC[$toc_id]['TOC_even_footer_value'] = 1; } + else if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='-1' || strtoupper(($attr['TOC-EVEN-FOOTER-VALUE'] ?? ''))=='OFF')) { $this->m_TOC[$toc_id]['TOC_even_footer_value'] = -1; } if (isset($attr['TOC-RESETPAGENUM']) && $attr['TOC-RESETPAGENUM']) { $this->m_TOC[$toc_id]['TOC_resetpagenum'] = $attr['TOC-RESETPAGENUM']; } else { $this->m_TOC[$toc_id]['TOC_resetpagenum'] = ''; } // mPDF 6 if (isset($attr['TOC-PAGENUMSTYLE']) && $attr['TOC-PAGENUMSTYLE']) { $this->m_TOC[$toc_id]['TOC_pagenumstyle'] = $attr['TOC-PAGENUMSTYLE']; } @@ -432,17 +435,17 @@ if (isset($attr['TOC-SHEET-SIZE']) && $attr['TOC-SHEET-SIZE']) { $this->m_TOC[$toc_id]['TOCsheetsize'] = $attr['TOC-SHEET-SIZE']; } else { $this->m_TOC[$toc_id]['TOCsheetsize'] = ''; } - if (isset($attr['TOC-PREHTML']) && $attr['TOC-PREHTML']) { $this->m_TOC[$toc_id]['TOCpreHTML'] = htmlspecialchars_decode($attr['TOC-PREHTML'],ENT_QUOTES); } - if (isset($attr['TOC-POSTHTML']) && $attr['TOC-POSTHTML']) { $this->m_TOC[$toc_id]['TOCpostHTML'] = htmlspecialchars_decode($attr['TOC-POSTHTML'],ENT_QUOTES); } + if (isset($attr['TOC-PREHTML']) && $attr['TOC-PREHTML']) { $this->m_TOC[$toc_id]['TOCpreHTML'] = htmlspecialchars_decode(($attr['TOC-PREHTML'] ?? ''),ENT_QUOTES); } + if (isset($attr['TOC-POSTHTML']) && $attr['TOC-POSTHTML']) { $this->m_TOC[$toc_id]['TOCpostHTML'] = htmlspecialchars_decode(($attr['TOC-POSTHTML'] ?? ''),ENT_QUOTES); } - if (isset($attr['TOC-BOOKMARKTEXT']) && $attr['TOC-BOOKMARKTEXT']) { $this->m_TOC[$toc_id]['TOCbookmarkText'] = htmlspecialchars_decode($attr['TOC-BOOKMARKTEXT'],ENT_QUOTES); } // *BOOKMARKS* + if (isset($attr['TOC-BOOKMARKTEXT']) && $attr['TOC-BOOKMARKTEXT']) { $this->m_TOC[$toc_id]['TOCbookmarkText'] = htmlspecialchars_decode(($attr['TOC-BOOKMARKTEXT'] ?? ''),ENT_QUOTES); } // *BOOKMARKS* } else { if (isset($attr['OUTDENT']) && $attr['OUTDENT']) { $this->TOCoutdent = $attr['OUTDENT']; } else { $this->TOCoutdent = ''; } // mPDF 5.6.19 if (isset($attr['TOC-ORIENTATION']) && $attr['TOC-ORIENTATION']) { $this->TOCorientation = $attr['TOC-ORIENTATION']; } else { $this->TOCorientation = ''; } - if (isset($attr['PAGING']) && (strtoupper($attr['PAGING'])=='OFF' || $attr['PAGING']==='0')) { $this->TOCusePaging = false; } + if (isset($attr['PAGING']) && (strtoupper(($attr['PAGING'] ?? ''))=='OFF' || $attr['PAGING']==='0')) { $this->TOCusePaging = false; } else { $this->TOCusePaging = true; } - if (isset($attr['LINKS']) && (strtoupper($attr['LINKS'])=='ON' || $attr['LINKS']==1)) { $this->TOCuseLinking = true; } + if (isset($attr['LINKS']) && (strtoupper(($attr['LINKS'] ?? ''))=='ON' || $attr['LINKS']==1)) { $this->TOCuseLinking = true; } else { $this->TOCuseLinking = false; } $this->TOC_margin_left = $this->TOC_margin_right = $this->TOC_margin_top = $this->TOC_margin_bottom = $this->TOC_margin_header = $this->TOC_margin_footer = ''; @@ -458,15 +461,15 @@ if (isset($attr['TOC-ODD-FOOTER-NAME']) && $attr['TOC-ODD-FOOTER-NAME']) { $this->TOC_odd_footer_name = $attr['TOC-ODD-FOOTER-NAME']; } if (isset($attr['TOC-EVEN-FOOTER-NAME']) && $attr['TOC-EVEN-FOOTER-NAME']) { $this->TOC_even_footer_name = $attr['TOC-EVEN-FOOTER-NAME']; } $this->TOC_odd_header_value = $this->TOC_even_header_value = $this->TOC_odd_footer_value = $this->TOC_even_footer_value = 0; - if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='1' || strtoupper($attr['TOC-ODD-HEADER-VALUE'])=='ON')) { $this->TOC_odd_header_value = 1; } - else if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='-1' || strtoupper($attr['TOC-ODD-HEADER-VALUE'])=='OFF')) { $this->TOC_odd_header_value = -1; } - if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='1' || strtoupper($attr['TOC-EVEN-HEADER-VALUE'])=='ON')) { $this->TOC_even_header_value = 1; } - else if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='-1' || strtoupper($attr['TOC-EVEN-HEADER-VALUE'])=='OFF')) { $this->TOC_even_header_value = -1; } - - if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='1' || strtoupper($attr['TOC-ODD-FOOTER-VALUE'])=='ON')) { $this->TOC_odd_footer_value = 1; } - else if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='-1' || strtoupper($attr['TOC-ODD-FOOTER-VALUE'])=='OFF')) { $this->TOC_odd_footer_value = -1; } - if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='1' || strtoupper($attr['TOC-EVEN-FOOTER-VALUE'])=='ON')) { $this->TOC_even_footer_value = 1; } - else if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='-1' || strtoupper($attr['TOC-EVEN-FOOTER-VALUE'])=='OFF')) { $this->TOC_even_footer_value = -1; } + if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='1' || strtoupper(($attr['TOC-ODD-HEADER-VALUE'] ?? ''))=='ON')) { $this->TOC_odd_header_value = 1; } + else if (isset($attr['TOC-ODD-HEADER-VALUE']) && ($attr['TOC-ODD-HEADER-VALUE']=='-1' || strtoupper(($attr['TOC-ODD-HEADER-VALUE'] ?? ''))=='OFF')) { $this->TOC_odd_header_value = -1; } + if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='1' || strtoupper(($attr['TOC-EVEN-HEADER-VALUE'] ?? ''))=='ON')) { $this->TOC_even_header_value = 1; } + else if (isset($attr['TOC-EVEN-HEADER-VALUE']) && ($attr['TOC-EVEN-HEADER-VALUE']=='-1' || strtoupper(($attr['TOC-EVEN-HEADER-VALUE'] ?? ''))=='OFF')) { $this->TOC_even_header_value = -1; } + + if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='1' || strtoupper(($attr['TOC-ODD-FOOTER-VALUE'] ?? ''))=='ON')) { $this->TOC_odd_footer_value = 1; } + else if (isset($attr['TOC-ODD-FOOTER-VALUE']) && ($attr['TOC-ODD-FOOTER-VALUE']=='-1' || strtoupper(($attr['TOC-ODD-FOOTER-VALUE'] ?? ''))=='OFF')) { $this->TOC_odd_footer_value = -1; } + if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='1' || strtoupper(($attr['TOC-EVEN-FOOTER-VALUE'] ?? ''))=='ON')) { $this->TOC_even_footer_value = 1; } + else if (isset($attr['TOC-EVEN-FOOTER-VALUE']) && ($attr['TOC-EVEN-FOOTER-VALUE']=='-1' || strtoupper(($attr['TOC-EVEN-FOOTER-VALUE'] ?? ''))=='OFF')) { $this->TOC_even_footer_value = -1; } if (isset($attr['TOC-PAGE-SELECTOR']) && $attr['TOC-PAGE-SELECTOR']) { $this->TOC_page_selector = $attr['TOC-PAGE-SELECTOR']; } else { $this->TOC_page_selector = ''; } if (isset($attr['TOC-RESETPAGENUM']) && $attr['TOC-RESETPAGENUM']) { $this->TOC_resetpagenum = $attr['TOC-RESETPAGENUM']; } @@ -477,16 +480,16 @@ else { $this->TOC_suppress = ''; } // mPDF 6 if (isset($attr['TOC-SHEET-SIZE']) && $attr['TOC-SHEET-SIZE']) { $this->TOCsheetsize = $attr['TOC-SHEET-SIZE']; } else { $this->TOCsheetsize = ''; } - if (isset($attr['TOC-PREHTML']) && $attr['TOC-PREHTML']) { $this->TOCpreHTML = htmlspecialchars_decode($attr['TOC-PREHTML'],ENT_QUOTES); } - if (isset($attr['TOC-POSTHTML']) && $attr['TOC-POSTHTML']) { $this->TOCpostHTML = htmlspecialchars_decode($attr['TOC-POSTHTML'],ENT_QUOTES); } - if (isset($attr['TOC-BOOKMARKTEXT']) && $attr['TOC-BOOKMARKTEXT']) { $this->TOCbookmarkText = htmlspecialchars_decode($attr['TOC-BOOKMARKTEXT'],ENT_QUOTES); } + if (isset($attr['TOC-PREHTML']) && $attr['TOC-PREHTML']) { $this->TOCpreHTML = htmlspecialchars_decode(($attr['TOC-PREHTML'] ?? ''),ENT_QUOTES); } + if (isset($attr['TOC-POSTHTML']) && $attr['TOC-POSTHTML']) { $this->TOCpostHTML = htmlspecialchars_decode(($attr['TOC-POSTHTML'] ?? ''),ENT_QUOTES); } + if (isset($attr['TOC-BOOKMARKTEXT']) && $attr['TOC-BOOKMARKTEXT']) { $this->TOCbookmarkText = htmlspecialchars_decode(($attr['TOC-BOOKMARKTEXT'] ?? ''),ENT_QUOTES); } } if ($this->mpdf->y == $this->mpdf->tMargin && (!$this->mpdf->mirrorMargins ||($this->mpdf->mirrorMargins && $this->mpdf->page % 2==1))) { if ($toc_id) { $this->m_TOC[$toc_id]['TOCmark'] = $this->mpdf->page; } else { $this->TOCmark = $this->mpdf->page; } // Don't add a page - if ($this->mpdf->page==1 && count($this->mpdf->PageNumSubstitutions)==0) { + if ($this->mpdf->page==1 && count(($this->mpdf->PageNumSubstitutions ?? []))==0) { $resetpagenum = ''; $pagenumstyle = ''; $suppress = ''; --- a/intranet/mpdf60/classes/grad.php +++ b/intranet/mpdf60/classes/grad.php @@ -4,7 +4,7 @@ var $mpdf = null; -function grad(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; } @@ -13,15 +13,15 @@ $s=' q '; $s.=sprintf(' %.3F %.3F %.3F %.3F re W n ', $x*_MPDFK, ($this->mpdf->h-$y)*_MPDFK, $w*_MPDFK, -$h*_MPDFK); $s.=sprintf(' %.3F 0 0 %.3F %.3F %.3F cm ', $w*_MPDFK, $h*_MPDFK, $x*_MPDFK, ($this->mpdf->h-($y+$h))*_MPDFK); - $n = count($this->mpdf->gradients)+1; + $n = count(($this->mpdf->gradients ?? []))+1; $this->mpdf->gradients[$n]['type'] = 6; //coons patch mesh $this->mpdf->gradients[$n]['colorspace'] = $colspace; //coons patch mesh $bpcd=65535; //16 BitsPerCoordinate $trans = false; $this->mpdf->gradients[$n]['stream']=''; - for($i=0;$i<count($patch_array);$i++){ - $this->mpdf->gradients[$n]['stream'].=chr($patch_array[$i]['f']); //start with the edge flag as 8 bit - for($j=0;$j<count($patch_array[$i]['points']);$j++){ + for($i=0;$i<count(($patch_array ?? []));$i++){ + $this->mpdf->gradients[$n]['stream'].=chr((int) ($patch_array[$i]['f'])); //start with the edge flag as 8 bit + for($j=0;$j<count(($patch_array[$i]['points'] ?? []));$j++){ //each point as 16 bit if (($j % 2) == 1) { // Y coordinate (adjusted as input is From top left) $patch_array[$i]['points'][$j]=(($patch_array[$i]['points'][$j]-$y_min)/($y_max-$y_min))*$bpcd; @@ -32,23 +32,23 @@ } if($patch_array[$i]['points'][$j]<0) $patch_array[$i]['points'][$j]=0; if($patch_array[$i]['points'][$j]>$bpcd) $patch_array[$i]['points'][$j]=$bpcd; - $this->mpdf->gradients[$n]['stream'].=chr(floor($patch_array[$i]['points'][$j]/256)); - $this->mpdf->gradients[$n]['stream'].=chr(floor($patch_array[$i]['points'][$j]%256)); - } - for($j=0;$j<count($patch_array[$i]['colors']);$j++){ + $this->mpdf->gradients[$n]['stream'].=chr((int) (floor($patch_array[$i]['points'][$j]/256))); + $this->mpdf->gradients[$n]['stream'].=chr((int) (floor($patch_array[$i]['points'][$j]%256))); + } + for($j=0;$j<count(($patch_array[$i]['colors'] ?? []));$j++){ //each color component as 8 bit if ($colspace=='RGB') { $this->mpdf->gradients[$n]['stream'].=($patch_array[$i]['colors'][$j][1]); $this->mpdf->gradients[$n]['stream'].=($patch_array[$i]['colors'][$j][2]); $this->mpdf->gradients[$n]['stream'].=($patch_array[$i]['colors'][$j][3]); - if (isset($patch_array[$i]['colors'][$j][4]) && ord($patch_array[$i]['colors'][$j][4])<100) { $trans = true; } + if (isset($patch_array[$i]['colors'][$j][4]) && ord(($patch_array[$i]['colors'][$j][4] ?? ''))<100) { $trans = true; } } else if ($colspace=='CMYK') { - $this->mpdf->gradients[$n]['stream'].=chr(ord($patch_array[$i]['colors'][$j][1])*2.55); - $this->mpdf->gradients[$n]['stream'].=chr(ord($patch_array[$i]['colors'][$j][2])*2.55); - $this->mpdf->gradients[$n]['stream'].=chr(ord($patch_array[$i]['colors'][$j][3])*2.55); - $this->mpdf->gradients[$n]['stream'].=chr(ord($patch_array[$i]['colors'][$j][4])*2.55); - if (isset($patch_array[$i]['colors'][$j][5]) && ord($patch_array[$i]['colors'][$j][5])<100) { $trans = true; } + $this->mpdf->gradients[$n]['stream'].=chr((int) (ord(($patch_array[$i]['colors'][$j][1] ?? ''))*2.55)); + $this->mpdf->gradients[$n]['stream'].=chr((int) (ord(($patch_array[$i]['colors'][$j][2] ?? ''))*2.55)); + $this->mpdf->gradients[$n]['stream'].=chr((int) (ord(($patch_array[$i]['colors'][$j][3] ?? ''))*2.55)); + $this->mpdf->gradients[$n]['stream'].=chr((int) (ord(($patch_array[$i]['colors'][$j][4] ?? ''))*2.55)); + if (isset($patch_array[$i]['colors'][$j][5]) && ord(($patch_array[$i]['colors'][$j][5] ?? ''))<100) { $trans = true; } } else if ($colspace=='Gray') { $this->mpdf->gradients[$n]['stream'].=($patch_array[$i]['colors'][$j][1]); @@ -59,23 +59,23 @@ // TRANSPARENCY if ($trans) { $this->mpdf->gradients[$n]['stream_trans']=''; - for($i=0;$i<count($patch_array);$i++){ - $this->mpdf->gradients[$n]['stream_trans'].=chr($patch_array[$i]['f']); - for($j=0;$j<count($patch_array[$i]['points']);$j++){ + for($i=0;$i<count(($patch_array ?? []));$i++){ + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) ($patch_array[$i]['f'])); + for($j=0;$j<count(($patch_array[$i]['points'] ?? []));$j++){ //each point as 16 bit - $this->mpdf->gradients[$n]['stream_trans'].=chr(floor($patch_array[$i]['points'][$j]/256)); - $this->mpdf->gradients[$n]['stream_trans'].=chr(floor($patch_array[$i]['points'][$j]%256)); - } - for($j=0;$j<count($patch_array[$i]['colors']);$j++){ + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) (floor($patch_array[$i]['points'][$j]/256))); + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) (floor($patch_array[$i]['points'][$j]%256))); + } + for($j=0;$j<count(($patch_array[$i]['colors'] ?? []));$j++){ //each color component as 8 bit // OPACITY if ($colspace=='RGB') { - $this->mpdf->gradients[$n]['stream_trans'].=chr(intval(ord($patch_array[$i]['colors'][$j][4])*2.55)); + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) (intval(ord(($patch_array[$i]['colors'][$j][4] ?? ''))*2.55))); } else if ($colspace=='CMYK') { - $this->mpdf->gradients[$n]['stream_trans'].=chr(intval(ord($patch_array[$i]['colors'][$j][5])*2.55)); + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) (intval(ord(($patch_array[$i]['colors'][$j][5] ?? ''))*2.55))); } else if ($colspace=='Gray') { - $this->mpdf->gradients[$n]['stream_trans'].=chr(intval(ord($patch_array[$i]['colors'][$j][3])*2.55)); + $this->mpdf->gradients[$n]['stream_trans'].=chr((int) (intval(ord(($patch_array[$i]['colors'][$j][3] ?? ''))*2.55))); } } } @@ -100,8 +100,8 @@ // $col = array(R,G,B/255); or array(G/255); or array(C,M,Y,K/100) // $stops = array('col'=>$col [, 'opacity'=>0-1] [, 'offset'=>0-1]) function Gradient($x, $y, $w, $h, $type, $stops=array(), $colorspace='RGB', $coords='', $extend='', $return=false, $is_mask=false) { - if (strtoupper(substr($type,0,1)) == 'L') { $type = 2; } // linear - else if (strtoupper(substr($type,0,1)) == 'R') { $type = 3; } // radial + if (strtoupper((substr(($type ?? ''),0,1) ?? '')) == 'L') { $type = 2; } // linear + else if (strtoupper((substr(($type ?? ''),0,1) ?? '')) == 'R') { $type = 3; } // radial if ($colorspace != 'CMYK' && $colorspace != 'Gray') { $colorspace = 'RGB'; } @@ -113,11 +113,11 @@ $useh = $bboxh; if ($type < 1) { $type = 2; } - if ($coords[0]!==false && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$coords[0],$m)) { + if ($coords[0]!==false && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($coords[0] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $coords[0] = $tmp/$w; } } - if ($coords[1]!==false && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$coords[1],$m)) { + if ($coords[1]!==false && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($coords[1] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $coords[1] = 1-($tmp/$h); } } @@ -325,15 +325,15 @@ $s .= sprintf(' %.3F 0 0 %.3F %.3F %.3F cm', $usew*_MPDFK, $useh*_MPDFK, $usex*_MPDFK, ($this->mpdf->h-($usey+$useh))*_MPDFK)."\n"; } - $n = count($this->mpdf->gradients) + 1; + $n = count(($this->mpdf->gradients ?? [])) + 1; $this->mpdf->gradients[$n]['type'] = $type; $this->mpdf->gradients[$n]['colorspace'] = $colorspace; $trans = false; $this->mpdf->gradients[$n]['is_mask'] = $is_mask; if ($is_mask) { $trans = true; } - if (count($stops) == 1) { $stops[1] = $stops[0]; } + if (count(($stops ?? [])) == 1) { $stops[1] = $stops[0]; } if (!isset($stops[0]['offset'])) { $stops[0]['offset'] = 0; } - if (!isset($stops[(count($stops)-1)]['offset'])) { $stops[(count($stops)-1)]['offset'] = 1; } + if (!isset($stops[(count(($stops ?? []))-1)]['offset'])) { $stops[(count(($stops ?? []))-1)]['offset'] = 1; } // Fix stop-offsets set as absolute lengths if ($type==2) { @@ -343,8 +343,8 @@ } else { $axis_length = $coords[4]*$usew; } // Absolute lengths are meaningless for an ellipse - Firefox uses Width as reference - for($i=0;$i<count($stops);$i++) { - if (isset($stops[$i]['offset']) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$stops[$i]['offset'],$m)) { + for($i=0;$i<count(($stops ?? []));$i++) { + if (isset($stops[$i]['offset']) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($stops[$i]['offset'] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); $stops[$i]['offset'] = $tmp/$axis_length; } @@ -356,26 +356,26 @@ $firststop['offset'] = 0; array_unshift($stops, $firststop); } - if (!$repeat && isset($stops[(count($stops)-1)]['offset']) && $stops[(count($stops)-1)]['offset']<1) { - $endstop = $stops[(count($stops)-1)]; + if (!$repeat && isset($stops[(count(($stops ?? []))-1)]['offset']) && $stops[(count(($stops ?? []))-1)]['offset']<1) { + $endstop = $stops[(count(($stops ?? []))-1)]; $endstop['offset'] = 1; $stops[] = $endstop; } - if ($stops[0]['offset'] > $stops[(count($stops)-1)]['offset']) { + if ($stops[0]['offset'] > $stops[(count(($stops ?? []))-1)]['offset']) { $stops[0]['offset'] = 0; - $stops[(count($stops)-1)]['offset'] = 1; - } - - for($i=0;$i<count($stops);$i++) { + $stops[(count(($stops ?? []))-1)]['offset'] = 1; + } + + for($i=0;$i<count(($stops ?? []));$i++) { // mPDF 5.3.74 if ($colorspace == 'CMYK') { - $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F %.3F %.3F %.3F', (ord($stops[$i]['col']{1})/100), (ord($stops[$i]['col']{2})/100), (ord($stops[$i]['col']{3})/100), (ord($stops[$i]['col']{4})/100)); + $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F %.3F %.3F %.3F', (ord(($stops[$i]['col'][1] ?? ''))/100), (ord(($stops[$i]['col'][2] ?? ''))/100), (ord(($stops[$i]['col'][3] ?? ''))/100), (ord(($stops[$i]['col'][4] ?? ''))/100)); } else if ($colorspace == 'Gray') { - $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F', (ord($stops[$i]['col']{1})/255)); + $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F', (ord(($stops[$i]['col'][1] ?? ''))/255)); } else { - $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F %.3F %.3F', (ord($stops[$i]['col']{1})/255), (ord($stops[$i]['col']{2})/255), (ord($stops[$i]['col']{3})/255)); + $this->mpdf->gradients[$n]['stops'][$i]['col'] = sprintf('%.3F %.3F %.3F', (ord(($stops[$i]['col'][1] ?? ''))/255), (ord(($stops[$i]['col'][2] ?? ''))/255), (ord(($stops[$i]['col'][3] ?? ''))/255)); } if (!isset($stops[$i]['opacity'])) { $stops[$i]['opacity'] = 1; } else if ($stops[$i]['opacity'] > 1 || $stops[$i]['opacity'] < 0) { $stops[$i]['opacity'] = 1; } @@ -384,13 +384,13 @@ } $this->mpdf->gradients[$n]['stops'][$i]['opacity'] = $stops[$i]['opacity']; // OFFSET - if ($i>0 && $i<(count($stops)-1)) { + if ($i>0 && $i<(count(($stops ?? []))-1)) { if (!isset($stops[$i]['offset']) || (isset($stops[$i+1]['offset']) && $stops[$i]['offset']>$stops[$i+1]['offset']) || $stops[$i]['offset']<$stops[$i-1]['offset']) { if (isset($stops[$i-1]['offset']) && isset($stops[$i+1]['offset'])) { $stops[$i]['offset'] = ($stops[$i-1]['offset']+$stops[$i+1]['offset'])/2; } else { - for($j=($i+1);$j<count($stops);$j++) { + for($j=($i+1);$j<count(($stops ?? []));$j++) { if(isset($stops[$j]['offset'])) { break; } } $int = ($stops[$j]['offset'] - $stops[($i-1)]['offset'])/($j-$i+1); @@ -405,7 +405,7 @@ } if ($repeat) { - $ns = count($this->mpdf->gradients[$n]['stops']); + $ns = count(($this->mpdf->gradients[$n]['stops'] ?? [])); $offs = array(); for($i=0;$i<$ns;$i++) { $offs[$i] = $this->mpdf->gradients[$n]['stops'][$i]['offset']; @@ -431,7 +431,7 @@ $this->mpdf->gradients[$n]['trans'] = true; $s .= ' /TGS'.$n.' gs '; } - if (!is_array($extend) || count($extend) <1) { + if (!is_array($extend) || count(($extend ?? [])) <1) { $extend=array('true', 'true'); // These are supposed to be quoted - appear in PDF file as text } $this->mpdf->gradients[$n]['coords'] = $coords; @@ -448,26 +448,26 @@ function parseMozGradient($bg) { // background[-image]: -moz-linear-gradient(left, #c7Fdde 20%, #FF0000 ); // background[-image]: linear-gradient(left, #c7Fdde 20%, #FF0000 ); // CSS3 - if (preg_match('/repeating-/',$bg)) { $repeat = true; } + if (preg_match('/repeating-/',($bg ?? ''))) { $repeat = true; } else { $repeat = false; } - if (preg_match('/linear-gradient\((.*)\)/',$bg,$m)) { + if (preg_match('/linear-gradient\((.*)\)/',($bg ?? ''),$m)) { $g = array(); $g['type'] = 2; $g['colorspace'] = 'RGB'; $g['extend'] = array('true','true'); - $v = trim($m[1]); + $v = trim(($m[1] ?? '')); // Change commas inside e.g. rgb(x,x,x) - while(preg_match('/(\([^\)]*?),/',$v)) { $v = preg_replace('/(\([^\)]*?),/','\\1@',$v); } + while(preg_match('/(\([^\)]*?),/',($v ?? ''))) { $v = preg_replace('/(\([^\)]*?),/','\\1@',($v ?? '')); } // Remove spaces inside e.g. rgb(x, x, x) - while(preg_match('/(\([^\)]*?)[ ]/',$v)) { $v = preg_replace('/(\([^\)]*?)[ ]/','\\1',$v); } - $bgr = preg_split('/\s*,\s*/',$v); - for($i=0;$i<count($bgr);$i++) { $bgr[$i] = preg_replace('/@/', ',', $bgr[$i]); } + while(preg_match('/(\([^\)]*?)[ ]/',($v ?? ''))) { $v = preg_replace('/(\([^\)]*?)[ ]/','\\1',($v ?? '')); } + $bgr = preg_split('/\s*,\s*/',($v ?? '')); + for($i=0;$i<count(($bgr ?? []));$i++) { $bgr[$i] = preg_replace('/@/', ',', ($bgr[$i] ?? '')); } // Is first part $bgr[0] a valid point/angle? - $first = preg_split('/\s+/',trim($bgr[0])); - if (preg_match('/(left|center|right|bottom|top|deg|grad|rad)/i',$bgr[0]) && !preg_match('/(<#|rgb|rgba|hsl|hsla)/i',$bgr[0])) { + $first = preg_split('/\s+/',(trim(($bgr[0] ?? '')) ?? '')); + if (preg_match('/(left|center|right|bottom|top|deg|grad|rad)/i',($bgr[0] ?? '')) && !preg_match('/(<#|rgb|rgba|hsl|hsla)/i',($bgr[0] ?? ''))) { $startStops = 1; } - else if (trim($first[(count($first)-1)]) === "0") { + else if (trim(($first[(count(($first ?? []))-1)] ?? '')) === "0") { $startStops = 1; } else { @@ -478,27 +478,27 @@ // first part a valid point/angle? if ($startStops == 1) { // default values // [<point> || <angle>,] = [<% em px left center right bottom top> || <deg grad rad 0>,] - if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',$bgr[0],$m)) { + if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',($bgr[0] ?? ''),$m)) { $angle = $m[1] + 0; - if (strtolower($m[2])=='deg') { $angle = $angle; } - else if (strtolower($m[2])=='grad') { $angle *= (360/400); } - else if (strtolower($m[2])=='rad') { $angle = rad2deg($angle); } + if (strtolower(($m[2] ?? ''))=='deg') { $angle = $angle; } + else if (strtolower(($m[2] ?? ''))=='grad') { $angle *= (360/400); } + else if (strtolower(($m[2] ?? ''))=='rad') { $angle = rad2deg($angle); } while($angle < 0) { $angle += 360; } $angle = ($angle % 360); } - else if (trim($first[(count($first)-1)]) === "0") { $angle = 0; } - if (preg_match('/left/i',$bgr[0])) { $startx = 0; } - else if (preg_match('/right/i',$bgr[0])) { $startx = 1; } - if (preg_match('/top/i',$bgr[0])) { $starty = 1; } - else if (preg_match('/bottom/i',$bgr[0])) { $starty = 0; } + else if (trim(($first[(count(($first ?? []))-1)] ?? '')) === "0") { $angle = 0; } + if (preg_match('/left/i',($bgr[0] ?? ''))) { $startx = 0; } + else if (preg_match('/right/i',($bgr[0] ?? ''))) { $startx = 1; } + if (preg_match('/top/i',($bgr[0] ?? ''))) { $starty = 1; } + else if (preg_match('/bottom/i',($bgr[0] ?? ''))) { $starty = 0; } // Check for %? ?% or %% - if (preg_match('/(\d+)[%]/i',$first[0],$m)) { $startx = $m[1]/100; } - else if (!isset($startx) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$first[0],$m)) { + if (preg_match('/(\d+)[%]/i',($first[0] ?? ''),$m)) { $startx = $m[1]/100; } + else if (!isset($startx) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($first[0] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $startx = $m[1]; } } - if (isset($first[1]) && preg_match('/(\d+)[%]/i',$first[1],$m)) { $starty = 1 - ($m[1]/100); } - else if (!isset($starty) && isset($first[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$first[1],$m)) { + if (isset($first[1]) && preg_match('/(\d+)[%]/i',($first[1] ?? ''),$m)) { $starty = 1 - ($m[1]/100); } + else if (!isset($starty) && isset($first[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($first[1] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $starty = $m[1]; } } @@ -519,60 +519,60 @@ if (!isset($angle)) { $angle = false; } $g['coords'] = array($startx ,$starty ,$endx ,$endy, $angle, $repeat ); $g['stops'] = array(); - for($i=$startStops;$i<count($bgr);$i++) { + for($i=$startStops;$i<count(($bgr ?? []));$i++) { $stop = array(); // parse stops - $el = preg_split('/\s+/',trim($bgr[$i])); + $el = preg_split('/\s+/',(trim(($bgr[$i] ?? '')) ?? '')); // mPDF 5.3.74 $col = $this->mpdf->ConvertColor($el[0]); if ($col) { $stop['col'] = $col; } else { $stop['col'] = $col = $this->mpdf->ConvertColor(255); } - if ($col{0}==1) $g['colorspace'] = 'Gray'; - else if ($col{0}==4 || $col{0}==6) $g['colorspace'] = 'CMYK'; - if ($col{0}==5) { $stop['opacity'] = ord($col{4})/100; } // transparency from rgba() - else if ($col{0}==6) { $stop['opacity'] = ord($col{5})/100; } // transparency from cmyka() - else if ($col{0}==1 && $col{2}==1) { $stop['opacity'] = ord($col{3})/100; } // transparency converted from rgba or cmyka() - - if (isset($el[1]) && preg_match('/(\d+)[%]/',$el[1],$m)) { + if ($col[0]==1) $g['colorspace'] = 'Gray'; + else if ($col[0]==4 || $col[0]==6) $g['colorspace'] = 'CMYK'; + if ($col[0]==5) { $stop['opacity'] = ord(($col[4] ?? ''))/100; } // transparency from rgba() + else if ($col[0]==6) { $stop['opacity'] = ord(($col[5] ?? ''))/100; } // transparency from cmyka() + else if ($col[0]==1 && $col[2]==1) { $stop['opacity'] = ord(($col[3] ?? ''))/100; } // transparency converted from rgba or cmyka() + + if (isset($el[1]) && preg_match('/(\d+)[%]/',($el[1] ?? ''),$m)) { $stop['offset'] = $m[1]/100; if ($stop['offset']>1) { unset($stop['offset']); } } - else if (isset($el[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$el[1],$m)) { + else if (isset($el[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($el[1] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $stop['offset'] = $m[1]; } } $g['stops'][] = $stop; } - if (count($g['stops'] )) { return $g; } + if (count(($g['stops'] ?? []) )) { return $g; } } - else if (preg_match('/radial-gradient\((.*)\)/',$bg,$m)) { + else if (preg_match('/radial-gradient\((.*)\)/',($bg ?? ''),$m)) { $g = array(); $g['type'] = 3; $g['colorspace'] = 'RGB'; $g['extend'] = array('true','true'); - $v = trim($m[1]); + $v = trim(($m[1] ?? '')); // Change commas inside e.g. rgb(x,x,x) - while(preg_match('/(\([^\)]*?),/',$v)) { $v = preg_replace('/(\([^\)]*?),/','\\1@',$v); } + while(preg_match('/(\([^\)]*?),/',($v ?? ''))) { $v = preg_replace('/(\([^\)]*?),/','\\1@',($v ?? '')); } // Remove spaces inside e.g. rgb(x, x, x) - while(preg_match('/(\([^\)]*?)[ ]/',$v)) { $v = preg_replace('/(\([^\)]*?)[ ]/','\\1',$v); } - $bgr = preg_split('/\s*,\s*/',$v); - for($i=0;$i<count($bgr);$i++) { $bgr[$i] = preg_replace('/@/', ',', $bgr[$i]); } + while(preg_match('/(\([^\)]*?)[ ]/',($v ?? ''))) { $v = preg_replace('/(\([^\)]*?)[ ]/','\\1',($v ?? '')); } + $bgr = preg_split('/\s*,\s*/',($v ?? '')); + for($i=0;$i<count(($bgr ?? []));$i++) { $bgr[$i] = preg_replace('/@/', ',', ($bgr[$i] ?? '')); } // Is first part $bgr[0] a valid point/angle? $startStops = 0; $pos_angle = false; $shape_size = false; - $first = preg_split('/\s+/',trim($bgr[0])); + $first = preg_split('/\s+/',(trim(($bgr[0] ?? '')) ?? '')); $checkCol = $this->mpdf->ConvertColor($first[0]); - if (preg_match('/(left|center|right|bottom|top|deg|grad|rad)/i',$bgr[0]) && !preg_match('/(<#|rgb|rgba|hsl|hsla)/i',$bgr[0])) { + if (preg_match('/(left|center|right|bottom|top|deg|grad|rad)/i',($bgr[0] ?? '')) && !preg_match('/(<#|rgb|rgba|hsl|hsla)/i',($bgr[0] ?? ''))) { $startStops=1; $pos_angle = $bgr[0]; } - else if (trim($first[(count($first)-1)]) === "0") { + else if (trim(($first[(count(($first ?? []))-1)] ?? '')) === "0") { $startStops=1; $pos_angle = $bgr[0]; } - else if (preg_match('/(circle|ellipse|closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',$bgr[0])) { + else if (preg_match('/(circle|ellipse|closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',($bgr[0] ?? ''))) { $startStops=1; $shape_size = $bgr[0]; } @@ -580,7 +580,7 @@ $startStops=1; $pos_angle = $bgr[0]; } - if (preg_match('/(circle|ellipse|closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',$bgr[1])) { + if (preg_match('/(circle|ellipse|closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',($bgr[1] ?? ''))) { $startStops=2; $shape_size = $bgr[1]; } @@ -588,18 +588,18 @@ // If valid point/angle? if ($pos_angle) { // default values // [<point> || <angle>,] = [<% em px left center right bottom top> || <deg grad rad 0>,] - if (preg_match('/left/i',$pos_angle)) { $startx = 0; } - else if (preg_match('/right/i',$pos_angle)) { $startx = 1; } - if (preg_match('/top/i',$pos_angle)) { $starty = 1; } - else if (preg_match('/bottom/i',$pos_angle)) { $starty = 0; } + if (preg_match('/left/i',($pos_angle ?? ''))) { $startx = 0; } + else if (preg_match('/right/i',($pos_angle ?? ''))) { $startx = 1; } + if (preg_match('/top/i',($pos_angle ?? ''))) { $starty = 1; } + else if (preg_match('/bottom/i',($pos_angle ?? ''))) { $starty = 0; } // Check for %? ?% or %% - if (preg_match('/(\d+)[%]/i',$first[0],$m)) { $startx = $m[1]/100; } - else if (!isset($startx) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$first[0],$m)) { + if (preg_match('/(\d+)[%]/i',($first[0] ?? ''),$m)) { $startx = $m[1]/100; } + else if (!isset($startx) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($first[0] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $startx = $m[1]; } } - if (isset($first[1]) && preg_match('/(\d+)[%]/i',$first[1],$m)) { $starty = 1 - ($m[1]/100); } - else if (!isset($starty) && isset($first[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$first[1],$m)) { + if (isset($first[1]) && preg_match('/(\d+)[%]/i',($first[1] ?? ''),$m)) { $starty = 1 - ($m[1]/100); } + else if (!isset($starty) && isset($first[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($first[1] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); if ($tmp) { $starty = $m[1]; } } @@ -629,10 +629,10 @@ $shape = 'ellipse'; // default $size = 'farthest-corner'; // default if ($shape_size) { // default values - if (preg_match('/(circle|ellipse)/i',$shape_size, $m)) { + if (preg_match('/(circle|ellipse)/i',($shape_size ?? ''), $m)) { $shape = $m[1]; } - if (preg_match('/(closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',$shape_size, $m)) { + if (preg_match('/(closest-side|closest-corner|farthest-side|farthest-corner|contain|cover)/i',($shape_size ?? ''), $m)) { $size = $m[1]; if ($size=='contain') { $size = 'closest-side'; } else if ($size=='cover') { $size = 'farthest-corner'; } @@ -649,31 +649,31 @@ $g['coords'] = array($startx ,$starty ,$endx ,$endy, $radius, $angle, $shape, $size, $repeat ); $g['stops'] = array(); - for($i=$startStops;$i<count($bgr);$i++) { + for($i=$startStops;$i<count(($bgr ?? []));$i++) { $stop = array(); // parse stops - $el = preg_split('/\s+/',trim($bgr[$i])); + $el = preg_split('/\s+/',(trim(($bgr[$i] ?? '')) ?? '')); // mPDF 5.3.74 $col = $this->mpdf->ConvertColor($el[0]); if ($col) { $stop['col'] = $col; } else { $stop['col'] = $col = $this->mpdf->ConvertColor(255); } - if ($col{0}==1) $g['colorspace'] = 'Gray'; - else if ($col{0}==4 || $col{0}==6) $g['colorspace'] = 'CMYK'; - if ($col{0}==5) { $stop['opacity'] = ord($col{4})/100; } // transparency from rgba() - else if ($col{0}==6) { $stop['opacity'] = ord($col{5})/100; } // transparency from cmyka() - else if ($col{0}==1 && $col{2}==1) { $stop['opacity'] = ord($col{3})/100; } // transparency converted from rgba or cmyka() - - if (isset($el[1]) && preg_match('/(\d+)[%]/',$el[1],$m)) { + if ($col[0]==1) $g['colorspace'] = 'Gray'; + else if ($col[0]==4 || $col[0]==6) $g['colorspace'] = 'CMYK'; + if ($col[0]==5) { $stop['opacity'] = ord(($col[4] ?? ''))/100; } // transparency from rgba() + else if ($col[0]==6) { $stop['opacity'] = ord(($col[5] ?? ''))/100; } // transparency from cmyka() + else if ($col[0]==1 && $col[2]==1) { $stop['opacity'] = ord(($col[3] ?? ''))/100; } // transparency converted from rgba or cmyka() + + if (isset($el[1]) && preg_match('/(\d+)[%]/',($el[1] ?? ''),$m)) { $stop['offset'] = $m[1]/100; if ($stop['offset']>1) { unset($stop['offset']); } } - else if (isset($el[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',$el[1],$m)) { + else if (isset($el[1]) && preg_match('/([0-9.]+(px|em|ex|pc|pt|cm|mm|in))/i',($el[1] ?? ''),$m)) { $tmp = $this->mpdf->ConvertSize($m[1],$this->mpdf->w,$this->mpdf->FontSize,false); $stop['offset'] = $el[1]; } $g['stops'][] = $stop; } - if (count($g['stops'] )) { return $g; } + if (count(($g['stops'] ?? []) )) { return $g; } } return array(); } @@ -682,18 +682,18 @@ // background-gradient: linear #00FFFF #FFFF00 0 0.5 1 0.5; or // background-gradient: radial #00FFFF #FFFF00 0.5 0.5 1 1 1.2; - $v = trim($bg); - $bgr = preg_split('/\s+/',$v); + $v = trim(($bg ?? '')); + $bgr = preg_split('/\s+/',($v ?? '')); $g = array(); - if (count($bgr)> 6) { - if (strtoupper(substr($bgr[0],0,1)) == 'L' && count($bgr)==7) { // linear + if (count(($bgr ?? []))> 6) { + if (strtoupper((substr(($bgr[0] ?? ''),0,1) ?? '')) == 'L' && count(($bgr ?? []))==7) { // linear $g['type'] = 2; //$coords = array(0,0,1,1 ); // 0 0 1 0 or 0 1 1 1 is L 2 R; 1,1,0,1 is R2L; 1,1,1,0 is T2B; 1,0,1,1 is B2T // Linear: $coords - array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). // The default value is from left to right (x1=0, y1=0, x2=1, y2=0). $g['coords'] = array($bgr[3], $bgr[4], $bgr[5], $bgr[6]); } - else if (count($bgr)==8) { // radial + else if (count(($bgr ?? []))==8) { // radial $g['type'] = 3; // Radial: $coords - array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, // (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). @@ -703,8 +703,8 @@ $g['colorspace'] = 'RGB'; // mPDF 5.3.74 $cor = $this->mpdf->ConvertColor($bgr[1]); - if ($cor{0}==1) $g['colorspace'] = 'Gray'; - else if ($cor{0}==4 || $cor{0}==6) $g['colorspace'] = 'CMYK'; + if ($cor[0]==1) $g['colorspace'] = 'Gray'; + else if ($cor[0]==4 || $cor[0]==6) $g['colorspace'] = 'CMYK'; if ($cor) { $g['col'] = $cor; } else { $g['col'] = $this->mpdf->ConvertColor(255); } $cor = $this->mpdf->ConvertColor($bgr[2]); --- a/intranet/mpdf60/classes/directw.php +++ b/intranet/mpdf60/classes/directw.php @@ -4,7 +4,7 @@ var $mpdf = null; -function directw(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; } @@ -19,10 +19,10 @@ $w = $this->mpdf->w - $this->mpdf->rMargin - $this->mpdf->x; $wmax = ($w - ($this->mpdf->cMarginL+$this->mpdf->cMarginR)); - $s=str_replace("\r",'',$txt); - if ($this->mpdf->usingCoreFont) { $nb=strlen($s); } + $s=str_replace("\r",'',($txt ?? '')); + if ($this->mpdf->usingCoreFont) { $nb=strlen(($s ?? '')); } else { - $nb=mb_strlen($s, $this->mpdf->mb_enc ); + $nb=mb_strlen(($s ?? ''), $this->mpdf->mb_enc ); // handle single space character if(($nb==1) && $s == " ") { $this->mpdf->x += $this->mpdf->GetStringWidth($s); @@ -35,15 +35,15 @@ $l=0; $nl=1; if (!$this->mpdf->usingCoreFont) { - if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", $txt)) { $this->mpdf->biDirectional = true; } // *RTL* + if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", ($txt ?? ''))) { $this->mpdf->biDirectional = true; } // *RTL* while($i<$nb) { //Get next character - $c = mb_substr($s,$i,1,$this->mpdf->mb_enc ); + $c = mb_substr(($s ?? ''),$i,1,$this->mpdf->mb_enc ); if($c == "\n") { // WORD SPACING $this->mpdf->ResetSpacing(); //Explicit line break - $tmp = rtrim(mb_substr($s,$j,$i-$j,$this->mpdf->mb_enc)); + $tmp = rtrim((mb_substr(($s ?? ''),$j,$i-$j,$this->mpdf->mb_enc) ?? '')); $this->mpdf->Cell($w, $h, $tmp, 0, 2, $align, $fill, $link); $i++; $sep = -1; @@ -77,24 +77,24 @@ continue; } if($i==$j) { $i++; } - $tmp = rtrim(mb_substr($s,$j,$i-$j,$this->mpdf->mb_enc)); + $tmp = rtrim((mb_substr(($s ?? ''),$j,$i-$j,$this->mpdf->mb_enc) ?? '')); $this->mpdf->Cell($w, $h, $tmp, 0, 2, $align, $fill, $link); } else { - $tmp = rtrim(mb_substr($s,$j,$sep-$j,$this->mpdf->mb_enc)); + $tmp = rtrim((mb_substr(($s ?? ''),$j,$sep-$j,$this->mpdf->mb_enc) ?? '')); if($align=='J') { ////////////////////////////////////////// // JUSTIFY J using Unicode fonts (Word spacing doesn't work) // WORD SPACING // Change NON_BREAKING SPACE to spaces so they are 'spaced' properly - $tmp = str_replace(chr(194).chr(160),chr(32),$tmp ); + $tmp = str_replace(chr(194).chr(160),(chr(32) ?? ''),($tmp ?? '') ); $len_ligne = $this->mpdf->GetStringWidth($tmp ); - $nb_carac = mb_strlen( $tmp , $this->mpdf->mb_enc ) ; + $nb_carac = mb_strlen( ($tmp ?? '') , $this->mpdf->mb_enc ) ; $nb_spaces = mb_substr_count( $tmp ,' ', $this->mpdf->mb_enc ) ; $inclCursive=false; if (isset($this->mpdf->CurrentFont['useOTL']) && $this->mpdf->CurrentFont['useOTL']) { - if (preg_match("/([".$this->mpdf->pregCURSchars."])/u", $tmp)) { $inclCursive = true; } + if (preg_match("/([".$this->mpdf->pregCURSchars."])/u", ($tmp ?? ''))) { $inclCursive = true; } } list($charspacing,$ws) = $this->mpdf->GetJspacing($nb_carac,$nb_spaces,((($w-2) - $len_ligne) * _MPDFK),$inclCursive); $this->mpdf->SetSpacing($charspacing,$ws); @@ -128,7 +128,7 @@ //Explicit line break // WORD SPACING $this->mpdf->ResetSpacing(); - $this->mpdf->Cell($w, $h, substr($s, $j, $i-$j), 0, 2, $align, $fill, $link); + $this->mpdf->Cell($w, $h, substr(($s ?? ''), $j, $i-$j), 0, 2, $align, $fill, $link); $i++; $sep = -1; $j = $i; @@ -161,18 +161,18 @@ continue; } if($i==$j) { $i++; } - $this->mpdf->Cell($w, $h, substr($s, $j, $i-$j), 0, 2, $align, $fill, $link); + $this->mpdf->Cell($w, $h, substr(($s ?? ''), $j, $i-$j), 0, 2, $align, $fill, $link); } else { - $tmp = substr($s, $j, $sep-$j); + $tmp = substr(($s ?? ''), $j, $sep-$j); if($align=='J') { ////////////////////////////////////////// // JUSTIFY J using Unicode fonts // WORD SPACING is not fully supported for complex scripts // Change NON_BREAKING SPACE to spaces so they are 'spaced' properly - $tmp = str_replace(chr(160),chr(32),$tmp ); + $tmp = str_replace((chr(160) ?? ''),(chr(32) ?? ''),($tmp ?? '') ); $len_ligne = $this->mpdf->GetStringWidth($tmp ); - $nb_carac = strlen( $tmp ) ; + $nb_carac = strlen( ($tmp ?? '') ) ; $nb_spaces = substr_count( $tmp ,' ' ) ; list($charspacing,$ws) = $this->mpdf->GetJspacing($nb_carac,$nb_spaces,((($w-2) - $len_ligne) * _MPDFK),$false); $this->mpdf->SetSpacing($charspacing,$ws); @@ -203,8 +203,8 @@ if($i!=$j) { if ($currentx != 0) $this->mpdf->x=$currentx; else $this->mpdf->x=$this->mpdf->lMargin; - if ($this->mpdf->usingCoreFont) { $tmp = substr($s,$j,$i-$j); } - else { $tmp = mb_substr($s,$j,$i-$j,$this->mpdf->mb_enc); } + if ($this->mpdf->usingCoreFont) { $tmp = substr(($s ?? ''),$j,$i-$j); } + else { $tmp = mb_substr(($s ?? ''),$j,$i-$j,$this->mpdf->mb_enc); } $this->mpdf->Cell($w,$h,$tmp,0,0,$align,$fill,$link); } } @@ -216,7 +216,7 @@ $fontwidth/=100; if($kerning==0) $this->mpdf->Error('Please use values unequal to zero for kerning (CircularText)'); if($fontwidth==0) $this->mpdf->Error('Please use values unequal to zero for font width (CircularText)'); - $text=str_replace("\r",'',$text); + $text=str_replace("\r",'',($text ?? '')); //circumference $u=($r*2)*M_PI; $checking = true; @@ -225,7 +225,7 @@ $t=0; $w = array(); if ($this->mpdf->usingCoreFont) { - $nb=strlen($text); + $nb=strlen(($text ?? '')); for($i=0; $i<$nb; $i++){ $w[$i]=$this->mpdf->GetStringWidth($text[$i]); $w[$i]*=$kerning*$fontwidth; @@ -233,11 +233,11 @@ } } else { - $nb=mb_strlen($text, $this->mpdf->mb_enc ); + $nb=mb_strlen(($text ?? ''), $this->mpdf->mb_enc ); $lastchar = ''; $unicode = $this->mpdf->UTF8StringToArray($text); for($i=0; $i<$nb; $i++){ - $c = mb_substr($text,$i,1,$this->mpdf->mb_enc ); + $c = mb_substr(($text ?? ''),$i,1,$this->mpdf->mb_enc ); $w[$i]=$this->mpdf->GetStringWidth($c); $w[$i]*=$kerning*$fontwidth; $char = $unicode[$i]; @@ -310,7 +310,7 @@ $this->mpdf->SetXY($x-$w[$i]/2, $y+$r-($this->mpdf->FontSize)); } if ($this->mpdf->usingCoreFont) { $c=$text[$i]; } - else { $c = mb_substr($text,$i,1,$this->mpdf->mb_enc ); } + else { $c = mb_substr(($text ?? ''),$i,1,$this->mpdf->mb_enc ); } $this->mpdf->Cell(($w[$i]),$this->mpdf->FontSize,$c,0,0,'C'); // mPDF 5.3.53 if($fontwidth!=1){ $this->mpdf->StopTransform(); @@ -349,11 +349,11 @@ if ($this->mpdf->text_input_as_HTML) { $text = $this->mpdf->all_entities_to_utf8($text); } - if ($this->mpdf->usingCoreFont) { $text = mb_convert_encoding($text,$this->mpdf->mb_enc,'UTF-8'); } + if ($this->mpdf->usingCoreFont) { $text = mb_convert_encoding(($text ?? ''),($this->mpdf->mb_enc ?? ''),'UTF-8'); } // DIRECTIONALITY - if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", $text)) { $this->mpdf->biDirectional = true; } // *RTL* + if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", ($text ?? ''))) { $this->mpdf->biDirectional = true; } // *RTL* $textvar = 0; $save_OTLtags = $this->mpdf->OTLtags; --- a/intranet/mpdf60/classes/barcode.php +++ b/intranet/mpdf60/classes/barcode.php @@ -65,7 +65,7 @@ public function setBarcode($code, $type, $pr='') { $this->print_ratio = 1; - switch (strtoupper($type)) { + switch (strtoupper(($type ?? ''))) { case 'ISBN': case 'ISSN': case 'EAN13': { // EAN 13 @@ -214,8 +214,8 @@ } case 'MSI': // MSI (Variation of Plessey code) case 'MSI+': { // MSI + CHECKSUM (modulo 11) - if (strtoupper($type)=='MSI') { $arrcode = $this->barcode_msi($code, false); } - if (strtoupper($type)=='MSI+') { $arrcode = $this->barcode_msi($code, true); } + if (strtoupper(($type ?? ''))=='MSI') { $arrcode = $this->barcode_msi($code, false); } + if (strtoupper(($type ?? ''))=='MSI+') { $arrcode = $this->barcode_msi($code, true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -227,7 +227,7 @@ case 'CODABAR': { // CODABAR if ($pr > 0) { $this->print_ratio = $pr; } else { $this->print_ratio = 2.5; } // spec: Pr= 1:2 - 1:3 (>2.2 if X<0.50) - if (strtoupper($type)=='CODABAR') { $arrcode = $this->barcode_codabar($code); } + if (strtoupper(($type ?? ''))=='CODABAR') { $arrcode = $this->barcode_codabar($code); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -242,12 +242,12 @@ case 'EAN128A': // EAN 128 A case 'EAN128B': // EAN 128 B case 'EAN128C': { // EAN 128 C - if (strtoupper($type)=='C128A') { $arrcode = $this->barcode_c128($code, 'A'); } - if (strtoupper($type)=='C128B') { $arrcode = $this->barcode_c128($code, 'B'); } - if (strtoupper($type)=='C128C') { $arrcode = $this->barcode_c128($code, 'C'); } - if (strtoupper($type)=='EAN128A') { $arrcode = $this->barcode_c128($code, 'A', true); } - if (strtoupper($type)=='EAN128B') { $arrcode = $this->barcode_c128($code, 'B', true); } - if (strtoupper($type)=='EAN128C') { $arrcode = $this->barcode_c128($code, 'C', true); } + if (strtoupper(($type ?? ''))=='C128A') { $arrcode = $this->barcode_c128($code, 'A'); } + if (strtoupper(($type ?? ''))=='C128B') { $arrcode = $this->barcode_c128($code, 'B'); } + if (strtoupper(($type ?? ''))=='C128C') { $arrcode = $this->barcode_c128($code, 'C'); } + if (strtoupper(($type ?? ''))=='EAN128A') { $arrcode = $this->barcode_c128($code, 'A', true); } + if (strtoupper(($type ?? ''))=='EAN128B') { $arrcode = $this->barcode_c128($code, 'B', true); } + if (strtoupper(($type ?? ''))=='EAN128C') { $arrcode = $this->barcode_c128($code, 'C', true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -262,12 +262,12 @@ case 'C39E+': { // CODE 39 EXTENDED + CHECKSUM if ($pr > 0) { $this->print_ratio = $pr; } else { $this->print_ratio = 2.5; } // spec: Pr= 1:2 - 1:3 (>2.2 if X<0.50) - $code = str_replace(chr(194).chr(160), ' ', $code); // mPDF 5.3.95 (for utf-8 encoded) - $code = str_replace(chr(160), ' ', $code); // mPDF 5.3.95 (for win-1252) - if (strtoupper($type)=='C39') { $arrcode = $this->barcode_code39($code, false, false); } - if (strtoupper($type)=='C39+') { $arrcode = $this->barcode_code39($code, false, true); } - if (strtoupper($type)=='C39E') { $arrcode = $this->barcode_code39($code, true, false); } - if (strtoupper($type)=='C39E+') { $arrcode = $this->barcode_code39($code, true, true); } + $code = str_replace(chr(194).chr(160), ' ', ($code ?? '')); // mPDF 5.3.95 (for utf-8 encoded) + $code = str_replace((chr(160) ?? ''), ' ', ($code ?? '')); // mPDF 5.3.95 (for win-1252) + if (strtoupper(($type ?? ''))=='C39') { $arrcode = $this->barcode_code39($code, false, false); } + if (strtoupper(($type ?? ''))=='C39+') { $arrcode = $this->barcode_code39($code, false, true); } + if (strtoupper(($type ?? ''))=='C39E') { $arrcode = $this->barcode_code39($code, true, false); } + if (strtoupper(($type ?? ''))=='C39E+') { $arrcode = $this->barcode_code39($code, true, true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -280,8 +280,8 @@ case 'S25+': { // Standard 2 of 5 + CHECKSUM if ($pr > 0) { $this->print_ratio = $pr; } else { $this->print_ratio = 3; } // spec: Pr=1:3/1:4.5 - if (strtoupper($type)=='S25') { $arrcode = $this->barcode_s25($code, false); } - if (strtoupper($type)=='S25+') { $arrcode = $this->barcode_s25($code, true); } + if (strtoupper(($type ?? ''))=='S25') { $arrcode = $this->barcode_s25($code, false); } + if (strtoupper(($type ?? ''))=='S25+') { $arrcode = $this->barcode_s25($code, true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -294,8 +294,8 @@ case 'I25+': { // Interleaved 2 of 5 + CHECKSUM if ($pr > 0) { $this->print_ratio = $pr; } else { $this->print_ratio = 2.5; } // spec: Pr= 1:2 - 1:3 (>2.2 if X<0.50) - if (strtoupper($type)=='I25') { $arrcode = $this->barcode_i25($code, false); } - if (strtoupper($type)=='I25+') { $arrcode = $this->barcode_i25($code, true); } + if (strtoupper(($type ?? ''))=='I25') { $arrcode = $this->barcode_i25($code, false); } + if (strtoupper(($type ?? ''))=='I25+') { $arrcode = $this->barcode_i25($code, true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -308,8 +308,8 @@ case 'I25B+': { // Interleaved 2 of 5 + CHECKSUM + Bearer bars if ($pr > 0) { $this->print_ratio = $pr; } else { $this->print_ratio = 2.5; } // spec: Pr= 1:2 - 1:3 (>2.2 if X<0.50) - if (strtoupper($type)=='I25B') { $arrcode = $this->barcode_i25($code, false); } - if (strtoupper($type)=='I25B+') { $arrcode = $this->barcode_i25($code, true); } + if (strtoupper(($type ?? ''))=='I25B') { $arrcode = $this->barcode_i25($code, false); } + if (strtoupper(($type ?? ''))=='I25B+') { $arrcode = $this->barcode_i25($code, true); } if ($arrcode == false) { break; } $arrcode['nom-X'] = 0.381; // Nominal value for X-dim (bar width) in mm (2 X min. spec.) $arrcode['nom-H'] = 10; // Nominal value for Height of Full bar in mm (non-spec.) @@ -374,7 +374,7 @@ $chr['%'] = '111212121'; $chr['*'] = '121121211'; - $code = strtoupper($code); + $code = strtoupper(($code ?? '')); $checkdigit = ''; if ($extended) { // extended mode @@ -393,7 +393,7 @@ $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); $k = 0; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; ++$i) { $char = $code[$i]; if(!isset($chr[$char])) { @@ -460,9 +460,9 @@ chr(120) => '+X', chr(121) => '+Y', chr(122) => '+Z', chr(123) => '%P', chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T'); $code_ext = ''; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0 ; $i < $clen; ++$i) { - if (ord($code[$i]) > 127) { + if (ord(($code[$i] ?? '')) > 127) { return false; } $code_ext .= $encode[$code[$i]]; @@ -480,7 +480,7 @@ 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%'); $sum = 0; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0 ; $i < $clen; ++$i) { $k = array_keys($chars, $code[$i]); $sum += $k[0]; @@ -542,7 +542,7 @@ $chr[130] = '122211'; // (+) $chr[131] = '312111'; // (%) $chr[42] = '111141'; // start-stop - $code = strtoupper($code); + $code = strtoupper(($code ?? '')); $encode = array( chr(0) => chr(131).'U', chr(1) => chr(128).'A', chr(2) => chr(128).'B', chr(3) => chr(128).'C', chr(4) => chr(128).'D', chr(5) => chr(128).'E', chr(6) => chr(128).'F', chr(7) => chr(128).'G', @@ -577,12 +577,12 @@ chr(120) => chr(130).'X', chr(121) => chr(130).'Y', chr(122) => chr(130).'Z', chr(123) => chr(131).'P', chr(124) => chr(131).'Q', chr(125) => chr(131).'R', chr(126) => chr(131).'S', chr(127) => chr(131).'T'); $code_ext = ''; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0 ; $i < $clen; ++$i) { - if (ord($code{$i}) > 127) { + if (ord(($code[$i] ?? '')) > 127) { return false; } - $code_ext .= $encode[$code{$i}]; + $code_ext .= $encode[$code[$i]]; } // checksum $code_ext .= $this->checksum_code93($code_ext); @@ -590,9 +590,9 @@ $code = '*'.$code_ext.'*'; $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); $k = 0; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; ++$i) { - $char = ord($code{$i}); + $char = ord(($code[$i] ?? '')); if(!isset($chr[$char])) { // invalid character return false; @@ -603,7 +603,7 @@ } else { $t = false; // space } - $w = $chr[$char]{$j}; + $w = $chr[$char][$j]; $bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); $bararray['maxw'] += $w; ++$k; @@ -626,13 +626,13 @@ 'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%', '<', '=', '>', '?'); // translate special characters - $code = strtr($code, chr(128).chr(131).chr(129).chr(130), '<=>?'); - $len = strlen($code); + $code = strtr(($code ?? ''), chr(128).chr(131).chr(129).chr(130), '<=>?'); + $len = strlen(($code ?? '')); // calculate check digit C $p = 1; $check = 0; for ($i = ($len - 1); $i >= 0; --$i) { - $k = array_keys($chars, $code{$i}); + $k = array_keys($chars, $code[$i]); $check += ($k[0] * $p); ++$p; if ($p > 20) { @@ -646,7 +646,7 @@ $p = 1; $check = 0; for ($i = $len; $i >= 0; --$i) { - $k = array_keys($chars, $code{$i}); + $k = array_keys($chars, $code[$i]); $check += ($k[0] * $p); ++$p; if ($p > 15) { @@ -657,7 +657,7 @@ $k = $chars[$check]; $checksum = $c.$k; // resto respecial characters - $checksum = strtr($checksum, '<=>?', chr(128).chr(131).chr(129).chr(130)); + $checksum = strtr(($checksum ?? ''), '<=>?', chr(128).chr(131).chr(129).chr(130)); return $checksum; } @@ -665,7 +665,7 @@ * Checksum for standard 2 of 5 barcodes. */ protected function checksum_s25($code) { - $len = strlen($code); + $len = strlen(($code ?? '')); $sum = 0; for ($i = 0; $i < $len; $i+=2) { $sum += $code[$i]; @@ -706,7 +706,7 @@ $checkdigit = ''; if ($checksum) { // add checksum - $clen = strlen($code); + $clen = strlen(($code ?? '')); $p = 2; $check = 0; for ($i = ($clen - 1); $i >= 0; --$i) { @@ -724,7 +724,7 @@ $checkdigit = $check; } $seq = '110'; // left guard - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; ++$i) { $digit = $code[$i]; if (!isset($chr[$digit])) { @@ -761,12 +761,12 @@ $checkdigit = $this->checksum_s25($code); $code .= $checkdigit ; } - if((strlen($code) % 2) != 0) { + if((strlen(($code ?? '')) % 2) != 0) { // add leading zero if code-length is odd $code = '0'.$code; } $seq = '11011010'; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; ++$i) { $digit = $code[$i]; if (!isset($chr[$digit])) { @@ -785,7 +785,7 @@ * Convert binary barcode sequence to barcode array */ protected function binseq_to_array($seq, $bararray) { - $len = strlen($seq); + $len = strlen(($seq ?? '')); $w = 0; $k = 0; for ($i = 0; $i < $len; ++$i) { @@ -829,16 +829,16 @@ $checkdigit = $this->checksum_s25($code); $code .= $checkdigit ; } - if((strlen($code) % 2) != 0) { + if((strlen(($code ?? '')) % 2) != 0) { // add leading zero if code-length is odd $code = '0'.$code; } // add start and stop codes - $code = 'AA'.strtolower($code).'ZA'; + $code = 'AA'.strtolower(($code ?? '')).'ZA'; $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); $k = 0; - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; $i = ($i + 2)) { $char_bar = $code[$i]; $char_space = $code[$i+1]; @@ -848,11 +848,11 @@ } // create a bar-space sequence $seq = ''; - $chrlen = strlen($chr[$char_bar]); + $chrlen = strlen(($chr[$char_bar] ?? '')); for ($s = 0; $s < $chrlen; $s++){ $seq .= $chr[$char_bar][$s] . $chr[$char_space][$s]; } - $seqlen = strlen($seq); + $seqlen = strlen(($seq ?? '')); for ($j = 0; $j < $seqlen; ++$j) { if (($j % 2) == 0) { $t = true; // bar @@ -989,12 +989,12 @@ '200000' /* END */ ); $keys = ''; - switch(strtoupper($type)) { + switch(strtoupper(($type ?? ''))) { case 'A': { $startid = 103; $keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'; for ($i = 0; $i < 32; ++$i) { - $keys .= chr($i); + $keys .= chr((int) ($i)); } break; } @@ -1006,17 +1006,17 @@ case 'C': { $startid = 105; $keys = ''; - if ((strlen($code) % 2) != 0) { + if ((strlen(($code ?? '')) % 2) != 0) { // The length of barcode value must be even ($code). You must pad the number with zeros return false; } for ($i = 0; $i <= 99; ++$i) { - $keys .= chr($i); + $keys .= chr((int) ($i)); } $new_code = ''; - $hclen = (strlen($code) / 2); + $hclen = (strlen(($code ?? '')) / 2); for ($i = 0; $i < $hclen; ++$i) { - $new_code .= chr(intval($code{(2 * $i)}.$code{(2 * $i + 1)})); + $new_code .= chr((int) (intval($code[(2 * $i)].$code[(2 * $i + 1)]))); } $code = $new_code; break; @@ -1029,22 +1029,22 @@ // calculate check character $sum = $startid; if ($ean) { $code = chr(102) . $code; } // Add FNC 1 - which identifies it as EAN-128 - $clen = strlen($code); + $clen = strlen(($code ?? '')); for ($i = 0; $i < $clen; ++$i) { if ($ean && $i==0) { $sum += 102; } - else { $sum += (strpos($keys, $code[$i]) * ($i+1)); } + else { $sum += (strpos(($keys ?? ''), ($code[$i] ?? '')) * ($i+1)); } } $check = ($sum % 103); $checkdigit = $check ; // add start, check and stop codes - $code = chr($startid).$code.chr($check).chr(106).chr(107); + $code = chr((int) ($startid)).$code.chr((int) ($check)).chr(106).chr(107); $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); $k = 0; - $len = strlen($code); + $len = strlen(($code ?? '')); for ($i = 0; $i < $len; ++$i) { - $ck = strpos($keys, $code[$i]); + $ck = strpos(($keys ?? ''), ($code[$i] ?? '')); if (($i == 0) || ($ean && $i==1) | ($i > ($len-4))) { - $char_num = ord($code[$i]); + $char_num = ord(($code[$i] ?? '')); $seq = $chr[$char_num]; } elseif(($ck >= 0) AND isset($chr[$ck])) { $seq = $chr[$ck]; @@ -1083,8 +1083,8 @@ } $data_len = $len - 1; //Padding - $code = str_pad($code, $data_len, '0', STR_PAD_LEFT); - $code_len = strlen($code); + $code = str_pad(($code ?? ''), $data_len, '0', STR_PAD_LEFT); + $code_len = strlen(($code ?? '')); // calculate check digit $sum_a = 0; for ($i = 1; $i < $data_len; $i+=2) { @@ -1119,28 +1119,28 @@ } if ($upce) { // convert UPC-A to UPC-E - $tmp = substr($code, 4, 3); - $prod_code = intval(substr($code,7,5)); // product code + $tmp = substr(($code ?? ''), 4, 3); + $prod_code = intval(substr(($code ?? ''),7,5)); // product code $invalid_upce = false; if (($tmp == '000') OR ($tmp == '100') OR ($tmp == '200')) { // manufacturer code ends in 000, 100, or 200 - $upce_code = substr($code, 2, 2).substr($code, 9, 3).substr($code, 4, 1); + $upce_code = substr(($code ?? ''), 2, 2).substr(($code ?? ''), 9, 3).substr(($code ?? ''), 4, 1); if ($prod_code > 999) { $invalid_upce = true; } } else { - $tmp = substr($code, 5, 2); + $tmp = substr(($code ?? ''), 5, 2); if ($tmp == '00') { // manufacturer code ends in 00 - $upce_code = substr($code, 2, 3).substr($code, 10, 2).'3'; + $upce_code = substr(($code ?? ''), 2, 3).substr(($code ?? ''), 10, 2).'3'; if ($prod_code > 99) { $invalid_upce = true; } } else { - $tmp = substr($code, 6, 1); + $tmp = substr(($code ?? ''), 6, 1); if ($tmp == '0') { // manufacturer code ends in 0 - $upce_code = substr($code, 2, 4).substr($code, 11, 1).'4'; + $upce_code = substr(($code ?? ''), 2, 4).substr(($code ?? ''), 11, 1).'4'; if ($prod_code > 9) { $invalid_upce = true; } } else { // manufacturer code does not end in zero - $upce_code = substr($code, 2, 5).substr($code, 11, 1); + $upce_code = substr(($code ?? ''), 2, 5).substr(($code ?? ''), 11, 1); if ($prod_code > 9) { $invalid_upce = true; } } } @@ -1224,7 +1224,7 @@ $seq = '101'; // left guard bar if ($upce) { $bararray = array('code' => $upce_code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); - $p = $upce_parities[$code{1}][$r]; + $p = $upce_parities[$code[1]][$r]; for ($i = 0; $i < 6; ++$i) { $seq .= $codes[$p[$i]][$upce_code[$i]]; } @@ -1237,7 +1237,7 @@ $seq .= $codes['A'][$code[$i]]; } } else { - $p = $parities[$code{0}]; + $p = $parities[$code[0]]; for ($i = 1; $i < $half_len; ++$i) { $seq .= $codes[$p[$i-1]][$code[$i]]; } @@ -1248,7 +1248,7 @@ } $seq .= '101'; // right guard bar } - $clen = strlen($seq); + $clen = strlen(($seq ?? '')); $w = 0; for ($i = 0; $i < $clen; ++$i) { $w += 1; @@ -1275,12 +1275,12 @@ */ protected function barcode_eanext($code, $len=5) { //Padding - $code = str_pad($code, $len, '0', STR_PAD_LEFT); + $code = str_pad(($code ?? ''), $len, '0', STR_PAD_LEFT); // calculate check digit if ($len == 2) { $r = $code % 4; } elseif ($len == 5) { - $r = (3 * ($code{0} + $code{2} + $code{4})) + (9 * ($code{1} + $code{3})); + $r = (3 * ($code[0] + $code[2] + $code[4])) + (9 * ($code[1] + $code[3])); $r %= 10; } else { return false; @@ -1331,7 +1331,7 @@ ); $p = $parities[$len][$r]; $seq = '1011'; // left guard bar - $seq .= $codes[$p[0]][$code{0}]; + $seq .= $codes[$p[0]][$code[0]]; for ($i = 1; $i < $len; ++$i) { $seq .= '01'; // separator $seq .= $codes[$p[$i]][$code[$i]]; @@ -1375,9 +1375,9 @@ } $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 5, 'bcode' => array()); $k = 0; - $code = str_replace('-', '', $code); - $code = str_replace(' ', '', $code); - $len = strlen($code); + $code = str_replace('-', '', ($code ?? '')); + $code = str_replace(' ', '', ($code ?? '')); + $len = strlen(($code ?? '')); // calculate checksum $sum = 0; for ($i = 0; $i < $len; ++$i) { @@ -1389,7 +1389,7 @@ } $code .= $chkd; $checkdigit = $chkd; - $len = strlen($code); + $len = strlen(($code ?? '')); // start bar $bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 5, 'p' => 0); $bararray['bcode'][$k++] = array('t' => 0, 'w' => $this->gapwidth , 'h' => 5, 'p' => 0); @@ -1467,8 +1467,8 @@ 'Y' => array(2,1,4,3), 'Z' => array(2,2,3,3) ); - $code = strtoupper($code); - $len = strlen($code); + $code = strtoupper(($code ?? '')); + $len = strlen(($code ?? '')); $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => $this->daft['F'], 'bcode' => array()); if ($notkix) { // table for checksum calculation (row,col) @@ -1603,8 +1603,8 @@ $k = 0; $w = 0; $seq = ''; - $code = strtoupper($code); - $len = strlen($code); + $code = strtoupper(($code ?? '')); + $len = strlen(($code ?? '')); for ($i = 0; $i < $len; ++$i) { if (!isset($chr[$code[$i]])) { return false; @@ -1651,7 +1651,7 @@ $k = 0; $w = 0; $seq = ''; - $len = strlen($code); + $len = strlen(($code ?? '')); // calculate check digit C $p = 1; $check = 0; @@ -1733,7 +1733,7 @@ $dsc_chr = array(7,1,9,5,8,0,2,4,6,3,5,8,9,7,3,0,6,1,7,4,6,8,9,2,5,1,7,5,4,3,8,7,6,0,2,5,4,9,3,0,1,6,8,2,0,4,5,9,6,7,5,2,6,3,8,5,1,9,8,7,4,0,2,6,3); $asc_pos = array(3,0,8,11,1,12,8,11,10,6,4,12,2,7,9,6,7,9,2,8,4,0,12,7,10,9,0,7,10,5,7,9,6,8,2,12,1,4,2,0,1,5,4,6,12,1,0,9,4,7,5,10,2,6,9,11,2,12,6,7,5,11,0,3,2); $dsc_pos = array(2,10,12,5,9,1,5,4,3,9,11,5,10,1,6,3,4,1,10,0,2,11,8,6,1,12,3,8,6,4,4,11,0,6,1,9,11,5,3,7,3,10,7,11,8,2,10,3,5,8,0,3,12,11,8,4,5,1,3,0,7,12,9,8,10); - $code_arr = explode('-', $code); + $code_arr = explode('-', ($code ?? '')); $tracking_number = $code_arr[0]; if (isset($code_arr[1])) { $routing_code = $code_arr[1]; @@ -1741,7 +1741,7 @@ $routing_code = ''; } // Conversion of Routing Code - switch (strlen($routing_code)) { + switch (strlen(($routing_code ?? ''))) { case 0: { $binary_code = 0; break; @@ -1764,23 +1764,23 @@ } } $binary_code = bcmul($binary_code, 10); - $binary_code = bcadd($binary_code, $tracking_number{0}); + $binary_code = bcadd($binary_code, $tracking_number[0]); $binary_code = bcmul($binary_code, 5); - $binary_code = bcadd($binary_code, $tracking_number{1}); - $binary_code .= substr($tracking_number, 2, 18); + $binary_code = bcadd($binary_code, $tracking_number[1]); + $binary_code .= substr(($tracking_number ?? ''), 2, 18); // convert to hexadecimal $binary_code = $this->dec_to_hex($binary_code); // pad to get 13 bytes - $binary_code = str_pad($binary_code, 26, '0', STR_PAD_LEFT); + $binary_code = str_pad(($binary_code ?? ''), 26, '0', STR_PAD_LEFT); // convert string to array of bytes $binary_code_arr = chunk_split($binary_code, 2, "\r"); - $binary_code_arr = substr($binary_code_arr, 0, -1); - $binary_code_arr = explode("\r", $binary_code_arr); + $binary_code_arr = substr(($binary_code_arr ?? ''), 0, -1); + $binary_code_arr = explode("\r", ($binary_code_arr ?? '')); // calculate frame check sequence $fcs = $this->imb_crc11fcs($binary_code_arr); // exclude first 2 bits from first byte $first_byte = sprintf('%2s', dechex((hexdec($binary_code_arr[0]) << 2) >> 2)); - $binary_code_102bit = $first_byte.substr($binary_code, 2); + $binary_code_102bit = $first_byte.substr(($binary_code ?? ''), 2); // convert binary data to codewords $codewords = array(); $data = $this->hex_to_dec($binary_code_102bit); @@ -1861,7 +1861,7 @@ if($number == 0) { array_push($hex, '0'); } else { - array_push($hex, strtoupper(dechex(bcmod($number, '16')))); + array_push($hex, strtoupper((dechex(bcmod($number, '16')) ?? ''))); $number = bcdiv($number, '16', 0); } } @@ -1876,7 +1876,7 @@ public function hex_to_dec($hex) { $dec = 0; $bitval = 1; - $len = strlen($hex); + $len = strlen(($hex ?? '')); for($pos = ($len - 1); $pos >= 0; --$pos) { $dec = bcadd($dec, bcmul(hexdec($hex[$pos]), $bitval)); $bitval = bcmul($bitval, 16); --- a/intranet/mpdf60/classes/ttfontsuni_analysis.php +++ b/intranet/mpdf60/classes/ttfontsuni_analysis.php @@ -3,6 +3,10 @@ require_once(_MPDF_PATH.'classes/ttfontsuni.php'); class TTFontFile_Analysis EXTENDS TTFontFile { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $version; + public $fontRevision; + // Used to get font information from files in directory function extractCoreInfo($file, $TTCfontID=0) { @@ -115,7 +119,7 @@ $string_data_offset = $name_offset + $this->read_ushort(); $names = array(1=>'',2=>'',3=>'',4=>'',6=>''); $K = array_keys($names); - $nameCount = count($names); + $nameCount = count(($names ?? [])); for ($i=0;$i<$numRecords; $i++) { $platformId = $this->read_ushort(); $encodingId = $this->read_ushort(); @@ -134,7 +138,7 @@ $N = ''; while ($length > 0) { $char = $this->read_ushort(); - $N .= (chr($char)); + $N .= (chr((int) ($char))); $length -= 1; } $this->_pos = $opos; @@ -153,11 +157,11 @@ } } if ($names[6]) - $psName = preg_replace('/ /','-',$names[6]); + $psName = preg_replace('/ /','-',($names[6] ?? '')); else if ($names[4]) - $psName = preg_replace('/ /','-',$names[4]); + $psName = preg_replace('/ /','-',($names[4] ?? '')); else if ($names[1]) - $psName = preg_replace('/ /','-',$names[1]); + $psName = preg_replace('/ /','-',($names[1] ?? '')); else $psName = ''; if (!$names[1] && !$psName) @@ -201,7 +205,7 @@ $this->_pos += 10; //PANOSE = 10 byte length $panose = fread($this->fh,10); $this->panose = array(); - for ($p=0;$p<strlen($panose);$p++) { $this->panose[] = ord($panose[$p]); } + for ($p=0;$p<strlen(($panose ?? ''));$p++) { $this->panose[] = ord(($panose[$p] ?? '')); } $this->skip(20); $fsSelection = $this->read_short(); } @@ -380,14 +384,14 @@ else if ($sFamily ==10) { $ftype = 'cursive'; } // Use PANOSE if ($panose) { - $bFamilyType=ord($panose[0]); + $bFamilyType=ord(($panose[0] ?? '')); if ($bFamilyType==2) { - $bSerifStyle=ord($panose[1]); + $bSerifStyle=ord(($panose[1] ?? '')); if (!$ftype) { if ($bSerifStyle>1 && $bSerifStyle<11) { $ftype = 'serif'; } else if ($bSerifStyle>10) { $ftype = 'sans'; } } - $bProportion=ord($panose[3]); + $bProportion=ord(($panose[3] ?? '')); if ($bProportion==9 || $bProportion==1) { $ftype = 'mono'; } // ==1 i.e. No Fit needed for OCR-a and -b } else if ($bFamilyType==3) { --- a/intranet/mpdf60/classes/cssmgr.php +++ b/intranet/mpdf60/classes/cssmgr.php @@ -1,6 +1,12 @@ <?php class cssmgr { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $cell_border_dominance_L; + public $cell_border_dominance_R; + public $cell_border_dominance_T; + public $cell_border_dominance_B; + var $mpdf = null; @@ -10,7 +16,7 @@ var $tbCSSlvl; -function cssmgr(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; $this->tablecascadeCSS = array(); $this->CSS=array(); @@ -19,16 +25,16 @@ } function ReadCSS($html) { - preg_match_all('/<style[^>]*media=["\']([^"\'>]*)["\'].*?<\/style>/is',$html,$m); - for($i=0; $i<count($m[0]); $i++) { - if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim($this->mpdf->CSSselectMedia).'|all)/i',$m[1][$i])) { - $html = preg_replace('/'.preg_quote($m[0][$i],'/').'/','',$html); - } - } - preg_match_all('/<link[^>]*media=["\']([^"\'>]*)["\'].*?>/is',$html,$m); - for($i=0; $i<count($m[0]); $i++) { - if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim($this->mpdf->CSSselectMedia).'|all)/i',$m[1][$i])) { - $html = preg_replace('/'.preg_quote($m[0][$i],'/').'/','',$html); + preg_match_all('/<style[^>]*media=["\']([^"\'>]*)["\'].*?<\/style>/is',($html ?? ''),$m); + for($i=0; $i<count(($m[0] ?? [])); $i++) { + if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim(($this->mpdf->CSSselectMedia ?? '')).'|all)/i',($m[1][$i] ?? ''))) { + $html = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/','',($html ?? '')); + } + } + preg_match_all('/<link[^>]*media=["\']([^"\'>]*)["\'].*?>/is',($html ?? ''),$m); + for($i=0; $i<count(($m[0] ?? [])); $i++) { + if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim(($this->mpdf->CSSselectMedia ?? '')).'|all)/i',($m[1][$i] ?? ''))) { + $html = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/','',($html ?? '')); } } @@ -37,21 +43,21 @@ // Remove Comment tags /* ... */ inside CSS as <style> in HTML document // But first, we replace upper and mixed case closing style tag with lower // case so we can use str_replace later. - preg_replace('/<\/style>/i', '</style>', $html); - preg_match_all('/<style.*?>(.*?)<\/style>/si',$html,$m); - if (count($m[1])) { - for($i=0;$i<count($m[1]);$i++) { + preg_replace('/<\/style>/i', '</style>', ($html ?? '')); + preg_match_all('/<style.*?>(.*?)<\/style>/si',($html ?? ''),$m); + if (count(($m[1] ?? []))) { + for($i=0;$i<count(($m[1] ?? []));$i++) { // Remove comment tags - $sub = preg_replace('/(<\!\-\-|\-\->)/s',' ',$m[1][$i]); - $sub = '>'.preg_replace('|/\*.*?\*/|s',' ',$sub).'</style>'; - $html = str_replace('>'.$m[1][$i].'</style>', $sub, $html); - } - } - - - $html = preg_replace('/<!--mpdf/i','',$html); - $html = preg_replace('/mpdf-->/i','',$html); - $html = preg_replace('/<\!\-\-.*?\-\->/s',' ',$html); + $sub = preg_replace('/(<\!\-\-|\-\->)/s',' ',($m[1][$i] ?? '')); + $sub = '>'.preg_replace('|/\*.*?\*/|s',' ',($sub ?? '')).'</style>'; + $html = str_replace('>'.$m[1][$i].'</style>', ($sub ?? ''), ($html ?? '')); + } + } + + + $html = preg_replace('/<!--mpdf/i','',($html ?? '')); + $html = preg_replace('/mpdf-->/i','',($html ?? '')); + $html = preg_replace('/<\!\-\-.*?\-\->/s',' ',($html ?? '')); $match = 0; // no match for instance $regexp = ''; // This helps debugging: showing what is the REAL string being processed @@ -59,13 +65,13 @@ //CSS inside external files $regexp = '/<link[^>]*rel=["\']stylesheet["\'][^>]*href=["\']([^>"\']*)["\'].*?>/si'; - $x = preg_match_all($regexp,$html,$cxt); + $x = preg_match_all(($regexp ?? ''),($html ?? ''),$cxt); if ($x) { $match += $x; $CSSext = $cxt[1]; } $regexp = '/<link[^>]*href=["\']([^>"\']*)["\'][^>]*?rel=["\']stylesheet["\'].*?>/si'; - $x = preg_match_all($regexp,$html,$cxt); + $x = preg_match_all(($regexp ?? ''),($html ?? ''),$cxt); if ($x) { $match += $x; $CSSext = array_merge($CSSext,$cxt[1]); @@ -74,7 +80,7 @@ // look for @import stylesheets //$regexp = '/@import url\([\'\"]{0,1}([^\)]*?\.css)[\'\"]{0,1}\)/si'; $regexp = '/@import url\([\'\"]{0,1}([^\)]*?\.css(\?\S+)?)[\'\"]{0,1}\)/si'; - $x = preg_match_all($regexp,$html,$cxt); + $x = preg_match_all(($regexp ?? ''),($html ?? ''),$cxt); if ($x) { $match += $x; $CSSext = array_merge($CSSext,$cxt[1]); @@ -83,7 +89,7 @@ // look for @import without the url() //$regexp = '/@import [\'\"]{0,1}([^;]*?\.css)[\'\"]{0,1}/si'; $regexp = '/@import [\'\"]{0,1}([^;]*?\.css(\?\S+)?)[\'\"]{0,1}/si'; - $x = preg_match_all($regexp,$html,$cxt); + $x = preg_match_all(($regexp ?? ''),($html ?? ''),$cxt); if ($x) { $match += $x; $CSSext = array_merge($CSSext,$cxt[1]); @@ -97,7 +103,7 @@ while($match){ $path = $CSSext[$ind]; - $path = htmlspecialchars_decode($path); // mPDF 6 + $path = htmlspecialchars_decode(($path ?? '')); // mPDF 6 $this->mpdf->GetFullPath($path); $CSSextblock = $this->mpdf->_get_file($path); @@ -106,8 +112,8 @@ // and fix url paths (including background-images) relative to stylesheet //$regexpem = '/@import url\([\'\"]{0,1}(.*?\.css)[\'\"]{0,1}\)/si'; $regexpem = '/@import url\([\'\"]{0,1}(.*?\.css(\?\S+)?)[\'\"]{0,1}\)/si'; - $xem = preg_match_all($regexpem,$CSSextblock,$cxtem); - $cssBasePath = preg_replace('/\/[^\/]*$/','',$path) . '/'; + $xem = preg_match_all(($regexpem ?? ''),($CSSextblock ?? ''),$cxtem); + $cssBasePath = preg_replace('/\/[^\/]*$/','',($path ?? '')) . '/'; if ($xem) { foreach($cxtem[1] AS $cxtembedded) { // path is relative to original stlyesheet!! @@ -117,14 +123,14 @@ } } $regexpem = '/(background[^;]*url\s*\(\s*[\'\"]{0,1})([^\)\'\"]*)([\'\"]{0,1}\s*\))/si'; - $xem = preg_match_all($regexpem,$CSSextblock,$cxtem); + $xem = preg_match_all(($regexpem ?? ''),($CSSextblock ?? ''),$cxtem); if ($xem) { - for ($i=0;$i<count($cxtem[0]);$i++) { + for ($i=0;$i<count(($cxtem[0] ?? []));$i++) { // path is relative to original stlyesheet!! $embedded = $cxtem[2][$i]; - if (!preg_match('/^data:image/i', $embedded)) { // mPDF 5.5.13 + if (!preg_match('/^data:image/i', ($embedded ?? ''))) { // mPDF 5.5.13 $this->mpdf->GetFullPath($embedded, $cssBasePath ); - $CSSextblock = preg_replace('/'.preg_quote($cxtem[0][$i],'/').'/', ($cxtem[1][$i].$embedded.$cxtem[3][$i]), $CSSextblock); + $CSSextblock = preg_replace('/'.preg_quote(($cxtem[0][$i] ?? ''),'/').'/', ($cxtem[1][$i].$embedded.$cxtem[3][$i]), ($CSSextblock ?? '')); } } } @@ -137,72 +143,72 @@ $match = 0; // reset value, if needed // CSS as <style> in HTML document $regexp = '/<style.*?>(.*?)<\/style>/si'; - $match = preg_match_all($regexp,$html,$CSSblock); + $match = preg_match_all(($regexp ?? ''),($html ?? ''),$CSSblock); if ($match) { $tmpCSSstr = implode(' ',$CSSblock[1]); $regexpem = '/(background[^;]*url\s*\(\s*[\'\"]{0,1})([^\)\'\"]*)([\'\"]{0,1}\s*\))/si'; - $xem = preg_match_all($regexpem,$tmpCSSstr ,$cxtem); + $xem = preg_match_all(($regexpem ?? ''),($tmpCSSstr ?? '') ,$cxtem); if ($xem) { - for ($i=0;$i<count($cxtem[0]);$i++) { + for ($i=0;$i<count(($cxtem[0] ?? []));$i++) { $embedded = $cxtem[2][$i]; - if (!preg_match('/^data:image/i', $embedded)) { // mPDF 5.5.13 + if (!preg_match('/^data:image/i', ($embedded ?? ''))) { // mPDF 5.5.13 $this->mpdf->GetFullPath($embedded); - $tmpCSSstr = preg_replace('/'.preg_quote($cxtem[0][$i],'/').'/', ($cxtem[1][$i].$embedded.$cxtem[3][$i]), $tmpCSSstr ); + $tmpCSSstr = preg_replace('/'.preg_quote(($cxtem[0][$i] ?? ''),'/').'/', ($cxtem[1][$i].$embedded.$cxtem[3][$i]), ($tmpCSSstr ?? '') ); } } } $CSSstr .= ' '.$tmpCSSstr; } // Remove comments - $CSSstr = preg_replace('|/\*.*?\*/|s',' ',$CSSstr); - $CSSstr = preg_replace('/[\s\n\r\t\f]/s',' ',$CSSstr); - - if (preg_match('/@media/',$CSSstr)) { - preg_match_all('/@media(.*?)\{(([^\{\}]*\{[^\{\}]*\})+)\s*\}/is',$CSSstr,$m); - for($i=0; $i<count($m[0]); $i++) { - if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim($this->mpdf->CSSselectMedia).'|all)/i',$m[1][$i])) { - $CSSstr = preg_replace('/'.preg_quote($m[0][$i],'/').'/','',$CSSstr); + $CSSstr = preg_replace('|/\*.*?\*/|s',' ',($CSSstr ?? '')); + $CSSstr = preg_replace('/[\s\n\r\t\f]/s',' ',($CSSstr ?? '')); + + if (preg_match('/@media/',($CSSstr ?? ''))) { + preg_match_all('/@media(.*?)\{(([^\{\}]*\{[^\{\}]*\})+)\s*\}/is',($CSSstr ?? ''),$m); + for($i=0; $i<count(($m[0] ?? [])); $i++) { + if ($this->mpdf->CSSselectMedia && !preg_match('/('.trim(($this->mpdf->CSSselectMedia ?? '')).'|all)/i',($m[1][$i] ?? ''))) { + $CSSstr = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/','',($CSSstr ?? '')); } else { - $CSSstr = preg_replace('/'.preg_quote($m[0][$i],'/').'/',' '.$m[2][$i].' ',$CSSstr); + $CSSstr = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/',' '.$m[2][$i].' ',($CSSstr ?? '')); } } } // Replace any background: url(data:image... with temporary image file reference - preg_match_all("/(url\(data:image\/(jpeg|gif|png);base64,(.*?)\))/si", $CSSstr, $idata); // mPDF 5.7.2 - if (count($idata[0])) { - for($i=0;$i<count($idata[0]);$i++) { + preg_match_all("/(url\(data:image\/(jpeg|gif|png);base64,(.*?)\))/si", ($CSSstr ?? ''), $idata); // mPDF 5.7.2 + if (count(($idata[0] ?? []))) { + for($i=0;$i<count(($idata[0] ?? []));$i++) { $file = _MPDF_TEMP_PATH.'_tempCSSidata'.RAND(1,10000).'_'.$i.'.'.$idata[2][$i]; //Save to local file - file_put_contents($file, base64_decode($idata[3][$i])); + file_put_contents($file, base64_decode(($idata[3][$i] ?? ''))); // $this->mpdf->GetFullPath($file); // ? is this needed - NO mPDF 5.6.03 - $CSSstr = str_replace($idata[0][$i], 'url("'.$file.'")', $CSSstr); // mPDF 5.5.17 - } - } - - $CSSstr = preg_replace('/(<\!\-\-|\-\->)/s',' ',$CSSstr); + $CSSstr = str_replace(($idata[0][$i] ?? ''), 'url("'.$file.'")', ($CSSstr ?? '')); // mPDF 5.5.17 + } + } + + $CSSstr = preg_replace('/(<\!\-\-|\-\->)/s',' ',($CSSstr ?? '')); // mPDF 5.7.4 URLs // Characters "(" ")" and ";" in url() e.g. background-image, cause problems parsing the CSS string // URLencode ( and ), but change ";" to a code which can be converted back after parsing (so as not to confuse ; // with a segment delimiter in the URI) $tempmarker = '%ZZ'; - if (strpos($CSSstr,'url(')!==false) { - preg_match_all( '/url\(\"(.*?)\"\)/', $CSSstr, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $CSSstr = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $CSSstr); - } - preg_match_all( '/url\(\'(.*?)\'\)/', $CSSstr, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $CSSstr = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $CSSstr); - } - preg_match_all( '/url\(([^\'\"].*?[^\'\"])\)/', $CSSstr, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $CSSstr = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $CSSstr); + if (strpos(($CSSstr ?? ''),'url(')!==false) { + preg_match_all( '/url\(\"(.*?)\"\)/', ($CSSstr ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $CSSstr = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($CSSstr ?? '')); + } + preg_match_all( '/url\(\'(.*?)\'\)/', ($CSSstr ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $CSSstr = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($CSSstr ?? '')); + } + preg_match_all( '/url\(([^\'\"].*?[^\'\"])\)/', ($CSSstr ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $CSSstr = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($CSSstr ?? '')); } } @@ -210,57 +216,57 @@ if ($CSSstr ) { $classproperties = array(); // mPDF 6 - preg_match_all('/(.*?)\{(.*?)\}/',$CSSstr,$styles); - for($i=0; $i < count($styles[1]) ; $i++) { + preg_match_all('/(.*?)\{(.*?)\}/',($CSSstr ?? ''),$styles); + for($i=0; $i < count(($styles[1] ?? [])) ; $i++) { // SET array e.g. $classproperties['COLOR'] = '#ffffff'; - $stylestr= trim($styles[2][$i]); - $stylearr = explode(';',$stylestr); + $stylestr= trim(($styles[2][$i] ?? '')); + $stylearr = explode(';',($stylestr ?? '')); foreach($stylearr AS $sta) { - if (trim($sta)) { + if (trim(($sta ?? ''))) { // Changed to allow style="background: url('http://www.bpm1.com/bg.jpg')" - $tmp = explode(':',$sta,2); + $tmp = explode(':',($sta ?? ''),2); $property = $tmp[0]; if (isset($tmp[1])) { $value = $tmp[1]; } else { $value = ''; } - $value = str_replace($tempmarker,';',$value); // mPDF 5.7.4 URLs - $property = trim($property); - $value = preg_replace('/\s*!important/i','',$value); - $value = trim($value); + $value = str_replace(($tempmarker ?? ''),';',($value ?? '')); // mPDF 5.7.4 URLs + $property = trim(($property ?? '')); + $value = preg_replace('/\s*!important/i','',($value ?? '')); + $value = trim(($value ?? '')); if ($property && ($value || $value==='0')) { // Ignores -webkit-gradient so doesn't override -moz- - if ((strtoupper($property)=='BACKGROUND-IMAGE' || strtoupper($property)=='BACKGROUND') && preg_match('/-webkit-gradient/i',$value)) { + if ((strtoupper(($property ?? ''))=='BACKGROUND-IMAGE' || strtoupper(($property ?? ''))=='BACKGROUND') && preg_match('/-webkit-gradient/i',($value ?? ''))) { continue; } - $classproperties[strtoupper($property)] = $value; + $classproperties[strtoupper(($property ?? ''))] = $value; } } } $classproperties = $this->fixCSS($classproperties); - $tagstr = strtoupper(trim($styles[1][$i])); - $tagarr = explode(',',$tagstr); + $tagstr = strtoupper((trim(($styles[1][$i] ?? '')) ?? '')); + $tagarr = explode(',',($tagstr ?? '')); $pageselectors = false; // used to turn on $this->mpdf->mirrorMargins foreach($tagarr AS $tg) { // mPDF 5.7.4 - if (preg_match('/NTH-CHILD\((\s*(([\-+]?\d*)N(\s*[\-+]\s*\d+)?|[\-+]?\d+|ODD|EVEN)\s*)\)/',$tg,$m) ) { - $tg = preg_replace('/NTH-CHILD\(.*\)/', 'NTH-CHILD('.str_replace(' ','',$m[1]).')', $tg); - } - $tags = preg_split('/\s+/',trim($tg)); - $level = count($tags); + if (preg_match('/NTH-CHILD\((\s*(([\-+]?\d*)N(\s*[\-+]\s*\d+)?|[\-+]?\d+|ODD|EVEN)\s*)\)/',($tg ?? ''),$m) ) { + $tg = preg_replace('/NTH-CHILD\(.*\)/', 'NTH-CHILD('.str_replace(' ','',($m[1] ?? '')).')', ($tg ?? '')); + } + $tags = preg_split('/\s+/',(trim(($tg ?? '')) ?? '')); + $level = count(($tags ?? [])); $t = ''; $t2 = ''; $t3 = ''; - if (trim($tags[0])=='@PAGE') { - if (isset($tags[0])) { $t = trim($tags[0]); } - if (isset($tags[1])) { $t2 = trim($tags[1]); } - if (isset($tags[2])) { $t3 = trim($tags[2]); } + if (trim(($tags[0] ?? ''))=='@PAGE') { + if (isset($tags[0])) { $t = trim(($tags[0] ?? '')); } + if (isset($tags[1])) { $t2 = trim(($tags[1] ?? '')); } + if (isset($tags[2])) { $t3 = trim(($tags[2] ?? '')); } $tag = ''; if ($level==1) { $tag = $t; } - else if ($level==2 && preg_match('/^[:](.*)$/',$t2,$m)) { + else if ($level==2 && preg_match('/^[:](.*)$/',($t2 ?? ''),$m)) { $tag = $t.'>>PSEUDO>>'.$m[1]; if ($m[1]=='LEFT' || $m[1]=='RIGHT') { $pageselectors = true; } // used to turn on $this->mpdf->mirrorMargins } else if ($level==2) { $tag = $t.'>>NAMED>>'.$t2; } - else if ($level==3 && preg_match('/^[:](.*)$/',$t3,$m)) { + else if ($level==3 && preg_match('/^[:](.*)$/',($t3 ?? ''),$m)) { $tag = $t.'>>NAMED>>'.$t2.'>>PSEUDO>>'.$m[1]; if ($m[1]=='LEFT' || $m[1]=='RIGHT') { $pageselectors = true; } // used to turn on $this->mpdf->mirrorMargins } @@ -269,19 +275,19 @@ } else if ($level == 1) { // e.g. p or .class or #id or p.class or p#id - if (isset($tags[0])) { $t = trim($tags[0]); } + if (isset($tags[0])) { $t = trim(($tags[0] ?? '')); } if ($t) { $tag = ''; - if (preg_match('/^[.](.*)$/',$t,$m)) { $tag = 'CLASS>>'.$m[1]; } - else if (preg_match('/^[#](.*)$/',$t,$m)) { $tag = 'ID>>'.$m[1]; } - else if (preg_match('/^\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',$t,$m)) { $tag = 'LANG>>'.strtolower($m[1]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^:LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',$t,$m)) { $tag = 'LANG>>'.strtolower($m[1]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[.](.*)$/',$t,$m)) { $tag = $m[1].'>>CLASS>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\s*:NTH-CHILD\((.*)\)$/',$t,$m)) { $tag = $m[1].'>>SELECTORNTHCHILD>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[#](.*)$/',$t,$m)) { $tag = $m[1].'>>ID>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',$t,$m)) { $tag = $m[1].'>>LANG>>'.strtolower($m[2]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.'):LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',$t,$m)) { $tag = $m[1].'>>LANG>>'.strtolower($m[2]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')$/',$t)) { $tag= $t; } + if (preg_match('/^[.](.*)$/',($t ?? ''),$m)) { $tag = 'CLASS>>'.$m[1]; } + else if (preg_match('/^[#](.*)$/',($t ?? ''),$m)) { $tag = 'ID>>'.$m[1]; } + else if (preg_match('/^\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',($t ?? ''),$m)) { $tag = 'LANG>>'.strtolower(($m[1] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^:LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',($t ?? ''),$m)) { $tag = 'LANG>>'.strtolower(($m[1] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[.](.*)$/',($t ?? ''),$m)) { $tag = $m[1].'>>CLASS>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\s*:NTH-CHILD\((.*)\)$/',($t ?? ''),$m)) { $tag = $m[1].'>>SELECTORNTHCHILD>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[#](.*)$/',($t ?? ''),$m)) { $tag = $m[1].'>>ID>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',($t ?? ''),$m)) { $tag = $m[1].'>>LANG>>'.strtolower(($m[2] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.'):LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',($t ?? ''),$m)) { $tag = $m[1].'>>LANG>>'.strtolower(($m[2] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')$/',($t ?? ''))) { $tag= $t; } if (isset($this->CSS[$tag]) && $tag) { $this->CSS[$tag] = $this->array_merge_recursive_unique($this->CSS[$tag], $classproperties); } else if ($tag) { $this->CSS[$tag] = $classproperties; } } @@ -289,20 +295,20 @@ else { $tmp = array(); for($n=0;$n<$level;$n++) { - if (isset($tags[$n])) { $t = trim($tags[$n]); } + if (isset($tags[$n])) { $t = trim(($tags[$n] ?? '')); } else { $t = ''; } if ($t) { $tag = ''; - if (preg_match('/^[.](.*)$/',$t,$m)) { $tag = 'CLASS>>'.$m[1]; } - else if (preg_match('/^[#](.*)$/',$t,$m)) { $tag = 'ID>>'.$m[1]; } - else if (preg_match('/^\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',$t,$m)) { $tag = 'LANG>>'.strtolower($m[1]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^:LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',$t,$m)) { $tag = 'LANG>>'.strtolower($m[1]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[.](.*)$/',$t,$m)) { $tag = $m[1].'>>CLASS>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\s*:NTH-CHILD\((.*)\)$/',$t,$m)) { $tag = $m[1].'>>SELECTORNTHCHILD>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[#](.*)$/',$t,$m)) { $tag = $m[1].'>>ID>>'.$m[2]; } - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',$t,$m)) { $tag = $m[1].'>>LANG>>'.strtolower($m[2]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.'):LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',$t,$m)) { $tag = $m[1].'>>LANG>>'.strtolower($m[2]); } // mPDF 6 Special case for lang as attribute selector - else if (preg_match('/^('.$this->mpdf->allowedCSStags.')$/',$t)) { $tag= $t; } + if (preg_match('/^[.](.*)$/',($t ?? ''),$m)) { $tag = 'CLASS>>'.$m[1]; } + else if (preg_match('/^[#](.*)$/',($t ?? ''),$m)) { $tag = 'ID>>'.$m[1]; } + else if (preg_match('/^\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',($t ?? ''),$m)) { $tag = 'LANG>>'.strtolower(($m[1] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^:LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',($t ?? ''),$m)) { $tag = 'LANG>>'.strtolower(($m[1] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[.](.*)$/',($t ?? ''),$m)) { $tag = $m[1].'>>CLASS>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\s*:NTH-CHILD\((.*)\)$/',($t ?? ''),$m)) { $tag = $m[1].'>>SELECTORNTHCHILD>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')[#](.*)$/',($t ?? ''),$m)) { $tag = $m[1].'>>ID>>'.$m[2]; } + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')\[LANG=[\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\]$/',($t ?? ''),$m)) { $tag = $m[1].'>>LANG>>'.strtolower(($m[2] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.'):LANG\([\'\"]{0,1}([A-Z\-]{2,11})[\'\"]{0,1}\)$/',($t ?? ''),$m)) { $tag = $m[1].'>>LANG>>'.strtolower(($m[2] ?? '')); } // mPDF 6 Special case for lang as attribute selector + else if (preg_match('/^('.$this->mpdf->allowedCSStags.')$/',($t ?? ''))) { $tag= $t; } if ($tag) $tmp[] = $tag; else { break; } @@ -325,7 +331,7 @@ } // end of if //Remove CSS (tags and content), if any $regexp = '/<style.*?>(.*?)<\/style>/si'; // it can be <style> or <style type="txt/css"> - $html = preg_replace($regexp,'',$html); + $html = preg_replace(($regexp ?? ''),'',($html ?? '')); //print_r($this->CSS); exit; //print_r($this->cascadeCSS); exit; return $html; @@ -334,46 +340,46 @@ function readInlineCSS($html) { - $html=htmlspecialchars_decode($html); // mPDF 5.7.4 URLs + $html=htmlspecialchars_decode(($html ?? '')); // mPDF 5.7.4 URLs // mPDF 5.7.4 URLs // Characters "(" ")" and ";" in url() e.g. background-image, cause probems parsing the CSS string // URLencode ( and ), but change ";" to a code which can be converted back after parsing (so as not to confuse ; // with a segment delimiter in the URI) $tempmarker = '%ZZ'; - if (strpos($html,'url(')!==false) { - preg_match_all( '/url\(\"(.*?)\"\)/', $html, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $html = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $html); - } - preg_match_all( '/url\(\'(.*?)\'\)/', $html, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $html = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $html); - } - preg_match_all( '/url\(([^\'\"].*?[^\'\"])\)/', $html, $m); - for($i = 0; $i < count($m[1]) ; $i++) { - $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),$m[1][$i]); - $html = preg_replace('/'.preg_quote($m[0][$i],'/').'/', 'url(\''.$tmp.'\')', $html); + if (strpos(($html ?? ''),'url(')!==false) { + preg_match_all( '/url\(\"(.*?)\"\)/', ($html ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $html = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($html ?? '')); + } + preg_match_all( '/url\(\'(.*?)\'\)/', ($html ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $html = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($html ?? '')); + } + preg_match_all( '/url\(([^\'\"].*?[^\'\"])\)/', ($html ?? ''), $m); + for($i = 0; $i < count(($m[1] ?? [])) ; $i++) { + $tmp = str_replace(array('(',')',';'),array('%28','%29',$tempmarker),($m[1][$i] ?? '')); + $html = preg_replace('/'.preg_quote(($m[0][$i] ?? ''),'/').'/', 'url(\''.$tmp.'\')', ($html ?? '')); } } //Fix incomplete CSS code - $size = strlen($html)-1; - if (substr($html,$size,1) != ';') $html .= ';'; + $size = strlen(($html ?? ''))-1; + if (substr(($html ?? ''),$size,1) != ';') $html .= ';'; //Make CSS[Name-of-the-class] = array(key => value) $regexp = '|\\s*?(\\S+?):(.+?);|i'; - preg_match_all( $regexp, $html, $styleinfo); + preg_match_all( ($regexp ?? ''), ($html ?? ''), $styleinfo); $properties = $styleinfo[1]; $values = $styleinfo[2]; //Array-properties and Array-values must have the SAME SIZE! $classproperties = array(); - for($i = 0; $i < count($properties) ; $i++) { + for($i = 0; $i < count(($properties ?? [])) ; $i++) { // Ignores -webkit-gradient so doesn't override -moz- - if ((strtoupper($properties[$i])=='BACKGROUND-IMAGE' || strtoupper($properties[$i])=='BACKGROUND') && preg_match('/-webkit-gradient/i',$values[$i])) { + if ((strtoupper(($properties[$i] ?? ''))=='BACKGROUND-IMAGE' || strtoupper(($properties[$i] ?? ''))=='BACKGROUND') && preg_match('/-webkit-gradient/i',($values[$i] ?? ''))) { continue; } - $values[$i] = str_replace($tempmarker,';',$values[$i]); // mPDF 5.7.4 URLs - $classproperties[strtoupper($properties[$i])] = trim($values[$i]); + $values[$i] = str_replace(($tempmarker ?? ''),';',($values[$i] ?? '')); // mPDF 5.7.4 URLs + $classproperties[strtoupper(($properties[$i] ?? ''))] = trim(($values[$i] ?? '')); } return $this->fixCSS($classproperties); } @@ -381,20 +387,20 @@ function _fix_borderStr($bd) { - preg_match_all("/\((.*?)\)/", $bd, $m); - if (count($m[1])) { - for($i=0;$i<count($m[1]);$i++) { - $sub = preg_replace("/ /", "", $m[1][$i]); - $bd = preg_replace('/'.preg_quote($m[1][$i], '/').'/si', $sub, $bd); - } - } - - $prop = preg_split('/\s+/',trim($bd)); + preg_match_all("/\((.*?)\)/", ($bd ?? ''), $m); + if (count(($m[1] ?? []))) { + for($i=0;$i<count(($m[1] ?? []));$i++) { + $sub = preg_replace("/ /", "", ($m[1][$i] ?? '')); + $bd = preg_replace('/'.preg_quote(($m[1][$i] ?? ''), '/').'/si', ($sub ?? ''), ($bd ?? '')); + } + } + + $prop = preg_split('/\s+/',(trim(($bd ?? '')) ?? '')); $w = 'medium'; $c = '#000000'; $s = 'none'; - if ( count($prop) == 1 ) { + if ( count(($prop ?? [])) == 1 ) { // solid if (in_array($prop[0],$this->mpdf->borderstyles) || $prop[0] == 'none' || $prop[0] == 'hidden' ) { $s = $prop[0]; } // #000000 @@ -402,7 +408,7 @@ // 1px else { $w = $prop[0]; } } - else if (count($prop) == 2 ) { + else if (count(($prop ?? [])) == 2 ) { // 1px solid if (in_array($prop[1],$this->mpdf->borderstyles) || $prop[1] == 'none' || $prop[1] == 'hidden' ) { $w = $prop[0]; $s = $prop[1]; } // solid #000000 @@ -410,11 +416,11 @@ // 1px #000000 else { $w = $prop[0]; $c = $prop[1]; } } - else if ( count($prop) == 3 ) { + else if ( count(($prop ?? [])) == 3 ) { // Change #000000 1px solid to 1px solid #000000 (proper) - if (substr($prop[0],0,1) == '#') { $c = $prop[0]; $w = $prop[1]; $s = $prop[2]; } + if (substr(($prop[0] ?? ''),0,1) == '#') { $c = $prop[0]; $w = $prop[1]; $s = $prop[2]; } // Change solid #000000 1px to 1px solid #000000 (proper) - else if (substr($prop[0],1,1) == '#') { $s = $prop[0]; $c = $prop[1]; $w = $prop[2]; } + else if (substr(($prop[0] ?? ''),1,1) == '#') { $s = $prop[0]; $c = $prop[1]; $w = $prop[2]; } // Change solid 1px #000000 to 1px solid #000000 (proper) else if (in_array($prop[0],$this->mpdf->borderstyles) || $prop[0] == 'none' || $prop[0] == 'hidden' ) { $s = $prop[0]; $w = $prop[1]; $c = $prop[2]; @@ -422,61 +428,61 @@ else { $w = $prop[0]; $s = $prop[1]; $c = $prop[2]; } } else { return ''; } - $s = strtolower($s); + $s = strtolower(($s ?? '')); return $w.' '.$s.' '.$c; } function fixCSS($prop) { - if (!is_array($prop) || (count($prop)==0)) return array(); + if (!is_array($prop) || (count(($prop ?? []))==0)) return array(); $newprop = array(); foreach($prop AS $k => $v) { if ($k != 'BACKGROUND-IMAGE' && $k != 'BACKGROUND' && $k != 'ODD-HEADER-NAME' && $k != 'EVEN-HEADER-NAME' && $k != 'ODD-FOOTER-NAME' && $k != 'EVEN-FOOTER-NAME' && $k != 'HEADER' && $k != 'FOOTER') { - $v = strtolower($v); + $v = strtolower(($v ?? '')); } if ($k == 'FONT') { - $s = trim($v); - preg_match_all('/\"(.*?)\"/',$s,$ff); - if (count($ff[1])) { + $s = trim(($v ?? '')); + preg_match_all('/\"(.*?)\"/',($s ?? ''),$ff); + if (count(($ff[1] ?? []))) { foreach($ff[1] AS $ffp) { - $w = preg_split('/\s+/',$ffp); - $s = preg_replace('/\"'.$ffp.'\"/',$w[0],$s); - } - } - preg_match_all('/\'(.*?)\'/',$s,$ff); - if (count($ff[1])) { + $w = preg_split('/\s+/',($ffp ?? '')); + $s = preg_replace('/\"'.$ffp.'\"/',($w[0] ?? ''),($s ?? '')); + } + } + preg_match_all('/\'(.*?)\'/',($s ?? ''),$ff); + if (count(($ff[1] ?? []))) { foreach($ff[1] AS $ffp) { - $w = preg_split('/\s+/',$ffp); - $s = preg_replace('/\''.$ffp.'\'/',$w[0],$s); - } - } - $s = preg_replace('/\s*,\s*/',',',$s); - $bits = preg_split('/\s+/',$s); - if (count($bits)>1) { - $k = 'FONT-FAMILY'; $v = $bits[(count($bits)-1)]; - $fs = $bits[(count($bits)-2)]; - if (preg_match('/(.*?)\/(.*)/',$fs, $fsp)) { + $w = preg_split('/\s+/',($ffp ?? '')); + $s = preg_replace('/\''.$ffp.'\'/',($w[0] ?? ''),($s ?? '')); + } + } + $s = preg_replace('/\s*,\s*/',',',($s ?? '')); + $bits = preg_split('/\s+/',($s ?? '')); + if (count(($bits ?? []))>1) { + $k = 'FONT-FAMILY'; $v = $bits[(count(($bits ?? []))-1)]; + $fs = $bits[(count(($bits ?? []))-2)]; + if (preg_match('/(.*?)\/(.*)/',($fs ?? ''), $fsp)) { $newprop['FONT-SIZE'] = $fsp[1]; $newprop['LINE-HEIGHT'] = $fsp[2]; } else { $newprop['FONT-SIZE'] = $fs; } - if (preg_match('/(italic|oblique)/i',$s)) { $newprop['FONT-STYLE'] = 'italic'; } + if (preg_match('/(italic|oblique)/i',($s ?? ''))) { $newprop['FONT-STYLE'] = 'italic'; } else { $newprop['FONT-STYLE'] = 'normal'; } - if (preg_match('/bold/i',$s)) { $newprop['FONT-WEIGHT'] = 'bold'; } + if (preg_match('/bold/i',($s ?? ''))) { $newprop['FONT-WEIGHT'] = 'bold'; } else { $newprop['FONT-WEIGHT'] = 'normal'; } - if (preg_match('/small-caps/i',$s)) { $newprop['TEXT-TRANSFORM'] = 'uppercase'; } + if (preg_match('/small-caps/i',($s ?? ''))) { $newprop['TEXT-TRANSFORM'] = 'uppercase'; } } } else if ($k == 'FONT-FAMILY') { - $aux_fontlist = explode(",",$v); + $aux_fontlist = explode(",",($v ?? '')); $found = 0; foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->mpdf->fonttrans[$v]) && $this->mpdf->fonttrans[$v]) { $v = $this->mpdf->fonttrans[$v]; } if ((!$this->mpdf->onlyCoreFonts && in_array($v,$this->mpdf->available_unifonts)) || in_array($v,array('ccourier','ctimes','chelvetica')) || @@ -489,10 +495,10 @@ } if (!$found) { foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->mpdf->fonttrans[$v]) && $this->mpdf->fonttrans[$v]) { $v = $this->mpdf->fonttrans[$v]; } if (in_array($v,$this->mpdf->sans_fonts) || in_array($v,$this->mpdf->serif_fonts) || in_array($v,$this->mpdf->mono_fonts) ) { $newprop[$k] = $v; @@ -503,23 +509,23 @@ } // mPDF 5.7.1 else if ($k == 'FONT-VARIANT') { - if (preg_match('/(normal|none)/',$v, $m)) { // mPDF 6 + if (preg_match('/(normal|none)/',($v ?? ''), $m)) { // mPDF 6 $newprop['FONT-VARIANT-LIGATURES'] = $m[1]; $newprop['FONT-VARIANT-CAPS'] = $m[1]; $newprop['FONT-VARIANT-NUMERIC'] = $m[1]; $newprop['FONT-VARIANT-ALTERNATES'] = $m[1]; } else { - if (preg_match_all('/(no-common-ligatures|\bcommon-ligatures|no-discretionary-ligatures|\bdiscretionary-ligatures|no-historical-ligatures|\bhistorical-ligatures|no-contextual|\bcontextual)/i',$v, $m)) { + if (preg_match_all('/(no-common-ligatures|\bcommon-ligatures|no-discretionary-ligatures|\bdiscretionary-ligatures|no-historical-ligatures|\bhistorical-ligatures|no-contextual|\bcontextual)/i',($v ?? ''), $m)) { $newprop['FONT-VARIANT-LIGATURES'] = implode(' ',$m[1]); } - if (preg_match('/(all-small-caps|\bsmall-caps|all-petite-caps|\bpetite-caps|unicase|titling-caps)/i',$v, $m)) { + if (preg_match('/(all-small-caps|\bsmall-caps|all-petite-caps|\bpetite-caps|unicase|titling-caps)/i',($v ?? ''), $m)) { $newprop['FONT-VARIANT-CAPS'] = $m[1]; } - if (preg_match_all('/(lining-nums|oldstyle-nums|proportional-nums|tabular-nums|diagonal-fractions|stacked-fractions)/i',$v, $m)) { + if (preg_match_all('/(lining-nums|oldstyle-nums|proportional-nums|tabular-nums|diagonal-fractions|stacked-fractions)/i',($v ?? ''), $m)) { $newprop['FONT-VARIANT-NUMERIC'] = implode(' ',$m[1]); } - if (preg_match('/(historical-forms)/i',$v, $m)) { + if (preg_match('/(historical-forms)/i',($v ?? ''), $m)) { $newprop['FONT-VARIANT-ALTERNATES'] = $m[1]; } } @@ -600,51 +606,51 @@ } else if ($k == 'BORDER-SPACING') { - $prop = preg_split('/\s+/',trim($v)); - if (count($prop) == 1 ) { + $prop = preg_split('/\s+/',(trim(($v ?? '')) ?? '')); + if (count(($prop ?? [])) == 1 ) { $newprop['BORDER-SPACING-H'] = $prop[0]; $newprop['BORDER-SPACING-V'] = $prop[0]; } - else if (count($prop) == 2 ) { + else if (count(($prop ?? [])) == 2 ) { $newprop['BORDER-SPACING-H'] = $prop[0]; $newprop['BORDER-SPACING-V'] = $prop[1]; } } else if ($k == 'TEXT-OUTLINE') { // mPDF 5.6.07 - $prop = preg_split('/\s+/',trim($v)); - if (trim(strtolower($v)) == 'none' ) { + $prop = preg_split('/\s+/',(trim(($v ?? '')) ?? '')); + if (trim((strtolower(($v ?? '')) ?? '')) == 'none' ) { $newprop['TEXT-OUTLINE'] = 'none'; } - else if (count($prop) == 2 ) { + else if (count(($prop ?? [])) == 2 ) { $newprop['TEXT-OUTLINE-WIDTH'] = $prop[0]; $newprop['TEXT-OUTLINE-COLOR'] = $prop[1]; } - else if (count($prop) == 3 ) { + else if (count(($prop ?? [])) == 3 ) { $newprop['TEXT-OUTLINE-WIDTH'] = $prop[0]; $newprop['TEXT-OUTLINE-COLOR'] = $prop[2]; } } else if ($k == 'SIZE') { - $prop = preg_split('/\s+/',trim($v)); - if (preg_match('/(auto|portrait|landscape)/',$prop[0])) { - $newprop['SIZE'] = strtoupper($prop[0]); - } - else if (count($prop) == 1 ) { + $prop = preg_split('/\s+/',(trim(($v ?? '')) ?? '')); + if (preg_match('/(auto|portrait|landscape)/',($prop[0] ?? ''))) { + $newprop['SIZE'] = strtoupper(($prop[0] ?? '')); + } + else if (count(($prop ?? [])) == 1 ) { $newprop['SIZE']['W'] = $this->mpdf->ConvertSize($prop[0]); $newprop['SIZE']['H'] = $this->mpdf->ConvertSize($prop[0]); } - else if (count($prop) == 2 ) { + else if (count(($prop ?? [])) == 2 ) { $newprop['SIZE']['W'] = $this->mpdf->ConvertSize($prop[0]); $newprop['SIZE']['H'] = $this->mpdf->ConvertSize($prop[1]); } } else if ($k == 'SHEET-SIZE') { - $prop = preg_split('/\s+/',trim($v)); - if (count($prop) == 2 ) { + $prop = preg_split('/\s+/',(trim(($v ?? '')) ?? '')); + if (count(($prop ?? [])) == 2 ) { $newprop['SHEET-SIZE'] = array($this->mpdf->ConvertSize($prop[0]), $this->mpdf->ConvertSize($prop[1])); } else { - if(preg_match('/([0-9a-zA-Z]*)-L/i',$v,$m)) { // e.g. A4-L = A$ landscape + if(preg_match('/([0-9a-zA-Z]*)-L/i',($v ?? ''),$m)) { // e.g. A4-L = A$ landscape $ft = $this->mpdf->_getPageFormat($m[1]); $format = array($ft[1],$ft[0]); } @@ -667,34 +673,34 @@ } /*-- BACKGROUNDS --*/ else if ($k == 'BACKGROUND-IMAGE') { - if (preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient\(.*\)/i',$v,$m)) { + if (preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient\(.*\)/i',($v ?? ''),$m)) { $newprop['BACKGROUND-IMAGE'] = $m[0]; continue; } - if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)/i',$v,$m)) { + if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)/i',($v ?? ''),$m)) { $newprop['BACKGROUND-IMAGE'] = $m[1]; } - else if (strtolower($v)=='none') { $newprop['BACKGROUND-IMAGE'] = ''; } + else if (strtolower(($v ?? ''))=='none') { $newprop['BACKGROUND-IMAGE'] = ''; } } else if ($k == 'BACKGROUND-REPEAT') { - if (preg_match('/(repeat-x|repeat-y|no-repeat|repeat)/i',$v,$m)) { - $newprop['BACKGROUND-REPEAT'] = strtolower($m[1]); + if (preg_match('/(repeat-x|repeat-y|no-repeat|repeat)/i',($v ?? ''),$m)) { + $newprop['BACKGROUND-REPEAT'] = strtolower(($m[1] ?? '')); } } else if ($k == 'BACKGROUND-POSITION') { $s = $v; - $bits = preg_split('/\s+/',trim($s)); + $bits = preg_split('/\s+/',(trim(($s ?? '')) ?? '')); // These should be Position x1 or x2 - if (count($bits)==1) { - if (preg_match('/bottom/',$bits[0])) { $bg['p'] = '50% 100%'; } - else if (preg_match('/top/',$bits[0])) { $bg['p'] = '50% 0%'; } + if (count(($bits ?? []))==1) { + if (preg_match('/bottom/',($bits[0] ?? ''))) { $bg['p'] = '50% 100%'; } + else if (preg_match('/top/',($bits[0] ?? ''))) { $bg['p'] = '50% 0%'; } else { $bg['p'] = $bits[0] . ' 50%'; } } - else if (count($bits)==2) { + else if (count(($bits ?? []))==2) { // Can be either right center or center right - if (preg_match('/(top|bottom)/',$bits[0]) || preg_match('/(left|right)/',$bits[1])) { + if (preg_match('/(top|bottom)/',($bits[0] ?? '')) || preg_match('/(left|right)/',($bits[1] ?? ''))) { $bg['p'] = $bits[1] . ' '.$bits[0]; } else { @@ -702,10 +708,10 @@ } } if ($bg['p']) { - $bg['p'] = preg_replace('/(left|top)/','0%',$bg['p']); - $bg['p'] = preg_replace('/(right|bottom)/','100%',$bg['p']); - $bg['p'] = preg_replace('/(center)/','50%',$bg['p']); - if (!preg_match('/[\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)* [\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)*/',$bg['p'])) { + $bg['p'] = preg_replace('/(left|top)/','0%',($bg['p'] ?? '')); + $bg['p'] = preg_replace('/(right|bottom)/','100%',($bg['p'] ?? '')); + $bg['p'] = preg_replace('/(center)/','50%',($bg['p'] ?? '')); + if (!preg_match('/[\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)* [\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)*/',($bg['p'] ?? ''))) { $bg['p'] = false; } } @@ -713,11 +719,11 @@ } /*-- END BACKGROUNDS --*/ else if ($k == 'IMAGE-ORIENTATION') { - if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',$v,$m)) { + if (preg_match('/([\-]*[0-9\.]+)(deg|grad|rad)/i',($v ?? ''),$m)) { $angle = $m[1] + 0; - if (strtolower($m[2])=='deg') { $angle = $angle; } - else if (strtolower($m[2])=='grad') { $angle *= (360/400); } - else if (strtolower($m[2])=='rad') { $angle = rad2deg($angle); } + if (strtolower(($m[2] ?? ''))=='deg') { $angle = $angle; } + else if (strtolower(($m[2] ?? ''))=='grad') { $angle *= (360/400); } + else if (strtolower(($m[2] ?? ''))=='rad') { $angle = rad2deg($angle); } while($angle < 0) { $angle += 360; } $angle = ($angle % 360); $angle /= 90; @@ -726,38 +732,38 @@ } } else if ($k == 'TEXT-ALIGN') { - if (preg_match('/["\'](.){1}["\']/i',$v,$m)) { + if (preg_match('/["\'](.){1}["\']/i',($v ?? ''),$m)) { $d = array_search($m[1],$this->mpdf->decimal_align); if ($d !== false) { $newprop['TEXT-ALIGN'] = $d; } - if (preg_match('/(center|left|right)/i',$v,$m)) { $newprop['TEXT-ALIGN'] .= strtoupper(substr($m[1],0,1)); } + if (preg_match('/(center|left|right)/i',($v ?? ''),$m)) { $newprop['TEXT-ALIGN'] .= strtoupper((substr(($m[1] ?? ''),0,1) ?? '')); } else { $newprop['TEXT-ALIGN'] .= 'R'; } // default = R } - else if (preg_match('/["\'](\\\[a-fA-F0-9]{1,6})["\']/i',$v,$m)) { - $utf8 = codeHex2utf(substr($m[1],1,6)); + else if (preg_match('/["\'](\\\[a-fA-F0-9]{1,6})["\']/i',($v ?? ''),$m)) { + $utf8 = codeHex2utf(substr(($m[1] ?? ''),1,6)); $d = array_search($utf8,$this->mpdf->decimal_align); if ($d !== false) { $newprop['TEXT-ALIGN'] = $d; } - if (preg_match('/(center|left|right)/i',$v,$m)) { $newprop['TEXT-ALIGN'] .= strtoupper(substr($m[1],0,1)); } + if (preg_match('/(center|left|right)/i',($v ?? ''),$m)) { $newprop['TEXT-ALIGN'] .= strtoupper((substr(($m[1] ?? ''),0,1) ?? '')); } else { $newprop['TEXT-ALIGN'] .= 'R'; } // default = R } else { $newprop[$k] = $v; } } // mpDF 6 Lists else if ($k == 'LIST-STYLE') { - if (preg_match('/none/i',$v,$m)) { + if (preg_match('/none/i',($v ?? ''),$m)) { $newprop['LIST-STYLE-TYPE'] = 'none'; $newprop['LIST-STYLE-IMAGE'] = 'none'; } - if (preg_match('/(lower-roman|upper-roman|lower-latin|lower-alpha|upper-latin|upper-alpha|decimal|disc|circle|square|arabic-indic|bengali|devanagari|gujarati|gurmukhi|kannada|malayalam|oriya|persian|tamil|telugu|thai|urdu|cambodian|khmer|lao|cjk-decimal|hebrew)/i',$v,$m)) { - $newprop['LIST-STYLE-TYPE'] = strtolower(trim($m[1])); - } - else if (preg_match('/U\+([a-fA-F0-9]+)/i',$v,$m)) { - $newprop['LIST-STYLE-TYPE'] = strtolower(trim($m[1])); - } - if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)/i',$v,$m)) { - $newprop['LIST-STYLE-IMAGE'] = strtolower(trim($m[1])); - } - if (preg_match('/(inside|outside)/i',$v,$m)) { - $newprop['LIST-STYLE-POSITION'] = strtolower(trim($m[1])); + if (preg_match('/(lower-roman|upper-roman|lower-latin|lower-alpha|upper-latin|upper-alpha|decimal|disc|circle|square|arabic-indic|bengali|devanagari|gujarati|gurmukhi|kannada|malayalam|oriya|persian|tamil|telugu|thai|urdu|cambodian|khmer|lao|cjk-decimal|hebrew)/i',($v ?? ''),$m)) { + $newprop['LIST-STYLE-TYPE'] = strtolower((trim(($m[1] ?? '')) ?? '')); + } + else if (preg_match('/U\+([a-fA-F0-9]+)/i',($v ?? ''),$m)) { + $newprop['LIST-STYLE-TYPE'] = strtolower((trim(($m[1] ?? '')) ?? '')); + } + if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)/i',($v ?? ''),$m)) { + $newprop['LIST-STYLE-IMAGE'] = strtolower((trim(($m[1] ?? '')) ?? '')); + } + if (preg_match('/(inside|outside)/i',($v ?? ''),$m)) { + $newprop['LIST-STYLE-POSITION'] = strtolower((trim(($m[1] ?? '')) ?? '')); } } @@ -771,30 +777,30 @@ function setCSSboxshadow($v) { $sh = array(); - $c = preg_match_all('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl)\(.*?\)/',$v,$x); // mPDF 5.6.05 + $c = preg_match_all('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl)\(.*?\)/',($v ?? ''),$x); // mPDF 5.6.05 for($i=0; $i<$c; $i++) { - $col = preg_replace('/,/','*',$x[0][$i]); - $v = preg_replace('/'.preg_quote($x[0][$i],'/').'/',$col,$v); - } - $ss = explode(',',$v); + $col = preg_replace('/,/','*',($x[0][$i] ?? '')); + $v = preg_replace('/'.preg_quote(($x[0][$i] ?? ''),'/').'/',($col ?? ''),($v ?? '')); + } + $ss = explode(',',($v ?? '')); foreach ($ss AS $s) { $new = array('inset'=>false, 'blur'=>0, 'spread'=>0); - if (preg_match('/inset/i',$s)) { $new['inset'] = true; $s = preg_replace('/\s*inset\s*/','',$s); } - $p = explode(' ',trim($s)); - if (isset($p[0])) { $new['x'] = $this->mpdf->ConvertSize(trim($p[0]),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); } - if (isset($p[1])) { $new['y'] = $this->mpdf->ConvertSize(trim($p[1]),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); } + if (preg_match('/inset/i',($s ?? ''))) { $new['inset'] = true; $s = preg_replace('/\s*inset\s*/','',($s ?? '')); } + $p = explode(' ',(trim(($s ?? '')) ?? '')); + if (isset($p[0])) { $new['x'] = $this->mpdf->ConvertSize(trim(($p[0] ?? '')),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); } + if (isset($p[1])) { $new['y'] = $this->mpdf->ConvertSize(trim(($p[1] ?? '')),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); } if (isset($p[2])) { - if (preg_match('/^\s*[\.\-0-9]/',$p[2])) { - $new['blur'] = $this->mpdf->ConvertSize(trim($p[2]),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); - } - else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',$p[2])); } + if (preg_match('/^\s*[\.\-0-9]/',($p[2] ?? ''))) { + $new['blur'] = $this->mpdf->ConvertSize(trim(($p[2] ?? '')),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); + } + else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',($p[2] ?? ''))); } if (isset($p[3])) { - if (preg_match('/^\s*[\.\-0-9]/',$p[3])) { - $new['spread'] = $this->mpdf->ConvertSize(trim($p[3]),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); - } - else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',$p[3])); } + if (preg_match('/^\s*[\.\-0-9]/',($p[3] ?? ''))) { + $new['spread'] = $this->mpdf->ConvertSize(trim(($p[3] ?? '')),$this->mpdf->blk[$this->mpdf->blklvl-1]['inner_width'],$this->mpdf->FontSize,false); + } + else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',($p[3] ?? ''))); } if (isset($p[4])) { - $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',$p[4])); + $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',($p[4] ?? ''))); } } } @@ -806,24 +812,24 @@ function setCSStextshadow($v) { $sh = array(); - $c = preg_match_all('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl)\(.*?\)/',$v,$x); // mPDF 5.6.05 + $c = preg_match_all('/(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl)\(.*?\)/',($v ?? ''),$x); // mPDF 5.6.05 for($i=0; $i<$c; $i++) { - $col = preg_replace('/,/','*',$x[0][$i]); - $v = preg_replace('/'.preg_quote($x[0][$i],'/').'/',$col,$v); - } - $ss = explode(',',$v); + $col = preg_replace('/,/','*',($x[0][$i] ?? '')); + $v = preg_replace('/'.preg_quote(($x[0][$i] ?? ''),'/').'/',($col ?? ''),($v ?? '')); + } + $ss = explode(',',($v ?? '')); foreach ($ss AS $s) { $new = array('blur'=>0); - $p = explode(' ',trim($s)); - if (isset($p[0])) { $new['x'] = $this->mpdf->ConvertSize(trim($p[0]),$this->mpdf->FontSize,$this->mpdf->FontSize,false); } - if (isset($p[1])) { $new['y'] = $this->mpdf->ConvertSize(trim($p[1]),$this->mpdf->FontSize,$this->mpdf->FontSize,false); } + $p = explode(' ',(trim(($s ?? '')) ?? '')); + if (isset($p[0])) { $new['x'] = $this->mpdf->ConvertSize(trim(($p[0] ?? '')),$this->mpdf->FontSize,$this->mpdf->FontSize,false); } + if (isset($p[1])) { $new['y'] = $this->mpdf->ConvertSize(trim(($p[1] ?? '')),$this->mpdf->FontSize,$this->mpdf->FontSize,false); } if (isset($p[2])) { - if (preg_match('/^\s*[\.\-0-9]/',$p[2])) { - $new['blur'] = $this->mpdf->ConvertSize(trim($p[2]),$this->mpdf->blk[$this->mpdf->blklvl]['inner_width'],$this->mpdf->FontSize,false); - } - else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',$p[2])); } + if (preg_match('/^\s*[\.\-0-9]/',($p[2] ?? ''))) { + $new['blur'] = $this->mpdf->ConvertSize(trim(($p[2] ?? '')),$this->mpdf->blk[$this->mpdf->blklvl]['inner_width'],$this->mpdf->FontSize,false); + } + else { $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',($p[2] ?? ''))); } if (isset($p[3])) { - $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',$p[3])); + $new['col'] = $this->mpdf->ConvertColor(preg_replace('/\*/',',',($p[3] ?? ''))); } } if (!isset($new['col']) || !$new['col']) { $new['col'] = $this->mpdf->ConvertColor('#888888'); } @@ -835,37 +841,37 @@ function parseCSSbackground($s) { $bg = array('c'=>false, 'i'=>false, 'r'=>false, 'p'=>false, ); /*-- BACKGROUNDS --*/ - if (preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient\(.*\)/i',$s,$m)) { + if (preg_match('/(-moz-)*(repeating-)*(linear|radial)-gradient\(.*\)/i',($s ?? ''),$m)) { $bg['i'] = $m[0]; } else /*-- END BACKGROUNDS --*/ - if (preg_match('/url\(/i',$s)) { + if (preg_match('/url\(/i',($s ?? ''))) { // If color, set and strip it off // mPDF 5.6.05 - if (preg_match('/^\s*(#[0-9a-fA-F]{3,6}|(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\(.*?\)|[a-zA-Z]{3,})\s+(url\(.*)/i',$s,$m)) { - $bg['c'] = strtolower($m[1]); + if (preg_match('/^\s*(#[0-9a-fA-F]{3,6}|(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\(.*?\)|[a-zA-Z]{3,})\s+(url\(.*)/i',($s ?? ''),$m)) { + $bg['c'] = strtolower(($m[1] ?? '')); $s = $m[3]; } /*-- BACKGROUNDS --*/ - if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)\s*(.*)/i',$s,$m)) { + if (preg_match('/url\([\'\"]{0,1}(.*?)[\'\"]{0,1}\)\s*(.*)/i',($s ?? ''),$m)) { $bg['i'] = $m[1]; - $s = strtolower($m[2]); - if (preg_match('/(repeat-x|repeat-y|no-repeat|repeat)/',$s,$m)) { + $s = strtolower(($m[2] ?? '')); + if (preg_match('/(repeat-x|repeat-y|no-repeat|repeat)/',($s ?? ''),$m)) { $bg['r'] = $m[1]; } // Remove repeat, attachment (discarded) and also any inherit - $s = preg_replace('/(repeat-x|repeat-y|no-repeat|repeat|scroll|fixed|inherit)/','',$s); - $bits = preg_split('/\s+/',trim($s)); + $s = preg_replace('/(repeat-x|repeat-y|no-repeat|repeat|scroll|fixed|inherit)/','',($s ?? '')); + $bits = preg_split('/\s+/',(trim(($s ?? '')) ?? '')); // These should be Position x1 or x2 - if (count($bits)==1) { - if (preg_match('/bottom/',$bits[0])) { $bg['p'] = '50% 100%'; } - else if (preg_match('/top/',$bits[0])) { $bg['p'] = '50% 0%'; } + if (count(($bits ?? []))==1) { + if (preg_match('/bottom/',($bits[0] ?? ''))) { $bg['p'] = '50% 100%'; } + else if (preg_match('/top/',($bits[0] ?? ''))) { $bg['p'] = '50% 0%'; } else { $bg['p'] = $bits[0] . ' 50%'; } } - else if (count($bits)==2) { + else if (count(($bits ?? []))==2) { // Can be either right center or center right - if (preg_match('/(top|bottom)/',$bits[0]) || preg_match('/(left|right)/',$bits[1])) { + if (preg_match('/(top|bottom)/',($bits[0] ?? '')) || preg_match('/(left|right)/',($bits[1] ?? ''))) { $bg['p'] = $bits[1] . ' '.$bits[0]; } else { @@ -873,34 +879,34 @@ } } if ($bg['p']) { - $bg['p'] = preg_replace('/(left|top)/','0%',$bg['p']); - $bg['p'] = preg_replace('/(right|bottom)/','100%',$bg['p']); - $bg['p'] = preg_replace('/(center)/','50%',$bg['p']); - if (!preg_match('/[\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)* [\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)*/',$bg['p'])) { + $bg['p'] = preg_replace('/(left|top)/','0%',($bg['p'] ?? '')); + $bg['p'] = preg_replace('/(right|bottom)/','100%',($bg['p'] ?? '')); + $bg['p'] = preg_replace('/(center)/','50%',($bg['p'] ?? '')); + if (!preg_match('/[\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)* [\-]{0,1}\d+(in|cm|mm|pt|pc|em|ex|px|%)*/',($bg['p'] ?? ''))) { $bg['p'] = false; } } } /*-- END BACKGROUNDS --*/ } - else if (preg_match('/^\s*(#[0-9a-fA-F]{3,6}|(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\(.*?\)|[a-zA-Z]{3,})/i',$s,$m)) { $bg['c'] = strtolower($m[1]); } // mPDF 5.6.05 + else if (preg_match('/^\s*(#[0-9a-fA-F]{3,6}|(rgba|rgb|device-cmyka|cmyka|device-cmyk|cmyk|hsla|hsl|spot)\(.*?\)|[a-zA-Z]{3,})/i',($s ?? ''),$m)) { $bg['c'] = strtolower(($m[1] ?? '')); } // mPDF 5.6.05 return ($bg); } function expand24($mp) { - $prop = preg_split('/\s+/',trim($mp)); - if (count($prop) == 1 ) { + $prop = preg_split('/\s+/',(trim(($mp ?? '')) ?? '')); + if (count(($prop ?? [])) == 1 ) { return array('T' => $prop[0], 'R' => $prop[0], 'B' => $prop[0], 'L'=> $prop[0]); } - if (count($prop) == 2 ) { + if (count(($prop ?? [])) == 2 ) { return array('T' => $prop[0], 'R' => $prop[1], 'B' => $prop[0], 'L'=> $prop[1]); } - if (count($prop) == 3 ) { + if (count(($prop ?? [])) == 3 ) { return array('T' => $prop[0], 'R' => $prop[1], 'B' => $prop[2], 'L'=> $prop[1]); } - if (count($prop) == 4 ) { + if (count(($prop ?? [])) == 4 ) { return array('T' => $prop[0], 'R' => $prop[1], 'B' => $prop[2], 'L'=> $prop[3]); } return array(); @@ -910,41 +916,41 @@ function border_radius_expand($val,$k) { $b = array(); if ($k == 'BORDER-RADIUS') { - $hv = explode('/',trim($val)); - $prop = preg_split('/\s+/',trim($hv[0])); - if (count($prop)==1) { + $hv = explode('/',(trim(($val ?? '')) ?? '')); + $prop = preg_split('/\s+/',(trim(($hv[0] ?? '')) ?? '')); + if (count(($prop ?? []))==1) { $b['TL-H'] = $b['TR-H'] = $b['BR-H'] = $b['BL-H'] = $prop[0]; } - else if (count($prop)==2) { + else if (count(($prop ?? []))==2) { $b['TL-H'] = $b['BR-H'] = $prop[0]; $b['TR-H'] = $b['BL-H'] = $prop[1]; } - else if (count($prop)==3) { + else if (count(($prop ?? []))==3) { $b['TL-H'] = $prop[0]; $b['TR-H'] = $b['BL-H'] = $prop[1]; $b['BR-H'] = $prop[2]; } - else if (count($prop)==4) { + else if (count(($prop ?? []))==4) { $b['TL-H'] = $prop[0]; $b['TR-H'] = $prop[1]; $b['BR-H'] = $prop[2]; $b['BL-H'] = $prop[3]; } - if (count($hv)==2) { - $prop = preg_split('/\s+/',trim($hv[1])); - if (count($prop)==1) { + if (count(($hv ?? []))==2) { + $prop = preg_split('/\s+/',(trim(($hv[1] ?? '')) ?? '')); + if (count(($prop ?? []))==1) { $b['TL-V'] = $b['TR-V'] = $b['BR-V'] = $b['BL-V'] = $prop[0]; } - else if (count($prop)==2) { + else if (count(($prop ?? []))==2) { $b['TL-V'] = $b['BR-V'] = $prop[0]; $b['TR-V'] = $b['BL-V'] = $prop[1]; } - else if (count($prop)==3) { + else if (count(($prop ?? []))==3) { $b['TL-V'] = $prop[0]; $b['TR-V'] = $b['BL-V'] = $prop[1]; $b['BR-V'] = $prop[2]; } - else if (count($prop)==4) { + else if (count(($prop ?? []))==4) { $b['TL-V'] = $prop[0]; $b['TR-V'] = $prop[1]; $b['BR-V'] = $prop[2]; @@ -963,8 +969,8 @@ // Parse 2 $h = 0; $v = 0; - $prop = preg_split('/\s+/',trim($val)); - if (count($prop)==1) { $h = $v = $val; } + $prop = preg_split('/\s+/',(trim(($val ?? '')) ?? '')); + if (count(($prop ?? []))==1) { $h = $v = $val; } else { $h = $prop[0]; $v = $prop[1]; } if ($h==0 || $v==0) { $h = $v = 0; } if ($k == 'BORDER-TOP-LEFT-RADIUS') { @@ -1001,7 +1007,7 @@ // for CSS handling function array_merge_recursive_unique($array1, $array2) { $arrays = func_get_args(); - $narrays = count($arrays); + $narrays = count(($arrays ?? [])); $ret = $arrays[0]; for ($i = 1; $i < $narrays; $i ++) { foreach ($arrays[$i] as $key => $value) { @@ -1032,20 +1038,20 @@ // STYLESHEET nth-child SELECTOR e.g. tr:nth-child(odd) td:nth-child(2n+1) if ($tag=='TR' && isset($p) && $p) { foreach($p AS $k=>$val) { - if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',$k, $m)) { + if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',($k ?? ''), $m)) { $select = false; if ($tag=='TR') { $row = $this->mpdf->row; - $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) : 0); - $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) : 0); + $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead'] ?? [])) : 0); + $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot'] ?? [])) : 0); if ($this->mpdf->tabletfoot) { $row -= $thnr; } else if (!$this->mpdf->tablethead) { $row -= ($thnr + $tfnr); } - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $row); } } else if ($tag=='TD' || $tag=='TH') { - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $this->mpdf->col); } } @@ -1102,21 +1108,21 @@ foreach(array('TOP','RIGHT','BOTTOM','LEFT') AS $side) { foreach(array('STYLE','WIDTH','COLOR') AS $el) { if (isset($a['BORDER-'.$side.'-'.$el])) { // e.g. $b['BORDER-TOP-STYLE'] - $s = trim($a['BORDER-'.$side.'-'.$el]); + $s = trim(($a['BORDER-'.$side.'-'.$el] ?? '')); if (isset($b['BORDER-'.$side])) { // e.g. $b['BORDER-TOP'] - $p = trim($b['BORDER-'.$side]); + $p = trim(($b['BORDER-'.$side] ?? '')); } else { $p = ''; } if ($el=='STYLE') { - if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', '\\1 '.$s.' \\3', $p); } + if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', '\\1 '.$s.' \\3', ($p ?? '')); } else { $b['BORDER-'.$side] = '0px '.$s.' #000000'; } } else if ($el=='WIDTH') { - if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', $s.' \\2 \\3', $p); } + if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', $s.' \\2 \\3', ($p ?? '')); } else { $b['BORDER-'.$side] = $s.' none #000000'; } } else if ($el=='COLOR') { - if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', '\\1 \\2 '.$s, $p); } + if ($p) { $b['BORDER-'.$side] = preg_replace('/(\S+)\s+(\S+)\s+(\S+)/', '\\1 \\2 '.$s, ($p ?? '')); } else { $b['BORDER-'.$side] = '0px none '.$s; } } } @@ -1126,21 +1132,22 @@ function MergeCSS($inherit,$tag,$attr) { + $attr = is_array($attr) ? $attr : array(); $p = array(); $zp = array(); $classes = array(); if (isset($attr['CLASS'])) { - $classes = preg_split('/\s+/',$attr['CLASS']); + $classes = preg_split('/\s+/',($attr['CLASS'] ?? '')); } if (!isset($attr['ID'])) { $attr['ID']=''; } // mPDF 6 $shortlang = ''; if (!isset($attr['LANG'])) { $attr['LANG']=''; } else { - $attr['LANG'] = strtolower($attr['LANG']); - if (strlen($attr['LANG']) == 5) { - $shortlang = substr($attr['LANG'],0,2); + $attr['LANG'] = strtolower(($attr['LANG'] ?? '')); + if (strlen(($attr['LANG'] ?? '')) == 5) { + $shortlang = substr(($attr['LANG'] ?? ''),0,2); } } //=============================================== @@ -1333,20 +1340,20 @@ // STYLESHEET nth-child SELECTOR e.g. tr:nth-child(odd) td:nth-child(2n+1) if ($tag=='TR' || $tag=='TD' || $tag=='TH') { foreach($this->CSS AS $k=>$val) { - if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',$k, $m)) { + if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',($k ?? ''), $m)) { $select = false; if ($tag=='TR') { $row = $this->mpdf->row; - $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) : 0); - $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) : 0); + $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead'] ?? [])) : 0); + $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot'] ?? [])) : 0); if ($this->mpdf->tabletfoot) { $row -= $thnr; } else if (!$this->mpdf->tablethead) { $row -= ($thnr + $tfnr); } - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $row); } } else if ($tag=='TD' || $tag=='TH') { - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $this->mpdf->col); } } @@ -1471,20 +1478,20 @@ // STYLESHEET nth-child SELECTOR e.g. tr:nth-child(odd) td:nth-child(2n+1) if ($tag=='TR' || $tag=='TD' || $tag=='TH') { foreach($this->tablecascadeCSS[$this->tbCSSlvl-1] AS $k=>$val) { - if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',$k, $m)) { + if (preg_match('/'.$tag.'>>SELECTORNTHCHILD>>(.*)/',($k ?? ''), $m)) { $select = false; if ($tag=='TR') { $row = $this->mpdf->row; - $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) : 0); - $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) : 0); + $thnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_thead'] ?? [])) : 0); + $tfnr = (isset($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot']) ? count(($this->mpdf->table[$this->mpdf->tableLevel][$this->mpdf->tbctr[$this->mpdf->tableLevel]]['is_tfoot'] ?? [])) : 0); if ($this->mpdf->tabletfoot) { $row -= $thnr; } else if (!$this->mpdf->tablethead) { $row -= ($thnr + $tfnr); } - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $row); } } else if ($tag=='TD' || $tag=='TH') { - if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',$m[1],$a)) { // mPDF 5.7.4 + if (preg_match('/(([\-+]?\d*)?N([\-+]\d+)?|[\-+]?\d+|ODD|EVEN)/',($m[1] ?? ''),$a)) { // mPDF 5.7.4 $select = $this->_nthchild($a, $this->mpdf->col); } } @@ -1580,21 +1587,21 @@ if (isset($bilp[ 'OTLtags' ]) && $bilp[ 'OTLtags' ]) { $ffs = array(); if (isset($bilp['OTLtags']['Minus']) && $bilp['OTLtags']['Minus']) { - $f = preg_split('/\s+/', trim($bilp['OTLtags']['Minus'])); + $f = preg_split('/\s+/', (trim(($bilp['OTLtags']['Minus'] ?? '')) ?? '')); foreach($f AS $ff) { $ffs[] = "'".$ff."' 0"; } } if (isset($bilp['OTLtags']['FFMinus']) && $bilp['OTLtags']['FFMinus']) { - $f = preg_split('/\s+/', trim($bilp['OTLtags']['FFMinus'])); + $f = preg_split('/\s+/', (trim(($bilp['OTLtags']['FFMinus'] ?? '')) ?? '')); foreach($f AS $ff) { $ffs[] = "'".$ff."' 0"; } } if (isset($bilp['OTLtags']['Plus']) && $bilp['OTLtags']['Plus']) { - $f = preg_split('/\s+/', trim($bilp['OTLtags']['Plus'])); + $f = preg_split('/\s+/', (trim(($bilp['OTLtags']['Plus'] ?? '')) ?? '')); foreach($f AS $ff) { $ffs[] = "'".$ff."' 1"; } } if (isset($bilp['OTLtags']['FFPlus']) && $bilp['OTLtags']['FFPlus']) { // May contain numeric value e.g. salt4 - $f = preg_split('/\s+/', trim($bilp['OTLtags']['FFPlus'])); + $f = preg_split('/\s+/', (trim(($bilp['OTLtags']['FFPlus'] ?? '')) ?? '')); foreach($f AS $ff) { - if (strlen($ff)>4) { $ffs[] = "'".substr($ff,0,4)."' ".substr($ff,4); } + if (strlen(($ff ?? ''))>4) { $ffs[] = "'".substr(($ff ?? ''),0,4)."' ".substr(($ff ?? ''),4); } else { $ffs[] = "'".$ff."' 1"; } } } @@ -1610,7 +1617,7 @@ $zp = array(); $oldcascadeCSS = $this->mpdf->blk[$this->mpdf->blklvl]['cascadeCSS']; $classes = array(); - if (isset($attr['CLASS'])) { $classes = preg_split('/\s+/',$attr['CLASS']); } + if (isset($attr['CLASS'])) { $classes = preg_split('/\s+/',($attr['CLASS'] ?? '')); } //=============================================== // DEFAULT for this TAG set in DefaultCSS if (isset($this->mpdf->defaultCSS[$tag])) { @@ -1688,14 +1695,14 @@ $a=1; $b=1; if ($f[0]=='ODD') { $a=2; $b=1; } else if ($f[0]=='EVEN') { $a=2; $b=0; } - else if (count($f)==2) { $a=0; $b=$f[1]+0; } // e.g. (+6) - else if (count($f)==3) { // e.g. (2N) + else if (count(($f ?? []))==2) { $a=0; $b=$f[1]+0; } // e.g. (+6) + else if (count(($f ?? []))==3) { // e.g. (2N) if ($f[2]=='') { $a=1; } else if ($f[2]=='-') { $a=-1; } else { $a=$f[2]+0; } $b=0; } - else if (count($f)==4) { // e.g. (2N+6) + else if (count(($f ?? []))==4) { // e.g. (2N+6) if ($f[2]=='') { $a=1; } else if ($f[2]=='-') { $a=-1; } else { $a=$f[2]+0; } --- a/intranet/mpdf60/classes/svg.php +++ b/intranet/mpdf60/classes/svg.php @@ -31,6 +31,12 @@ // and on returning size class SVG { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $dashesUsed; + public $kf; + public $lastcontrolpoints; + public $lastcommand; + var $svg_font; // array - holds content of SVG fonts defined in image // mPDF 6 var $svg_gradient; // array - contient les infos sur les gradient fill du svg class par id du svg @@ -67,7 +73,7 @@ var $textjuststarted; // mPDF 5.7.4 var $intext; // mPDF 5.7.4 - function SVG(&$mpdf){ + function __construct(&$mpdf){ $this->svg_font = array(); // mPDF 6 $this->svg_gradient = array(); $this->svg_shadinglist = array(); @@ -152,7 +158,7 @@ $srcpath = $attribs['xlink:href']; $orig_srcpath = ''; - if (trim($srcpath) != '' && substr($srcpath,0,4)=='var:') { + if (trim(($srcpath ?? '')) != '' && substr(($srcpath ?? ''),0,4)=='var:') { $orig_srcpath = $srcpath; $this->mpdf_ref->GetFullPath($srcpath); } @@ -170,7 +176,7 @@ $meetOrSlice = 'meet'; // preserveAspectRatio - $ar = preg_split('/\s+/', strtolower($par)); + $ar = preg_split('/\s+/', (strtolower(($par ?? '')) ?? '')); if ($ar[0]!='none') { // If "none" need to do nothing // Force uniform scaling if (isset($ar[1]) && $ar[1]=='slice') { $meetOrSlice = 'slice'; } @@ -251,7 +257,7 @@ function svgGradient($gradient_info, $attribs, $element){ - $n = count($this->mpdf_ref->gradients)+1; + $n = count(($this->mpdf_ref->gradients ?? []))+1; // Get bounding dimensions of element $w = 100; @@ -277,10 +283,10 @@ $y_offset = $attribs['cy']-$attribs['r']; } else if ($element=='polygon') { - $pts = preg_split('/[ ,]+/', trim($attribs['points'])); + $pts = preg_split('/[ ,]+/', (trim(($attribs['points'] ?? '')) ?? '')); $maxr=$maxb=0; $minl=$mint=999999; - for ($i=0;$i<count($pts); $i++) { + for ($i=0;$i<count(($pts ?? [])); $i++) { if ($i % 2 == 0) { // x values $minl = min($minl,$pts[$i]); $maxr = max($maxr,$pts[$i]); @@ -303,15 +309,15 @@ $y_offset = $this->pathBBox[1]; } else { - preg_match_all('/([a-z]|[A-Z])([ ,\-.\d]+)*/', $attribs['d'], $commands, PREG_SET_ORDER); + preg_match_all('/([a-z]|[A-Z])([ ,\-.\d]+)*/', ($attribs['d'] ?? ''), $commands, PREG_SET_ORDER); $maxr=$maxb=0; $minl=$mint=999999; foreach($commands as $c){ - if(count($c)==3){ + if(count(($c ?? []))==3){ list($tmp, $cmd, $arg) = $c; if ($cmd=='M' || $cmd=='L' || $cmd=='C' || $cmd=='S' || $cmd=='Q' || $cmd=='T') { - $pts = preg_split('/[ ,]+/', trim($arg)); - for ($i=0;$i<count($pts); $i++) { + $pts = preg_split('/[ ,]+/', (trim(($arg ?? '')) ?? '')); + for ($i=0;$i<count(($pts ?? [])); $i++) { if ($i % 2 == 0) { // x values $minl = min($minl,$pts[$i]); $maxr = max($maxr,$pts[$i]); @@ -346,49 +352,49 @@ // TRANSFORMATIONS $transformations = ''; if (isset($gradient_info['transform'])){ - preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)\((.*?)\)/is',$gradient_info['transform'],$m); - if (count($m[0])) { - for($i=0; $i<count($m[0]); $i++) { - $c = strtolower($m[1][$i]); - $v = trim($m[2][$i]); - $vv = preg_split('/[ ,]+/',$v); - if ($c=='matrix' && count($vv)==6) { + preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)\((.*?)\)/is',($gradient_info['transform'] ?? ''),$m); + if (count(($m[0] ?? []))) { + for($i=0; $i<count(($m[0] ?? [])); $i++) { + $c = strtolower(($m[1][$i] ?? '')); + $v = trim(($m[2][$i] ?? '')); + $vv = preg_split('/[ ,]+/',($v ?? '')); + if ($c=='matrix' && count(($vv ?? []))==6) { // Note angle of rotation is reversed (from SVG to PDF), so vv[1] and vv[2] are negated // cf svgDefineStyle() $transformations .= sprintf(' %.3F %.3F %.3F %.3F %.3F %.3F cm ', $vv[0], -$vv[1], -$vv[2], $vv[3], $vv[4]*$this->kp, -$vv[5]*$this->kp); } - else if ($c=='translate' && count($vv)) { + else if ($c=='translate' && count(($vv ?? []))) { $tm[4] = $vv[0]; - if (count($vv)==2) { $t_y = -$vv[1]; } + if (count(($vv ?? []))==2) { $t_y = -$vv[1]; } else { $t_y = 0; } $tm[5] = $t_y; $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', $tm[4]*$this->kp, $tm[5]*$this->kp); } - else if ($c=='scale' && count($vv)) { - if (count($vv)==2) { $s_y = $vv[1]; } + else if ($c=='scale' && count(($vv ?? []))) { + if (count(($vv ?? []))==2) { $s_y = $vv[1]; } else { $s_y = $vv[0]; } $tm[0] = $vv[0]; $tm[3] = $s_y; $transformations .= sprintf(' %.3F 0 0 %.3F 0 0 cm ', $tm[0], $tm[3]); } - else if ($c=='rotate' && count($vv)) { + else if ($c=='rotate' && count(($vv ?? []))) { $tm[0] = cos(deg2rad(-$vv[0])); $tm[1] = sin(deg2rad(-$vv[0])); $tm[2] = -$tm[1]; $tm[3] = $tm[0]; - if (count($vv)==3) { + if (count(($vv ?? []))==3) { $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', $vv[1]*$this->kp, -$vv[2]*$this->kp); } $transformations .= sprintf(' %.3F %.3F %.3F %.3F 0 0 cm ', $tm[0], $tm[1], $tm[2], $tm[3]); - if (count($vv)==3) { + if (count(($vv ?? []))==3) { $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', -$vv[1]*$this->kp, $vv[2]*$this->kp); } } - else if ($c=='skewx' && count($vv)) { + else if ($c=='skewx' && count(($vv ?? []))) { $tm[2] = tan(deg2rad(-$vv[0])); $transformations .= sprintf(' 1 0 %.3F 1 0 0 cm ', $tm[2]); } - else if ($c=='skewy' && count($vv)) { + else if ($c=='skewy' && count(($vv ?? []))) { $tm[1] = tan(deg2rad(-$vv[0])); $transformations .= sprintf(' 1 %.3F 0 1 0 0 cm ', $tm[1]); } @@ -400,17 +406,17 @@ $return = ""; - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='userspaceonuse') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='userspaceonuse') { if ($transformations) { $return .= $transformations; } } $spread = 'P'; // pad if (isset($gradient_info['spread'])) { - if (strtolower($gradient_info['spread'])=='reflect') { $spread = 'F'; } // reflect - else if (strtolower($gradient_info['spread'])=='repeat') { $spread = 'R'; } // repeat + if (strtolower(($gradient_info['spread'] ?? ''))=='reflect') { $spread = 'F'; } // reflect + else if (strtolower(($gradient_info['spread'] ?? ''))=='repeat') { $spread = 'R'; } // repeat } - for ($i=0; $i<(count($gradient_info['color'])); $i++) { + for ($i=0; $i<(count(($gradient_info['color'] ?? []))); $i++) { if (stristr($gradient_info['color'][$i]['offset'], '%')!== false) { $gradient_info['color'][$i]['offset'] = ($gradient_info['color'][$i]['offset']+0)/100; } if (isset($gradient_info['color'][($i+1)]['offset']) && stristr($gradient_info['color'][($i+1)]['offset'], '%')!== false) { $gradient_info['color'][($i+1)]['offset'] = ($gradient_info['color'][($i+1)]['offset']+0)/100; } if ($gradient_info['color'][$i]['offset']<0) { $gradient_info['color'][$i]['offset'] = 0; } @@ -426,19 +432,19 @@ array_unshift($gradient_info['color'], $gradient_info['color'][0]); $gradient_info['color'][0]['offset'] = 0; } - $ns = count($gradient_info['color']); + $ns = count(($gradient_info['color'] ?? [])); if (isset($gradient_info['color'][($ns-1)]['offset']) && $gradient_info['color'][($ns-1)]['offset']<1) { $gradient_info['color'][] = $gradient_info['color'][($ns-1)]; $gradient_info['color'][($ns)]['offset'] = 1; } - $ns = count($gradient_info['color']); + $ns = count(($gradient_info['color'] ?? [])); if ($gradient_info['type'] == 'linear'){ // mPDF 4.4.003 - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='userspaceonuse') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='userspaceonuse') { if (isset($gradient_info['info']['x1'])) { $gradient_info['info']['x1'] = ($gradient_info['info']['x1']-$x_offset) / $w; } if (isset($gradient_info['info']['y1'])) { $gradient_info['info']['y1'] = ($gradient_info['info']['y1']-$y_offset) / $h; } if (isset($gradient_info['info']['x2'])) { $gradient_info['info']['x2'] = ($gradient_info['info']['x2']-$x_offset) / $w; } @@ -465,7 +471,7 @@ $usey = $y_offset; $usew = $bboxw; $useh = $bboxh; - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='userspaceonuse') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='userspaceonuse') { $angle = rad2deg(atan2(($gradient_info['info']['y2']-$gradient_info['info']['y1']), ($gradient_info['info']['x2']-$gradient_info['info']['x1']))); if ($angle < 0) { $angle += 360; } else if ($angle > 360) { $angle -= 360; } @@ -489,7 +495,7 @@ $return .= sprintf('%.3F 0 0 %.3F %.3F %.3F cm ', $a*$this->kp, $d*$this->kp, $e*$this->kp, $f*$this->kp); - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='objectboundingbox') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='objectboundingbox') { if ($transformations) { $return .= $transformations; } } @@ -581,10 +587,10 @@ } // Gradient STOPs - $stops = count($gradient_info['color']); + $stops = count(($gradient_info['color'] ?? [])); if ($stops < 2) { return ''; } - $range = $gradient_info['color'][count($gradient_info['color'])-1]['offset']-$gradient_info['color'][0]['offset']; + $range = $gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']-$gradient_info['color'][0]['offset']; $min = $gradient_info['color'][0]['offset']; for ($i=0; $i<($stops); $i++) { @@ -602,8 +608,8 @@ } $grx1 = $x1 + ($x2-$x1)*$gradient_info['color'][0]['offset']; $gry1 = $y1 + ($y2-$y1)*$gradient_info['color'][0]['offset']; - $grx2 = $x1 + ($x2-$x1)*$gradient_info['color'][count($gradient_info['color'])-1]['offset']; - $gry2 = $y1 + ($y2-$y1)*$gradient_info['color'][count($gradient_info['color'])-1]['offset']; + $grx2 = $x1 + ($x2-$x1)*$gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']; + $gry2 = $y1 + ($y2-$y1)*$gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']; $this->mpdf_ref->gradients[$n]['coords']=array($grx1, $gry1, $grx2, $gry2); @@ -621,7 +627,7 @@ $return .= " Q\n"; } else if ($gradient_info['type'] == 'radial'){ - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='userspaceonuse') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='userspaceonuse') { if ($w > $h) { $h = $w; } else { $w = $h; } if (isset($gradient_info['info']['x0'])) { $gradient_info['info']['x0'] = ($gradient_info['info']['x0']-$x_offset) / $w; } @@ -660,7 +666,7 @@ $usey = $y_offset; $usew = $bboxw; $useh = $bboxh; - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='userspaceonuse') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='userspaceonuse') { $angle = rad2deg(atan2(($gradient_info['info']['y0']-$gradient_info['info']['y1']), ($gradient_info['info']['x0']-$gradient_info['info']['x1']))); if ($angle < 0) { $angle += 360; } else if ($angle > 360) { $angle -= 360; } @@ -692,7 +698,7 @@ $return .= sprintf('%.3F 0 0 %.3F %.3F %.3F cm ', $a*$this->kp, $d*$this->kp, $e*$this->kp, $f*$this->kp); // mPDF 5.0.039 - if (isset($gradient_info['units']) && strtolower($gradient_info['units'])=='objectboundingbox') { + if (isset($gradient_info['units']) && strtolower(($gradient_info['units'] ?? ''))=='objectboundingbox') { if ($transformations) { $return .= $transformations; } } @@ -741,10 +747,10 @@ } // Gradient STOPs - $stops = count($gradient_info['color']); + $stops = count(($gradient_info['color'] ?? [])); if ($stops < 2) { return ''; } - $range = $gradient_info['color'][count($gradient_info['color'])-1]['offset']-$gradient_info['color'][0]['offset']; + $range = $gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']-$gradient_info['color'][0]['offset']; $min = $gradient_info['color'][0]['offset']; for ($i=0; $i<($stops); $i++) { @@ -762,10 +768,10 @@ } $grx1 = $x1 + ($x0-$x1)*$gradient_info['color'][0]['offset']; $gry1 = $y1 + ($y0-$y1)*$gradient_info['color'][0]['offset']; - $grx2 = $x1 + ($x0-$x1)*$gradient_info['color'][count($gradient_info['color'])-1]['offset']; - $gry2 = $y1 + ($y0-$y1)*$gradient_info['color'][count($gradient_info['color'])-1]['offset']; + $grx2 = $x1 + ($x0-$x1)*$gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']; + $gry2 = $y1 + ($y0-$y1)*$gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']; $grir = $r*$gradient_info['color'][0]['offset']; - $grr = $r*$gradient_info['color'][count($gradient_info['color'])-1]['offset']; + $grr = $r*$gradient_info['color'][count(($gradient_info['color'] ?? []))-1]['offset']; $this->mpdf_ref->gradients[$n]['coords']=array($grx1, $gry1, $grx2, $gry2, abs($grr), abs($grir) ); @@ -793,8 +799,8 @@ // save all <svg> tag attributes $this->svg_attribs = $attribs; if(isset($this->svg_attribs['viewBox'])) { - $vb = preg_split('/\s+/is', trim($this->svg_attribs['viewBox'])); - if (count($vb)==4) { + $vb = preg_split('/\s+/is', (trim(($this->svg_attribs['viewBox'] ?? '')) ?? '')); + if (count(($vb ?? []))==4) { $this->svg_info['x'] = $vb[0]; $this->svg_info['y'] = $vb[1]; $this->svg_info['w'] = $vb[2]; @@ -846,8 +852,8 @@ if($this->svg_attribs['overflow'] == 'hidden') { // Not sure if this is supposed to strip off units, but since I dont use any I will omlt this step - $svg_w = preg_replace("/([0-9\.]*)(.*)/i","$1",$this->svg_attribs['width']); - $svg_h = preg_replace("/([0-9\.]*)(.*)/i","$1",$this->svg_attribs['height']); + $svg_w = preg_replace("/([0-9\.]*)(.*)/i","$1",($this->svg_attribs['width'] ?? '')); + $svg_h = preg_replace("/([0-9\.]*)(.*)/i","$1",($this->svg_attribs['height'] ?? '')); // $xmax = floor($this->svg_attribs['width']); $xmax = floor($svg_w); @@ -872,7 +878,7 @@ function svgDefineStyle($critere_style){ - $tmp = count($this->svg_style)-1; + $tmp = count(($this->svg_style ?? []))-1; $current_style = $this->svg_style[$tmp]; unset($current_style['transformations']); @@ -880,13 +886,13 @@ // TRANSFORM SCALE $transformations = ''; if (isset($critere_style['transform'])){ - preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)\((.*?)\)/is',$critere_style['transform'],$m); - if (count($m[0])) { - for($i=0; $i<count($m[0]); $i++) { - $c = strtolower($m[1][$i]); - $v = trim($m[2][$i]); - $vv = preg_split('/[ ,]+/',$v); - if ($c=='matrix' && count($vv)==6) { + preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)\((.*?)\)/is',($critere_style['transform'] ?? ''),$m); + if (count(($m[0] ?? []))) { + for($i=0; $i<count(($m[0] ?? [])); $i++) { + $c = strtolower(($m[1][$i] ?? '')); + $v = trim(($m[2][$i] ?? '')); + $vv = preg_split('/[ ,]+/',($v ?? '')); + if ($c=='matrix' && count(($vv ?? []))==6) { // mPDF 5.0.039 // Note angle of rotation is reversed (from SVG to PDF), so vv[1] and vv[2] are negated $transformations .= sprintf(' %.3F %.3F %.3F %.3F %.3F %.3F cm ', $vv[0], -$vv[1], -$vv[2], $vv[3], $vv[4]*$this->kp, -$vv[5]*$this->kp); @@ -916,38 +922,38 @@ */ } - else if ($c=='translate' && count($vv)) { + else if ($c=='translate' && count(($vv ?? []))) { $tm[4] = $vv[0]; - if (count($vv)==2) { $t_y = -$vv[1]; } + if (count(($vv ?? []))==2) { $t_y = -$vv[1]; } else { $t_y = 0; } $tm[5] = $t_y; $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', $tm[4]*$this->kp, $tm[5]*$this->kp); } - else if ($c=='scale' && count($vv)) { - if (count($vv)==2) { $s_y = $vv[1]; } + else if ($c=='scale' && count(($vv ?? []))) { + if (count(($vv ?? []))==2) { $s_y = $vv[1]; } else { $s_y = $vv[0]; } $tm[0] = $vv[0]; $tm[3] = $s_y; $transformations .= sprintf(' %.3F 0 0 %.3F 0 0 cm ', $tm[0], $tm[3]); } - else if ($c=='rotate' && count($vv)) { + else if ($c=='rotate' && count(($vv ?? []))) { $tm[0] = cos(deg2rad(-$vv[0])); $tm[1] = sin(deg2rad(-$vv[0])); $tm[2] = -$tm[1]; $tm[3] = $tm[0]; - if (count($vv)==3) { + if (count(($vv ?? []))==3) { $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', $vv[1]*$this->kp, -$vv[2]*$this->kp); } $transformations .= sprintf(' %.3F %.3F %.3F %.3F 0 0 cm ', $tm[0], $tm[1], $tm[2], $tm[3]); - if (count($vv)==3) { + if (count(($vv ?? []))==3) { $transformations .= sprintf(' 1 0 0 1 %.3F %.3F cm ', -$vv[1]*$this->kp, $vv[2]*$this->kp); } } - else if ($c=='skewx' && count($vv)) { + else if ($c=='skewx' && count(($vv ?? []))) { $tm[2] = tan(deg2rad(-$vv[0])); $transformations .= sprintf(' 1 0 %.3F 1 0 0 cm ', $tm[2]); } - else if ($c=='skewy' && count($vv)) { + else if ($c=='skewy' && count(($vv ?? []))) { $tm[1] = tan(deg2rad(-$vv[0])); $transformations .= sprintf(' 1 %.3F 0 1 0 0 cm ', $tm[1]); } @@ -958,52 +964,52 @@ } if (isset($critere_style['style'])){ - if (preg_match('/fill:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/i',$critere_style['style'], $m)) { // mPDF 5.7.2 - $current_style['fill'] = '#'.str_pad(dechex($m[1]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[2]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[3]), 2, "0", STR_PAD_LEFT); - } - else { $tmp = preg_replace("/(.*)fill:\s*([a-z0-9#_()]*|none)(.*)/i","$2",$critere_style['style']); + if (preg_match('/fill:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/i',($critere_style['style'] ?? ''), $m)) { // mPDF 5.7.2 + $current_style['fill'] = '#'.str_pad((dechex($m[1]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[2]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[3]) ?? ''), 2, "0", STR_PAD_LEFT); + } + else { $tmp = preg_replace("/(.*)fill:\s*([a-z0-9#_()]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['fill'] = $tmp; } } // mPDF 5.7.2 - if ((preg_match("/[^-]opacity:\s*([a-z0-9.]*|none)/i",$critere_style['style'], $m) || - preg_match("/^opacity:\s*([a-z0-9.]*|none)/i",$critere_style['style'], $m)) && $m[1]!='inherit') { + if ((preg_match("/[^-]opacity:\s*([a-z0-9.]*|none)/i",($critere_style['style'] ?? ''), $m) || + preg_match("/^opacity:\s*([a-z0-9.]*|none)/i",($critere_style['style'] ?? ''), $m)) && $m[1]!='inherit') { $current_style['fill-opacity'] = $m[1]; $current_style['stroke-opacity'] = $m[1]; } - $tmp = preg_replace("/(.*)fill-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)fill-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['fill-opacity'] = $tmp;} - $tmp = preg_replace("/(.*)fill-rule:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)fill-rule:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['fill-rule'] = $tmp;} - if (preg_match('/stroke:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',$critere_style['style'], $m)) { - $current_style['stroke'] = '#'.str_pad(dechex($m[1]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[2]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[3]), 2, "0", STR_PAD_LEFT); - } - else { $tmp = preg_replace("/(.*)stroke:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + if (preg_match('/stroke:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',($critere_style['style'] ?? ''), $m)) { + $current_style['stroke'] = '#'.str_pad((dechex($m[1]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[2]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[3]) ?? ''), 2, "0", STR_PAD_LEFT); + } + else { $tmp = preg_replace("/(.*)stroke:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke'] = $tmp; } } - $tmp = preg_replace("/(.*)stroke-linecap:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-linecap:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-linecap'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-linejoin:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-linejoin:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-linejoin'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-miterlimit:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-miterlimit:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-miterlimit'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-opacity'] = $tmp; } - $tmp = preg_replace("/(.*)stroke-width:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-width:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-width'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-dasharray:\s*([a-z0-9., ]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-dasharray:\s*([a-z0-9., ]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-dasharray'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-dashoffset:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-dashoffset:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp!='inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-dashoffset'] = $tmp;} } @@ -1075,7 +1081,7 @@ if (substr_count($critere_style['fill'],'url')>0 && $element != 'line'){ // // couleur degrad - $id_gradient = preg_replace("/url\(#([\w_]*)\)/i","$1",$critere_style['fill']); + $id_gradient = preg_replace("/url\(#([\w_]*)\)/i","$1",($critere_style['fill'] ?? '')); if ($id_gradient != $critere_style['fill']) { if (isset($this->svg_gradient[$id_gradient])) { $fill_gradient = $this->svgGradient($this->svg_gradient[$id_gradient], $attribs, $element); @@ -1089,11 +1095,11 @@ } // Used as indirect setting for currentColor - else if (strtolower($critere_style['fill']) == 'currentcolor' && $element != 'line'){ + else if (strtolower(($critere_style['fill'] ?? '')) == 'currentcolor' && $element != 'line'){ $col = $this->mpdf_ref->ConvertColor($critere_style['color']); if ($col) { - if ($col{0}==5) { $critere_style['fill-opacity'] = ord($col{4}/100); } // RGBa - if ($col{0}==6) { $critere_style['fill-opacity'] = ord($col{5}/100); } // CMYKa + if ($col[0]==5) { $critere_style['fill-opacity'] = ord(($col[4]/100 ?? '')); } // RGBa + if ($col[0]==6) { $critere_style['fill-opacity'] = ord(($col[5]/100 ?? '')); } // CMYKa $path_style .= $this->mpdf_ref->SetFColor($col, true).' '; $style .= 'F'; } @@ -1101,8 +1107,8 @@ else if ($critere_style['fill'] != 'none' && $element != 'line'){ $col = $this->mpdf_ref->ConvertColor($critere_style['fill']); if ($col) { - if ($col{0}==5) { $critere_style['fill-opacity'] = ord($col{4}/100); } // RGBa - if ($col{0}==6) { $critere_style['fill-opacity'] = ord($col{5}/100); } // CMYKa + if ($col[0]==5) { $critere_style['fill-opacity'] = ord(($col[4]/100 ?? '')); } // RGBa + if ($col[0]==6) { $critere_style['fill-opacity'] = ord(($col[5]/100 ?? '')); } // CMYKa $path_style .= $this->mpdf_ref->SetFColor($col, true).' '; $style .= 'F'; } @@ -1124,11 +1130,11 @@ */ } // Used as indirect setting for currentColor - else if (strtolower($critere_style['stroke']) == 'currentcolor'){ + else if (strtolower(($critere_style['stroke'] ?? '')) == 'currentcolor'){ $col = $this->mpdf_ref->ConvertColor($critere_style['color']); if ($col) { - if ($col{0}==5) { $critere_style['stroke-opacity'] = ord($col{4}/100); } // RGBa - if ($col{0}==6) { $critere_style['stroke-opacity'] = ord($col{5}/100); } // CMYKa + if ($col[0]==5) { $critere_style['stroke-opacity'] = ord(($col[4]/100 ?? '')); } // RGBa + if ($col[0]==6) { $critere_style['stroke-opacity'] = ord(($col[5]/100 ?? '')); } // CMYKa $path_style .= $this->mpdf_ref->SetDColor($col, true).' '; $style .= 'D'; $lw = $this->ConvertSVGSizePixels($critere_style['stroke-width']); @@ -1140,8 +1146,8 @@ if ($col) { // mPDF 5.0.051 // mPDF 5.3.74 - if ($col{0}==5) { $critere_style['stroke-opacity'] = ord($col{4}/100); } // RGBa - if ($col{0}==6) { $critere_style['stroke-opacity'] = ord($col{5}/100); } // CMYKa + if ($col[0]==5) { $critere_style['stroke-opacity'] = ord(($col[4]/100 ?? '')); } // RGBa + if ($col[0]==6) { $critere_style['stroke-opacity'] = ord(($col[5]/100 ?? '')); } // CMYKa $path_style .= $this->mpdf_ref->SetDColor($col, true).' '; $style .= 'D'; $lw = $this->ConvertSVGSizePixels($critere_style['stroke-width']); @@ -1174,20 +1180,20 @@ if (isset($critere_style['stroke-miterlimit'])){ if ($critere_style['stroke-miterlimit'] == 'none'){ } - else if (preg_match('/^[\d.]+$/',$critere_style['stroke-miterlimit'])) { + else if (preg_match('/^[\d.]+$/',($critere_style['stroke-miterlimit'] ?? ''))) { $path_style .= sprintf('%.2F M ',$critere_style['stroke-miterlimit']); } } if (isset($critere_style['stroke-dasharray'])){ $off = 0; - $d = preg_split('/[ ,]/',$critere_style['stroke-dasharray']); - if (count($d) == 1 && $d[0]==0) { + $d = preg_split('/[ ,]/',($critere_style['stroke-dasharray'] ?? '')); + if (count(($d ?? [])) == 1 && $d[0]==0) { $path_style .= '[] 0 d '; } else { - if (count($d) % 2 == 1) { $d = array_merge($d, $d); } // 5, 3, 1 => 5,3,1,5,3,1 OR 3 => 3,3 + if (count(($d ?? [])) % 2 == 1) { $d = array_merge($d, $d); } // 5, 3, 1 => 5,3,1,5,3,1 OR 3 => 3,3 $arr = ''; - for($i=0; $i<count($d); $i+=2) { + for($i=0; $i<count(($d ?? [])); $i+=2) { $arr .= sprintf('%.3F %.3F ', $d[$i]*$this->kp, $d[$i+1]*$this->kp); } if (isset($critere_style['stroke-dashoffset'])){ $off = $critere_style['stroke-dashoffset'] + 0; } @@ -1256,18 +1262,18 @@ $start = array($this->xbase, -$this->ybase); - preg_match_all('/[\-^]?[\d.]+(e[\-]?[\d]+){0,1}/i', $arguments, $a, PREG_SET_ORDER); + preg_match_all('/[\-^]?[\d.]+(e[\-]?[\d]+){0,1}/i', ($arguments ?? ''), $a, PREG_SET_ORDER); // if the command is a capital letter, the coords go absolute, otherwise relative - if(strtolower($command) == $command) $relative = true; + if(strtolower(($command ?? '')) == $command) $relative = true; else $relative = false; - $ile_argumentow = count($a); + $ile_argumentow = count(($a ?? [])); // each command may have different needs for arguments [1 to 8] - switch(strtolower($command)){ + switch(strtolower(($command ?? ''))){ case 'm': // move for($i = 0; $i<$ile_argumentow; $i+=2){ $x = $a[$i][0]; @@ -1895,7 +1901,7 @@ $ybase = - $this->ConvertSVGSizePixels($arguments[1],'y'); } $path_cmd = sprintf('%.3F %.3F m ', $xbase*$this->kp, $ybase*$this->kp); - for ($i = 2; $i<count($arguments);$i += 2) { + for ($i = 2; $i<count(($arguments ?? []));$i += 2) { if ($ispolyline) { $tmp_x = $arguments[$i] ; $tmp_y = - $arguments[($i+1)] ; @@ -1918,7 +1924,7 @@ $xbase = $arguments[0] ; $ybase = - $arguments[1] ; $path_cmd = sprintf('%.3F %.3F m ', $xbase*$this->kp, $ybase*$this->kp); - for ($i = 2; $i<count($arguments);$i += 2) { + for ($i = 2; $i<count(($arguments ?? []));$i += 2) { $tmp_x = $arguments[$i] ; $tmp_y = - $arguments[($i+1)] ; @@ -1935,7 +1941,7 @@ // write string to image function svgText() { // $tmp = count($this->txt_style)-1; - $current_style = $this->txt_style[count($this->txt_style)-1]; // mPDF 5.7.4 + $current_style = $this->txt_style[count(($this->txt_style ?? []))-1]; // mPDF 5.7.4 $style = ''; $op = ''; $render = -1; @@ -2010,13 +2016,13 @@ $y = $this->txt_data[1]; // mPDF 5.7.4 $txt = $this->txt_data[2]; - $txt = preg_replace('/\f/','',$txt); - $txt = preg_replace('/\r/','',$txt); - $txt = preg_replace('/\n/',' ',$txt); - $txt = preg_replace('/\t/',' ',$txt); - $txt = preg_replace("/[ ]+/u",' ',$txt); - - if ($this->textjuststarted) { $txt = ltrim($txt); } // mPDF 5.7.4 + $txt = preg_replace('/\f/','',($txt ?? '')); + $txt = preg_replace('/\r/','',($txt ?? '')); + $txt = preg_replace('/\n/',' ',($txt ?? '')); + $txt = preg_replace('/\t/',' ',($txt ?? '')); + $txt = preg_replace("/[ ]+/u",' ',($txt ?? '')); + + if ($this->textjuststarted) { $txt = ltrim(($txt ?? '')); } // mPDF 5.7.4 $this->textjuststarted = false; // mPDF 5.7.4 $txt = $this->mpdf_ref->purify_utf8_text($txt); @@ -2024,13 +2030,13 @@ $txt = $this->mpdf_ref->all_entities_to_utf8($txt); } - $nb=mb_strlen($txt, 'UTF-8'); + $nb=mb_strlen(($txt ?? ''), 'UTF-8'); $i=0; $sw = 0; $subpath_cmd = ''; while($i<$nb) { //Get next character - $char = mb_substr($txt,$i,1,'UTF-8'); + $char = mb_substr(($txt ?? ''),$i,1,'UTF-8'); if (isset($svg_font['glyphs'][$char])) { @@ -2042,13 +2048,13 @@ $d = $svg_font['d']; $horiz_adv_x = $svg_font['horiz-adv-x']; // missing glyph width } - preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $d, $commands, PREG_SET_ORDER); + preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', ($d ?? ''), $commands, PREG_SET_ORDER); $subpath_cmd .= sprintf('q %.4F 0 0 %.4F mPDF-AXS(%.4F) %.4F cm ', $scale, -$scale, ($x + $sw*$scale)*$this->kp, -$y*$this->kp); $this->subPathInit = true; $this->pathBBox = array(999999,999999,-999999,-999999); foreach($commands as $cmd){ - if(count($cmd)==3 || (isset($cmd[2]) && $cmd[2]=='')){ + if(count(($cmd ?? []))==3 || (isset($cmd[2]) && $cmd[2]=='')){ list($tmp, $command, $arguments) = $cmd; } else{ @@ -2136,13 +2142,13 @@ $y = $this->txt_data[1]; // mPDF 5.7.4 $txt = $this->txt_data[2]; - $txt = preg_replace('/\f/','',$txt); - $txt = preg_replace('/\r/','',$txt); - $txt = preg_replace('/\n/',' ',$txt); - $txt = preg_replace('/\t/',' ',$txt); - $txt = preg_replace("/[ ]+/u",' ',$txt); - - if ($this->textjuststarted) { $txt = ltrim($txt); } // mPDF 5.7.4 + $txt = preg_replace('/\f/','',($txt ?? '')); + $txt = preg_replace('/\r/','',($txt ?? '')); + $txt = preg_replace('/\n/',' ',($txt ?? '')); + $txt = preg_replace('/\t/',' ',($txt ?? '')); + $txt = preg_replace("/[ ]+/u",' ',($txt ?? '')); + + if ($this->textjuststarted) { $txt = ltrim(($txt ?? '')); } // mPDF 5.7.4 $this->textjuststarted = false; // mPDF 5.7.4 $txt = $this->mpdf_ref->purify_utf8_text($txt); @@ -2150,8 +2156,8 @@ $txt = $this->mpdf_ref->all_entities_to_utf8($txt); } - if ($this->mpdf_ref->usingCoreFont) { $txt = mb_convert_encoding($txt,$this->mpdf_ref->mb_enc,'UTF-8'); } - if (preg_match("/([".$this->mpdf_ref->pregRTLchars."])/u", $txt)) { $this->mpdf_ref->biDirectional = true; } + if ($this->mpdf_ref->usingCoreFont) { $txt = mb_convert_encoding(($txt ?? ''),($this->mpdf_ref->mb_enc ?? ''),'UTF-8'); } + if (preg_match("/([".$this->mpdf_ref->pregRTLchars."])/u", ($txt ?? ''))) { $this->mpdf_ref->biDirectional = true; } $textvar = 0; $save_OTLtags = $this->mpdf_ref->OTLtags; @@ -2198,7 +2204,7 @@ } else { return ' '; } // Reset font // mPDF 5.7.4 - $prev_style = $this->txt_style[count($this->txt_style)-1]; + $prev_style = $this->txt_style[count(($this->txt_style ?? []))-1]; $style = ''; $style .= ($prev_style['font-weight'] == 'bold')?'B':''; $style .= ($prev_style['font-style'] == 'italic')?'I':''; @@ -2212,73 +2218,73 @@ function svgDefineTxtStyle($critere_style) { // get copy of current/default txt style, and modify it with supplied attributes - $tmp = count($this->txt_style)-1; + $tmp = count(($this->txt_style ?? []))-1; $current_style = $this->txt_style[$tmp]; if (isset($critere_style['style'])){ - if (preg_match('/fill:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',$critere_style['style'], $m)) { - $current_style['fill'] = '#'.str_pad(dechex($m[1]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[2]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[3]), 2, "0", STR_PAD_LEFT); - } - else { $tmp = preg_replace("/(.*)fill:\s*([a-z0-9#_()]*|none)(.*)/i","$2",$critere_style['style']); + if (preg_match('/fill:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',($critere_style['style'] ?? ''), $m)) { + $current_style['fill'] = '#'.str_pad((dechex($m[1]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[2]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[3]) ?? ''), 2, "0", STR_PAD_LEFT); + } + else { $tmp = preg_replace("/(.*)fill:\s*([a-z0-9#_()]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['fill'] = $tmp; } } // mPDF 6 - if (preg_match("/[^-]opacity:\s*([a-z0-9.]*|none)/i",$critere_style['style'], $m) || - preg_match("/^opacity:\s*([a-z0-9.]*|none)/i",$critere_style['style'], $m)) { + if (preg_match("/[^-]opacity:\s*([a-z0-9.]*|none)/i",($critere_style['style'] ?? ''), $m) || + preg_match("/^opacity:\s*([a-z0-9.]*|none)/i",($critere_style['style'] ?? ''), $m)) { $current_style['fill-opacity'] = $m[1]; $current_style['stroke-opacity'] = $m[1]; } - $tmp = preg_replace("/(.*)fill-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)fill-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['fill-opacity'] = $tmp;} - $tmp = preg_replace("/(.*)fill-rule:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)fill-rule:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp != $critere_style['style'] && $tmp!=$critere_style['style']){ $current_style['fill-rule'] = $tmp;} - if (preg_match('/stroke:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',$critere_style['style'], $m)) { - $current_style['stroke'] = '#'.str_pad(dechex($m[1]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[2]), 2, "0", STR_PAD_LEFT).str_pad(dechex($m[3]), 2, "0", STR_PAD_LEFT); - } - else { $tmp = preg_replace("/(.*)stroke:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + if (preg_match('/stroke:\s*rgb\((\d+),\s*(\d+),\s*(\d+)\)/',($critere_style['style'] ?? ''), $m)) { + $current_style['stroke'] = '#'.str_pad((dechex($m[1]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[2]) ?? ''), 2, "0", STR_PAD_LEFT).str_pad((dechex($m[3]) ?? ''), 2, "0", STR_PAD_LEFT); + } + else { $tmp = preg_replace("/(.*)stroke:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke'] = $tmp; } } - $tmp = preg_replace("/(.*)stroke-linecap:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-linecap:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-linecap'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-linejoin:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-linejoin:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-linejoin'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-miterlimit:\s*([a-z0-9#]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-miterlimit:\s*([a-z0-9#]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-miterlimit'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-opacity:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-opacity'] = $tmp; } - $tmp = preg_replace("/(.*)stroke-width:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-width:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-width'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-dasharray:\s*([a-z0-9., ]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-dasharray:\s*([a-z0-9., ]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-dasharray'] = $tmp;} - $tmp = preg_replace("/(.*)stroke-dashoffset:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)stroke-dashoffset:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $current_style['stroke-dashoffset'] = $tmp;} - $tmp = preg_replace("/(.*)font-family:\s*([a-z0-9.\"' ,\-]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)font-family:\s*([a-z0-9.\"' ,\-]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['font-family'] = $tmp;} - $tmp = preg_replace("/(.*)font-size:\s*([a-z0-9.]*|none)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)font-size:\s*([a-z0-9.]*|none)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['font-size'] = $tmp;} - $tmp = preg_replace("/(.*)font-weight:\s*([a-z0-9.]*|normal)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)font-weight:\s*([a-z0-9.]*|normal)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['font-weight'] = $tmp;} - $tmp = preg_replace("/(.*)font-style:\s*([a-z0-9.]*|normal)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)font-style:\s*([a-z0-9.]*|normal)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['font-style'] = $tmp;} - $tmp = preg_replace("/(.*)font-variant:\s*([a-z0-9.]*|normal)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)font-variant:\s*([a-z0-9.]*|normal)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['font-variant'] = $tmp;} - $tmp = preg_replace("/(.*)text-anchor:\s*(start|middle|end)(.*)/i","$2",$critere_style['style']); + $tmp = preg_replace("/(.*)text-anchor:\s*(start|middle|end)(.*)/i","$2",($critere_style['style'] ?? '')); if ($tmp && $tmp != 'inherit' && $tmp!=$critere_style['style']){ $critere_style['text-anchor'] = $tmp;} } @@ -2286,14 +2292,14 @@ // [ [ <'font-style'> || <'font-variant'> || <'font-weight'> ]?<'font-size'> [ / <'line-height'> ]? <'font-family'> ] - $tmp = preg_replace("/(.*)(italic|oblique)(.*)/i","$2",$critere_style['font']); + $tmp = preg_replace("/(.*)(italic|oblique)(.*)/i","$2",($critere_style['font'] ?? '')); if ($tmp != $critere_style['font']){ if($tmp == 'oblique'){ $tmp = 'italic'; } $current_style['font-style'] = $tmp; } - $tmp = preg_replace("/(.*)(bold|bolder)(.*)/i","$2",$critere_style['font']); + $tmp = preg_replace("/(.*)(bold|bolder)(.*)/i","$2",($critere_style['font'] ?? '')); if ($tmp != $critere_style['font']){ if($tmp == 'bolder'){ $tmp = 'bold'; @@ -2301,13 +2307,13 @@ $current_style['font-weight'] = $tmp; } - $tmp = preg_replace("/(.*)(small\-caps)(.*)/i","$2",$critere_style['font']); + $tmp = preg_replace("/(.*)(small\-caps)(.*)/i","$2",($critere_style['font'] ?? '')); if ($tmp != $critere_style['font']){ $current_style['font-variant'] = $tmp; } // select digits not followed by percent sign nor preceeded by forward slash - $tmp = preg_replace("/(.*)\b(\d+)[\b|\/](.*)/i","$2",$critere_style['font']); + $tmp = preg_replace("/(.*)\b(\d+)[\b|\/](.*)/i","$2",($critere_style['font'] ?? '')); if ($tmp != $critere_style['font']){ $current_style['font-size'] = $this->ConvertSVGSizePts($tmp); $this->mpdf_ref->SetFont('','',$current_style['font-size'],false); @@ -2339,7 +2345,7 @@ } if(isset($critere_style['font-style']) && $critere_style['font-style']!='inherit'){ - if(strtolower($critere_style['font-style']) == 'oblique') + if(strtolower(($critere_style['font-style'] ?? '')) == 'oblique') { $critere_style['font-style'] = 'italic'; } @@ -2347,7 +2353,7 @@ } if(isset($critere_style['font-weight']) && $critere_style['font-weight']!='inherit'){ - if(strtolower($critere_style['font-weight']) == 'bolder') + if(strtolower(($critere_style['font-weight'] ?? '')) == 'bolder') { $critere_style['font-weight'] = 'bold'; } @@ -2359,7 +2365,7 @@ } if(isset($critere_style['font-size']) && $critere_style['font-size']!='inherit'){ - if (strpos($critere_style['font-size'], '%')!==false) { + if (strpos(($critere_style['font-size'] ?? ''), '%')!==false) { $current_style['font-size-parent'] = $current_style['font-size']; } $current_style['font-size'] = $this->ConvertSVGSizePts($critere_style['font-size']); @@ -2368,7 +2374,7 @@ if(isset($critere_style['font-family']) && $critere_style['font-family']!='inherit'){ $v = $critere_style['font-family']; - $aux_fontlist = explode(",",$v); + $aux_fontlist = explode(",",($v ?? '')); $found = 0; $svgfontstyle = 'R'; @@ -2377,10 +2383,10 @@ $svgfontstyle .= (isset($current_style['font-variant']) && $current_style['font-variant'] == 'small-caps')?'S':''; foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->mpdf_ref->fonttrans[$v]) && $this->mpdf_ref->fonttrans[$v]) { $v = $this->mpdf_ref->fonttrans[$v]; } if ((!$this->mpdf_ref->usingCoreFont && in_array($v,$this->mpdf_ref->available_unifonts)) || ($this->mpdf_ref->usingCoreFont && in_array($v,array('courier','times','helvetica','arial'))) || @@ -2392,10 +2398,10 @@ } if (!$found) { foreach($aux_fontlist AS $f) { - $fonttype = trim($f); - $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',$fonttype); - $fonttype = preg_replace('/ /','',$fonttype); - $v = strtolower(trim($fonttype)); + $fonttype = trim(($f ?? '')); + $fonttype = preg_replace('/["\']*(.*?)["\']*/','\\1',($fonttype ?? '')); + $fonttype = preg_replace('/ /','',($fonttype ?? '')); + $v = strtolower((trim(($fonttype ?? '')) ?? '')); if (isset($this->mpdf_ref->fonttrans[$v]) && $this->mpdf_ref->fonttrans[$v]) { $v = $this->mpdf_ref->fonttrans[$v]; } if (in_array($v,$this->mpdf_ref->sans_fonts) || in_array($v,$this->mpdf_ref->serif_fonts) || in_array($v,$this->mpdf_ref->mono_fonts) || isset($this->svg_font[$v][$svgfontstyle ])) { // mPDF 6 $current_style['font-family'] = $v; @@ -2447,12 +2453,12 @@ //$data = preg_replace('/<!DOCTYPE.*? >/is', '', $data); //$data = preg_replace('/<\?xml.*? >/is', '', $data); - $data = preg_replace('/^.*?<svg([> ])/is', '<svg\\1', $data); // mPDF 5.7.4 - - $data = preg_replace('/<!--.*?-->/is', '', $data); // mPDF 5.7.4 + $data = preg_replace('/^.*?<svg([> ])/is', '<svg\\1', ($data ?? '')); // mPDF 5.7.4 + + $data = preg_replace('/<!--.*?-->/is', '', ($data ?? '')); // mPDF 5.7.4 // Converts < to < when not a tag - $data = preg_replace('/<([^!?\/a-zA-Z_:])/i','<\\1',$data ); // mPDF 5.7.4 + $data = preg_replace('/<([^!?\/a-zA-Z_:])/i','<\\1',($data ?? '') ); // mPDF 5.7.4 if (_SVG_AUTOFONT) { $data = $this->markScriptToLang($data); } @@ -2462,67 +2468,67 @@ $last_svg_fontdefw = ''; // mPDF 6 $last_svg_fontstyle = ''; // mPDF 6 - if (preg_match('/<!ENTITY/si',$data)) { + if (preg_match('/<!ENTITY/si',($data ?? ''))) { // Get User-defined entities - preg_match_all('/<!ENTITY\s+([a-z]+)\s+\"(.*?)\">/si',$data, $ent); + preg_match_all('/<!ENTITY\s+([a-z]+)\s+\"(.*?)\">/si',($data ?? ''), $ent); // Replace entities - for ($i=0; $i<count($ent[0]); $i++) { - $data = preg_replace('/&'.preg_quote($ent[1][$i],'/').';/is', $ent[2][$i], $data); - } - } - - if (preg_match('/xlink:href\s*=/si',$data)) { + for ($i=0; $i<count(($ent[0] ?? [])); $i++) { + $data = preg_replace('/&'.preg_quote(($ent[1][$i] ?? ''),'/').';/is', ($ent[2][$i] ?? ''), ($data ?? '')); + } + } + + if (preg_match('/xlink:href\s*=/si',($data ?? ''))) { // GRADIENTS // Get links - preg_match_all('/(<(linearGradient|radialgradient)[^>]*)xlink:href\s*=\s*["\']#(.*?)["\'](.*?)\/>/si',$data, $links); - if (count($links[0])) { $links[5] = array(); } + preg_match_all('/(<(linearGradient|radialgradient)[^>]*)xlink:href\s*=\s*["\']#(.*?)["\'](.*?)\/>/si',($data ?? ''), $links); + if (count(($links[0] ?? []))) { $links[5] = array(); } // Delete links from data - keeping in $links - for ($i=0; $i<count($links[0]); $i++) { + for ($i=0; $i<count(($links[0] ?? [])); $i++) { $links[5][$i] = 'tmpLink'.RAND(100000,9999999); - $data = preg_replace('/'.preg_quote($links[0][$i],'/').'/is', '<MYLINKS'.$links[5][$i].'>' , $data); + $data = preg_replace('/'.preg_quote(($links[0][$i] ?? ''),'/').'/is', '<MYLINKS'.$links[5][$i].'>' , ($data ?? '')); } // Get targets - preg_match_all('/<(linearGradient|radialgradient)([^>]*)id\s*=\s*["\'](.*?)["\'](.*?)>(.*?)<\/(linearGradient|radialgradient)>/si',$data, $m); + preg_match_all('/<(linearGradient|radialgradient)([^>]*)id\s*=\s*["\'](.*?)["\'](.*?)>(.*?)<\/(linearGradient|radialgradient)>/si',($data ?? ''), $m); $targets = array(); $stops = array(); // keeping in $targets - for ($i=0; $i<count($m[0]); $i++) { + for ($i=0; $i<count(($m[0] ?? [])); $i++) { $stops[$m[3][$i]] = $m[5][$i]; } // Add back links this time as targets (gradients) - for ($i=0; $i<count($links[0]); $i++) { + for ($i=0; $i<count(($links[0] ?? [])); $i++) { $def = $links[1][$i] .' '.$links[4][$i].'>'. $stops[$links[3][$i]].'</'.$links[2][$i] .'>' ; - $data = preg_replace('/<MYLINKS'.$links[5][$i].'>/is', $def , $data); + $data = preg_replace('/<MYLINKS'.$links[5][$i].'>/is', ($def ?? '') , ($data ?? '')); } // mPDF 5.7.4 // <TREF> - preg_match_all('/<tref ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)\/>/si',$data, $links); - for ($i=0; $i<count($links[0]); $i++) { + preg_match_all('/<tref ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)\/>/si',($data ?? ''), $links); + for ($i=0; $i<count(($links[0] ?? [])); $i++) { // Get the item to use from defs $insert = ''; - if (preg_match('/<text [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>(.*?)<\/text>/si',$data, $m)) { + if (preg_match('/<text [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>(.*?)<\/text>/si',($data ?? ''), $m)) { $insert = $m[1]; } if ($insert) { - $data = preg_replace('/'.preg_quote($links[0][$i],'/').'/is', $insert, $data); + $data = preg_replace('/'.preg_quote(($links[0][$i] ?? ''),'/').'/is', ($insert ?? ''), ($data ?? '')); } } // mPDF 5.7.2 // <USE> - preg_match_all('/<use ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)\/>/si',$data, $links); - for ($i=0; $i<count($links[0]); $i++) { + preg_match_all('/<use ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)\/>/si',($data ?? ''), $links); + for ($i=0; $i<count(($links[0] ?? [])); $i++) { // Get the item to use from defs $insert = ''; - if (preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*\/>/si',$data, $m)) { + if (preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*\/>/si',($data ?? ''), $m)) { $insert = $m[0]; } - if (!$insert && preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\']/si',$data, $m)) { - - if (preg_match('/<'.$m[1].'[^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>.*?<\/'.$m[1].'>/si',$data, $m)) { + if (!$insert && preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\']/si',($data ?? ''), $m)) { + + if (preg_match('/<'.$m[1].'[^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>.*?<\/'.$m[1].'>/si',($data ?? ''), $m)) { $insert = $m[0]; } } @@ -2531,23 +2537,23 @@ $inners = $links[1][$i] . ' ' . $links[3][$i]; // Change x,y coords to translate() - if (preg_match('/y\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { $y = $m[1]; } + if (preg_match('/y\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { $y = $m[1]; } else { $y = 0; } - if (preg_match('/x\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { $x = $m[1]; } + if (preg_match('/x\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { $x = $m[1]; } else { $x = 0; } if ($x || $y) { - $inners = preg_replace('/(y|x)\s*=\s*["\']([^>]*?)["\']/', '', $inners); - if (preg_match('/transform\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { - if (preg_match('/translate\(\s*([0-9\.]+)\s*,\s*([0-9\.]+)\s*\)/', $m[1], $mm)) { + $inners = preg_replace('/(y|x)\s*=\s*["\']([^>]*?)["\']/', '', ($inners ?? '')); + if (preg_match('/transform\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { + if (preg_match('/translate\(\s*([0-9\.]+)\s*,\s*([0-9\.]+)\s*\)/', ($m[1] ?? ''), $mm)) { $transform = $m[1]; // transform="...." $x += $mm[1]; $y += $mm[2]; - $transform = preg_replace('/'.preg_quote($mm[0],'/').'/', '', $transform); + $transform = preg_replace('/'.preg_quote(($mm[0] ?? ''),'/').'/', '', ($transform ?? '')); $transform = 'transform="'.$transform.' translate('.$x.', '.$y.')"'; - $inners = preg_replace('/'.preg_quote($m[0],'/').'/is', $transform, $inners); + $inners = preg_replace('/'.preg_quote(($m[0] ?? ''),'/').'/is', ($transform ?? ''), ($inners ?? '')); } else { - $inners = preg_replace('/'.preg_quote($m[0],'/').'/is', 'transform="'.$m[1].' translate('.$x.', '.$y.')"', $inners); + $inners = preg_replace('/'.preg_quote(($m[0] ?? ''),'/').'/is', 'transform="'.$m[1].' translate('.$x.', '.$y.')"', ($inners ?? '')); } } else { @@ -2556,19 +2562,19 @@ } } $replacement = '<g '.$inners.'>'.$insert.'</g>'; - $data = preg_replace('/'.preg_quote($links[0][$i],'/').'/is', $replacement, $data); - } - preg_match_all('/<use ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)>\s*<\/use>/si',$data, $links); - for ($i=0; $i<count($links[0]); $i++) { + $data = preg_replace('/'.preg_quote(($links[0][$i] ?? ''),'/').'/is', ($replacement ?? ''), ($data ?? '')); + } + preg_match_all('/<use ([^>]*)xlink:href\s*=\s*["\']#([^>]*?)["\']([^>]*)>\s*<\/use>/si',($data ?? ''), $links); + for ($i=0; $i<count(($links[0] ?? [])); $i++) { // Get the item to use from defs $insert = ''; - if (preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*\/>/si',$data, $m)) { + if (preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*\/>/si',($data ?? ''), $m)) { $insert = $m[0]; } - if (!$insert && preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\']/si',$data, $m)) { - - if (preg_match('/<'.$m[1].'[^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>.*?<\/'.$m[1].'>/si',$data, $m)) { + if (!$insert && preg_match('/<([a-zA-Z]*) [^>]*id\s*=\s*["\']'.$links[2][$i].'["\']/si',($data ?? ''), $m)) { + + if (preg_match('/<'.$m[1].'[^>]*id\s*=\s*["\']'.$links[2][$i].'["\'][^>]*>.*?<\/'.$m[1].'>/si',($data ?? ''), $m)) { $insert = $m[0]; } } @@ -2577,23 +2583,23 @@ $inners = $links[1][$i] . ' ' . $links[3][$i]; // Change x,y coords to translate() - if (preg_match('/y\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { $y = $m[1]; } + if (preg_match('/y\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { $y = $m[1]; } else { $y = 0; } - if (preg_match('/x\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { $x = $m[1]; } + if (preg_match('/x\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { $x = $m[1]; } else { $x = 0; } if ($x || $y) { - $inners = preg_replace('/(y|x)\s*=\s*["\']([^>]*?)["\']/', '', $inners); - if (preg_match('/transform\s*=\s*["\']([^>]*?)["\']/', $inners, $m)) { - if (preg_match('/translate\(\s*([0-9\.]+)\s*,\s*([0-9\.]+)\s*\)/', $m[1], $mm)) { + $inners = preg_replace('/(y|x)\s*=\s*["\']([^>]*?)["\']/', '', ($inners ?? '')); + if (preg_match('/transform\s*=\s*["\']([^>]*?)["\']/', ($inners ?? ''), $m)) { + if (preg_match('/translate\(\s*([0-9\.]+)\s*,\s*([0-9\.]+)\s*\)/', ($m[1] ?? ''), $mm)) { $transform = $m[1]; // transform="...." $x += $mm[1]; $y += $mm[2]; - $transform = preg_replace('/'.preg_quote($mm[0],'/').'/', '', $transform); + $transform = preg_replace('/'.preg_quote(($mm[0] ?? ''),'/').'/', '', ($transform ?? '')); $transform = 'transform="'.$transform.' translate('.$x.', '.$y.')"'; - $inners = preg_replace('/'.preg_quote($m[0],'/').'/is', $transform, $inners); + $inners = preg_replace('/'.preg_quote(($m[0] ?? ''),'/').'/is', ($transform ?? ''), ($inners ?? '')); } else { - $inners = preg_replace('/'.preg_quote($m[0],'/').'/is', 'transform="'.$m[1].' translate('.$x.', '.$y.')"', $inners); + $inners = preg_replace('/'.preg_quote(($m[0] ?? ''),'/').'/is', 'transform="'.$m[1].' translate('.$x.', '.$y.')"', ($inners ?? '')); } } else { @@ -2601,7 +2607,7 @@ } } $replacement = '<g '.$inners.'>'.$insert.'</g>'; - $data = preg_replace('/'.preg_quote($links[0][$i],'/').'/is', $replacement, $data); + $data = preg_replace('/'.preg_quote(($links[0][$i] ?? ''),'/').'/is', ($replacement ?? ''), ($data ?? '')); } @@ -2609,9 +2615,9 @@ } // Removes <pattern> - $data = preg_replace('/<pattern.*?<\/pattern>/is', '', $data); + $data = preg_replace('/<pattern.*?<\/pattern>/is', '', ($data ?? '')); // Removes <marker> - $data = preg_replace('/<marker.*?<\/marker>/is', '', $data); + $data = preg_replace('/<marker.*?<\/marker>/is', '', ($data ?? '')); $this->svg_info['data'] = $data; @@ -2627,7 +2633,7 @@ global $svg_class, $last_gradid, $last_svg_fontid, $last_svg_fontdefw, $last_svg_fontstyle; // mPDF 6 // mPDF 6 - if (strtolower($name) == 'font'){ + if (strtolower(($name ?? '')) == 'font'){ $last_svg_fontid = ''; if (isset($attribs['horiz-adv-x']) && $attribs['horiz-adv-x']) { $last_svg_fontdefw = $attribs['horiz-adv-x']; @@ -2635,7 +2641,7 @@ return; } // mPDF 6 - else if (strtolower($name) == 'font-face'){ + else if (strtolower(($name ?? '')) == 'font-face'){ $last_svg_fontstyle = 'R'; $last_svg_fontstyle .= (isset($attribs['font-weight']) && $attribs['font-weight'] == 'bold')?'B':''; $last_svg_fontstyle .= (isset($attribs['font-style']) && $attribs['font-style'] == 'italic')?'I':''; @@ -2647,7 +2653,7 @@ 'd' => '', 'glyphs' => array() ); - $last_svg_fontid = strtolower($attribs['font-family']); + $last_svg_fontid = strtolower(($attribs['font-family'] ?? '')); if ($last_svg_fontdefw) { $tmp_svg_font['horiz-adv-x'] = $last_svg_fontdefw; } else { $tmp_svg_font['horiz-adv-x'] = 500; } $svg_class->svg_font[$last_svg_fontid][$last_svg_fontstyle] = $tmp_svg_font; @@ -2655,7 +2661,7 @@ return; } // mPDF 6 - else if (strtolower($name) == 'missing-glyph'){ + else if (strtolower(($name ?? '')) == 'missing-glyph'){ if ($last_svg_fontid && isset($attribs['horiz-adv-x'])) { $svg_class->svg_font[$last_svg_fontid][$last_svg_fontstyle]['horiz-adv-x'] = (isset($attribs['horiz-adv-x']) ? $attribs['horiz-adv-x'] : ''); $svg_class->svg_font[$last_svg_fontid][$last_svg_fontstyle]['d'] = (isset($attribs['d']) ? $attribs['d'] : ''); @@ -2663,7 +2669,7 @@ return; } // mPDF 6 - else if (strtolower($name) == 'glyph'){ + else if (strtolower(($name ?? '')) == 'glyph'){ if ($last_svg_fontid && isset($attribs['unicode'])) { $svg_class->svg_font[$last_svg_fontid][$last_svg_fontstyle]['glyphs'][$attribs['unicode']] = array( 'horiz-adv-x' => (isset($attribs['horiz-adv-x']) ? $attribs['horiz-adv-x'] : $last_svg_fontdefw), @@ -2673,7 +2679,7 @@ return; } // mPDF 5.7.2 - else if (strtolower($name) == 'lineargradient'){ + else if (strtolower(($name ?? '')) == 'lineargradient'){ $tmp_gradient = array( 'type' => 'linear', 'transform' => (isset($attribs['gradientTransform']) ? $attribs['gradientTransform'] : ''), @@ -2689,7 +2695,7 @@ $svg_class->svgAddGradient($attribs['id'],$tmp_gradient); return; } - else if (strtolower($name) == 'radialgradient'){ + else if (strtolower(($name ?? '')) == 'radialgradient'){ $tmp_gradient = array( 'type' => 'radial', 'transform' => (isset($attribs['gradientTransform']) ? $attribs['gradientTransform'] : ''), @@ -2706,40 +2712,40 @@ $svg_class->svgAddGradient($attribs['id'],$tmp_gradient); return; } - else if (strtolower($name) == 'stop'){ - if (!$last_gradid) break; + else if (strtolower(($name ?? '')) == 'stop'){ + if (!$last_gradid) return; $color = '#000000'; - if (isset($attribs['style']) AND preg_match('/stop-color:\s*([^;]*)/i',$attribs['style'],$m)) { - $color = trim($m[1]); + if (isset($attribs['style']) AND preg_match('/stop-color:\s*([^;]*)/i',($attribs['style'] ?? ''),$m)) { + $color = trim(($m[1] ?? '')); } else if (isset($attribs['stop-color']) && $attribs['stop-color']) { $color = $attribs['stop-color']; } $col = $svg_class->mpdf_ref->ConvertColor($color); if (!$col) { $col = $svg_class->mpdf_ref->ConvertColor('#000000'); } // In case "transparent" or "inherit" returned - if ($col{0}==3 || $col{0}==5) { // RGB - $color_final = sprintf('%.3F %.3F %.3F',ord($col{1})/255,ord($col{2})/255,ord($col{3})/255); + if ($col[0]==3 || $col[0]==5) { // RGB + $color_final = sprintf('%.3F %.3F %.3F',ord(($col[1] ?? ''))/255,ord(($col[2] ?? ''))/255,ord(($col[3] ?? ''))/255); $svg_class->svg_gradient[$last_gradid]['colorspace']='RGB'; } - else if ($col{0}==4 || $col{0}==6) { // CMYK - $color_final = sprintf('%.3F %.3F %.3F %.3F',ord($col{1})/100,ord($col{2})/100,ord($col{3})/100,ord($col{4})/100); + else if ($col[0]==4 || $col[0]==6) { // CMYK + $color_final = sprintf('%.3F %.3F %.3F %.3F',ord(($col[1] ?? ''))/100,ord(($col[2] ?? ''))/100,ord(($col[3] ?? ''))/100,ord(($col[4] ?? ''))/100); $svg_class->svg_gradient[$last_gradid]['colorspace']='CMYK'; } - else if ($col{0}==1) { // Grayscale - $color_final = sprintf('%.3F',ord($col{1})/255); + else if ($col[0]==1) { // Grayscale + $color_final = sprintf('%.3F',ord(($col[1] ?? ''))/255); $svg_class->svg_gradient[$last_gradid]['colorspace']='Gray'; } $stop_opacity = 1; - if (isset($attribs['style']) AND preg_match('/stop-opacity:\s*([0-9.]*)/i',$attribs['style'],$m)) { + if (isset($attribs['style']) AND preg_match('/stop-opacity:\s*([0-9.]*)/i',($attribs['style'] ?? ''),$m)) { $stop_opacity = $m[1]; } else if (isset($attribs['stop-opacity'])) { $stop_opacity = $attribs['stop-opacity']; } - else if ($col{0}==5) { // RGBa - $stop_opacity = ord($col{4}/100); - } - else if ($col{0}==6) { // CMYKa - $stop_opacity = ord($col{5}/100); + else if ($col[0]==5) { // RGBa + $stop_opacity = ord(($col[4]/100 ?? '')); + } + else if ($col[0]==6) { // CMYKa + $stop_opacity = ord(($col[5]/100 ?? '')); } $tmp_color = array( @@ -2754,7 +2760,7 @@ $svg_class->xbase = 0; $svg_class->ybase = 0; - switch (strtolower($name)){ + switch (strtolower(($name ?? ''))){ // Don't output stuff inside <defs> case 'defs': @@ -2767,12 +2773,12 @@ case 'path': $path = $attribs['d']; - preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $path, $commands, PREG_SET_ORDER); + preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', ($path ?? ''), $commands, PREG_SET_ORDER); $path_cmd = ''; $svg_class->subPathInit = true; $svg_class->pathBBox = array(999999,999999,-999999,-999999); foreach($commands as $c){ - if((isset($c) && count($c)==3) || (isset($c[2]) && $c[2]=='')){ + if((isset($c) && count(($c ?? []))==3) || (isset($c[2]) && $c[2]=='')){ list($tmp, $command, $arguments) = $c; } else{ @@ -2851,9 +2857,9 @@ case 'polyline': $path = $attribs['points']; - preg_match_all('/[0-9\-\.]*/',$path, $tmp, PREG_SET_ORDER); + preg_match_all('/[0-9\-\.]*/',($path ?? ''), $tmp, PREG_SET_ORDER); $arguments = array(); - for ($i=0;$i<count($tmp);$i++){ + for ($i=0;$i<count(($tmp ?? []));$i++){ if ($tmp[$i][0] !=''){ array_push($arguments, $tmp[$i][0]); } @@ -2866,9 +2872,9 @@ case 'polygon': $path = $attribs['points']; - preg_match_all('/([\-]*[0-9\.]+)/',$path, $tmp); + preg_match_all('/([\-]*[0-9\.]+)/',($path ?? ''), $tmp); $arguments = array(); - for ($i=0;$i<count($tmp[0]);$i++){ + for ($i=0;$i<count(($tmp[0] ?? []));$i++){ if ($tmp[0][$i] !=''){ array_push($arguments, $tmp[0][$i]); } @@ -2918,12 +2924,12 @@ $styl = ''; if (_SVG_CLASSES && isset($attribs['class']) && $attribs['class']) { - $classes = preg_split('/\s+/',trim($attribs['class'])); + $classes = preg_split('/\s+/',(trim(($attribs['class'] ?? '')) ?? '')); foreach($classes AS $class) { - if (isset($svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper($class)])) { - $c = $svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper($class)]; + if (isset($svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper(($class ?? ''))])) { + $c = $svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper(($class ?? ''))]; foreach($c AS $prop=>$val) { - $styl .= strtolower($prop).':'.$val.';'; + $styl .= strtolower(($prop ?? '')).':'.$val.';'; } } } @@ -2961,7 +2967,7 @@ unset($critere_style['x'], $critere_style['y']); $svg_class->svgDefineTxtStyle($critere_style); - $svg_class->textanchor = $svg_class->txt_style[count($svg_class->txt_style)-1]['text-anchor']; // mPDF 5.7.4 + $svg_class->textanchor = $svg_class->txt_style[count(($svg_class->txt_style ?? []))-1]['text-anchor']; // mPDF 5.7.4 $svg_class->textXorigin = $svg_class->txt_data[0]; // mPDF 5.7.4 $svg_class->textYorigin = $svg_class->txt_data[1]; // mPDF 5.7.4 $svg_class->textjuststarted = true; // mPDF 5.7.4 @@ -2974,17 +2980,17 @@ // OUTPUT CHUNK(s) UP To NOW (svgText updates $svg_class->textlength) $p_cmd = $svg_class->svgText(); $svg_class->textoutput .= $p_cmd; - $tmp = count($svg_class->svg_style)-1; + $tmp = count(($svg_class->svg_style ?? []))-1; $current_style = $svg_class->svg_style[$tmp]; $styl = ''; if (_SVG_CLASSES && isset($attribs['class']) && $attribs['class']) { - $classes = preg_split('/\s+/',trim($attribs['class'])); + $classes = preg_split('/\s+/',(trim(($attribs['class'] ?? '')) ?? '')); foreach($classes AS $class) { - if (isset($svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper($class)])) { - $c = $svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper($class)]; + if (isset($svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper(($class ?? ''))])) { + $c = $svg_class->mpdf_ref->cssmgr->CSS['CLASS>>'.strtoupper(($class ?? ''))]; foreach($c AS $prop=>$val) { - $styl .= strtolower($prop).':'.$val.';'; + $styl .= strtolower(($prop ?? '')).':'.$val.';'; } } } @@ -3015,13 +3021,13 @@ if ($svg_class->textanchor == 'end') { $tx = -$svg_class->texttotallength; } else if ($svg_class->textanchor == 'middle') { $tx = -$svg_class->texttotallength/2; } else { $tx = 0; } - while(preg_match('/mPDF-AXS\((.*?)\)/',$svg_class->textoutput,$m)) { + while(preg_match('/mPDF-AXS\((.*?)\)/',($svg_class->textoutput ?? ''),$m)) { if ($tx) { $txk = $m[1] + ($tx*$svg_class->kp); - $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/', sprintf('%.4F', $txk) ,$svg_class->textoutput,1); + $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/', (sprintf('%.4F', $txk) ?? '') ,($svg_class->textoutput ?? ''),1); } else { - $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/','\\1',$svg_class->textoutput,1); + $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/','\\1',($svg_class->textoutput ?? ''),1); } } @@ -3043,7 +3049,7 @@ unset($critere_style['x'], $critere_style['y']); $svg_class->svgDefineTxtStyle($critere_style); - $svg_class->textanchor = $svg_class->txt_style[count($svg_class->txt_style)-1]['text-anchor']; + $svg_class->textanchor = $svg_class->txt_style[count(($svg_class->txt_style ?? []))-1]['text-anchor']; $svg_class->textXorigin = $x; $svg_class->textYorigin = $y; @@ -3079,7 +3085,7 @@ //insertion des path et du style dans le flux de donn general. if (isset($path_cmd) && $path_cmd) { // mPDF 5.0 - list($prestyle,$poststyle) = $svg_class->svgStyle($path_style, $attribs, strtolower($name)); + list($prestyle,$poststyle) = $svg_class->svgStyle($path_style, $attribs, strtolower(($name ?? ''))); if (isset($path_style['transformations']) && $path_style['transformations']) { // transformation on an element $svg_class->svgWriteString(" q ".$path_style['transformations']. $prestyle . $path_cmd . $poststyle . " Q\n"); } @@ -3121,7 +3127,7 @@ $svg_class->textoutput .= $p_cmd; } - $tmp = count($svg_class->svg_style)-1; + $tmp = count(($svg_class->svg_style ?? []))-1; $current_style = $svg_class->svg_style[$tmp]; if ($current_style['transformations']) { // If in the middle of <text> element, add to textoutput, else WriteString @@ -3148,10 +3154,10 @@ $last_gradid = ''; break; case "text": - $svg_class->txt_data[2] = rtrim($svg_class->txt_data[2]); // mPDF 5.7.4 + $svg_class->txt_data[2] = rtrim(($svg_class->txt_data[2] ?? '')); // mPDF 5.7.4 $path_cmd = $svg_class->svgText(); $svg_class->textoutput .= $path_cmd; // mPDF 5.7.4 - $tmp = count($svg_class->svg_style)-1; + $tmp = count(($svg_class->svg_style ?? []))-1; $current_style = $svg_class->svg_style[$tmp]; if ($current_style['transformations']) { $svg_class->textoutput .= " Q\n"; // mPDF 5.7.4 @@ -3164,13 +3170,13 @@ if ($svg_class->textanchor == 'end') { $tx = -$svg_class->texttotallength; } else if ($svg_class->textanchor == 'middle') { $tx = -$svg_class->texttotallength/2; } else { $tx = 0; } - while(preg_match('/mPDF-AXS\((.*?)\)/',$svg_class->textoutput,$m)) { + while(preg_match('/mPDF-AXS\((.*?)\)/',($svg_class->textoutput ?? ''),$m)) { if ($tx) { $txk = $m[1] + ($tx*$svg_class->kp); - $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/', sprintf('%.4F', $txk) ,$svg_class->textoutput,1); + $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/', (sprintf('%.4F', $txk) ?? '') ,($svg_class->textoutput ?? ''),1); } else { - $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/','\\1',$svg_class->textoutput,1); + $svg_class->textoutput = preg_replace('/mPDF-AXS\((.*?)\)/','\\1',($svg_class->textoutput ?? ''),1); } } @@ -3185,7 +3191,7 @@ case "tspan": $p_cmd = $svg_class->svgText(); $svg_class->textoutput .= $p_cmd; - $tmp = count($svg_class->svg_style)-1; + $tmp = count(($svg_class->svg_style ?? []))-1; $current_style = $svg_class->svg_style[$tmp]; if ($current_style['transformations']) { $svg_class->textoutput .= " Q\n"; @@ -3240,7 +3246,7 @@ } $n = ''; - $a=preg_split('/<(.*?)>/ms',$html,-1,PREG_SPLIT_DELIM_CAPTURE); + $a=preg_split('/<(.*?)>/ms',($html ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); foreach($a as $i => $e) { if($i%2==0) { $e = strcode2utf($e); @@ -3280,7 +3286,7 @@ // Move common script from end of x to start of x+1 for($sch=0;$sch<$subchunk;$sch++) { if ($scriptblocks[$sch] > 0 && $scriptblocks[$sch] != $this->mpdf_ref->baseScript && $scriptblocks[$sch+1] == $this->mpdf_ref->baseScript) { - $end = count($chardata[$sch])-1; + $end = count(($chardata[$sch] ?? []))-1; while($chardata[$sch][$end]['script'] == 0 && $end > 1) { // common script $tmp = array_pop($chardata[$sch]); array_unshift($chardata[$sch+1],$tmp); @@ -3293,33 +3299,33 @@ for($sch=0;$sch<=$subchunk;$sch++) { if (isset($chardata[$sch])) { $s = ''; - for ($j=0;$j<count($chardata[$sch]);$j++) { + for ($j=0;$j<count(($chardata[$sch] ?? []));$j++) { $s.=code2utf($chardata[$sch][$j]['uni']); } // ZZZ99 Undo lesser_entity_decode as above - but only for <>& - $s = str_replace("&","&",$s); - $s = str_replace("<","<",$s); - $s = str_replace(">",">",$s); - - if (substr($a[$i-1],0,5)!='<text' && substr($a[$i-1],0,5)!='<tspa') { continue; } // <tspan> or <text> only + $s = str_replace("&","&",($s ?? '')); + $s = str_replace("<","<",($s ?? '')); + $s = str_replace(">",">",($s ?? '')); + + if (substr(($a[$i-1] ?? ''),0,5)!='<text' && substr(($a[$i-1] ?? ''),0,5)!='<tspa') { continue; } // <tspan> or <text> only $lang = ''; // Check Vietnamese if Latin script - even if Basescript - if ($scriptblocks[$sch] == UCDN::SCRIPT_LATIN && $this->mpdf_ref->autoVietnamese && preg_match("/([".$this->viet."])/u", $s)) { + if ($scriptblocks[$sch] == UCDN::SCRIPT_LATIN && $this->mpdf_ref->autoVietnamese && preg_match("/([".$this->viet."])/u", ($s ?? ''))) { $lang="vi"; } // Check Arabic for different languages if Arabic script - even if Basescript else if ($scriptblocks[$sch] == UCDN::SCRIPT_ARABIC && $this->mpdf_ref->autoArabic) { - if (preg_match("/[".$this->sindhi ."]/u", $s) ) { + if (preg_match("/[".$this->sindhi ."]/u", ($s ?? '')) ) { $lang="sd"; } - else if (preg_match("/[".$this->urdu ."]/u", $s) ) { + else if (preg_match("/[".$this->urdu ."]/u", ($s ?? '')) ) { $lang="ur"; } - else if (preg_match("/[".$this->pashto ."]/u", $s) ) { + else if (preg_match("/[".$this->pashto ."]/u", ($s ?? '')) ) { $lang="ps"; } - else if (preg_match("/[".$this->persian ."]/u", $s) ) { + else if (preg_match("/[".$this->persian ."]/u", ($s ?? '')) ) { $lang="fa"; } else if ($this->mpdf_ref->baseScript != UCDN::SCRIPT_ARABIC && isset($this->script2lang[$scriptblocks[$sch]])) { --- a/intranet/mpdf60/classes/bmp.php +++ b/intranet/mpdf60/classes/bmp.php @@ -4,7 +4,7 @@ var $mpdf = null; -function bmp(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; } @@ -13,20 +13,20 @@ $info = array(); // Adapted from script by Valentin Schmidt // http://staff.dasdeck.de/valentin/fpdf/fpdf_bmp/ - $bfOffBits=$this->_fourbytes2int_le(substr($data,10,4)); - $width=$this->_fourbytes2int_le(substr($data,18,4)); - $height=$this->_fourbytes2int_le(substr($data,22,4)); + $bfOffBits=$this->_fourbytes2int_le(substr(($data ?? ''),10,4)); + $width=$this->_fourbytes2int_le(substr(($data ?? ''),18,4)); + $height=$this->_fourbytes2int_le(substr(($data ?? ''),22,4)); $flip = ($height<0); if ($flip) $height =-$height; - $biBitCount=$this->_twobytes2int_le(substr($data,28,2)); - $biCompression=$this->_fourbytes2int_le(substr($data,30,4)); + $biBitCount=$this->_twobytes2int_le(substr(($data ?? ''),28,2)); + $biCompression=$this->_fourbytes2int_le(substr(($data ?? ''),30,4)); $info = array('w'=>$width, 'h'=>$height); if ($biBitCount<16){ $info['cs'] = 'Indexed'; $info['bpc'] = $biBitCount; - $palStr = substr($data,54,($bfOffBits-54)); + $palStr = substr(($data ?? ''),54,($bfOffBits-54)); $pal = ''; - $cnt = strlen($palStr)/4; + $cnt = strlen(($palStr ?? ''))/4; for ($i=0;$i<$cnt;$i++){ $n = 4*$i; $pal .= $palStr[$n+2].$palStr[$n+1].$palStr[$n]; @@ -43,7 +43,7 @@ return array('error' => "BMP Image cannot be converted to suitable colour space - ".$file." - (Image replaced by 'no-image'.)"); } - $biXPelsPerMeter=$this->_fourbytes2int_le(substr($data,38,4)); // horizontal pixels per meter, usually set to zero + $biXPelsPerMeter=$this->_fourbytes2int_le(substr(($data ?? ''),38,4)); // horizontal pixels per meter, usually set to zero //$biYPelsPerMeter=$this->_fourbytes2int_le(substr($data,42,4)); // vertical pixels per meter, usually set to zero $biXPelsPerMeter=round($biXPelsPerMeter/1000 *25.4); //$biYPelsPerMeter=round($biYPelsPerMeter/1000 *25.4); @@ -51,13 +51,13 @@ switch ($biCompression){ case 0: - $str = substr($data,$bfOffBits); + $str = substr(($data ?? ''),$bfOffBits); break; case 1: # BI_RLE8 - $str = $this->rle8_decode(substr($data,$bfOffBits), $width); + $str = $this->rle8_decode(substr(($data ?? ''),$bfOffBits), $width); break; case 2: # BI_RLE4 - $str = $this->rle4_decode(substr($data,$bfOffBits), $width); + $str = $this->rle4_decode(substr(($data ?? ''),$bfOffBits), $width); break; } $bmpdata = ''; @@ -89,18 +89,18 @@ for ($y=0;$y<$height;$y++){ $y0 = $y*$w_row; for ($x=0;$x<$width;$x++){ - $n = (ord( $str[$y0 + 2*$x + 1])*256 + ord( $str[$y0 + 2*$x])); + $n = (ord( ($str[$y0 + 2*$x + 1] ?? ''))*256 + ord( ($str[$y0 + 2*$x] ?? ''))); $b = ($n & 31)<<3; $g = ($n & 992)>>2; $r = ($n & 31744)>>7128; - $bmpdata .= chr($r) . chr($g) . chr($b); + $bmpdata .= chr((int) ($r)) . chr((int) ($g)) . chr((int) ($b)); } } }else{ for ($y=$height-1;$y>=0;$y--){ $y0 = $y*$w_row; for ($x=0;$x<$width;$x++){ - $n = (ord( $str[$y0 + 2*$x + 1])*256 + ord( $str[$y0 + 2*$x])); + $n = (ord( ($str[$y0 + 2*$x + 1] ?? ''))*256 + ord( ($str[$y0 + 2*$x] ?? ''))); $b = ($n & 31)<<3; $g = ($n & 992)>>2; $r = ($n & 31744)>>7; - $bmpdata .= chr($r) . chr($g) . chr($b); + $bmpdata .= chr((int) ($r)) . chr((int) ($g)) . chr((int) ($b)); } } } @@ -144,12 +144,12 @@ function _fourbytes2int_le($s) { //Read a 4-byte integer from string - return (ord($s[3])<<24) + (ord($s[2])<<16) + (ord($s[1])<<8) + ord($s[0]); + return (ord(($s[3] ?? ''))<<24) + (ord(($s[2] ?? ''))<<16) + (ord(($s[1] ?? ''))<<8) + ord(($s[0] ?? '')); } function _twobytes2int_le($s) { //Read a 2-byte integer from string - return (ord(substr($s, 1, 1))<<8) + ord(substr($s, 0, 1)); + return (ord((substr(($s ?? ''), 1, 1) ?? ''))<<8) + ord((substr(($s ?? ''), 0, 1) ?? '')); } @@ -158,33 +158,33 @@ function rle8_decode ($str, $width){ $lineWidth = $width + (3 - ($width-1) % 4); $out = ''; - $cnt = strlen($str); + $cnt = strlen(($str ?? '')); for ($i=0;$i<$cnt;$i++){ - $o = ord($str[$i]); + $o = ord(($str[$i] ?? '')); switch ($o){ case 0: # ESCAPE $i++; - switch (ord($str[$i])){ + switch (ord(($str[$i] ?? ''))){ case 0: # NEW LINE - $padCnt = $lineWidth - strlen($out)%$lineWidth; - if ($padCnt<$lineWidth) $out .= str_repeat(chr(0), $padCnt); # pad line + $padCnt = $lineWidth - strlen(($out ?? ''))%$lineWidth; + if ($padCnt<$lineWidth) $out .= str_repeat((chr(0) ?? ''), $padCnt); # pad line break; case 1: # END OF FILE - $padCnt = $lineWidth - strlen($out)%$lineWidth; - if ($padCnt<$lineWidth) $out .= str_repeat(chr(0), $padCnt); # pad line + $padCnt = $lineWidth - strlen(($out ?? ''))%$lineWidth; + if ($padCnt<$lineWidth) $out .= str_repeat((chr(0) ?? ''), $padCnt); # pad line break 3; case 2: # DELTA $i += 2; break; default: # ABSOLUTE MODE - $num = ord($str[$i]); + $num = ord(($str[$i] ?? '')); for ($j=0;$j<$num;$j++) $out .= $str[++$i]; if ($num % 2) $i++; } break; default: - $out .= str_repeat($str[++$i], $o); + $out .= str_repeat(($str[++$i] ?? ''), $o); } } return $out; @@ -196,29 +196,29 @@ $w = floor($width/2) + ($width % 2); $lineWidth = $w + (3 - ( ($width-1) / 2) % 4); $pixels = array(); - $cnt = strlen($str); + $cnt = strlen(($str ?? '')); for ($i=0;$i<$cnt;$i++){ - $o = ord($str[$i]); + $o = ord(($str[$i] ?? '')); switch ($o){ case 0: # ESCAPE $i++; - switch (ord($str[$i])){ + switch (ord(($str[$i] ?? ''))){ case 0: # NEW LINE - while (count($pixels)%$lineWidth!=0) + while (count(($pixels ?? []))%$lineWidth!=0) $pixels[]=0; break; case 1: # END OF FILE - while (count($pixels)%$lineWidth!=0) + while (count(($pixels ?? []))%$lineWidth!=0) $pixels[]=0; break 3; case 2: # DELTA $i += 2; break; default: # ABSOLUTE MODE - $num = ord($str[$i]); + $num = ord(($str[$i] ?? '')); for ($j=0;$j<$num;$j++){ if ($j%2==0){ - $c = ord($str[++$i]); + $c = ord(($str[++$i] ?? '')); $pixels[] = ($c & 240)>>4; } else $pixels[] = $c & 15; @@ -227,17 +227,17 @@ } break; default: - $c = ord($str[++$i]); + $c = ord(($str[++$i] ?? '')); for ($j=0;$j<$o;$j++) $pixels[] = ($j%2==0 ? ($c & 240)>>4 : $c & 15); } } $out = ''; - if (count($pixels)%2) $pixels[]=0; - $cnt = count($pixels)/2; + if (count(($pixels ?? []))%2) $pixels[]=0; + $cnt = count(($pixels ?? []))/2; for ($i=0;$i<$cnt;$i++) - $out .= chr(16*$pixels[2*$i] + $pixels[2*$i+1]); + $out .= chr((int) (16*$pixels[2*$i] + $pixels[2*$i+1])); return $out; } --- a/intranet/mpdf60/classes/ttfontsuni.php +++ b/intranet/mpdf60/classes/ttfontsuni.php @@ -43,12 +43,25 @@ // mPDF 5.7.1 if(!function_exists('unicode_hex')){ function unicode_hex($unicode_dec) { - return (sprintf("%05s", strtoupper(dechex($unicode_dec)))); + return (sprintf("%05s", strtoupper((dechex($unicode_dec) ?? '')))); } } class TTFontFile { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $version; + public $fontRevision; + public $restrictedUse; + public $GSUBFeatures; + public $GSUBLookups; + public $glyphIDtoUni; + public $glyphToChar; + public $GSLuCoverage; + public $LuCoverage; + public $codeToGlyph; + public $glyphdata; + var $GPOSFeatures; // mPDF 5.7.1 var $GPOSLookups; // mPDF 5.7.1 @@ -119,7 +132,7 @@ var $haskernGPOS; var $hassmallcapsGSUB; - function TTFontFile() { + function __construct() { $this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file) } @@ -208,7 +221,7 @@ $table = $this->get_chunk($t['offset'], $t['length']); $checksum = $this->calcChecksum($table); if ($t['tag'] == 'head') { - $up = unpack('n*', substr($table,8,4)); + $up = unpack('n*', substr(($table ?? ''),8,4)); $adjustment[0] = $up[1]; $adjustment[1] = $up[2]; $checksum = $this->sub32($checksum, $adjustment); @@ -234,13 +247,13 @@ } function calcChecksum($data) { - if (strlen($data) % 4) { $data .= str_repeat("\0",(4-(strlen($data) % 4))); } - $len = strlen($data); + if (strlen(($data ?? '')) % 4) { $data .= str_repeat("\0",(4-(strlen(($data ?? '')) % 4))); } + $len = strlen(($data ?? '')); $hi=0x0000; $lo=0x0000; for($i=0;$i<$len;$i+=4) { - $hi += (ord($data[$i])<<8) + ord($data[$i+1]); - $lo += (ord($data[$i+2])<<8) + ord($data[$i+3]); + $hi += (ord(($data[$i] ?? ''))<<8) + ord(($data[$i+1] ?? '')); + $lo += (ord(($data[$i+2] ?? ''))<<8) + ord(($data[$i+3] ?? '')); $hi += ($lo >> 16) & 0xFFFF; $lo = $lo & 0xFFFF; } @@ -280,7 +293,7 @@ function read_short() { $this->_pos += 2; $s = fread($this->fh,2); - $a = (ord($s[0])<<8) + ord($s[1]); + $a = (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -288,7 +301,7 @@ } function unpack_short($s) { - $a = (ord($s[0])<<8) + ord($s[1]); + $a = (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -298,27 +311,27 @@ function read_ushort() { $this->_pos += 2; $s = fread($this->fh,2); - return (ord($s[0])<<8) + ord($s[1]); + return (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); } function read_ulong() { $this->_pos += 4; $s = fread($this->fh,4); // if large uInt32 as an integer, PHP converts it to -ve - return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 16777216 = 1<<24 + return (ord(($s[0] ?? ''))*16777216) + (ord(($s[1] ?? ''))<<16) + (ord(($s[2] ?? ''))<<8) + ord(($s[3] ?? '')); // 16777216 = 1<<24 } function get_ushort($pos) { fseek($this->fh,$pos); $s = fread($this->fh,2); - return (ord($s[0])<<8) + ord($s[1]); + return (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); } function get_ulong($pos) { fseek($this->fh,$pos); $s = fread($this->fh,4); // iF large uInt32 as an integer, PHP converts it to -ve - return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 16777216 = 1<<24 + return (ord(($s[0] ?? ''))*16777216) + (ord(($s[1] ?? ''))<<16) + (ord(($s[2] ?? ''))<<8) + ord(($s[3] ?? '')); // 16777216 = 1<<24 } function pack_short($val) { @@ -331,7 +344,7 @@ } function splice($stream, $offset, $value) { - return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value)); + return substr(($stream ?? ''),0,$offset) . $value . substr(($stream ?? ''),$offset+strlen(($value ?? ''))); } function _set_ushort($stream, $offset, $value) { @@ -497,7 +510,7 @@ $string_data_offset = $name_offset + $this->read_ushort(); $names = array(1=>'',2=>'',3=>'',4=>'',6=>''); $K = array_keys($names); - $nameCount = count($names); + $nameCount = count(($names ?? [])); for ($i=0;$i<$numRecords; $i++) { $platformId = $this->read_ushort(); $encodingId = $this->read_ushort(); @@ -516,7 +529,7 @@ $N = ''; while ($length > 0) { $char = $this->read_ushort(); - $N .= (chr($char)); + $N .= (chr((int) ($char))); $length -= 1; } $this->_pos = $opos; @@ -537,19 +550,19 @@ if ($names[6]) $psName = $names[6]; else if ($names[4]) - $psName = preg_replace('/ /','-',$names[4]); + $psName = preg_replace('/ /','-',($names[4] ?? '')); else if ($names[1]) - $psName = preg_replace('/ /','-',$names[1]); + $psName = preg_replace('/ /','-',($names[1] ?? '')); else $psName = ''; if (!$psName) die("Could not find PostScript font name: ".$this->filename); // CHECK IF psName valid (PadaukBook contains illegal characters in Name ID 6 i.e. Postscript Name) $psNameInvalid = false; - for ($i=0;$i<count($psName);$i++) { + for ($i=0;$i<count(($psName ?? []));$i++) { $c = $psName[$i]; - $oc = ord($c); - if ($oc>126 || strpos(' [](){}<>/%',$c)!==false) { + $oc = ord(($c ?? '')); + if ($oc>126 || strpos(' [](){}<>/%',($c ?? ''))!==false) { //die("psName=".$psName." contains invalid character ".$c." ie U+".ord(c)); $psNameInvalid = true; break; @@ -557,7 +570,7 @@ } if ($psNameInvalid && $names[4]) - $psName = preg_replace('/ /','-',$names[4]); + $psName = preg_replace('/ /','-',($names[4] ?? '')); $this->name = $psName; @@ -647,7 +660,7 @@ $this->_pos += 10; //PANOSE = 10 byte length $panose = fread($this->fh,10); $this->panose = array(); - for ($p=0;$p<strlen($panose);$p++) { $this->panose[] = ord($panose[$p]); } + for ($p=0;$p<strlen(($panose ?? ''));$p++) { $this->panose[] = ord(($panose[$p] ?? '')); } //$this->skip(26); // mPDF 6 $this->skip(20); @@ -920,9 +933,9 @@ $char = $glyphToChar[$gid][0]; if ($char != 0 && $char != 65535) { - $this->glyphIDtoUni[$gid*3] = chr($char >> 16); - $this->glyphIDtoUni[$gid*3 + 1] = chr(($char >> 8) & 0xFF); - $this->glyphIDtoUni[$gid*3 + 2] = chr($char & 0xFF); + $this->glyphIDtoUni[$gid*3] = chr((int) ($char >> 16)); + $this->glyphIDtoUni[$gid*3 + 1] = chr((int) (($char >> 8) & 0xFF)); + $this->glyphIDtoUni[$gid*3 + 2] = chr((int) ($char & 0xFF)); } } } @@ -1000,7 +1013,7 @@ $left = $this->read_ushort(); $right = $this->read_ushort(); $val = $this->read_short(); - if (count($glyphToChar[$left])==1 && count($glyphToChar[$right])==1) { + if (count(($glyphToChar[$left] ?? []))==1 && count(($glyphToChar[$right] ?? []))==1) { if ($left != 32 && $right != 32) { $this->kerninfo[$glyphToChar[$left][0]][$glyphToChar[$right][0]] = intval($val*$scale); } @@ -1043,16 +1056,16 @@ } else { $GlyphByClass = array(); } - if (isset($GlyphByClass[1]) && count($GlyphByClass[1])>0) { $this->GlyphClassBases = ' '.implode('| ',$GlyphByClass[1]); } + if (isset($GlyphByClass[1]) && count(($GlyphByClass[1] ?? []))>0) { $this->GlyphClassBases = ' '.implode('| ',$GlyphByClass[1]); } else { $this->GlyphClassBases = ''; } - if (isset($GlyphByClass[2]) && count($GlyphByClass[2])>0) { $this->GlyphClassLigatures = ' '.implode('| ',$GlyphByClass[2]); } + if (isset($GlyphByClass[2]) && count(($GlyphByClass[2] ?? []))>0) { $this->GlyphClassLigatures = ' '.implode('| ',$GlyphByClass[2]); } else { $this->GlyphClassLigatures = ''; } - if (isset($GlyphByClass[3]) && count($GlyphByClass[3])>0) { $this->GlyphClassMarks = ' '.implode('| ',$GlyphByClass[3]); } + if (isset($GlyphByClass[3]) && count(($GlyphByClass[3] ?? []))>0) { $this->GlyphClassMarks = ' '.implode('| ',$GlyphByClass[3]); } else { $this->GlyphClassMarks = ''; } - if (isset($GlyphByClass[4]) && count($GlyphByClass[4])>0) { $this->GlyphClassComponents = ' '.implode('| ',$GlyphByClass[4]); } + if (isset($GlyphByClass[4]) && count(($GlyphByClass[4] ?? []))>0) { $this->GlyphClassComponents = ' '.implode('| ',$GlyphByClass[4]); } else { $this->GlyphClassComponents = ''; } - if (isset($GlyphByClass[3]) && count($GlyphByClass[3])>0) { $Marks = $GlyphByClass[3]; } // to use for MarkAttachmentType + if (isset($GlyphByClass[3]) && count(($GlyphByClass[3] ?? []))>0) { $Marks = $GlyphByClass[3]; } // to use for MarkAttachmentType else { $Marks = array(); } @@ -1095,7 +1108,7 @@ $MarkAttachmentTypes = $this->_getClassDefinitionTable(); foreach($MarkAttachmentTypes AS $class=>$glyphs) { - if (is_array($Marks) && count($Marks)) { + if (is_array($Marks) && count(($Marks ?? []))) { $mat = array_diff($Marks, $MarkAttachmentTypes[$class]); sort($mat, SORT_STRING); } @@ -1664,7 +1677,7 @@ if ($Lookup[$i]['Type'] == 1) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(false); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = unicode_hex($this->glyphToChar[$glyphs[$g]][0]); @@ -1684,13 +1697,13 @@ else if ($Lookup[$i]['Type'] == 2) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = $glyphs[$g]; // Flag = Ignore if ($this->_checkGSUBignore($Lookup[$i]['Flag'], $replace[0], $Lookup[$i]['MarkFilteringSet'])) { continue; } -if (!isset($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID']) || count($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'])==0) { continue; } // Illegal for GlyphCount to be 0; either error in font, or something has gone wrong - lets carry on for now! +if (!isset($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID']) || count(($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'] ?? []))==0) { continue; } // Illegal for GlyphCount to be 0; either error in font, or something has gone wrong - lets carry on for now! foreach($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'] AS $sub) { $substitute[] = unicode_hex($this->glyphToChar[$sub][0]); } @@ -1701,7 +1714,7 @@ else if ($Lookup[$i]['Type'] == 3) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = $glyphs[$g]; @@ -1978,14 +1991,14 @@ $rtl = array(); $rtlSUB = "array()"; $finals = ''; - if (strpos('arab syrc hebr thaa nko samr', $st)!==false) { // all RTL scripts [any/all languages] ? Mandaic + if (strpos('arab syrc hebr thaa nko samr', ($st ?? ''))!==false) { // all RTL scripts [any/all languages] ? Mandaic //print_r($volt); exit; foreach($volt AS $v) { // isol fina fin2 fin3 medi med2 for Syriac // ISOLATED FORM :: FINAL :: INITIAL :: MEDIAL :: MED2 :: FIN2 :: FIN3 - if (strpos('isol fina init medi fin2 fin3 med2',$v['tag'])!==false) { + if (strpos('isol fina init medi fin2 fin3 med2',($v['tag'] ?? ''))!==false) { $key = $v['match']; - $key = preg_replace('/[\(\)]*/','',$key); + $key = preg_replace('/[\(\)]*/','',($key ?? '')); $sub = $v['replace']; if ($v['tag'] == 'isol') $kk = 0; else if ($v['tag'] == 'fina') $kk = 1; @@ -1995,8 +2008,8 @@ else if ($v['tag'] == 'fin2') $kk = 5; else if ($v['tag'] == 'fin3') $kk = 6; $rtl[$key][$kk] = $sub; - if (isset($v['prel']) && count($v['prel'])) $rtl[$key]['prel'][$kk] = $v['prel']; - if (isset($v['postl']) && count($v['postl'])) $rtl[$key]['postl'][$kk] = $v['postl']; + if (isset($v['prel']) && count(($v['prel'] ?? []))) $rtl[$key]['prel'][$kk] = $v['prel']; + if (isset($v['postl']) && count(($v['postl'] ?? []))) $rtl[$key]['postl'][$kk] = $v['postl']; if (isset($v['ignore']) && $v['ignore']) { $rtl[$key]['ignore'][$kk] = $v['ignore']; } @@ -2006,9 +2019,9 @@ else { if (isset($v['context']) && $v['context']) { foreach($v['rules'] AS $vs) { - for($i=0;$i<count($vs['match']);$i++) { - if (isset($vs['replace'][$i]) && preg_match('/^0[A-F0-9]{4}$/', $vs['match'][$i])) { - if (preg_match('/^0[EF][A-F0-9]{3}$/', $vs['replace'][$i])) { + for($i=0;$i<count(($vs['match'] ?? []));$i++) { + if (isset($vs['replace'][$i]) && preg_match('/^0[A-F0-9]{4}$/', ($vs['match'][$i] ?? ''))) { + if (preg_match('/^0[EF][A-F0-9]{3}$/', ($vs['replace'][$i] ?? ''))) { $rtlpua[] = $vs['replace'][$i]; } } @@ -2016,11 +2029,11 @@ } } else { - preg_match_all('/\((0[A-F0-9]{4})\)/', $v['match'], $m); - for($i=0;$i<count($m[0]);$i++) { - $sb = explode(' ',$v['replace']); + preg_match_all('/\((0[A-F0-9]{4})\)/', ($v['match'] ?? ''), $m); + for($i=0;$i<count(($m[0] ?? []));$i++) { + $sb = explode(' ',($v['replace'] ?? '')); foreach($sb AS $sbg) { - if (preg_match('/(0[EF][A-F0-9]{3})/', $sbg, $mr)) { + if (preg_match('/(0[EF][A-F0-9]{3})/', ($sbg ?? ''), $mr)) { $rtlpua[] = $mr[1]; } } @@ -2033,7 +2046,7 @@ // priority rules (see otl.php) foreach($rtl AS $base=>$variants) { if (isset($variants[1])) { // i.e. final form - if (strpos('0FE8E 0FE94 0FEA2 0FEAA 0FEAE 0FEC2 0FEDA 0FEDE 0FB93 0FECA 0FED2 0FED6 0FEEE 0FEF0 0FEF2', $variants[1])===false) { // not already included + if (strpos('0FE8E 0FE94 0FEA2 0FEAA 0FEAE 0FEC2 0FEDA 0FEDE 0FB93 0FECA 0FED2 0FED6 0FEEE 0FEF0 0FEF2', ($variants[1] ?? ''))===false) { // not already included // This version does not exclude RA (0631) FEAE; Ya (064A) FEF2; Alef Maqsurah (0649) FEF0 which // are selected in priority if connected to a medial Bah @@ -2046,14 +2059,14 @@ //print_r($rtlpua); exit; ksort($rtl); $a = var_export($rtl, true); - $a = preg_replace('/\\\\\\\\/',"\\",$a); - $a = preg_replace('/\'/','"',$a); - $a = preg_replace('/\r/','',$a); - $a = preg_replace('/> \n/','>',$a); - $a = preg_replace('/\n \)/',')',$a); - $a= preg_replace('/\n /',' ',$a); - $a = preg_replace('/\[IGNORE(\d+)\]/','".$ignore[\\1]."',$a); - $rtlSUB = preg_replace('/[ ]+/',' ',$a); + $a = preg_replace('/\\\\\\\\/',"\\",($a ?? '')); + $a = preg_replace('/\'/','"',($a ?? '')); + $a = preg_replace('/\r/','',($a ?? '')); + $a = preg_replace('/> \n/','>',($a ?? '')); + $a = preg_replace('/\n \)/',')',($a ?? '')); + $a= preg_replace('/\n /',' ',($a ?? '')); + $a = preg_replace('/\[IGNORE(\d+)\]/','".$ignore[\\1]."',($a ?? '')); + $rtlSUB = preg_replace('/[ ]+/',' ',($a ?? '')); } //===================================================================================== @@ -2064,19 +2077,19 @@ $pref = array(); $blwf = array(); $pstf = array(); - if (strpos('dev2 bng2 gur2 gjr2 ory2 tml2 tel2 knd2 mlm2 deva beng guru gujr orya taml telu knda mlym', $st)!==false) { // all INDIC scripts [any/all languages] - - if (strpos('deva beng guru gujr orya taml telu knda mlym', $st)!==false) { $is_old_spec = true; } + if (strpos('dev2 bng2 gur2 gjr2 ory2 tml2 tel2 knd2 mlm2 deva beng guru gujr orya taml telu knda mlym', ($st ?? ''))!==false) { // all INDIC scripts [any/all languages] + + if (strpos('deva beng guru gujr orya taml telu knda mlym', ($st ?? ''))!==false) { $is_old_spec = true; } else { $is_old_spec = false; } // First get 'locl' substitutions (reversed!) $loclsubs = array(); foreach($volt AS $v) { - if (strpos('locl',$v['tag'])!==false) { + if (strpos('locl',($v['tag'] ?? ''))!==false) { $key = $v['match']; - $key = preg_replace('/[\(\)]*/','',$key); + $key = preg_replace('/[\(\)]*/','',($key ?? '')); $sub = $v['replace']; - if ($key && strlen(trim($key))==5 && $sub) { $loclsubs[$sub] = $key; } + if ($key && strlen((trim(($key ?? '')) ?? ''))==5 && $sub) { $loclsubs[$sub] = $key; } } } //if (count($loclsubs)) { print_r($loclsubs); exit; } @@ -2102,28 +2115,28 @@ // Currently set to cope with both // See also classes/otl.php - if (strpos('rphf half pref blwf pstf',$v['tag'])!==false) { + if (strpos('rphf half pref blwf pstf',($v['tag'] ?? ''))!==false) { if (isset($v['context']) && $v['context'] && $v['nBacktrack']==0 && $v['nLookahead']==0) { foreach($v['rules'] AS $vs) { - if (count($vs['match'])==2 && count($vs['replace'])==1) { + if (count(($vs['match'] ?? []))==2 && count(($vs['replace'] ?? []))==1) { $sub = $vs['replace'][0]; // If Halant Cons <pref>, <blwf> and <pstf> in New version only - if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',$vs['match'][0])!==false && strpos('pref blwf pstf',$v['tag'])!==false && !$is_old_spec ) { + if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',($vs['match'][0] ?? ''))!==false && strpos('pref blwf pstf',($v['tag'] ?? ''))!==false && !$is_old_spec ) { $key = $vs['match'][1]; $tag = $v['tag']; if (isset($loclsubs[$key])) { - $$tag[$loclsubs[$key]] = $sub; + ${$tag}[$loclsubs[$key]] = $sub; } $tmp = &$$tag; $tmp[hexdec($key)] = hexdec($sub); } // If Cons Halant <rphf> and <half> always // and <pref>, <blwf> and <pstf> in Old version - else if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',$vs['match'][1])!==false && (strpos('rphf half',$v['tag'])!==false || (strpos('pref blwf pstf',$v['tag'])!==false && ($is_old_spec || _OTL_OLD_SPEC_COMPAT_2)))) { + else if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',($vs['match'][1] ?? ''))!==false && (strpos('rphf half',($v['tag'] ?? ''))!==false || (strpos('pref blwf pstf',($v['tag'] ?? ''))!==false && ($is_old_spec || _OTL_OLD_SPEC_COMPAT_2)))) { $key = $vs['match'][0]; $tag = $v['tag']; if (isset($loclsubs[$key])) { - $$tag[$loclsubs[$key]] = $sub; + ${$tag}[$loclsubs[$key]] = $sub; } $tmp = &$$tag; $tmp[hexdec($key)] = hexdec($sub); @@ -2133,26 +2146,26 @@ } else if (!isset($v['context'])) { $key = $v['match']; - $key = preg_replace('/[\(\)]*/','',$key); + $key = preg_replace('/[\(\)]*/','',($key ?? '')); $sub = $v['replace']; - if ($key && strlen(trim($key))==11 && $sub) { + if ($key && strlen((trim(($key ?? '')) ?? ''))==11 && $sub) { // If Cons Halant <rphf> and <half> always // and <pref>, <blwf> and <pstf> in Old version // If Halant Cons <pref>, <blwf> and <pstf> in New version only - if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',substr($key, 0, 5))!==false && strpos('pref blwf pstf',$v['tag'])!==false && !$is_old_spec ) { - $key = substr($key, 6, 5); + if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',(substr(($key ?? ''), 0, 5) ?? ''))!==false && strpos('pref blwf pstf',($v['tag'] ?? ''))!==false && !$is_old_spec ) { + $key = substr(($key ?? ''), 6, 5); $tag = $v['tag']; if (isset($loclsubs[$key])) { - $$tag[$loclsubs[$key]] = $sub; + ${$tag}[$loclsubs[$key]] = $sub; } $tmp = &$$tag; $tmp[hexdec($key)] = hexdec($sub); } - else if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',substr($key, 6, 5))!==false && (strpos('rphf half',$v['tag'])!==false || (strpos('pref blwf pstf',$v['tag'])!==false && ($is_old_spec || _OTL_OLD_SPEC_COMPAT_2)))) { - $key = substr($key, 0, 5); + else if (strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',(substr(($key ?? ''), 6, 5) ?? ''))!==false && (strpos('rphf half',($v['tag'] ?? ''))!==false || (strpos('pref blwf pstf',($v['tag'] ?? ''))!==false && ($is_old_spec || _OTL_OLD_SPEC_COMPAT_2)))) { + $key = substr(($key ?? ''), 0, 5); $tag = $v['tag']; if (isset($loclsubs[$key])) { - $$tag[$loclsubs[$key]] = $sub; + ${$tag}[$loclsubs[$key]] = $sub; } $tmp= &$$tag; $tmp[hexdec($key)] = hexdec($sub); @@ -2175,7 +2188,7 @@ //===================================================================================== //===================================================================================== //===================================================================================== - if (count($rtl) || count($rphf ) || count($half ) || count($pref ) || count($blwf ) || count($pstf ) || $finals) { + if (count(($rtl ?? [])) || count(($rphf ?? []) ) || count(($half ?? []) ) || count(($pref ?? []) ) || count(($blwf ?? []) ) || count(($pstf ?? []) ) || $finals) { // SAVE LOOKUPS TO FILE fontname.GSUB.scripttag.langtag.php @@ -2206,10 +2219,10 @@ // All RTL glyphs from font added to (or already in) PUA [reqd for magic_reverse] $rtlPUAstr = ""; - if (count($rtlpua)) { + if (count(($rtlpua ?? []))) { $rtlpua = array_unique($rtlpua); sort($rtlpua); - $n = count($rtlpua); + $n = count(($rtlpua ?? [])); for($i=0;$i<$n;$i++) { if (hexdec($rtlpua[$i])<hexdec('E000') || hexdec($rtlpua[$i])>hexdec('F8FF')) { unset($rtlpua[$i]); @@ -2278,7 +2291,7 @@ // LookupType 1: Single Substitution Subtable if ($Lookup[$i]['Type'] == 1) { - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; // Ignore has already been applied earlier on @@ -2289,7 +2302,7 @@ } // LookupType 2: Multiple Substitution Subtable else if ($Lookup[$i]['Type'] == 2) { - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = implode(" ", $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute']); // Ignore has already been applied earlier on @@ -2300,7 +2313,7 @@ } // LookupType 3: Alternate Forms else if ($Lookup[$i]['Type'] == 3) { - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; // Ignore has already been applied earlier on @@ -2311,13 +2324,13 @@ } // LookupType 4: Ligature Substitution Subtable else if ($Lookup[$i]['Type'] == 4) { - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; // Ignore has already been applied earlier on $ignore = $this->_getGSUBignoreString($Lookup[$i]['Flag'], $Lookup[$i]['MarkFilteringSet']); $repl = $this->_makeGSUBinputMatch($inputGlyphs, $ignore); - $subs = $this->_makeGSUBinputReplacement(count($inputGlyphs), $substitute, $ignore, 0, count($inputGlyphs), 0); + $subs = $this->_makeGSUBinputReplacement(count(($inputGlyphs ?? [])), $substitute, $ignore, 0, count(($inputGlyphs ?? [])), 0); $volt[] = array('match'=>$repl, 'replace'=>$subs, 'tag'=>$tag, 'key'=>$inputGlyphs[0], 'type' => 4, 'CompCount' => $Lookup[$i]['Subtable'][$c]['subs'][$s]['CompCount'], 'Lig' => $substitute); } } @@ -2338,7 +2351,7 @@ } $inputGlyphs[0] = $Lookup[$i]['Subtable'][$c]['SubRuleSet'][$s]['FirstGlyph']; ksort($inputGlyphs); - $nInput = count($inputGlyphs); + $nInput = count(($inputGlyphs ?? [])); $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, array(), 0); $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => '', 'match' => $contextInputMatch, 'nBacktrack' => 0, 'nInput' => $nInput, 'nLookahead' => 0, 'rules' => array(), ); @@ -2349,18 +2362,18 @@ // $Lookup[$lup] = secondary Lookup for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } $REPL = implode(" ",$luss['substitute']); - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2372,7 +2385,7 @@ } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } @@ -2413,23 +2426,23 @@ // $Lookup[$lup] = secondary Lookup for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (isset($Lookup[$lup]['Subtable'][$lus]['subs']) && count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (isset($Lookup[$lup]['Subtable'][$lus]['subs']) && count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, $lookupGlyphs, $seqIndex); $REPL = implode(" ",$luss['substitute']); // Returns e.g. "REPL\${6}\${8}" or "\${1}\${2} \${3} REPL\${4}\${6}\${8} \${9}" - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2439,7 +2452,7 @@ } } } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } @@ -2469,30 +2482,30 @@ // Returns e.g. (ignore) (FD12|FD13)(ignore) (FEEB|FEEC) $lookaheadMatch = $this->_makeGSUBlookaheadMatch($lookaheadGlyphs, $ignore); - $nBsubs = 2*count($backtrackGlyphs); + $nBsubs = 2*count(($backtrackGlyphs ?? [])); $nIsubs = (2*$nInput)-1; $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, array(), 0); - $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count($backtrackGlyphs), 'nInput' => $nInput, 'nLookahead' => count($lookaheadGlyphs), 'rules' => array(), ); + $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count(($backtrackGlyphs ?? [])), 'nInput' => $nInput, 'nLookahead' => count(($lookaheadGlyphs ?? [])), 'rules' => array(), ); for ($b=0;$b<$Lookup[$i]['Subtable'][$c]['SubstCount'];$b++) { $lup = $Lookup[$i]['Subtable'][$c]['SubstLookupRecord'][$b]['LookupListIndex']; $seqIndex = $Lookup[$i]['Subtable'][$c]['SubstLookupRecord'][$b]['SequenceIndex']; for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, $lookupGlyphs, $seqIndex); $REPL = implode(" ",$luss['substitute']); - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2502,7 +2515,7 @@ } } } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } //print_r($Lookup[$i]); @@ -2525,7 +2538,7 @@ } $inputGlyphs[0] = $firstInputGlyph; ksort($inputGlyphs); - $nInput = count($inputGlyphs); + $nInput = count(($inputGlyphs ?? [])); if ($rule['BacktrackGlyphCount']) { $backtrackGlyphs = $rule['BacktrackGlyphs']; } else { $backtrackGlyphs = array(); } @@ -2536,11 +2549,11 @@ $lookaheadMatch = $this->_makeGSUBlookaheadMatch($lookaheadGlyphs, $ignore); - $nBsubs = 2*count($backtrackGlyphs); + $nBsubs = 2*count(($backtrackGlyphs ?? [])); $nIsubs = (2*$nInput)-1; $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, array(), 0); - $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count($backtrackGlyphs), 'nInput' => $nInput, 'nLookahead' => count($lookaheadGlyphs), 'rules' => array(), ); + $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count(($backtrackGlyphs ?? [])), 'nInput' => $nInput, 'nLookahead' => count(($lookaheadGlyphs ?? [])), 'rules' => array(), ); for ($b=0;$b<$rule['SubstCount'];$b++) { @@ -2549,23 +2562,23 @@ // $Lookup[$lup] = secondary Lookup for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, $lookupGlyphs, $seqIndex); $REPL = implode(" ",$luss['substitute']); - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2577,7 +2590,7 @@ } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; @@ -2651,11 +2664,11 @@ // Returns e.g. (ignore) (FD12|FD13)(ignore) (FEEB|FEEC) $lookaheadMatch = $this->_makeGSUBlookaheadMatch($lookaheadGlyphs, $ignore); - $nBsubs = 2*count($backtrackGlyphs); + $nBsubs = 2*count(($backtrackGlyphs ?? [])); $nIsubs = (2*$nInput)-1; $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, array(), 0); - $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count($backtrackGlyphs), 'nInput' => $nInput, 'nLookahead' => count($lookaheadGlyphs), 'rules' => array(), ); + $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count(($backtrackGlyphs ?? [])), 'nInput' => $nInput, 'nLookahead' => count(($lookaheadGlyphs ?? [])), 'rules' => array(), ); for ($b=0;$b<$rule['SubstCount'];$b++) { $lup = $rule['LookupListIndex'][$b]; @@ -2663,23 +2676,23 @@ // $Lookup[$lup] = secondary Lookup for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, $lookupGlyphs, $seqIndex); $REPL = implode(" ",$luss['substitute']); // Returns e.g. "REPL\${6}\${8}" or "\${1}\${2} \${3} REPL\${4}\${6}\${8} \${9}" - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2689,7 +2702,7 @@ } } } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } @@ -2720,30 +2733,30 @@ // Returns e.g. (ignore) (FD12|FD13)(ignore) (FEEB|FEEC) $lookaheadMatch = $this->_makeGSUBlookaheadMatch($lookaheadGlyphs, $ignore); - $nBsubs = 2*count($backtrackGlyphs); + $nBsubs = 2*count(($backtrackGlyphs ?? [])); $nIsubs = (2*$nInput)-1; $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, array(), 0); - $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count($backtrackGlyphs), 'nInput' => $nInput, 'nLookahead' => count($lookaheadGlyphs), 'rules' => array(), ); + $subRule = array('context' => 1, 'tag' => $tag, 'matchback' => $backtrackMatch, 'match' => ($contextInputMatch . $lookaheadMatch), 'nBacktrack' => count(($backtrackGlyphs ?? [])), 'nInput' => $nInput, 'nLookahead' => count(($lookaheadGlyphs ?? [])), 'rules' => array(), ); for ($b=0;$b<$Lookup[$i]['Subtable'][$c]['SubstCount'];$b++) { $lup = $Lookup[$i]['Subtable'][$c]['SubstLookupRecord'][$b]['LookupListIndex']; $seqIndex = $Lookup[$i]['Subtable'][$c]['SubstLookupRecord'][$b]['SequenceIndex']; for($lus=0;$lus<$Lookup[$lup]['SubtableCount'];$lus++) { - if (count($Lookup[$lup]['Subtable'][$lus]['subs'])) { + if (count(($Lookup[$lup]['Subtable'][$lus]['subs'] ?? []))) { foreach($Lookup[$lup]['Subtable'][$lus]['subs'] AS $luss) { $lookupGlyphs = $luss['Replace']; - $mLen = count($lookupGlyphs); + $mLen = count(($lookupGlyphs ?? [])); // Only apply if the (first) 'Replace' glyph from the // Lookup list is in the [inputGlyphs] at ['SequenceIndex'] // then apply the substitution - if (strpos($inputGlyphs[$seqIndex],$lookupGlyphs[0])===false) { continue; } + if (strpos(($inputGlyphs[$seqIndex] ?? ''),($lookupGlyphs[0] ?? ''))===false) { continue; } // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) $contextInputMatch = $this->_makeGSUBcontextInputMatch($inputGlyphs, $ignore, $lookupGlyphs, $seqIndex); $REPL = implode(" ",$luss['substitute']); - if (strpos("isol fina fin2 fin3 medi med2 init ",$tag)!==false && $scripttag=='arab') { + if (strpos("isol fina fin2 fin3 medi med2 init ",($tag ?? ''))!==false && $scripttag=='arab') { $volt[] = array('match'=>$lookupGlyphs[0], 'replace'=>$REPL, 'tag'=>$tag, 'prel'=>$backtrackGlyphs, 'postl'=>$lookaheadGlyphs, 'ignore'=>$ignore); } else { @@ -2753,7 +2766,7 @@ } } } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } } @@ -2767,17 +2780,17 @@ function _checkGSUBignore($flag, $glyph, $MarkFilteringSet) { $ignore = false; // Flag & 0x0008 = Ignore Marks - (unless already done with MarkAttachmentType) - if ((($flag & 0x0008) == 0x0008 && ($flag & 0xFF00) == 0) && strpos($this->GlyphClassMarks,$glyph)) { $ignore = true; } - if ((($flag & 0x0004) == 0x0004) && strpos($this->GlyphClassLigatures,$glyph)) { $ignore = true; } - if ((($flag & 0x0002) == 0x0002) && strpos($this->GlyphClassBases,$glyph)) { $ignore = true; } + if ((($flag & 0x0008) == 0x0008 && ($flag & 0xFF00) == 0) && strpos(($this->GlyphClassMarks ?? ''),($glyph ?? ''))) { $ignore = true; } + if ((($flag & 0x0004) == 0x0004) && strpos(($this->GlyphClassLigatures ?? ''),($glyph ?? ''))) { $ignore = true; } + if ((($flag & 0x0002) == 0x0002) && strpos(($this->GlyphClassBases ?? ''),($glyph ?? ''))) { $ignore = true; } // Flag & 0xFF?? = MarkAttachmentType if ($flag & 0xFF00) { // "a lookup must ignore any mark glyphs that are not in the specified mark attachment class" // $this->MarkAttachmentType is already adjusted for this i.e. contains all Marks except those in the MarkAttachmentClassDef table - if (strpos($this->MarkAttachmentType[($flag >> 8)],$glyph)) { $ignore = true; } + if (strpos(($this->MarkAttachmentType[($flag >> 8)] ?? ''),($glyph ?? ''))) { $ignore = true; } } // Flag & 0x0010 = UseMarkFilteringSet - if (($flag & 0x0010) && strpos($this->MarkGlyphSets[$MarkFilteringSet],$glyph)) { $ignore = true; } + if (($flag & 0x0010) && strpos(($this->MarkGlyphSets[$MarkFilteringSet] ?? ''),($glyph ?? ''))) { $ignore = true; } return $ignore; } @@ -2891,8 +2904,8 @@ // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) // $inputGlyphs = array of glyphs(glyphstrings) making up Input sequence in Context // $lookupGlyphs = array of glyphs (single Glyphs) making up Lookup Input sequence - $mLen = count($lookupGlyphs); // nGlyphs in the secondary Lookup match - $nInput = count($inputGlyphs); // nGlyphs in the Primary Input sequence + $mLen = count(($lookupGlyphs ?? [])); // nGlyphs in the secondary Lookup match + $nInput = count(($inputGlyphs ?? [])); // nGlyphs in the Primary Input sequence $str = ""; for($i=0;$i<$nInput;$i++) { if ($i>0) { $str .= $ignore." "; } @@ -2908,7 +2921,7 @@ // $inputGlyphs = array of glyphs(glyphstrings) making up Input sequence in Context // $lookupGlyphs = array of glyphs making up Lookup Input sequence - if applicable $str = ""; - for($i=1;$i<=count($inputGlyphs);$i++) { + for($i=1;$i<=count(($inputGlyphs ?? []));$i++) { if ($i>1) { $str .= $ignore." "; } $str .= "(".$inputGlyphs[($i-1)].")"; } @@ -2922,7 +2935,7 @@ // 3 2 1 0 // each item being e.g. E0AD|E0AF|F1FD $str = ""; - for($i=(count($backtrackGlyphs)-1);$i>=0;$i--) { + for($i=(count(($backtrackGlyphs ?? []))-1);$i>=0;$i--) { $str .= "(".$backtrackGlyphs[$i].")".$ignore." "; } return $str; @@ -2935,7 +2948,7 @@ // 0 1 2 3 // each item being e.g. E0AD|E0AF|F1FD $str = ""; - for($i=0;$i<count($lookaheadGlyphs);$i++) { + for($i=0;$i<count(($lookaheadGlyphs ?? []));$i++) { $str .= $ignore." (".$lookaheadGlyphs[$i].")"; } return $str; @@ -3424,7 +3437,7 @@ $this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs); } - $numGlyphs = $numberOfHMetrics = count($subsetglyphs ); + $numGlyphs = $numberOfHMetrics = count(($subsetglyphs ?? []) ); /////////////////////////////////// // name - table copied from the original @@ -3448,7 +3461,7 @@ /////////////////////////////////// if (isset($this->tables['post'])) { $opost = $this->get_table('post'); - $post = "\x00\x03\x00\x00" . substr($opost,4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + $post = "\x00\x03\x00\x00" . substr(($opost ?? ''),4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; $this->add('post', $post); } @@ -3482,7 +3495,7 @@ // CMap table /////////////////////////////////// // cmap - Character to glyph mapping - $segCount = count($range) + 1; // + 1 Last segment has missing character 0xFFFF + $segCount = count(($range ?? [])) + 1; // + 1 Last segment has missing character 0xFFFF $searchRange = 1; $entrySelector = 0; while ($searchRange * 2 <= $segCount ) { @@ -3507,7 +3520,7 @@ // endCode(s) foreach($range AS $start=>$subrange) { - $endCode = $start + (count($subrange)-1); + $endCode = $start + (count(($subrange ?? []))-1); $cmap[] = $endCode; // endCode(s) } $cmap[] = 0xFFFF; // endCode of last Segment @@ -3521,7 +3534,7 @@ // idDelta(s) foreach($range AS $start=>$subrange) { $idDelta = -($start-$subrange[0]); - $n += count($subrange); + $n += count(($subrange ?? [])); $cmap[] = $idDelta; // idDelta(s) } $cmap[] = 1; // idDelta of last Segment @@ -3579,7 +3592,7 @@ $glyphPos = $this->glyphPos[$originalGlyphIdx]; $glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; if ($glyfLength < $this->maxStrLenRead) { - $data = substr($glyphData,$glyphPos,$glyphLen); + $data = substr(($glyphData ?? ''),$glyphPos,$glyphLen); } else { if ($glyphLen > 0) $data = $this->get_chunk($glyfOffset+$glyphPos,$glyphLen); @@ -3588,22 +3601,22 @@ if ($glyphLen > 0) { if (_RECALC_PROFILE) { - $xMin = $this->unpack_short(substr($data,2,2)); - $yMin = $this->unpack_short(substr($data,4,2)); - $xMax = $this->unpack_short(substr($data,6,2)); - $yMax = $this->unpack_short(substr($data,8,2)); + $xMin = $this->unpack_short(substr(($data ?? ''),2,2)); + $yMin = $this->unpack_short(substr(($data ?? ''),4,2)); + $xMax = $this->unpack_short(substr(($data ?? ''),6,2)); + $yMax = $this->unpack_short(substr(($data ?? ''),8,2)); $xMinT = min($xMinT,$xMin); $yMinT = min($yMinT,$yMin); $xMaxT = max($xMaxT,$xMax); $yMaxT = max($yMaxT,$yMax); - $aw = $this->unpack_short(substr($hm,0,2)); - $lsb = $this->unpack_short(substr($hm,2,2)); + $aw = $this->unpack_short(substr(($hm ?? ''),0,2)); + $lsb = $this->unpack_short(substr(($hm ?? ''),2,2)); $advanceWidthMax = max($advanceWidthMax,$aw); $minLeftSideBearing = min($minLeftSideBearing,$lsb); $minRightSideBearing = min($minRightSideBearing,($aw - $lsb - ($xMax - $xMin))); $xMaxExtent = max($xMaxExtent,($lsb + ($xMax - $xMin))); } - $up = unpack("n", substr($data,0,2)); + $up = unpack("n", substr(($data ?? ''),0,2)); } if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) { // If number of contours <= -1 i.e. composiste glyph $pos_in_glyph = 10; @@ -3611,9 +3624,9 @@ $nComponentElements = 0; while ($flags & GF_MORE) { $nComponentElements += 1; // number of glyphs referenced at top level - $up = unpack("n", substr($data,$pos_in_glyph,2)); + $up = unpack("n", substr(($data ?? ''),$pos_in_glyph,2)); $flags = $up[1]; - $up = unpack("n", substr($data,$pos_in_glyph+2,2)); + $up = unpack("n", substr(($data ?? ''),$pos_in_glyph+2,2)); $glyphIdx = $up[1]; $this->glyphdata[$originalGlyphIdx]['compGlyphs'][] = $glyphIdx; $data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]); @@ -3634,7 +3647,7 @@ // Count number of points in simple glyph $pos_in_glyph = 10 + ($nContours * 2) - 2; // Last endContourPoint - $up = unpack("n", substr($data,$pos_in_glyph,2)); + $up = unpack("n", substr(($data ?? ''),$pos_in_glyph,2)); $points = $up[1]+1; $this->glyphdata[$originalGlyphIdx]['nPoints'] = $points; $maxPoints = max($maxPoints, $points); @@ -3695,7 +3708,7 @@ $head = $this->_set_short($head, 38, $yMinT); // for all glyph bounding boxes $head = $this->_set_short($head, 40, $xMaxT); // for all glyph bounding boxes $head = $this->_set_short($head, 42, $yMaxT); // for all glyph bounding boxes - $head[17] = chr($head[17] & ~(1 << 4)); // Unset Bit 4 (as hdmx/LTSH tables not included) + $head[17] = chr((int) ($head[17] & ~(1 << 4))); // Unset Bit 4 (as hdmx/LTSH tables not included) } $this->add('head', $head); @@ -3950,7 +3963,7 @@ } else { $originalGlyphIdx = 0; } if (!isset($glyphSet[$originalGlyphIdx])) { - $glyphSet[$originalGlyphIdx] = count($glyphMap); + $glyphSet[$originalGlyphIdx] = count(($glyphMap ?? [])); $glyphMap[] = $originalGlyphIdx; } $codeToGlyph[$code] = $glyphSet[$originalGlyphIdx]; @@ -3959,7 +3972,7 @@ list($start,$dummy) = $this->get_table_pos('glyf'); $n = 0; - while ($n < count($glyphMap)) { + while ($n < count(($glyphMap ?? []))) { $originalGlyphIdx = $glyphMap[$n]; $glyphPos = $this->glyphPos[$originalGlyphIdx]; $glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; @@ -3974,7 +3987,7 @@ $flags = $this->read_ushort(); $glyphIdx = $this->read_ushort(); if (!isset($glyphSet[$glyphIdx])) { - $glyphSet[$glyphIdx] = count($glyphMap); + $glyphSet[$glyphIdx] = count(($glyphMap ?? [])); $glyphMap[] = $glyphIdx; } if ($flags & GF_WORDS) @@ -3991,7 +4004,7 @@ } } - $numGlyphs = $n = count($glyphMap); + $numGlyphs = $n = count(($glyphMap ?? [])); $numberOfHMetrics = $n; /////////////////////////////////// @@ -4039,7 +4052,7 @@ $os2 = $this->_set_ushort($os2, 84, 0x0000); // ulCodePageRange = Bit #32- Symbol **** 84 = Bits 32-47 $os2 = $this->_set_ushort($os2, 64, 0x01); // FirstCharIndex - $os2 = $this->_set_ushort($os2, 66, count($subset)); // LastCharIndex + $os2 = $this->_set_ushort($os2, 66, count(($subset ?? []))); // LastCharIndex // Set PANOSE first bit to 5 for Symbol $os2 = $this->splice($os2, 32, chr(5).chr(0).chr(1).chr(0).chr(1).chr(0).chr(0).chr(0).chr(0).chr(0)); $this->add('OS/2', $os2 ); @@ -4059,7 +4072,7 @@ /////////////////////////////////// if (isset($this->tables['post'])) { $opost = $this->get_table('post'); - $post = "\x00\x03\x00\x00" . substr($opost,4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + $post = "\x00\x03\x00\x00" . substr(($opost ?? ''),4,12) . "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; } $this->add('post', $post); @@ -4103,7 +4116,7 @@ $prevglidx = $glidx; } // cmap - Character to glyph mapping - $segCount = count($range) + 1; // + 1 Last segment has missing character 0xFFFF + $segCount = count(($range ?? [])) + 1; // + 1 Last segment has missing character 0xFFFF $searchRange = 1; $entrySelector = 0; while ($searchRange * 2 <= $segCount ) { @@ -4122,7 +4135,7 @@ // endCode(s) foreach($range AS $start=>$subrange) { - $endCode = $start + (count($subrange)-1); + $endCode = $start + (count(($subrange ?? []))-1); $cmap[] = $endCode; // endCode(s) } $cmap[] = 0xFFFF; // endCode of last Segment @@ -4136,7 +4149,7 @@ // idDelta(s) foreach($range AS $start=>$subrange) { $idDelta = -($start-$subrange[0]); - $n += count($subrange); + $n += count(($subrange ?? [])); $cmap[] = $idDelta; // idDelta(s) } $cmap[] = 1; // idDelta of last Segment @@ -4158,7 +4171,7 @@ /////////////////////////////////// // cmap - Character to glyph mapping /////////////////////////////////// - $entryCount = count($subset); + $entryCount = count(($subset ?? [])); $length = 10 + $entryCount * 2; $off = 20 + $length; @@ -4208,20 +4221,20 @@ $glyphPos = $this->glyphPos[$originalGlyphIdx]; $glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos; if ($glyfLength < $this->maxStrLenRead) { - $data = substr($glyphData,$glyphPos,$glyphLen); + $data = substr(($glyphData ?? ''),$glyphPos,$glyphLen); } else { if ($glyphLen > 0) $data = $this->get_chunk($glyfOffset+$glyphPos,$glyphLen); else $data = ''; } - if ($glyphLen > 0) $up = unpack("n", substr($data,0,2)); + if ($glyphLen > 0) $up = unpack("n", substr(($data ?? ''),0,2)); if ($glyphLen > 2 && ($up[1] & (1 << 15)) ) { $pos_in_glyph = 10; $flags = GF_MORE; while ($flags & GF_MORE) { - $up = unpack("n", substr($data,$pos_in_glyph,2)); + $up = unpack("n", substr(($data ?? ''),$pos_in_glyph,2)); $flags = $up[1]; - $up = unpack("n", substr($data,$pos_in_glyph+2,2)); + $up = unpack("n", substr(($data ?? ''),$pos_in_glyph+2,2)); $glyphIdx = $up[1]; $data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]); $pos_in_glyph += 4; @@ -4278,7 +4291,7 @@ function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) { $depth++; $maxdepth = max($maxdepth, $depth); - if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) { + if (count(($this->glyphdata[$originalGlyphIdx]['compGlyphs'] ?? []))) { foreach($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) { $this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours); } @@ -4308,7 +4321,7 @@ $flags = $this->read_ushort(); $glyphIdx = $this->read_ushort(); if (!isset($glyphSet[$glyphIdx])) { - $glyphSet[$glyphIdx] = count($subsetglyphs); // old glyphID to new glyphID + $glyphSet[$glyphIdx] = count(($subsetglyphs ?? [])); // old glyphID to new glyphID $subsetglyphs[$glyphIdx] = true; } $savepos = ftell($this->fh); @@ -4362,8 +4375,8 @@ $w = intval(round($scale*$aw)); if ($w == 0) { $w = 65535; } if ($char < 196608) { - $this->charWidths[$char*2] = chr($w >> 8); - $this->charWidths[$char*2 + 1] = chr($w & 0xFF); + $this->charWidths[$char*2] = chr((int) ($w >> 8)); + $this->charWidths[$char*2 + 1] = chr((int) ($w & 0xFF)); $nCharWidths++; } @@ -4383,8 +4396,8 @@ foreach($glyphToChar[$glyph] AS $char) { if ($char != 0 && $char != 65535) { if ($char < 196608) { - $this->charWidths[$char*2] = chr($w >> 8); - $this->charWidths[$char*2 + 1] = chr($w & 0xFF); + $this->charWidths[$char*2] = chr((int) ($w >> 8)); + $this->charWidths[$char*2 + 1] = chr((int) ($w & 0xFF)); $nCharWidths++; } } @@ -4393,8 +4406,8 @@ } // NB 65535 is a set width of 0 // First bytes define number of chars in font - $this->charWidths[0] = chr($nCharWidths >> 8); - $this->charWidths[1] = chr($nCharWidths & 0xFF); + $this->charWidths[0] = chr((int) ($nCharWidths >> 8)); + $this->charWidths[1] = chr((int) ($nCharWidths & 0xFF)); } @@ -4487,7 +4500,7 @@ // Put the TTF file together function endTTFile(&$stm) { $stm = ''; - $numTables = count($this->otables); + $numTables = count(($this->otables ?? [])); $searchRange = 1; $entrySelector = 0; while ($searchRange * 2 <= $numTables) { @@ -4514,15 +4527,15 @@ $stm .= $tag; $checksum = $this->calcChecksum($data); $stm .= pack("nn", $checksum[0],$checksum[1]); - $stm .= pack("NN", $offset, strlen($data)); - $paddedLength = (strlen($data)+3)&~3; + $stm .= pack("NN", $offset, strlen(($data ?? ''))); + $paddedLength = (strlen(($data ?? ''))+3)&~3; $offset = $offset + $paddedLength; } // Table data foreach ($tables AS $tag=>$data) { $data .= "\0\0\0"; - $stm .= substr($data,0,(strlen($data)&~3)); + $stm .= substr(($data ?? ''),0,(strlen(($data ?? ''))&~3)); } $checksum = $this->calcChecksum($stm); @@ -4656,7 +4669,7 @@ // CMap table /////////////////////////////////// // cmap - Character to glyph mapping - $segCount = count($range) + 1; // + 1 Last segment has missing character 0xFFFF + $segCount = count(($range ?? [])) + 1; // + 1 Last segment has missing character 0xFFFF $searchRange = 1; $entrySelector = 0; while ($searchRange * 2 <= $segCount ) { @@ -4681,7 +4694,7 @@ // endCode(s) foreach($range AS $start=>$subrange) { - $endCode = $start + (count($subrange)-1); + $endCode = $start + (count(($subrange ?? []))-1); $cmap[] = $endCode; // endCode(s) } $cmap[] = 0xFFFF; // endCode of last Segment --- a/intranet/mpdf60/classes/gif.php +++ b/intranet/mpdf60/classes/gif.php @@ -26,7 +26,7 @@ /////////////////////////////////////////////////////////////////////////// // CONSTRUCTOR - function CGIFLZW() + function __construct() { $this->MAX_LZW_BITS = 12; unSet($this->Next); @@ -44,7 +44,7 @@ function deCompress($data, &$datLen) { - $stLen = strlen($data); + $stLen = strlen(($data ?? '')); $datLen = 0; $ret = ""; $dp = 0; // data pointer @@ -53,7 +53,7 @@ $this->LZWCommandInit($data, $dp); while(($iIndex = $this->LZWCommand($data, $dp)) >= 0) { - $ret .= chr($iIndex); + $ret .= chr((int) ($iIndex)); } $datLen = $dp; @@ -68,7 +68,7 @@ /////////////////////////////////////////////////////////////////////////// function LZWCommandInit(&$data, &$dp) { - $this->SetCodeSize = ord($data[0]); + $this->SetCodeSize = ord(($data[0] ?? '')); $dp += 1; $this->CodeSize = $this->SetCodeSize + 1; @@ -202,12 +202,12 @@ $this->Buf[0] = $this->Buf[$this->LastByte - 2]; $this->Buf[1] = $this->Buf[$this->LastByte - 1]; - $Count = ord($data[$dp]); + $Count = ord(($data[$dp] ?? '')); $dp += 1; if($Count) { for($i = 0; $i < $Count; $i++) { - $this->Buf[2 + $i] = ord($data[$dp+$i]); + $this->Buf[2 + $i] = ord(($data[$dp+$i] ?? '')); } $dp += $Count; } @@ -240,7 +240,7 @@ /////////////////////////////////////////////////////////////////////////// // CONSTRUCTOR - function CGIFCOLORTABLE() + function __construct() { unSet($this->m_nColors); unSet($this->m_arColors); @@ -254,12 +254,12 @@ $this->m_arColors = array(); for($i = 0; $i < $num; $i++) { - $rgb = substr($lpData, $i * 3, 3); - if(strlen($rgb) < 3) { + $rgb = substr(($lpData ?? ''), $i * 3, 3); + if(strlen(($rgb ?? '')) < 3) { return false; } - $this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]); + $this->m_arColors[] = (ord(($rgb[2] ?? '')) << 16) + (ord(($rgb[1] ?? '')) << 8) + ord(($rgb[0] ?? '')); $this->m_nColors++; } @@ -274,9 +274,9 @@ for($i = 0; $i < $this->m_nColors; $i++) { $ret .= - chr(($this->m_arColors[$i] & 0x000000FF)) . // R - chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G - chr(($this->m_arColors[$i] & 0x00FF0000) >> 16); // B + chr(((int) ($this->m_arColors[$i] & 0x000000FF))) . // R + chr((int) (($this->m_arColors[$i] & 0x0000FF00) >> 8)) . // G + chr((int) (($this->m_arColors[$i] & 0x00FF0000) >> 16)); // B } return $ret; @@ -327,7 +327,7 @@ /////////////////////////////////////////////////////////////////////////// // CONSTRUCTOR - function CGIFFILEHEADER() + function __construct() { unSet($this->m_lpVer); unSet($this->m_nWidth); @@ -347,29 +347,29 @@ { $hdrLen = 0; - $this->m_lpVer = substr($lpData, 0, 6); + $this->m_lpVer = substr(($lpData ?? ''), 0, 6); if(($this->m_lpVer <> "GIF87a") && ($this->m_lpVer <> "GIF89a")) { return false; } - $this->m_nWidth = $this->w2i(substr($lpData, 6, 2)); - $this->m_nHeight = $this->w2i(substr($lpData, 8, 2)); + $this->m_nWidth = $this->w2i(substr(($lpData ?? ''), 6, 2)); + $this->m_nHeight = $this->w2i(substr(($lpData ?? ''), 8, 2)); if(!$this->m_nWidth || !$this->m_nHeight) { return false; } - $b = ord(substr($lpData, 10, 1)); + $b = ord((substr(($lpData ?? ''), 10, 1) ?? '')); $this->m_bGlobalClr = ($b & 0x80) ? true : false; $this->m_nColorRes = ($b & 0x70) >> 4; $this->m_bSorted = ($b & 0x08) ? true : false; $this->m_nTableSize = 2 << ($b & 0x07); - $this->m_nBgColor = ord(substr($lpData, 11, 1)); - $this->m_nPixelRatio = ord(substr($lpData, 12, 1)); + $this->m_nBgColor = ord((substr(($lpData ?? ''), 11, 1) ?? '')); + $this->m_nPixelRatio = ord((substr(($lpData ?? ''), 12, 1) ?? '')); $hdrLen = 13; if($this->m_bGlobalClr) { $this->m_colorTable = new CGIFCOLORTABLE(); - if(!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) { + if(!$this->m_colorTable->load(substr(($lpData ?? ''), $hdrLen), $this->m_nTableSize)) { return false; } $hdrLen += 3 * $this->m_nTableSize; @@ -382,7 +382,7 @@ function w2i($str) { - return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8); + return ord((substr(($str ?? ''), 0, 1) ?? '')) + (ord((substr(($str ?? ''), 1, 1) ?? '')) << 8); } } @@ -403,7 +403,7 @@ /////////////////////////////////////////////////////////////////////////// // CONSTRUCTOR - function CGIFIMAGEHEADER() + function __construct() { unSet($this->m_nLeft); unSet($this->m_nTop); @@ -422,16 +422,16 @@ { $hdrLen = 0; - $this->m_nLeft = $this->w2i(substr($lpData, 0, 2)); - $this->m_nTop = $this->w2i(substr($lpData, 2, 2)); - $this->m_nWidth = $this->w2i(substr($lpData, 4, 2)); - $this->m_nHeight = $this->w2i(substr($lpData, 6, 2)); + $this->m_nLeft = $this->w2i(substr(($lpData ?? ''), 0, 2)); + $this->m_nTop = $this->w2i(substr(($lpData ?? ''), 2, 2)); + $this->m_nWidth = $this->w2i(substr(($lpData ?? ''), 4, 2)); + $this->m_nHeight = $this->w2i(substr(($lpData ?? ''), 6, 2)); if(!$this->m_nWidth || !$this->m_nHeight) { return false; } - $b = ord($lpData{8}); + $b = ord(($lpData[8] ?? '')); $this->m_bLocalClr = ($b & 0x80) ? true : false; $this->m_bInterlace = ($b & 0x40) ? true : false; $this->m_bSorted = ($b & 0x20) ? true : false; @@ -440,7 +440,7 @@ if($this->m_bLocalClr) { $this->m_colorTable = new CGIFCOLORTABLE(); - if(!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) { + if(!$this->m_colorTable->load(substr(($lpData ?? ''), $hdrLen), $this->m_nTableSize)) { return false; } $hdrLen += 3 * $this->m_nTableSize; @@ -453,7 +453,7 @@ function w2i($str) { - return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8); + return ord((substr(($str ?? ''), 0, 1) ?? '')) + (ord((substr(($str ?? ''), 1, 1) ?? '')) << 8); } } @@ -473,7 +473,7 @@ /////////////////////////////////////////////////////////////////////////// - function CGIFIMAGE() + function __construct() { unSet($this->m_disp); unSet($this->m_bUser); @@ -493,8 +493,8 @@ $datLen = 0; while(true) { - $b = ord($data[0]); - $data = substr($data, 1); + $b = ord(($data[0] ?? '')); + $data = substr(($data ?? ''), 1); $datLen++; switch($b) { @@ -512,7 +512,7 @@ if(!$this->m_gih->load($data, $len)) { return false; } - $data = substr($data, $len); + $data = substr(($data ?? ''), $len); $datLen += $len; // ALLOC BUFFER @@ -522,7 +522,7 @@ return false; } - $data = substr($data, $len); + $data = substr(($data ?? ''), $len); $datLen += $len; if($this->m_gih->m_bInterlace) { @@ -545,22 +545,22 @@ { $extLen = 0; - $b = ord($data[0]); - $data = substr($data, 1); + $b = ord(($data[0] ?? '')); + $data = substr(($data ?? ''), 1); $extLen++; switch($b) { case 0xF9: // Graphic Control - $b = ord($data[1]); + $b = ord(($data[1] ?? '')); $this->m_disp = ($b & 0x1C) >> 2; $this->m_bUser = ($b & 0x02) ? true : false; $this->m_bTrans = ($b & 0x01) ? true : false; - $this->m_nDelay = $this->w2i(substr($data, 2, 2)); - $this->m_nTrans = ord($data[4]); + $this->m_nDelay = $this->w2i(substr(($data ?? ''), 2, 2)); + $this->m_nTrans = ord(($data[4] ?? '')); break; case 0xFE: // Comment - $this->m_lpComm = substr($data, 1, ord($data[0])); + $this->m_lpComm = substr(($data ?? ''), 1, ord(($data[0] ?? ''))); break; case 0x01: // Plain text @@ -571,14 +571,14 @@ } // SKIP DEFAULT AS DEFS MAY CHANGE - $b = ord($data[0]); - $data = substr($data, 1); + $b = ord(($data[0] ?? '')); + $data = substr(($data ?? ''), 1); $extLen++; while($b > 0) { - $data = substr($data, $b); + $data = substr(($data ?? ''), $b); $extLen += $b; - $b = ord($data[0]); - $data = substr($data, 1); + $b = ord(($data[0] ?? '')); + $data = substr(($data ?? ''), 1); $extLen++; } return true; @@ -588,7 +588,7 @@ function w2i($str) { - return ord(substr($str, 0, 1)) + (ord(substr($str, 1, 1)) << 8); + return ord((substr(($str ?? ''), 0, 1) ?? '')) + (ord((substr(($str ?? ''), 1, 1) ?? '')) << 8); } /////////////////////////////////////////////////////////////////////////// @@ -621,13 +621,13 @@ } for(; $y < $this->m_gih->m_nHeight; $y += $s) { - $lne = substr($this->m_data, 0, $this->m_gih->m_nWidth); - $this->m_data = substr($this->m_data, $this->m_gih->m_nWidth); + $lne = substr(($this->m_data ?? ''), 0, $this->m_gih->m_nWidth); + $this->m_data = substr(($this->m_data ?? ''), $this->m_gih->m_nWidth); $data = - substr($data, 0, $y * $this->m_gih->m_nWidth) . + substr(($data ?? ''), 0, $y * $this->m_gih->m_nWidth) . $lne . - substr($data, ($y + 1) * $this->m_gih->m_nWidth); + substr(($data ?? ''), ($y + 1) * $this->m_gih->m_nWidth); } } @@ -647,7 +647,7 @@ /////////////////////////////////////////////////////////////////////////// // CONSTRUCTOR - function CGIF() + function __construct() { $this->m_gfh = new CGIFFILEHEADER(); $this->m_img = new CGIFIMAGE(); @@ -678,14 +678,14 @@ return false; } - $this->m_lpData = substr($this->m_lpData, $len); + $this->m_lpData = substr(($this->m_lpData ?? ''), $len); do { $imgLen = 0; if(!$this->m_img->load($this->m_lpData, $imgLen)) { return false; } - $this->m_lpData = substr($this->m_lpData, $imgLen); + $this->m_lpData = substr(($this->m_lpData ?? ''), $imgLen); } while($iIndex-- > 0); --- a/intranet/mpdf60/classes/myanmar.php +++ b/intranet/mpdf60/classes/myanmar.php @@ -214,21 +214,21 @@ $syllable_serial = 1; $broken_syllables = false; - while($ptr < strlen($s)) { + while($ptr < strlen(($s ?? ''))) { $match = ''; $syllable_length = 1; $syllable_type = self::NON_MYANMAR_CLUSTER ; // CONSONANT_SYLLABLE Consonant syllable // From OT spec: - if (preg_match('/^(RaH)?([C|R]|V|d|D)[s]?(H([C|R|V])[s]?)*(H|[a]*[n]?[l]?((m[k]?|k)[a]?)?[e]*[v]*[b]*[A]*(N[a]?)?(t[k]?[a]*[v]*[A]*(N[a]?)?)*(p[A]*(N[a]?)?)*S*[J|Z]?)/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + if (preg_match('/^(RaH)?([C|R]|V|d|D)[s]?(H([C|R|V])[s]?)*(H|[a]*[n]?[l]?((m[k]?|k)[a]?)?[e]*[v]*[b]*[A]*(N[a]?)?(t[k]?[a]*[v]*[A]*(N[a]?)?)*(p[A]*(N[a]?)?)*S*[J|Z]?)/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::CONSONANT_SYLLABLE ; } // BROKEN_CLUSTER syllable - else if (preg_match('/^(RaH)?s?(H|[a]*[n]?[l]?((m[k]?|k)[a]?)?[e]*[v]*[b]*[A]*(N[a]?)?(t[k]?[a]*[v]*[A]*(N[a]?)?)*(p[A]*(N[a]?)?)*S*[J|Z]?)/', substr($s,$ptr), $ma)) { - if (strlen($ma[0])) { // May match blank - $syllable_length = strlen($ma[0]); + else if (preg_match('/^(RaH)?s?(H|[a]*[n]?[l]?((m[k]?|k)[a]?)?[e]*[v]*[b]*[A]*(N[a]?)?(t[k]?[a]*[v]*[A]*(N[a]?)?)*(p[A]*(N[a]?)?)*S*[J|Z]?)/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + if (strlen(($ma[0] ?? ''))) { // May match blank + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::BROKEN_CLUSTER ; $broken_syllables = true; } @@ -244,7 +244,7 @@ public static function reordering(&$info, $GSUBdata, $broken_syllables, $dottedcircle) { if ($broken_syllables && $dottedcircle) { self::insert_dotted_circles ($info, $dottedcircle); } - $count = count($info); + $count = count(($info ?? [])); if (!$count) return; $last = 0; $last_syllable = $info[0]['syllable']; @@ -261,7 +261,7 @@ public static function insert_dotted_circles(&$info, $dottedcircle) { $idx = 0; $last_syllable = 0; - while ($idx < count($info)) { + while ($idx < count(($info ?? []))) { $syllable = $info[$idx]['syllable']; $syllable_type = ($syllable & 0x0F); if ($last_syllable != $syllable && $syllable_type == self::BROKEN_CLUSTER) { --- a/intranet/mpdf60/classes/otl_dump.php +++ b/intranet/mpdf60/classes/otl_dump.php @@ -25,10 +25,22 @@ // mPDF 5.7.1 if(!function_exists('unicode_hex')){ function unicode_hex($unicode_dec) { - return (sprintf("%05s", strtoupper(dechex($unicode_dec)))); + return (sprintf("%05s", strtoupper((dechex($unicode_dec) ?? '')))); } } class OTLdump { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $mpdf; + public $mode; + public $version; + public $fontRevision; + public $restrictedUse; + public $GSUBFeatures; + public $GSUBLookups; + public $glyphIDtoUni; + public $glyphToChar; + public $GSLuCoverage; + var $GPOSFeatures; // mPDF 5.7.1 var $GPOSLookups; // mPDF 5.7.1 @@ -85,13 +97,13 @@ var $maxUniChar; var $kerninfo; - function OTLdump(&$mpdf) { + function __construct(&$mpdf) { $this->mpdf = $mpdf; $this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file) } - function getMetrics($file, $fontkey, $TTCfontID=0, $debug=false, $BMPonly=false, $kerninfo=false, $useOTL=0, $mode) { // mPDF 5.7.1 + function getMetrics($file, $fontkey, $TTCfontID, $debug, $BMPonly, $kerninfo, $useOTL, $mode) { // mPDF 5.7.1 $this->mode = $mode; $this->useOTL = $useOTL; // mPDF 5.7.1 $this->fontkey = $fontkey; // mPDF 5.7.1 @@ -157,7 +169,7 @@ $table = $this->get_chunk($t['offset'], $t['length']); $checksum = $this->calcChecksum($table); if ($t['tag'] == 'head') { - $up = unpack('n*', substr($table,8,4)); + $up = unpack('n*', substr(($table ?? ''),8,4)); $adjustment[0] = $up[1]; $adjustment[1] = $up[2]; $checksum = $this->sub32($checksum, $adjustment); @@ -183,13 +195,13 @@ } function calcChecksum($data) { - if (strlen($data) % 4) { $data .= str_repeat("\0",(4-(strlen($data) % 4))); } - $len = strlen($data); + if (strlen(($data ?? '')) % 4) { $data .= str_repeat("\0",(4-(strlen(($data ?? '')) % 4))); } + $len = strlen(($data ?? '')); $hi=0x0000; $lo=0x0000; for($i=0;$i<$len;$i+=4) { - $hi += (ord($data[$i])<<8) + ord($data[$i+1]); - $lo += (ord($data[$i+2])<<8) + ord($data[$i+3]); + $hi += (ord(($data[$i] ?? ''))<<8) + ord(($data[$i+1] ?? '')); + $lo += (ord(($data[$i+2] ?? ''))<<8) + ord(($data[$i+3] ?? '')); $hi += ($lo >> 16) & 0xFFFF; $lo = $lo & 0xFFFF; } @@ -227,7 +239,7 @@ function read_short() { $this->_pos += 2; $s = fread($this->fh,2); - $a = (ord($s[0])<<8) + ord($s[1]); + $a = (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -235,7 +247,7 @@ } function unpack_short($s) { - $a = (ord($s[0])<<8) + ord($s[1]); + $a = (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -245,27 +257,27 @@ function read_ushort() { $this->_pos += 2; $s = fread($this->fh,2); - return (ord($s[0])<<8) + ord($s[1]); + return (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); } function read_ulong() { $this->_pos += 4; $s = fread($this->fh,4); // if large uInt32 as an integer, PHP converts it to -ve - return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 16777216 = 1<<24 + return (ord(($s[0] ?? ''))*16777216) + (ord(($s[1] ?? ''))<<16) + (ord(($s[2] ?? ''))<<8) + ord(($s[3] ?? '')); // 16777216 = 1<<24 } function get_ushort($pos) { fseek($this->fh,$pos); $s = fread($this->fh,2); - return (ord($s[0])<<8) + ord($s[1]); + return (ord(($s[0] ?? ''))<<8) + ord(($s[1] ?? '')); } function get_ulong($pos) { fseek($this->fh,$pos); $s = fread($this->fh,4); // iF large uInt32 as an integer, PHP converts it to -ve - return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 16777216 = 1<<24 + return (ord(($s[0] ?? ''))*16777216) + (ord(($s[1] ?? ''))<<16) + (ord(($s[2] ?? ''))<<8) + ord(($s[3] ?? '')); // 16777216 = 1<<24 } function pack_short($val) { @@ -278,7 +290,7 @@ } function splice($stream, $offset, $value) { - return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value)); + return substr(($stream ?? ''),0,$offset) . $value . substr(($stream ?? ''),$offset+strlen(($value ?? ''))); } function _set_ushort($stream, $offset, $value) { @@ -338,7 +350,7 @@ $string_data_offset = $name_offset + $this->read_ushort(); $names = array(1=>'',2=>'',3=>'',4=>'',6=>''); $K = array_keys($names); - $nameCount = count($names); + $nameCount = count(($names ?? [])); for ($i=0;$i<$numRecords; $i++) { $platformId = $this->read_ushort(); $encodingId = $this->read_ushort(); @@ -357,7 +369,7 @@ $N = ''; while ($length > 0) { $char = $this->read_ushort(); - $N .= (chr($char)); + $N .= (chr((int) ($char))); $length -= 1; } $this->_pos = $opos; @@ -378,19 +390,19 @@ if ($names[6]) $psName = $names[6]; else if ($names[4]) - $psName = preg_replace('/ /','-',$names[4]); + $psName = preg_replace('/ /','-',($names[4] ?? '')); else if ($names[1]) - $psName = preg_replace('/ /','-',$names[1]); + $psName = preg_replace('/ /','-',($names[1] ?? '')); else $psName = ''; if (!$psName) die("Could not find PostScript font name: ".$this->filename); if ($debug) { - for ($i=0;$i<count($psName);$i++) { + for ($i=0;$i<count(($psName ?? []));$i++) { $c = $psName[$i]; - $oc = ord($c); - if ($oc>126 || strpos(' [](){}<>/%',$c)!==false) - die("psName=".$psName." contains invalid character ".$c." ie U+".ord(c)); + $oc = ord(($c ?? '')); + if ($oc>126 || strpos(' [](){}<>/%',($c ?? ''))!==false) + die("psName=".$psName." contains invalid character ".$c." ie U+".ord((c ?? ''))); } } $this->name = $psName; @@ -470,7 +482,7 @@ $this->_pos += 10; //PANOSE = 10 byte length $panose = fread($this->fh,10); $this->panose = array(); - for ($p=0;$p<strlen($panose);$p++) { $this->panose[] = ord($panose[$p]); } + for ($p=0;$p<strlen(($panose ?? ''));$p++) { $this->panose[] = ord(($panose[$p] ?? '')); } $this->skip(26); $sTypoAscender = $this->read_short(); $sTypoDescender = $this->read_short(); @@ -687,9 +699,9 @@ if (isset($glyphToChar[$gid][0])) { $char = $glyphToChar[$gid][0]; if ($char != 0 && $char != 65535) { - $this->glyphIDtoUni[$gid*3] = chr($char >> 16); - $this->glyphIDtoUni[$gid*3 + 1] = chr(($char >> 8) & 0xFF); - $this->glyphIDtoUni[$gid*3 + 2] = chr($char & 0xFF); + $this->glyphIDtoUni[$gid*3] = chr((int) ($char >> 16)); + $this->glyphIDtoUni[$gid*3 + 1] = chr((int) (($char >> 8) & 0xFF)); + $this->glyphIDtoUni[$gid*3 + 2] = chr((int) ($char & 0xFF)); } } } @@ -722,7 +734,7 @@ $left = $this->read_ushort(); $right = $this->read_ushort(); $val = $this->read_short(); - if (count($glyphToChar[$left])==1 && count($glyphToChar[$right])==1) { + if (count(($glyphToChar[$left] ?? []))==1 && count(($glyphToChar[$right] ?? []))==1) { if ($left != 32 && $right != 32) { $this->kerninfo[$glyphToChar[$left][0]][$glyphToChar[$right][0]] = intval($val*$scale); } @@ -768,7 +780,7 @@ $this->mpdf->WriteHTML('<h2>Glyph classes</h2>'); } - if (isset($GlyphByClass[1]) && count($GlyphByClass[1])>0) { + if (isset($GlyphByClass[1]) && count(($GlyphByClass[1] ?? []))>0) { $this->GlyphClassBases = $this->formatClassArr($GlyphByClass[1]); if ($this->mode == 'summary') { $this->mpdf->WriteHTML('<h3>Glyph class 1</h3>'); @@ -783,7 +795,7 @@ } } else { $this->GlyphClassBases = ''; } - if (isset($GlyphByClass[2]) && count($GlyphByClass[2])>0) { + if (isset($GlyphByClass[2]) && count(($GlyphByClass[2] ?? []))>0) { $this->GlyphClassLigatures = $this->formatClassArr($GlyphByClass[2]); if ($this->mode == 'summary') { $this->mpdf->WriteHTML('<h3>Glyph class 2</h3>'); @@ -798,7 +810,7 @@ } } else { $this->GlyphClassLigatures = ''; } - if (isset($GlyphByClass[3]) && count($GlyphByClass[3])>0) { + if (isset($GlyphByClass[3]) && count(($GlyphByClass[3] ?? []))>0) { $this->GlyphClassMarks = $this->formatClassArr($GlyphByClass[3]); if ($this->mode == 'summary') { $this->mpdf->WriteHTML('<h3>Glyph class 3</h3>'); @@ -813,7 +825,7 @@ } } else { $this->GlyphClassMarks = ''; } - if (isset($GlyphByClass[4]) && count($GlyphByClass[4])>0) { + if (isset($GlyphByClass[4]) && count(($GlyphByClass[4] ?? []))>0) { $this->GlyphClassComponents = $this->formatClassArr($GlyphByClass[4]); if ($this->mode == 'summary') { $this->mpdf->WriteHTML('<h3>Glyph class 4</h3>'); @@ -871,7 +883,7 @@ $MarkAttachmentTypes = $this->_getClassDefinitionTable(); foreach($MarkAttachmentTypes AS $class=>$glyphs) { - if (is_array($Marks) && count($Marks)) { + if (is_array($Marks) && count(($Marks ?? []))) { $mat = array_diff($Marks, $MarkAttachmentTypes[$class]); sort($mat, SORT_STRING); } @@ -1076,7 +1088,7 @@ $this->mpdf->WriteHTML('<h3>GSUB Scripts & Languages</h3>'); $this->mpdf->WriteHTML('<div class="glyphs">'); $html = ''; - if (count($gsub)) { + if (count(($gsub ?? []))) { foreach ($gsub AS $st=>$g) { $html .= '<h5>'.$st.'</h5>'; foreach ($g AS $l=>$t) { @@ -1448,7 +1460,7 @@ if ($Lookup[$i]['Type'] == 1) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(false); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = unicode_hex($this->glyphToChar[$glyphs[$g]][0]); @@ -1468,13 +1480,13 @@ else if ($Lookup[$i]['Type'] == 2) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = $glyphs[$g]; // Flag = Ignore if ($this->_checkGSUBignore($Lookup[$i]['Flag'], $replace[0], $Lookup[$i]['MarkFilteringSet'])) { continue; } -if (!isset($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID']) || count($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'])==0) { continue; } // Illegal for GlyphCount to be 0; either error in font, or something has gone wrong - lets carry on for now! +if (!isset($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID']) || count(($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'] ?? []))==0) { continue; } // Illegal for GlyphCount to be 0; either error in font, or something has gone wrong - lets carry on for now! foreach($Lookup[$i]['Subtable'][$c]['Sequences'][$g]['SubstituteGlyphID'] AS $sub) { $substitute[] = unicode_hex($this->glyphToChar[$sub][0]); } @@ -1485,7 +1497,7 @@ else if ($Lookup[$i]['Type'] == 3) { $this->seek($Lookup[$i]['Subtable'][$c]['CoverageTableOffset']); $glyphs = $this->_getCoverage(); - for ($g=0;$g<count($glyphs);$g++) { + for ($g=0;$g<count(($glyphs ?? []));$g++) { $replace = array(); $substitute = array(); $replace[] = $glyphs[$g]; @@ -1798,10 +1810,10 @@ // LookupType 1: Single Substitution Subtable if ($Lookup[$i]['Type'] == 1) { $html .= '<div class="lookuptype">LookupType 1: Single Substitution Subtable</div>'; - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; - if ($level==2 && strpos($coverage, $inputGlyphs[0])===false) { continue; } + if ($level==2 && strpos(($coverage ?? ''), ($inputGlyphs[0] ?? ''))===false) { continue; } $html .= '<div class="substitution">'; $html .= '<span class="unicode">'.$this->formatUni($inputGlyphs[0]).' </span> '; if ($level==2 && $exB) { $html .= $exB; } @@ -1818,10 +1830,10 @@ // LookupType 2: Multiple Substitution Subtable else if ($Lookup[$i]['Type'] == 2) { $html .= '<div class="lookuptype">LookupType 2: Multiple Substitution Subtable</div>'; - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute']; - if ($level==2 && strpos($coverage, $inputGlyphs[0])===false) { continue; } + if ($level==2 && strpos(($coverage ?? ''), ($inputGlyphs[0] ?? ''))===false) { continue; } $html .= '<div class="substitution">'; $html .= '<span class="unicode">'.$this->formatUni($inputGlyphs[0]).' </span> '; if ($level==2 && $exB) { $html .= $exB; } @@ -1838,10 +1850,10 @@ // LookupType 3: Alternate Forms else if ($Lookup[$i]['Type'] == 3) { $html .= '<div class="lookuptype">LookupType 3: Alternate Forms</div>'; - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; - if ($level==2 && strpos($coverage, $inputGlyphs[0])===false) { continue; } + if ($level==2 && strpos(($coverage ?? ''), ($inputGlyphs[0] ?? ''))===false) { continue; } $html .= '<div class="substitution">'; $html .= '<span class="unicode">'.$this->formatUni($inputGlyphs[0]).' </span> '; if ($level==2 && $exB) { $html .= $exB; } @@ -1852,8 +1864,8 @@ $html .= '<span class="changed"> '.$this->formatEntity($substitute).'</span>'; if ($level==2 && $exL) { $html .= $exL; } $html .= '  <span class="unicode">'.$this->formatUni($substitute).'</span> '; - if (count($Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'])>1) { - for ($alt=1;$alt<count($Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute']);$alt++) { + if (count(($Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'] ?? []))>1) { + for ($alt=1;$alt<count(($Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'] ?? []));$alt++) { $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][$alt]; $html .= '  |   ALT #'.$alt.'   '; $html .= '<span class="changed"> '.$this->formatEntity($substitute).'</span>'; @@ -1866,10 +1878,10 @@ // LookupType 4: Ligature Substitution Subtable else if ($Lookup[$i]['Type'] == 4) { $html .= '<div class="lookuptype">LookupType 4: Ligature Substitution Subtable</div>'; - for ($s=0;$s<count($Lookup[$i]['Subtable'][$c]['subs']);$s++) { + for ($s=0;$s<count(($Lookup[$i]['Subtable'][$c]['subs'] ?? []));$s++) { $inputGlyphs = $Lookup[$i]['Subtable'][$c]['subs'][$s]['Replace']; $substitute = $Lookup[$i]['Subtable'][$c]['subs'][$s]['substitute'][0]; - if ($level==2 && strpos($coverage, $inputGlyphs[0])===false) { continue; } + if ($level==2 && strpos(($coverage ?? ''), ($inputGlyphs[0] ?? ''))===false) { continue; } $html .= '<div class="substitution">'; $html .= '<span class="unicode">'.$this->formatUniArr($inputGlyphs).' </span> '; if ($level==2 && $exB) { $html .= $exB; } @@ -1903,12 +1915,12 @@ } $inputGlyphs[0] = $Lookup[$i]['Subtable'][$c]['SubRuleSet'][$s]['FirstGlyph']; ksort($inputGlyphs); - $nInput = count($inputGlyphs); + $nInput = count(($inputGlyphs ?? [])); $exampleI = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> '.$this->formatEntityStr($inputGlyphs[$ff]).' </span></div>'; $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } @@ -1929,9 +1941,9 @@ } $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { $exL .= $this->formatEntity($inputGlyphs[$ip]).'‍'; } $exL .= '</span>'; @@ -1948,7 +1960,7 @@ } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } @@ -1979,7 +1991,7 @@ $exampleI = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { if (!$inputGlyphs[$ff]) { @@ -2015,9 +2027,9 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { if (!$inputGlyphs[$ip]) { $exL .= '[*]'; } @@ -2038,7 +2050,7 @@ // to level 2 and only apply if first Replace glyph is in this list $html .= $this->_getGSUBarray($Lookup, $lul2, $scripttag, 2, $inputGlyphs[$seqIndex], $exB, $exL); } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } } @@ -2056,7 +2068,7 @@ $exampleI = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> '.$this->formatEntityStr($inputGlyphs[$ff]).' </span></div>'; $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } @@ -2077,9 +2089,9 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { $exL .= $exampleI[$ip].'‍'; } $exL .= '</span>'; @@ -2095,7 +2107,7 @@ // to level 2 and only apply if first Replace glyph is in this list $html .= $this->_getGSUBarray($Lookup, $lul2, $scripttag, 2, $inputGlyphs[$seqIndex], $exB, $exL); } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; } //print_r($Lookup[$i]); @@ -2121,7 +2133,7 @@ } $inputGlyphs[0] = $firstInputGlyph; ksort($inputGlyphs); - $nInput = count($inputGlyphs); + $nInput = count(($inputGlyphs ?? [])); if ($rule['BacktrackGlyphCount']) { $backtrackGlyphs = $rule['BacktrackGlyphs']; } else { $backtrackGlyphs = array(); } @@ -2134,15 +2146,15 @@ $exampleI = array(); $exampleL = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=count($backtrackGlyphs)-1;$ff>=0;$ff--) { + for ($ff=count(($backtrackGlyphs ?? []))-1;$ff>=0;$ff--) { $html .= '<div>Backtrack #'.$ff.': <span class="unicode">'.$this->formatUniStr($backtrackGlyphs[$ff]).'</span></div>'; $exampleB[] = $this->formatEntityFirst($backtrackGlyphs[$ff]); } - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> '.$this->formatEntityStr($inputGlyphs[$ff]).' </span></div>'; $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } - for ($ff=0;$ff<count($lookaheadGlyphs);$ff++) { + for ($ff=0;$ff<count(($lookaheadGlyphs ?? []));$ff++) { $html .= '<div>Lookahead #'.$ff.': <span class="unicode">'.$this->formatUniStr($lookaheadGlyphs[$ff]).'</span></div>'; $exampleL[] = $this->formatEntityFirst($lookaheadGlyphs[$ff]); } @@ -2156,7 +2168,7 @@ // GENERATE exampleB[n] exampleI[<seqIndex] .... exampleI[>seqIndex] exampleL[n] $exB = ''; $exL = ''; - if (count($exampleB)) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } + if (count(($exampleB ?? []))) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } if ($seqIndex>0) { $exB .= '<span class="inputother">'; @@ -2166,15 +2178,15 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { $exL .= $this->formatEntity($inputGlyphs[$ip]).'‍'; } $exL .= '</span>'; } - if (count($exampleL)) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } + if (count(($exampleL ?? []))) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } $html .= '<div class="sequenceIndex">Substitution Position: '.$seqIndex.'</div>'; @@ -2188,7 +2200,7 @@ } - if (count($subRule['rules'])) $volt[] = $subRule; + if (count(($subRule['rules'] ?? []))) $volt[] = $subRule; @@ -2249,7 +2261,7 @@ $exampleI = array(); $exampleL = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=count($backtrackGlyphs)-1;$ff>=0;$ff--) { + for ($ff=count(($backtrackGlyphs ?? []))-1;$ff>=0;$ff--) { if (!$backtrackGlyphs[$ff]) { $html .= '<div>Backtrack #'.$ff.': <span class="unchanged"> [NOT '.$this->formatEntityStr($class0excl).'] </span></div>'; $exampleB[] = '[NOT '.$this->formatEntityFirst($class0excl).']'; @@ -2260,7 +2272,7 @@ $exampleB[] = $this->formatEntityFirst($backtrackGlyphs[$ff]); } } - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { if (!$inputGlyphs[$ff]) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> [NOT '.$this->formatEntityStr($class0excl).'] </span></div>'; $exampleI[] = '[NOT '.$this->formatEntityFirst($class0excl).']'; @@ -2270,7 +2282,7 @@ $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } } - for ($ff=0;$ff<count($lookaheadGlyphs);$ff++) { + for ($ff=0;$ff<count(($lookaheadGlyphs ?? []));$ff++) { if (!$lookaheadGlyphs[$ff]) { $html .= '<div>Lookahead #'.$ff.': <span class="unchanged"> [NOT '.$this->formatEntityStr($class0excl).'] </span></div>'; $exampleL[] = '[NOT '.$this->formatEntityFirst($class0excl).']'; @@ -2291,7 +2303,7 @@ // GENERATE exampleB[n] exampleI[<seqIndex] .... exampleI[>seqIndex] exampleL[n] $exB = ''; $exL = ''; - if (count($exampleB)) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } + if (count(($exampleB ?? []))) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } if ($seqIndex>0) { $exB .= '<span class="inputother">'; @@ -2306,9 +2318,9 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { if (!$inputGlyphs[$ip]) { $exL .= '[*]'; } @@ -2319,7 +2331,7 @@ $exL .= '</span>'; } - if (count($exampleL)) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } + if (count(($exampleL ?? []))) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } $html .= '<div class="sequenceIndex">Substitution Position: '.$seqIndex.'</div>'; @@ -2363,15 +2375,15 @@ $exampleI = array(); $exampleL = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=count($backtrackGlyphs)-1;$ff>=0;$ff--) { + for ($ff=count(($backtrackGlyphs ?? []))-1;$ff>=0;$ff--) { $html .= '<div>Backtrack #'.$ff.': <span class="unicode">'.$this->formatUniStr($backtrackGlyphs[$ff]).'</span></div>'; $exampleB[] = $this->formatEntityFirst($backtrackGlyphs[$ff]); } - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> '.$this->formatEntityStr($inputGlyphs[$ff]).' </span></div>'; $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } - for ($ff=0;$ff<count($lookaheadGlyphs);$ff++) { + for ($ff=0;$ff<count(($lookaheadGlyphs ?? []));$ff++) { $html .= '<div>Lookahead #'.$ff.': <span class="unicode">'.$this->formatUniStr($lookaheadGlyphs[$ff]).'</span></div>'; $exampleL[] = $this->formatEntityFirst($lookaheadGlyphs[$ff]); } @@ -2386,7 +2398,7 @@ // GENERATE exampleB[n] exampleI[<seqIndex] .... exampleI[>seqIndex] exampleL[n] $exB = ''; $exL = ''; - if (count($exampleB)) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } + if (count(($exampleB ?? []))) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } if ($seqIndex>0) { $exB .= '<span class="inputother">'; @@ -2396,15 +2408,15 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { $exL .= $exampleI[$ip].'‍'; } $exL .= '</span>'; } - if (count($exampleL)) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } + if (count(($exampleL ?? []))) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } $html .= '<div class="sequenceIndex">Substitution Position: '.$seqIndex.'</div>'; @@ -2432,13 +2444,13 @@ function _checkGSUBignore($flag, $glyph, $MarkFilteringSet) { $ignore = false; // Flag & 0x0008 = Ignore Marks - if ((($flag & 0x0008) == 0x0008) && strpos($this->GlyphClassMarks,$glyph)) { $ignore = true; } - if ((($flag & 0x0004) == 0x0004) && strpos($this->GlyphClassLigatures,$glyph)) { $ignore = true; } - if ((($flag & 0x0002) == 0x0002) && strpos($this->GlyphClassBases,$glyph)) { $ignore = true; } + if ((($flag & 0x0008) == 0x0008) && strpos(($this->GlyphClassMarks ?? ''),($glyph ?? ''))) { $ignore = true; } + if ((($flag & 0x0004) == 0x0004) && strpos(($this->GlyphClassLigatures ?? ''),($glyph ?? ''))) { $ignore = true; } + if ((($flag & 0x0002) == 0x0002) && strpos(($this->GlyphClassBases ?? ''),($glyph ?? ''))) { $ignore = true; } // Flag & 0xFF?? = MarkAttachmentType - if (($flag & 0xFF00) && strpos($this->MarkAttachmentType[($flag >> 8)],$glyph)) { $ignore = true; } + if (($flag & 0xFF00) && strpos(($this->MarkAttachmentType[($flag >> 8)] ?? ''),($glyph ?? ''))) { $ignore = true; } // Flag & 0x0010 = UseMarkFilteringSet - if (($flag & 0x0010) && strpos($this->MarkGlyphSets[$MarkFilteringSet],$glyph)) { $ignore = true; } + if (($flag & 0x0010) && strpos(($this->MarkGlyphSets[$MarkFilteringSet] ?? ''),($glyph ?? ''))) { $ignore = true; } return $ignore; } @@ -2540,8 +2552,8 @@ // Returns e.g. (0612)(ignore) (0613)(ignore) (0614) // $inputGlyphs = array of glyphs(glyphstrings) making up Input sequence in Context // $lookupGlyphs = array of glyphs (single Glyphs) making up Lookup Input sequence - $mLen = count($lookupGlyphs); // nGlyphs in the secondary Lookup match - $nInput = count($inputGlyphs); // nGlyphs in the Primary Input sequence + $mLen = count(($lookupGlyphs ?? [])); // nGlyphs in the secondary Lookup match + $nInput = count(($inputGlyphs ?? [])); // nGlyphs in the Primary Input sequence $str = ""; for($i=0;$i<$nInput;$i++) { if ($i>0) { $str .= $ignore." "; } @@ -2557,7 +2569,7 @@ // $inputGlyphs = array of glyphs(glyphstrings) making up Input sequence in Context // $lookupGlyphs = array of glyphs making up Lookup Input sequence - if applicable $str = ""; - for($i=1;$i<=count($inputGlyphs);$i++) { + for($i=1;$i<=count(($inputGlyphs ?? []));$i++) { if ($i>1) { $str .= $ignore." "; } $str .= "".$inputGlyphs[($i-1)].""; } @@ -2571,7 +2583,7 @@ // 3 2 1 0 // each item being e.g. E0AD|E0AF|F1FD $str = ""; - for($i=(count($backtrackGlyphs)-1);$i>=0;$i--) { + for($i=(count(($backtrackGlyphs ?? []))-1);$i>=0;$i--) { $str .= "".$backtrackGlyphs[$i]." ".$ignore." "; } return $str; @@ -2584,7 +2596,7 @@ // 0 1 2 3 // each item being e.g. E0AD|E0AF|F1FD $str = ""; - for($i=0;$i<count($lookaheadGlyphs);$i++) { + for($i=0;$i<count(($lookaheadGlyphs ?? []));$i++) { $str .= $ignore." ".$lookaheadGlyphs[$i].""; } return $str; @@ -2818,7 +2830,7 @@ if ($this->mode == 'summary') { $this->mpdf->WriteHTML('<h3>GPOS Scripts & Languages</h3>'); $html = ''; - if (count($gpos)) { + if (count(($gpos ?? []))) { foreach ($gpos AS $st=>$g) { $html .= '<h5>'.$st.'</h5>'; foreach ($g AS $l=>$t) { @@ -2889,7 +2901,7 @@ $lul = array(); // array of LookupListIndexes $tags = array(); // corresponding array of feature tags e.g. 'ccmp' - if (count($langsys)) { + if (count(($langsys ?? []))) { foreach($langsys AS $tag=>$ft) { foreach($ft AS $ll) { $lul[$ll] = $tag; @@ -2955,8 +2967,8 @@ $this->seek($Coverage); $glyphs = $this->_getCoverage(); // Array of Hex Glyphs - for($g=0;$g<count($glyphs);$g++) { - if ($level==2 && strpos($lcoverage, $glyphs[$g])===false) { continue; } + for($g=0;$g<count(($glyphs ?? []));$g++) { + if ($level==2 && strpos(($lcoverage ?? ''), ($glyphs[$g] ?? ''))===false) { continue; } $html .= '<div class="substitution">'; $html .= '<span class="unicode">'.$this->formatUni($glyphs[$g]).' </span> '; @@ -2991,8 +3003,8 @@ $this->seek($Coverage); $glyphs = $this->_getCoverage(); // Array of Hex Glyphs - for($g=0;$g<count($glyphs);$g++) { - if ($level==2 && strpos($lcoverage, $glyphs[$g])===false) { continue; } + for($g=0;$g<count(($glyphs ?? []));$g++) { + if ($level==2 && strpos(($lcoverage ?? ''), ($glyphs[$g] ?? ''))===false) { continue; } $Value = $Values[$g]; $html .= '<div class="substitution">'; @@ -3036,7 +3048,7 @@ $this->seek($Coverage); $glyphs = $this->_getCoverage(); // Array of Hex Glyphs for($p=0;$p<$PairSetCount;$p++) { - if ($level==2 && strpos($lcoverage, $glyphs[$p])===false) { continue; } + if ($level==2 && strpos(($lcoverage ?? ''), ($glyphs[$p] ?? ''))===false) { continue; } $this->seek($PairSetOffset[$p]); // First Glyph = $glyphs[$p] @@ -3131,15 +3143,15 @@ } - for($c1=0;$c1<count($Class1[$i]);$c1++) { + for($c1=0;$c1<count(($Class1[$i] ?? []));$c1++) { $FirstGlyph = $Class1[$i][$c1]; - if ($level==2 && strpos($lcoverage, $FirstGlyph)===false) { + if ($level==2 && strpos(($lcoverage ?? ''), ($FirstGlyph ?? ''))===false) { continue; } - for($c2=0;$c2<count($Class2[$j]);$c2++) { + for($c2=0;$c2<count(($Class2[$j] ?? []));$c2++) { $SecondGlyph = $Class2[$j][$c2]; @@ -3241,8 +3253,8 @@ $firstMark = ''; $html .= '<div class="glyphs">Marks: '; - for($i=0;$i<count($MarkGlyphs);$i++) { - if ($level==2 && strpos($lcoverage, $MarkGlyphs[$i])===false) { continue; } + for($i=0;$i<count(($MarkGlyphs ?? []));$i++) { + if ($level==2 && strpos(($lcoverage ?? ''), ($MarkGlyphs[$i] ?? ''))===false) { continue; } else { if (!$firstMark) { $firstMark = $MarkGlyphs[$i]; } } @@ -3252,14 +3264,14 @@ if (!$firstMark) { return; } $html .= '<div class="glyphs">Bases: '; - for($j=0;$j<count($BaseGlyphs);$j++) { + for($j=0;$j<count(($BaseGlyphs ?? []));$j++) { $html .= ' '.$this->formatEntity($BaseGlyphs[$j]).' '; } $html .= '</div>'; // Example $html .= '<div class="glyphs" style="font-feature-settings:\''.$tag.'\' 1;">Example(s): '; - for ($j=0;$j<min(count($BaseGlyphs),20);$j++) { + for ($j=0;$j<min(count(($BaseGlyphs ?? [])),20);$j++) { $html .= ' '.$this->formatEntity($BaseGlyphs[$j]).$this->formatEntity($firstMark,true).'   '; } $html .= '</div>'; @@ -3286,8 +3298,8 @@ $firstMark = ''; $html .= '<div class="glyphs">Marks: <span class="unchanged">'; $MarkRecord = array(); - for ($i=0;$i<count($MarkGlyphs);$i++) { - if ($level==2 && strpos($lcoverage, $MarkGlyphs[$i])===false) { continue; } + for ($i=0;$i<count(($MarkGlyphs ?? []));$i++) { + if ($level==2 && strpos(($lcoverage ?? ''), ($MarkGlyphs[$i] ?? ''))===false) { continue; } else { if (!$firstMark) { $firstMark = $MarkGlyphs[$i]; } } @@ -3303,7 +3315,7 @@ $LigatureCount = $this->read_ushort(); $LigatureAttach = array(); $html .= '<div class="glyphs">Ligatures: <span class="unchanged">'; - for ($j=0;$j<count($LigatureGlyphs);$j++) { + for ($j=0;$j<count(($LigatureGlyphs ?? []));$j++) { // Get the relevant LigatureRecord $LigatureAttach[$j] = $LigatureArray + $this->read_ushort(); $html .= ' '.$this->formatEntity($LigatureGlyphs[$j]).' '; @@ -3355,8 +3367,8 @@ $firstMark = ''; $html .= '<div class="glyphs">Marks: <span class="unchanged">'; - for($i=0;$i<count($Mark1Glyphs);$i++) { - if ($level==2 && strpos($lcoverage, $Mark1Glyphs[$i])===false) { continue; } + for($i=0;$i<count(($Mark1Glyphs ?? []));$i++) { + if ($level==2 && strpos(($lcoverage ?? ''), ($Mark1Glyphs[$i] ?? ''))===false) { continue; } else { if (!$firstMark) { $firstMark = $Mark1Glyphs[$i]; } } @@ -3367,14 +3379,14 @@ if ($firstMark) { $html .= '<div class="glyphs">Bases: <span class="unchanged">'; - for($j=0;$j<count($Mark2Glyphs);$j++) { + for($j=0;$j<count(($Mark2Glyphs ?? []));$j++) { $html .= ' '.$this->formatEntity($Mark2Glyphs[$j]).' '; } $html .= '</span></div>'; // Example $html .= '<div class="glyphs" style="font-feature-settings:\''.$tag.'\' 1;">Example(s): <span class="changed">'; - for ($j=0;$j<min(count($Mark2Glyphs),20);$j++) { + for ($j=0;$j<min(count(($Mark2Glyphs ?? [])),20);$j++) { $html .= ' '.$this->formatEntity($Mark2Glyphs[$j]).$this->formatEntity($firstMark,true).'   '; } $html .= '</span></div>'; @@ -3476,15 +3488,15 @@ $exampleI = array(); $exampleL = array(); $html .= '<div class="context">CONTEXT: '; - for ($ff=count($backtrackGlyphs)-1;$ff>=0;$ff--) { + for ($ff=count(($backtrackGlyphs ?? []))-1;$ff>=0;$ff--) { $html .= '<div>Backtrack #'.$ff.': <span class="unicode">'.$this->formatUniStr($backtrackGlyphs[$ff]).'</span></div>'; $exampleB[] = $this->formatEntityFirst($backtrackGlyphs[$ff]); } - for ($ff=0;$ff<count($inputGlyphs);$ff++) { + for ($ff=0;$ff<count(($inputGlyphs ?? []));$ff++) { $html .= '<div>Input #'.$ff.': <span class="unchanged"> '.$this->formatEntityStr($inputGlyphs[$ff]).' </span></div>'; $exampleI[] = $this->formatEntityFirst($inputGlyphs[$ff]); } - for ($ff=0;$ff<count($lookaheadGlyphs);$ff++) { + for ($ff=0;$ff<count(($lookaheadGlyphs ?? []));$ff++) { $html .= '<div>Lookahead #'.$ff.': <span class="unicode">'.$this->formatUniStr($lookaheadGlyphs[$ff]).'</span></div>'; $exampleL[] = $this->formatEntityFirst($lookaheadGlyphs[$ff]); } @@ -3498,7 +3510,7 @@ // GENERATE exampleB[n] exampleI[<seqIndex] .... exampleI[>seqIndex] exampleL[n] $exB = ''; $exL = ''; - if (count($exampleB)) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } + if (count(($exampleB ?? []))) { $exB .= '<span class="backtrack">'.implode('‍',$exampleB).'</span>'; } if ($seqIndex>0) { $exB .= '<span class="inputother">'; @@ -3508,15 +3520,15 @@ $exB .= '</span>'; } - if (count($inputGlyphs)>($seqIndex+1)) { + if (count(($inputGlyphs ?? []))>($seqIndex+1)) { $exL .= '<span class="inputother">'; - for($ip=$seqIndex+1;$ip<count($inputGlyphs);$ip++) { + for($ip=$seqIndex+1;$ip<count(($inputGlyphs ?? []));$ip++) { $exL .= '‍'.$exampleI[$ip]; } $exL .= '</span>'; } - if (count($exampleL)) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } + if (count(($exampleL ?? []))) { $exL .= '<span class="lookahead">'.implode('‍',$exampleL).'</span>'; } $html .= '<div class="sequenceIndex">Substitution Position: '.$seqIndex.'</div>'; @@ -3599,7 +3611,7 @@ function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) { $depth++; $maxdepth = max($maxdepth, $depth); - if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) { + if (count(($this->glyphdata[$originalGlyphIdx]['compGlyphs'] ?? []))) { foreach($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) { $this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours); } @@ -3629,7 +3641,7 @@ $flags = $this->read_ushort(); $glyphIdx = $this->read_ushort(); if (!isset($glyphSet[$glyphIdx])) { - $glyphSet[$glyphIdx] = count($subsetglyphs); // old glyphID to new glyphID + $glyphSet[$glyphIdx] = count(($subsetglyphs ?? [])); // old glyphID to new glyphID $subsetglyphs[$glyphIdx] = true; } $savepos = ftell($this->fh); @@ -3685,8 +3697,8 @@ $w = intval(round($scale*$aw)); if ($w == 0) { $w = 65535; } if ($char < 196608) { - $this->charWidths[$char*2] = chr($w >> 8); - $this->charWidths[$char*2 + 1] = chr($w & 0xFF); + $this->charWidths[$char*2] = chr((int) ($w >> 8)); + $this->charWidths[$char*2 + 1] = chr((int) ($w & 0xFF)); $nCharWidths++; } } @@ -3704,8 +3716,8 @@ foreach($glyphToChar[$glyph] AS $char) { if ($char != 0 && $char != 65535) { if ($char < 196608) { - $this->charWidths[$char*2] = chr($w >> 8); - $this->charWidths[$char*2 + 1] = chr($w & 0xFF); + $this->charWidths[$char*2] = chr((int) ($w >> 8)); + $this->charWidths[$char*2 + 1] = chr((int) ($w & 0xFF)); $nCharWidths++; } } @@ -3714,8 +3726,8 @@ } // NB 65535 is a set width of 0 // First bytes define number of chars in font - $this->charWidths[0] = chr($nCharWidths >> 8); - $this->charWidths[1] = chr($nCharWidths & 0xFF); + $this->charWidths[0] = chr((int) ($nCharWidths >> 8)); + $this->charWidths[1] = chr((int) ($nCharWidths & 0xFF)); } @@ -3805,17 +3817,17 @@ } function formatUni($char) { - $x = preg_replace('/^[0]*/','',$char); - $x = str_pad($x, 4, '0', STR_PAD_LEFT); + $x = preg_replace('/^[0]*/','',($char ?? '')); + $x = str_pad(($x ?? ''), 4, '0', STR_PAD_LEFT); $d = hexdec($x); if (($d>57343 && $d<63744) || ($d>122879 && $d<126977)) { $id = 'M'; } // E000 - F8FF, 1E000-1F000 else { $id = 'U'; } return $id .'+'.$x; } function formatEntity($char, $allowjoining=false) { - $char = preg_replace('/^[0]/','',$char); + $char = preg_replace('/^[0]/','',($char ?? '')); $x = '&#x'.$char.';'; - if (strpos($this->GlyphClassMarks, $char)!==false) { + if (strpos(($this->GlyphClassMarks ?? ''), ($char ?? ''))!==false) { if (!$allowjoining) { $x = '◌'.$x; } @@ -3825,20 +3837,20 @@ function formatUniArr($arr) { $s = array(); foreach($arr AS $c) { - $x = preg_replace('/^[0]*/','',$c); + $x = preg_replace('/^[0]*/','',($c ?? '')); $d = hexdec($x); if (($d>57343 && $d<63744) || ($d>122879 && $d<126977)) { $id = 'M'; } // E000 - F8FF, 1E000-1F000 else { $id = 'U'; } - $s[] = $id .'+'.str_pad($x, 4, '0', STR_PAD_LEFT); + $s[] = $id .'+'.str_pad(($x ?? ''), 4, '0', STR_PAD_LEFT); } return implode(', ',$s); } function formatEntityArr($arr) { $s = array(); foreach($arr AS $c) { - $c = preg_replace('/^[0]/','',$c); + $c = preg_replace('/^[0]/','',($c ?? '')); $x = '&#x'.$c.';'; - if (strpos($this->GlyphClassMarks, $c)!==false) { + if (strpos(($this->GlyphClassMarks ?? ''), ($c ?? ''))!==false) { $x = '◌'.$x; } $s[] = $x; @@ -3848,33 +3860,33 @@ function formatClassArr($arr) { $s = array(); foreach($arr AS $c) { - $x = preg_replace('/^[0]*/','',$c); + $x = preg_replace('/^[0]*/','',($c ?? '')); $d = hexdec($x); if (($d>57343 && $d<63744) || ($d>122879 && $d<126977)) { $id = 'M'; } // E000 - F8FF, 1E000-1F000 else { $id = 'U'; } - $s[] = $id .'+'.str_pad($x, 4, '0', STR_PAD_LEFT); + $s[] = $id .'+'.str_pad(($x ?? ''), 4, '0', STR_PAD_LEFT); } return implode(', ',$s); } function formatUniStr($str) { $s = array(); - $arr = explode('|',$str); + $arr = explode('|',($str ?? '')); foreach($arr AS $c) { - $x = preg_replace('/^[0]*/','',$c); + $x = preg_replace('/^[0]*/','',($c ?? '')); $d = hexdec($x); if (($d>57343 && $d<63744) || ($d>122879 && $d<126977)) { $id = 'M'; } // E000 - F8FF, 1E000-1F000 else { $id = 'U'; } - $s[] = $id .'+'.str_pad($x, 4, '0', STR_PAD_LEFT); + $s[] = $id .'+'.str_pad(($x ?? ''), 4, '0', STR_PAD_LEFT); } return implode(', ',$s); } function formatEntityStr($str) { $s = array(); - $arr = explode('|',$str); + $arr = explode('|',($str ?? '')); foreach($arr AS $c) { - $c = preg_replace('/^[0]/','',$c); + $c = preg_replace('/^[0]/','',($c ?? '')); $x = '&#x'.$c.';'; - if (strpos($this->GlyphClassMarks, $c)!==false) { + if (strpos(($this->GlyphClassMarks ?? ''), ($c ?? ''))!==false) { $x = '◌'.$x; } $s[] = $x; @@ -3882,10 +3894,10 @@ return implode(' ',$s); // ZWNJ? ‍ } function formatEntityFirst($str) { - $arr = explode('|',$str); - $char = preg_replace('/^[0]/','',$arr[0]); + $arr = explode('|',($str ?? '')); + $char = preg_replace('/^[0]/','',($arr[0] ?? '')); $x = '&#x'.$char.';'; - if (strpos($this->GlyphClassMarks, $char)!==false) { + if (strpos(($this->GlyphClassMarks ?? ''), ($char ?? ''))!==false) { $x = '◌'.$x; } return $x; --- a/intranet/mpdf60/classes/mpdfform.php +++ b/intranet/mpdf60/classes/mpdfform.php @@ -49,7 +49,7 @@ // FORMS var $textarea_lineheight; -function mpdfform(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; // ACTIVE FORMS @@ -148,11 +148,11 @@ $this->mpdf->y += $this->form_element_spacing['input']['outer']['v'] /$k; // Chop texto to max length $w-inner-padding while ($this->mpdf->GetStringWidth($texto) > $w-($this->form_element_spacing['input']['inner']['h']*2)) { - $texto = mb_substr($texto,0,mb_strlen($texto,$this->mpdf->mb_enc)-1,$this->mpdf->mb_enc); + $texto = mb_substr(($texto ?? ''),0,mb_strlen(($texto ?? ''),$this->mpdf->mb_enc)-1,$this->mpdf->mb_enc); } // DIRECTIONALITY - if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", $texto)) { $this->mpdf->biDirectional = true; } // *RTL* + if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", ($texto ?? ''))) { $this->mpdf->biDirectional = true; } // *RTL* // Use OTL OpenType Table Layout - GSUB & GPOS if (isset($this->mpdf->CurrentFont['useOTL']) && $this->mpdf->CurrentFont['useOTL']) { @@ -269,14 +269,14 @@ else { $js = ''; } // mPDF 5.3.37 $data = array('VAL' => array(), 'OPT' => array(), 'SEL' => array(), ); if (isset($objattr['items'])) { - for($i=0; $i<count($objattr['items']); $i++) { + for($i=0; $i<count(($objattr['items'] ?? [])); $i++) { $item = $objattr['items'][$i]; $data['VAL'][] = (isset($item['exportValue']) ? $item['exportValue'] : ''); $data['OPT'][] = (isset($item['content']) ? $item['content'] : ''); if (isset($item['selected']) && $item['selected']) { $data['SEL'][] = $i; } } } - if (count($data['SEL'])==0 && $this->formSelectDefaultOption) {$data['SEL'][] = 0; } + if (count(($data['SEL'] ?? []))==0 && $this->formSelectDefaultOption) {$data['SEL'][] = 0; } if (isset($objattr['color'])) { $this->mpdf->SetTColor($objattr['color']); } @@ -302,7 +302,7 @@ $this->mpdf->y += $this->form_element_spacing['select']['outer']['v'] /$k ; // DIRECTIONALITY - if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", $texto)) { $this->mpdf->biDirectional = true; } // *RTL* + if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", ($texto ?? ''))) { $this->mpdf->biDirectional = true; } // *RTL* $this->mpdf->magic_reverse_dir($texto, $this->mpdf->directionality, $objattr['OTLdata']); @@ -397,7 +397,7 @@ $this->mpdf->y += $this->form_element_spacing['button']['inner']['v'] /$k ; // DIRECTIONALITY - if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", $texto)) { $this->mpdf->biDirectional = true; } // *RTL* + if (preg_match("/([".$this->mpdf->pregRTLchars."])/u", ($texto ?? ''))) { $this->mpdf->biDirectional = true; } // *RTL* // Use OTL OpenType Table Layout - GSUB & GPOS if (isset($this->mpdf->CurrentFont['useOTL']) && $this->mpdf->CurrentFont['useOTL']) { @@ -644,7 +644,7 @@ function SetFormButtonJS( $name, $js ) { - $js = str_replace("\t",' ', trim($js) ); + $js = str_replace("\t",' ', (trim(($js ?? '')) ?? '') ); if ( isset($name) && isset($js) ) { $this->array_form_button_js[$this->mpdf->_escape($name)] = array( 'js' => $js @@ -653,7 +653,7 @@ } function SetFormChoiceJS( $name, $js ) { - $js = str_replace("\t",' ', trim($js) ); + $js = str_replace("\t",' ', (trim(($js ?? '')) ?? '') ); if ( isset($name) && isset($js) ) { $this->array_form_choice_js[$this->mpdf->_escape($name)] = array( 'js' => $js @@ -662,8 +662,8 @@ } function SetFormTextJS( $name, $js) { - for ($i=0; $i<count($js); $i++) { - $j = str_replace("\t",' ', trim($js[$i][1]) ); + for ($i=0; $i<count(($js ?? [])); $i++) { + $j = str_replace("\t",' ', (trim(($js[$i][1] ?? '')) ?? '') ); $format = $js[$i][0]; if ($name) { $this->array_form_text_js[$this->mpdf->_escape($name)][$format] = array('js' => $j); @@ -682,7 +682,7 @@ chr(0202) => chr(0221), chr(0232) => chr(0235), chr(0230) => chr(0037), chr(0231) => chr(0222), chr(0216) => chr(0231), chr(0240) => chr(0040) ); // mPDF 5.3.46 - return strtr($txt, $Win1252ToPDFDocEncoding ); + return strtr(($txt ?? ''), ($Win1252ToPDFDocEncoding ?? '') ); } @@ -693,7 +693,7 @@ else if( $align == 'R' ) { $align = '2'; } else { $align = '0'; } if ($maxlen < 1) { $maxlen = false; } - if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', $name)) { + if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', ($name ?? ''))) { $this->mpdf->Error("Field [".$name."] must have a name attribute, which can only contain letters, numbers, colon(:), undersore(_) or hyphen(-)"); } if ($this->mpdf->onlyCoreFonts) { @@ -740,7 +740,7 @@ 'fontcolor' => $this->mpdf->TextColor, ) ); - if (is_array($js) && count($js)>0) { $this->SetFormTextJS( $name, $js); } // mPDF 5.3.25 + if (is_array($js) && count(($js ?? []))>0) { $this->SetFormTextJS( $name, $js); } // mPDF 5.3.25 if ($this->mpdf->keep_block_together) { $this->mpdf->ktForms[]= $f; } else if ($this->mpdf->writingHTMLheader || $this->mpdf->writingHTMLfooter) { $this->mpdf->HTMLheaderPageForms[]= $f; } else { @@ -764,17 +764,17 @@ $this->formn++; if( $this->mpdf->blk[$this->mpdf->blklvl]['direction'] == 'rtl' ) { $align = '2'; } else { $align = '0'; } - if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', $name)) { + if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', ($name ?? ''))) { $this->mpdf->Error("Field [".$name."] must have a name attribute, which can only contain letters, numbers, colon(:), undersore(_) or hyphen(-)"); } if ($this->mpdf->onlyCoreFonts) { - for($i=0;$i<count($array['VAL']);$i++) { + for($i=0;$i<count(($array['VAL'] ?? []));$i++) { $array['VAL'][$i] = $this->Win1252ToPDFDocEncoding($array['VAL'][$i]); $array['OPT'][$i] = $this->Win1252ToPDFDocEncoding($array['OPT'][$i]); } } else { - for($i=0;$i<count($array['VAL']);$i++) { + for($i=0;$i<count(($array['VAL'] ?? []));$i++) { if (isset($this->mpdf->CurrentFont['subset'])) { $this->mpdf->UTF8StringToArray($array['VAL'][$i], true); // Add characters to font subset $this->mpdf->UTF8StringToArray($array['OPT'][$i], true); // Add characters to font subset @@ -858,7 +858,7 @@ } - function SetFormSubmit( $w, $h, $name, $value = 'Submit', $url, $title = '', $typ = 'html', $method = 'POST', $flags = array(), $background_col=false, $border_col=false, $noprint=false) { + function SetFormSubmit( $w, $h, $name, $value, $url, $title = '', $typ = 'html', $method = 'POST', $flags = array(), $background_col=false, $border_col=false, $noprint=false) { if (!$name) { $name = 'Submit'; } $this->SetFormButton( $w, $h, $name, $value, 'submit', $title, $flags, false, false, $background_col, $border_col, $noprint); $this->forms[$this->formn]['URL'] = $url; @@ -896,7 +896,7 @@ function SetFormButton( $bb, $hh, $name, $value, $type, $title = '', $flags = array(), $checked=false, $disabled=false, $background_col=false, $border_col=false, $noprint=false ) { $this->formn++; - if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', $name)) { + if (!preg_match('/^[a-zA-Z0-9_:\-]+$/', ($name ?? ''))) { $this->mpdf->Error("Field [".$name."] must have a name attribute, which can only contain letters, numbers, colon(:), undersore(_) or hyphen(-)"); } if (!$this->mpdf->onlyCoreFonts) { @@ -910,7 +910,7 @@ } else if ($type == 'radio') { $uvalue = $this->mpdf->UTF8ToUTF16BE($value, true); - $value = mb_convert_encoding($value, 'Windows-1252', 'UTF-8'); + $value = mb_convert_encoding(($value ?? ''), 'Windows-1252', 'UTF-8'); } else { $value = $this->mpdf->UTF8ToUTF16BE($value, true); @@ -920,11 +920,11 @@ else { $title = $this->Win1252ToPDFDocEncoding($title); $value = $this->Win1252ToPDFDocEncoding($value); //// ??? not needed - $uvalue = mb_convert_encoding($value, 'UTF-8', 'Windows-1252'); + $uvalue = mb_convert_encoding(($value ?? ''), 'UTF-8', 'Windows-1252'); $uvalue = $this->mpdf->UTF8ToUTF16BE($uvalue, true); } if ($type == 'radio' || $type == 'checkbox') { - if (!preg_match('/^[a-zA-Z0-9_:\-\.]+$/', $value)) { + if (!preg_match('/^[a-zA-Z0-9_:\-\.]+$/', ($value ?? ''))) { $this->mpdf->Error("Field '".$name."' must have a value, which can only contain letters, numbers, colon(:), undersore(_), hyphen(-) or period(.)"); } } @@ -1088,10 +1088,10 @@ $this->mpdf->_out('/Type /XObject'); $this->mpdf->_out('/Subtype /Image'); $this->mpdf->_out('/BBox [0 0 1 1]'); - $this->mpdf->_out('/Length '.strlen($info['data'])); + $this->mpdf->_out('/Length '.strlen(($info['data'] ?? ''))); $this->mpdf->_out('/BitsPerComponent '.$info['bpc']); if ($info['cs']=='Indexed') { - $this->mpdf->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal'])/3-1).' '.($this->mpdf->n+1).' 0 R]'); + $this->mpdf->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen(($info['pal'] ?? ''))/3-1).' '.($this->mpdf->n+1).' 0 R]'); } else { $this->mpdf->_out('/ColorSpace /'.$info['cs']); @@ -1113,7 +1113,7 @@ $filter=($this->mpdf->compress) ? '/Filter /FlateDecode ' : ''; $this->mpdf->_newobj(); $pal=($this->mpdf->compress) ? gzcompress($info['pal']) : $info['pal']; - $this->mpdf->_out('<<'.$filter.'/Length '.strlen($pal).'>>'); + $this->mpdf->_out('<<'.$filter.'/Length '.strlen(($pal ?? '')).'>>'); $this->mpdf->_putstream($pal); $this->mpdf->_out('endobj'); } @@ -1322,13 +1322,13 @@ $this->mpdf->_newobj(); $p=($this->mpdf->compress) ? gzcompress($r_on) : $r_on; - $this->mpdf->_out('<<'.$filter.'/Length '.strlen($p).' /Resources 2 0 R>>'); + $this->mpdf->_out('<<'.$filter.'/Length '.strlen(($p ?? '')).' /Resources 2 0 R>>'); $this->mpdf->_putstream($p); $this->mpdf->_out('endobj'); $this->mpdf->_newobj(); $p=($this->mpdf->compress) ? gzcompress($r_off) : $r_off; - $this->mpdf->_out('<<'.$filter.'/Length '.strlen($p).' /Resources 2 0 R>>'); + $this->mpdf->_out('<<'.$filter.'/Length '.strlen(($p ?? '')).' /Resources 2 0 R>>'); $this->mpdf->_putstream($p); $this->mpdf->_out('endobj'); } @@ -1351,7 +1351,7 @@ } $this->mpdf->_newobj(); $p=($this->mpdf->compress) ? gzcompress($cb_on) : $cb_on; - $this->mpdf->_out('<<'.$filter.'/Length '.strlen($p).' /Resources 2 0 R>>'); + $this->mpdf->_out('<<'.$filter.'/Length '.strlen(($p ?? '')).' /Resources 2 0 R>>'); $this->mpdf->_putstream($p); $this->mpdf->_out('endobj'); @@ -1359,7 +1359,7 @@ if (!$this->formUseZapD) { $this->mpdf->_newobj(); $p=($this->mpdf->compress) ? gzcompress($cb_off) : $cb_off; - $this->mpdf->_out('<<'.$filter.'/Length '.strlen($p).' /Resources 2 0 R>>'); + $this->mpdf->_out('<<'.$filter.'/Length '.strlen(($p ?? '')).' /Resources 2 0 R>>'); $this->mpdf->_putstream($p); $this->mpdf->_out('endobj'); } @@ -1400,7 +1400,7 @@ $this->mpdf->_out('/DA (/F'.$this->mpdf->fonts[$form['style']['font']]['i'].' '.$form['style']['fontsize'].' Tf '.$form['style']['fontcolor'].')'); $opt = ''; - for( $i = 0; $i < count($form['OPT']['VAL']) ; $i++ ) { + for( $i = 0; $i < count(($form['OPT']['VAL'] ?? [])) ; $i++ ) { $opt .= '[ '.$this->mpdf->_textstring($form['OPT']['VAL'][$i]).' '.$this->mpdf->_textstring($form['OPT']['OPT'][$i]).' ] '; } $this->mpdf->_out('/Opt [ '.$opt.']'); @@ -1414,7 +1414,7 @@ $selectIndex .= ' '.$selectVal.' '; } if ( $selectItem ) { - if (count($form['OPT']['SEL']) < 2) { + if (count(($form['OPT']['SEL'] ?? [])) < 2) { $this->mpdf->_out('/V '.$selectItem.' '); $this->mpdf->_out('/DV '.$selectItem.' '); } @@ -1425,7 +1425,7 @@ $this->mpdf->_out('/I ['.$selectIndex.'] '); } - if ( is_array($form['FF']) && count($form['FF'])>0 ) { + if ( is_array($form['FF']) && count(($form['FF'] ?? []))>0 ) { $this->mpdf->_out('/Ff '.$this->_setflag($form['FF']).' '); } // Javascript @@ -1465,7 +1465,7 @@ $this->mpdf->_out('/H /N '); $this->mpdf->_out('/R 0 '); - if ( is_array($form['FF']) && count($form['FF'])>0 ) { + if ( is_array($form['FF']) && count(($form['FF'] ?? []))>0 ) { $this->mpdf->_out('/Ff '.$this->_setflag($form['FF']).' '); } if ( isset($form['maxlen']) && $form['maxlen']>0 ) { --- a/intranet/mpdf60/classes/indic.php +++ b/intranet/mpdf60/classes/indic.php @@ -186,24 +186,24 @@ $syllable_serial = 1; $broken_syllables = false; - while($ptr < strlen($s)) { + while($ptr < strlen(($s ?? ''))) { $match = ''; $syllable_length = 1; $syllable_type = self::NON_INDIC_CLUSTER ; // CONSONANT_SYLLABLE Consonant syllable // From OT spec: - if (preg_match('/^([CR]m*[N]?(H[ZJ]?|[ZJ]H))*[CR]m*[N]?[A]?(H[ZJ]?|[M]*[N]?[H]?)?[S]?[v]{0,2}/', substr($s,$ptr), $ma)) { + if (preg_match('/^([CR]m*[N]?(H[ZJ]?|[ZJ]H))*[CR]m*[N]?[A]?(H[ZJ]?|[M]*[N]?[H]?)?[S]?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { // From HarfBuzz: //if (preg_match('/^r?([CR]J?(Z?[N]{0,2})?[ZJ]?H(J[N]?)?){0,4}[CR]J?(Z?[N]{0,2})?A?((([ZJ]?H(J[N]?)?)|HZ)|(HJ)?([ZJ]{0,3}M[N]?(H|JHJR)?){0,4})?(S[Z]?)?[v]{0,2}/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::CONSONANT_SYLLABLE ; } // VOWEL_SYLLABLE Vowel-based syllable // From OT spec: - else if (preg_match('/^(RH|r)?V[N]?([ZJ]?H[CR]m*|J[CR]m*)?([M]*[N]?[H]?)?[S]?[v]{0,2}/', substr($s,$ptr), $ma)) { + else if (preg_match('/^(RH|r)?V[N]?([ZJ]?H[CR]m*|J[CR]m*)?([M]*[N]?[H]?)?[S]?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { // From HarfBuzz: //else if (preg_match('/^(RH|r)?V(Z?[N]{0,2})?(J|([ZJ]?H(J[N]?)?[CR]J?(Z?[N]{0,2})?){0,4}((([ZJ]?H(J[N]?)?)|HZ)|(HJ)?([ZJ]{0,3}M[N]?(H|JHJR)?){0,4})?(S[Z]?)?[v]{0,2})/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::VOWEL_SYLLABLE ; } @@ -215,19 +215,19 @@ $o[$ptr - 1]['general_category'] > UCDN::UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK ) - && (preg_match('/^(RH|r)?[sD][N]?([ZJ]?H[CR]m*)?([M]*[N]?[H]?)?[S]?[v]{0,2}/', substr($s,$ptr), $ma))) { + && (preg_match('/^(RH|r)?[sD][N]?([ZJ]?H[CR]m*)?([M]*[N]?[H]?)?[S]?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma))) { // From HarfBuzz: // && (preg_match('/^(RH|r)?[sD](Z?[N]{0,2})?(([ZJ]?H(J[N]?)?)[CR]J?(Z?[N]{0,2})?){0,4}((([ZJ]?H(J[N]?)?)|HZ)|(HJ)?([ZJ]{0,3}M[N]?(H|JHJR)?){0,4})?(S[Z]?)?[v]{0,2}/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::STANDALONE_CLUSTER ; } // BROKEN_CLUSTER syllable - else if (preg_match('/^(RH|r)?[N]?([ZJ]?H[CR])?([M]*[N]?[H]?)?[S]?[v]{0,2}/', substr($s,$ptr), $ma)) { + else if (preg_match('/^(RH|r)?[N]?([ZJ]?H[CR])?([M]*[N]?[H]?)?[S]?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { // From HarfBuzz: //else if (preg_match('/^(RH|r)?(Z?[N]{0,2})?(([ZJ]?H(J[N]?)?)[CR]J?(Z?[N]{0,2})?){0,4}((([ZJ]?H(J[N]?)?)|HZ)|(HJ)?([ZJ]{0,3}M[N]?(H|JHJR)?){0,4})(S[Z]?)?[v]{0,2}/', substr($s,$ptr), $ma)) { - if (strlen($ma[0])) { // May match blank - $syllable_length = strlen($ma[0]); + if (strlen(($ma[0] ?? ''))) { // May match blank + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::BROKEN_CLUSTER ; $broken_syllables = true; } @@ -246,20 +246,20 @@ $syllable_serial = 1; $broken_syllables = false; - while($ptr < strlen($s)) { + while($ptr < strlen(($s ?? ''))) { $match = ''; $syllable_length = 1; $syllable_type = self::NON_INDIC_CLUSTER ; // CONSONANT_SYLLABLE Consonant syllable // From OT spec: - if (preg_match('/^([CR]HJ|[CR]JH){0,8}[CR][HM]{0,3}[S]{0,1}/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + if (preg_match('/^([CR]HJ|[CR]JH){0,8}[CR][HM]{0,3}[S]{0,1}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::CONSONANT_SYLLABLE ; } // VOWEL_SYLLABLE Vowel-based syllable // From OT spec: - else if (preg_match('/^V[S]{0,1}/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + else if (preg_match('/^V[S]{0,1}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::VOWEL_SYLLABLE ; } @@ -275,26 +275,26 @@ $syllable_serial = 1; $broken_syllables = false; - while($ptr < strlen($s)) { + while($ptr < strlen(($s ?? ''))) { $match = ''; $syllable_length = 1; $syllable_type = self::NON_INDIC_CLUSTER ; // CONSONANT_SYLLABLE Consonant syllable - if (preg_match('/^r?([CR]J?((Z?F)?[N]{0,2})?[ZJ]?G(JN?)?){0,4}[CR]J?((Z?F)?[N]{0,2})?A?((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})?(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2}/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + if (preg_match('/^r?([CR]J?((Z?F)?[N]{0,2})?[ZJ]?G(JN?)?){0,4}[CR]J?((Z?F)?[N]{0,2})?A?((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})?(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::CONSONANT_SYLLABLE ; } // VOWEL_SYLLABLE Vowel-based syllable - else if (preg_match('/^(RH|r)?V((Z?F)?[N]{0,2})?(J|([ZJ]?G(JN?)?[CR]J?((Z?F)?[N]{0,2})?){0,4}((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})?(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2})/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + else if (preg_match('/^(RH|r)?V((Z?F)?[N]{0,2})?(J|([ZJ]?G(JN?)?[CR]J?((Z?F)?[N]{0,2})?){0,4}((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})?(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2})/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::VOWEL_SYLLABLE ; } // BROKEN_CLUSTER syllable - else if (preg_match('/^(RH|r)?((Z?F)?[N]{0,2})?(([ZJ]?G(JN?)?)[CR]J?((Z?F)?[N]{0,2})?){0,4}((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2}/', substr($s,$ptr), $ma)) { - if (strlen($ma[0])) { // May match blank - $syllable_length = strlen($ma[0]); + else if (preg_match('/^(RH|r)?((Z?F)?[N]{0,2})?(([ZJ]?G(JN?)?)[CR]J?((Z?F)?[N]{0,2})?){0,4}((([ZJ]?G(JN?)?)|GZ)|(GJ)?([ZJ]{0,3}MN?(H|JHJR)?){0,4})(G([CR]J?((Z?F)?[N]{0,2})?|V))?(SZ?)?[v]{0,2}/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + if (strlen(($ma[0] ?? ''))) { // May match blank + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::BROKEN_CLUSTER ; $broken_syllables = true; } @@ -313,7 +313,7 @@ if ($broken_syllables && $dottedcircle) { self::insert_dotted_circles ($info, $dottedcircle); } - $count = count($info); + $count = count(($info ?? [])); if (!$count) return; $last = 0; $last_syllable = $info[0]['syllable']; @@ -328,7 +328,7 @@ } public static function update_consonant_positions(&$info, $GSUBdata) { - $count = count($info); + $count = count(($info ?? [])); for ($i = 0; $i < $count; $i++) { if ($info[$i]['indic_position'] == self::POS_BASE_C) { $c = $info[$i]['uni']; @@ -343,7 +343,7 @@ public static function insert_dotted_circles(&$info, $dottedcircle) { $idx = 0; $last_syllable = 0; - while ($idx < count($info)) { + while ($idx < count(($info ?? []))) { $syllable = $info[$idx]['syllable']; $syllable_type = ($syllable & 0x0F); if ($last_syllable != $syllable && $syllable_type == self::BROKEN_CLUSTER) { @@ -352,7 +352,7 @@ $dottedcircle[0]['syllable'] = $info[$idx]['syllable']; /* Insert dottedcircle after possible Repha. */ - while ($idx < count($info) && $last_syllable == $info[$idx]['syllable'] && $info[$idx]['indic_category'] == self::OT_Repha) + while ($idx < count(($info ?? [])) && $last_syllable == $info[$idx]['syllable'] && $info[$idx]['indic_category'] == self::OT_Repha) $idx++; array_splice($info, $idx, 0, $dottedcircle); } @@ -415,7 +415,7 @@ /* -> If the syllable starts with Ra + Halant (in a script that has Reph) * and has more than one consonant, Ra is excluded from candidates for * base consonants. */ - if (count($GSUBdata['rphf']) /* ?? $indic_plan->mask_array[RPHF] */ && $start + 3 <= $end && + if (count(($GSUBdata['rphf'] ?? [])) /* ?? $indic_plan->mask_array[RPHF] */ && $start + 3 <= $end && ( ($indic_config[4] == self::REPH_MODE_IMPLICIT && !self::is_joiner($info[$start + 2])) || ($indic_config[4] == self::REPH_MODE_EXPLICIT && $info[$start + 2]['indic_category'] == self::OT_ZWJ) @@ -791,7 +791,7 @@ } if ($scriptblock != UCDN::SCRIPT_KHMER) { - if (count($GSUBdata['pref']) && $base + 2 < $end) { + if (count(($GSUBdata['pref'] ?? [])) && $base + 2 < $end) { /* Find a Halant,Ra sequence and mark it for pre-base processing. */ for ($i = $base + 1; $i + 1 < $end; $i++) { // If old_spec find Ra-Halant... @@ -835,7 +835,7 @@ } public static function final_reordering (&$info, $GSUBdata, $indic_config, $scriptblock, $is_old_spec) { - $count = count($info); + $count = count(($info ?? [])); if (!$count) return; $last = 0; $last_syllable = $info[0]['syllable']; @@ -1067,7 +1067,7 @@ */ - if (count($GSUBdata['pref']) && $base + 1 < $end) { /* Otherwise there can't be any pre-base reordering Ra. */ + if (count(($GSUBdata['pref'] ?? [])) && $base + 1 < $end) { /* Otherwise there can't be any pre-base reordering Ra. */ for ($i = $base + 1; $i < $end; $i++) { if ($info[$i]['mask'] & self::FLAG(self::PREF)) { /* 1. Only reorder a glyph produced by substitution during application --- a/intranet/mpdf60/classes/otl.php +++ b/intranet/mpdf60/classes/otl.php @@ -10,6 +10,18 @@ class otl { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $current_fh; + public $GDEFdata; + public $GSUB_length; + public $schOTLdata; + public $GSLuCoverage; + public $GSUBLookups; + public $arabGlyphs; + public $Entry; + public $Exit; + public $GPOSLookups; + var $mpdf; var $arabLeftJoining; @@ -43,7 +55,7 @@ var $debugOTL = false; -function otl(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; $this->arabic_initialise(); @@ -61,7 +73,7 @@ function applyOTL($str, $useOTL) { $this->OTLdata = array(); - if (trim($str)=='') { return $str; } + if (trim(($str ?? ''))=='') { return $str; } if (!$useOTL) { return $str; } // 1. Load GDEF data @@ -134,7 +146,7 @@ $charasstr = $this->unicode_hex($char); - if (strpos($this->GlyphClassMarks, $charasstr)!==false) { $OTLdata[$subchunk][$charctr]['group'] = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($charasstr ?? ''))!==false) { $OTLdata[$subchunk][$charctr]['group'] = 'M'; } else if ($char == 32 || $char == 12288) { $OTLdata[$subchunk][$charctr]['group'] = 'S'; } // 12288 = 0x3000 = CJK space else { $OTLdata[$subchunk][$charctr]['group'] = 'C'; } @@ -173,10 +185,10 @@ $is_old_spec = false; $ScriptLang = $this->mpdf->CurrentFont['GSUBScriptLang']; - if (count($ScriptLang)) { + if (count(($ScriptLang ?? []))) { list($GSUBscriptTag,$is_old_spec) = $this->_getOTLscriptTag($ScriptLang, $scripttag, $scriptblock, $this->shaper, $useOTL, 'GSUB'); - if ($this->mpdf->fontLanguageOverride && strpos($ScriptLang[$GSUBscriptTag], $this->mpdf->fontLanguageOverride)!==false) { - $GSUBlangsys = str_pad($this->mpdf->fontLanguageOverride,4); + if ($this->mpdf->fontLanguageOverride && strpos(($ScriptLang[$GSUBscriptTag] ?? ''), ($this->mpdf->fontLanguageOverride ?? ''))!==false) { + $GSUBlangsys = str_pad(($this->mpdf->fontLanguageOverride ?? ''),4); } else if ($GSUBscriptTag && isset($ScriptLang[$GSUBscriptTag]) && $ScriptLang[$GSUBscriptTag]!='') { $GSUBlangsys = $this->_getOTLLangTag($this->mpdf->currentLang, $ScriptLang[$GSUBscriptTag]); @@ -185,17 +197,17 @@ $ScriptLang = $this->mpdf->CurrentFont['GPOSScriptLang']; // NB If after GSUB, the same script/lang exist for GPOS, just use these... - if ($GSUBscriptTag && $GSUBlangsys && isset($ScriptLang[$GSUBscriptTag]) && strpos($ScriptLang[$GSUBscriptTag], $GSUBlangsys)!==false) { + if ($GSUBscriptTag && $GSUBlangsys && isset($ScriptLang[$GSUBscriptTag]) && strpos(($ScriptLang[$GSUBscriptTag] ?? ''), ($GSUBlangsys ?? ''))!==false) { $GPOSlangsys = $GSUBlangsys; $GPOSscriptTag = $GSUBscriptTag; } // else repeat for GPOS // [Font XBRiyaz has GSUB tables for latn, but not GPOS for latn] - else if (count($ScriptLang)) { + else if (count(($ScriptLang ?? []))) { list($GPOSscriptTag,$dummy) = $this->_getOTLscriptTag($ScriptLang, $scripttag, $scriptblock, $this->shaper, $useOTL, 'GPOS'); - if ($GPOSscriptTag && $this->mpdf->fontLanguageOverride && strpos($ScriptLang[$GPOSscriptTag], $this->mpdf->fontLanguageOverride)!==false) { - $GPOSlangsys = str_pad($this->mpdf->fontLanguageOverride,4); + if ($GPOSscriptTag && $this->mpdf->fontLanguageOverride && strpos(($ScriptLang[$GPOSscriptTag] ?? ''), ($this->mpdf->fontLanguageOverride ?? ''))!==false) { + $GPOSlangsys = str_pad(($this->mpdf->fontLanguageOverride ?? ''),4); } else if ($GPOSscriptTag && isset($ScriptLang[$GPOSscriptTag]) && $ScriptLang[$GPOSscriptTag]!='') { $GPOSlangsys = $this->_getOTLLangTag($this->mpdf->currentLang, $ScriptLang[$GPOSscriptTag]); @@ -212,7 +224,7 @@ if (!$GSUBscriptTag && !$GSUBlangsys && !$GPOSscriptTag && !$GPOSlangsys) { // Remove ZWJ and ZWNJ - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if ($this->OTLdata[$i]['uni']==8204 || $this->OTLdata[$i]['uni']==8205) { array_splice($this->OTLdata, $i, 1); } @@ -327,7 +339,7 @@ $this->arabGlyphs = $this->GSUBdata[$this->GSUBfont]['rtlSUB']; - $gcms = explode("| ",$this->GlyphClassMarks); + $gcms = explode("| ",($this->GlyphClassMarks ?? '')); $gcm = array(); foreach($gcms AS $g) { $gcm[hexdec($g)] = 1; } $this->arabTransparentJoin = $this->arabTransparent + $gcm; @@ -337,7 +349,7 @@ // c. Set Kashida points (after joining occurred - medi, fina, init) but before other substitutions //----------------------------------------------------------------------------------- //if ($scriptblock == UCDN::SCRIPT_ARABIC ) { - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { // Put the kashida marker on the character BEFORE which is inserted the kashida // Kashida marker is inverse of priority i.e. Priority 1 => 7, Priority 7 => 1. @@ -354,7 +366,7 @@ // Position: After the character else if ($this->OTLdata[$i]['uni']==0xFEB3 || $this->OTLdata[$i]['uni']==0xFEB4 || $this->OTLdata[$i]['uni']==0xFEBB || $this->OTLdata[$i]['uni']==0xFEBC) { $checkpos = $i+1; - while (isset($this->OTLdata[$checkpos]) && strpos($this->GlyphClassMarks, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } if (isset($this->OTLdata[$checkpos])) { @@ -388,7 +400,7 @@ || $this->OTLdata[$i]['uni']==0xFBFD || $this->OTLdata[$i]['uni']==0xFBFF ) { $checkpos = $i-1; - while (isset($this->OTLdata[$checkpos]) && strpos($this->GlyphClassMarks, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } if (isset($this->OTLdata[$checkpos]) && $this->OTLdata[$checkpos]['uni']==0xFE92) { @@ -415,10 +427,10 @@ */ if (!isset($this->OTLdata[$i]['GPOSinfo']['kashida'])) { - if (strpos($this->GSUBdata[$this->GSUBfont]['finals'], $this->OTLdata[$i]['hex'])!==false) { // ANY OTHER FINAL FORM + if (strpos(($this->GSUBdata[$this->GSUBfont]['finals'] ?? ''), ($this->OTLdata[$i]['hex'] ?? ''))!==false) { // ANY OTHER FINAL FORM $this->OTLdata[$i]['GPOSinfo']['kashida'] = 2; } - else if (strpos('0FEAE 0FEF0 0FEF2',$this->OTLdata[$i]['hex'])!==false) { // not already included in 5 above + else if (strpos('0FEAE 0FEF0 0FEF2',($this->OTLdata[$i]['hex'] ?? ''))!==false) { // not already included in 5 above $this->OTLdata[$i]['GPOSinfo']['kashida'] = 1; } } @@ -435,7 +447,7 @@ $usetags = $this->_applyTagSettings($tags, $GSUBFeatures, $omittags, false) ; } - $ts = explode(' ',$usetags); + $ts = explode(' ',($usetags ?? '')); foreach($ts AS $ut) { // - Apply one at a time in Feature order $this->_applyGSUBrules($ut, $GSUBscriptTag, $GSUBlangsys); } @@ -443,7 +455,7 @@ // e. NOT IN SPEC // If space precedes a mark -> substitute a   before the Mark, to prevent line breaking Test: //----------------------------------------------------------------------------------- - for($ptr=1; $ptr<count($this->OTLdata); $ptr++) { + for($ptr=1; $ptr<count(($this->OTLdata ?? [])); $ptr++) { if ($this->OTLdata[$ptr]['general_category'] == UCDN::UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK && $this->OTLdata[$ptr-1]['uni'] == 32) { $this->OTLdata[$ptr-1]['uni'] = 0xa0; $this->OTLdata[$ptr-1]['hex'] = '000A0'; @@ -459,24 +471,24 @@ // a. First decompose/compose split mattras // (normalize) ??????? Nukta/Halant order etc ?????????????????????????????????????????????????????????????????????????? //----------------------------------------------------------------------------------- - for($ptr=0; $ptr<count($this->OTLdata); $ptr++) { + for($ptr=0; $ptr<count(($this->OTLdata ?? [])); $ptr++) { $char = $this->OTLdata[$ptr]['uni']; $sub = INDIC::decompose_indic($char); if ($sub) { $newinfo = array(); - for($i=0;$i<count($sub);$i++) { + for($i=0;$i<count(($sub ?? []));$i++) { $newinfo[$i] = array(); $ucd_record = UCDN::get_ucd_record($sub[$i]); $newinfo[$i]['general_category'] = $ucd_record[0]; $newinfo[$i]['bidi_type'] = $ucd_record[2]; $charasstr = $this->unicode_hex($sub[$i]); - if (strpos($this->GlyphClassMarks, $charasstr)!==false) { $newinfo[$i]['group'] = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($charasstr ?? ''))!==false) { $newinfo[$i]['group'] = 'M'; } else { $newinfo[$i]['group'] = 'C'; } $newinfo[$i]['uni'] = $sub[$i]; $newinfo[$i]['hex'] = $charasstr; } array_splice($this->OTLdata, $ptr, 1, $newinfo); - $ptr += count($sub)-1; + $ptr += count(($sub ?? []))-1; } /* Only Composition-exclusion exceptions that we want to recompose. */ if ($this->shaper == 'I') { @@ -774,7 +786,7 @@ * Lao versions are the same as Thai + 0x80. */ if ($this->shaper == 'T' || $this->shaper == 'L') { - for($ptr=0; $ptr<count($this->OTLdata); $ptr++) { + for($ptr=0; $ptr<count(($this->OTLdata ?? [])); $ptr++) { $char = $this->OTLdata[$ptr]['uni']; if (($char & ~0x0080) == 0x0E33) { // if SARA_AM (U+0E33 or U+0EB3) @@ -787,7 +799,7 @@ $newinfo[0]['general_category'] = $ucd_record[0]; $newinfo[0]['bidi_type'] = $ucd_record[2]; $charasstr = $this->unicode_hex($sub[0]); - if (strpos($this->GlyphClassMarks, $charasstr)!==false) { $newinfo[0]['group'] = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($charasstr ?? ''))!==false) { $newinfo[0]['group'] = 'M'; } else { $newinfo[0]['group'] = 'C'; } $newinfo[0]['uni'] = $sub[0]; $newinfo[0]['hex'] = $charasstr; @@ -812,7 +824,7 @@ $newinfo[0]['general_category'] = $ucd_record[0]; $newinfo[0]['bidi_type'] = $ucd_record[2]; $charasstr = $this->unicode_hex($sub[1]); - if (strpos($this->GlyphClassMarks, $charasstr)!==false) { $newinfo[0]['group'] = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($charasstr ?? ''))!==false) { $newinfo[0]['group'] = 'M'; } else { $newinfo[0]['group'] = 'C'; } $newinfo[0]['uni'] = $sub[1]; $newinfo[0]['hex'] = $charasstr; @@ -835,7 +847,7 @@ // From MS OTL spec the following are Digit modifiers (Md): 0F180F19, 0F3E0F3F // Digits: 0F200F33 // On testing only 0x0F3F (pre-based mark) seems to need re-ordering - for($ptr=0; $ptr<count($this->OTLdata)-1; $ptr++) { + for($ptr=0; $ptr<count(($this->OTLdata ?? []))-1; $ptr++) { if (INDIC::in_range($this->OTLdata[$ptr]['uni'], 0x0F20, 0x0F33) && $this->OTLdata[$ptr+1]['uni'] == 0x0F3F ) { $tmp = $this->OTLdata[$ptr+1]; $this->OTLdata[$ptr+1] = $this->OTLdata[$ptr]; @@ -892,7 +904,7 @@ $useGSUBtags = $this->_applyTagSettings($tags, $GSUBFeatures, $omittags, false) ; } // APPLY GSUB rules (as long as not Latin + SmallCaps - but not OTL smcp) - if (!(($this->mpdf->textvar & FC_SMALLCAPS) && $scriptblock == UCDN::SCRIPT_LATIN && strpos($useGSUBtags, 'smcp')===false)) { + if (!(($this->mpdf->textvar & FC_SMALLCAPS) && $scriptblock == UCDN::SCRIPT_LATIN && strpos(($useGSUBtags ?? ''), 'smcp')===false)) { $this->_applyGSUBrules($useGSUBtags, $GSUBscriptTag, $GSUBlangsys); } } @@ -912,7 +924,7 @@ 'bidi_type' => UCDN::BIDI_CLASS_BN, 'group' => 'S', 'uni' => 0x200B, 'hex' => '0200B'); // Then insert U+200B at (after) all word end boundaries - for ($i=count($this->OTLdata)-1;$i>0;$i--) { + for ($i=count(($this->OTLdata ?? []))-1;$i>0;$i--) { // Make sure after GSUB that wordend has not been moved - check next char is not in the same syllable if (isset($this->OTLdata[$i]['wordend']) && $this->OTLdata[$i]['wordend'] && isset($this->OTLdata[$i+1]['uni']) && (!isset($this->OTLdata[$i+1]['syllable']) || !isset($this->OTLdata[$i+1]['syllable']) || $this->OTLdata[$i+1]['syllable']!=$this->OTLdata[$i]['syllable'])) { @@ -931,7 +943,7 @@ //======================================================= if ($this->shaper == 'I' || $this->shaper == 'S' || $this->shaper == 'A' || $this->shaper == 'K' || $this->shaper == 'M') { // Remove ZWJ and ZWNJ - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if ($this->OTLdata[$i]['uni']==8204 || $this->OTLdata[$i]['uni']==8205) { array_splice($this->OTLdata, $i, 1); $this->_updateLigatureMarks($i, -1); @@ -990,7 +1002,7 @@ //============================== $LookupList = array(); foreach($GPOSFeatures AS $tag=>$arr) { - if (strpos($usetags, $tag)!==false) { + if (strpos(($usetags ?? ''), ($tag ?? ''))!==false) { foreach($arr AS $lu) { $LookupList[$lu] = $tag; } } } @@ -1001,20 +1013,20 @@ //============================== // APPLY THE GPOS RULES (as long as not Latin + SmallCaps - but not OTL smcp) - if (!(($this->mpdf->textvar & FC_SMALLCAPS) && $scriptblock == UCDN::SCRIPT_LATIN && strpos($useGSUBtags, 'smcp')===false)) { + if (!(($this->mpdf->textvar & FC_SMALLCAPS) && $scriptblock == UCDN::SCRIPT_LATIN && strpos(($useGSUBtags ?? ''), 'smcp')===false)) { $this->_applyGPOSrules($LookupList, $is_old_spec); // (sets: $this->OTLdata[n]['GPOSinfo'] XPlacement YPlacement XAdvance Entry Exit ) } // 10. Process cursive text //============================== - if (count($this->Entry) || count($this->Exit)) { + if (count(($this->Entry ?? [])) || count(($this->Exit ?? []))) { // RTL $incurs = false; - for ($i=(count($this->OTLdata)-1);$i>=0;$i--) { + for ($i=(count(($this->OTLdata ?? []))-1);$i>=0;$i--) { if (isset($this->Entry[$i]) && isset($this->Entry[$i]['Y']) && $this->Entry[$i]['dir']=='RTL') { $nextbase = $i-1; // Set as next base ignoring marks (next base reading RTL in logical oder - while(isset($this->OTLdata[$nextbase]['hex']) && strpos($this->GlyphClassMarks, $this->OTLdata[$nextbase]['hex'])!==false) { $nextbase--; } + while(isset($this->OTLdata[$nextbase]['hex']) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$nextbase]['hex'] ?? ''))!==false) { $nextbase--; } if (isset($this->Exit[$nextbase]) && isset($this->Exit[$nextbase]['Y']) ) { $diff = $this->Entry[$i]['Y'] - $this->Exit[$nextbase]['Y']; if ($incurs===false) { $incurs = $diff; } @@ -1033,15 +1045,15 @@ } else { $incurs = false; } } - else if (strpos($this->GlyphClassMarks, $this->OTLdata[$i]['hex'])!==false) { continue; } // ignore Marks + else if (strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$i]['hex'] ?? ''))!==false) { continue; } // ignore Marks else { $incurs = false; } } // LTR $incurs = false; - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if (isset($this->Exit[$i]) && isset($this->Exit[$i]['Y']) && $this->Exit[$i]['dir']=='LTR') { $nextbase = $i+1; // Set as next base ignoring marks - while(strpos($this->GlyphClassMarks, $this->OTLdata[$nextbase]['hex'])!==false) { $nextbase++; } + while(strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$nextbase]['hex'] ?? ''))!==false) { $nextbase++; } if (isset($this->Entry[$nextbase]) && isset($this->Entry[$nextbase]['Y']) ) { $diff = $this->Exit[$i]['Y'] - $this->Entry[$nextbase]['Y']; @@ -1061,7 +1073,7 @@ } else { $incurs = false; } } - else if (strpos($this->GlyphClassMarks, $this->OTLdata[$i]['hex'])!==false) { continue; } // ignore Marks + else if (strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$i]['hex'] ?? ''))!==false) { continue; } // ignore Marks else { $incurs = false; } } } @@ -1088,7 +1100,7 @@ $ectr = 0; for($sch=0;$sch<=$subchunk;$sch++) { - for ($i=0;$i<count($this->schOTLdata[$sch]);$i++) { + for ($i=0;$i<count(($this->schOTLdata[$sch] ?? []));$i++) { if (isset($this->schOTLdata[$sch][$i]['GPOSinfo'])) { $newGPOSinfo[$ectr] = $this->schOTLdata[$sch][$i]['GPOSinfo']; } @@ -1127,45 +1139,45 @@ // Font features to enable - set by font-variant-xx if (isset($this->mpdf->OTLtags['Plus'])) $fp = $this->mpdf->OTLtags['Plus']; - preg_match_all('/([a-zA-Z0-9]{4})/',$fp,$m); - for($i=0;$i<count($m[0]);$i++) { + preg_match_all('/([a-zA-Z0-9]{4})/',($fp ?? ''),$m); + for($i=0;$i<count(($m[0] ?? []));$i++) { $t = $m[1][$i]; // Is it a valid tag? - if(isset($Features[$t]) && strpos($omittags,$t)===false && (!$onlytags || strpos($tags,$t)!==false )) { + if(isset($Features[$t]) && strpos(($omittags ?? ''),($t ?? ''))===false && (!$onlytags || strpos(($tags ?? ''),($t ?? ''))!==false )) { $usetags .= ' '.$t; } } // Font features to disable - set by font-variant-xx if (isset($this->mpdf->OTLtags['Minus'])) $fm = $this->mpdf->OTLtags['Minus']; - preg_match_all('/([a-zA-Z0-9]{4})/',$fm,$m); - for($i=0;$i<count($m[0]);$i++) { + preg_match_all('/([a-zA-Z0-9]{4})/',($fm ?? ''),$m); + for($i=0;$i<count(($m[0] ?? []));$i++) { $t = $m[1][$i]; // Is it a valid tag? - if(isset($Features[$t]) && strpos($omittags,$t)===false && (!$onlytags || strpos($tags,$t)!==false )) { - $usetags = str_replace($t,'',$usetags); + if(isset($Features[$t]) && strpos(($omittags ?? ''),($t ?? ''))===false && (!$onlytags || strpos(($tags ?? ''),($t ?? ''))!==false )) { + $usetags = str_replace(($t ?? ''),'',($usetags ?? '')); } } // Font features to enable - set by font-feature-settings if (isset($this->mpdf->OTLtags['FFPlus'])) $ffp = $this->mpdf->OTLtags['FFPlus']; // Font Features - may include integer: salt4 - preg_match_all('/([a-zA-Z0-9]{4})([\d+]*)/',$ffp,$m); - for($i=0;$i<count($m[0]);$i++) { + preg_match_all('/([a-zA-Z0-9]{4})([\d+]*)/',($ffp ?? ''),$m); + for($i=0;$i<count(($m[0] ?? []));$i++) { $t = $m[1][$i]; // Is it a valid tag? - if(isset($Features[$t]) && strpos($omittags,$t)===false && (!$onlytags || strpos($tags,$t)!==false )) { + if(isset($Features[$t]) && strpos(($omittags ?? ''),($t ?? ''))===false && (!$onlytags || strpos(($tags ?? ''),($t ?? ''))!==false )) { $usetags .= ' '.$m[0][$i]; // - may include integer: salt4 } } // Font features to disable - set by font-feature-settings if (isset($this->mpdf->OTLtags['FFMinus'])) $ffm = $this->mpdf->OTLtags['FFMinus']; - preg_match_all('/([a-zA-Z0-9]{4})/',$ffm,$m); - for($i=0;$i<count($m[0]);$i++) { + preg_match_all('/([a-zA-Z0-9]{4})/',($ffm ?? ''),$m); + for($i=0;$i<count(($m[0] ?? []));$i++) { $t = $m[1][$i]; // Is it a valid tag? - if(isset($Features[$t]) && strpos($omittags,$t)===false && (!$onlytags || strpos($tags,$t)!==false )) { - $usetags = str_replace($t,'',$usetags); + if(isset($Features[$t]) && strpos(($omittags ?? ''),($t ?? ''))===false && (!$onlytags || strpos(($tags ?? ''),($t ?? ''))!==false )) { + $usetags = str_replace(($t ?? ''),'',($usetags ?? '')); } } return $usetags; @@ -1180,7 +1192,7 @@ $GSUBFeatures = $this->mpdf->CurrentFont['GSUBFeatures'][$scriptTag][$langsys]; $LookupList = array(); foreach($GSUBFeatures AS $tag=>$arr) { - if (strpos($usetags, $tag)!==false) { + if (strpos(($usetags ?? ''), ($tag ?? ''))!==false) { foreach($arr AS $lu) { $LookupList[$lu] = $tag; } } } @@ -1191,12 +1203,12 @@ $Flag = $this->GSUBLookups[$lu]['Flag']; $MarkFilteringSet = $this->GSUBLookups[$lu]['MarkFilteringSet']; $tagInt = 1; - if (preg_match('/'.$tag.'([0-9]{1,2})/', $usetags, $m)) { + if (preg_match('/'.$tag.'([0-9]{1,2})/', ($usetags ?? ''), $m)) { $tagInt = $m[1]; } $ptr = 0; // Test each glyph sequentially - while($ptr < (count($this->OTLdata))) { // whilst there is another glyph ..0064 + while($ptr < (count(($this->OTLdata ?? [])))) { // whilst there is another glyph ..0064 $currGlyph = $this->OTLdata[$ptr]['hex']; $currGID = $this->OTLdata[$ptr]['uni']; $shift = 1; @@ -1221,11 +1233,11 @@ $GSUBFeatures = $this->mpdf->CurrentFont['GSUBFeatures'][$scriptTag][$langsys]; - $tags = explode(' ',$usetags); + $tags = explode(' ',($usetags ?? '')); foreach($tags AS $usetag) { $LookupList = array(); foreach($GSUBFeatures AS $tag=>$arr) { - if (strpos($usetags, $tag)!==false) { + if (strpos(($usetags ?? ''), ($tag ?? ''))!==false) { foreach($arr AS $lu) { $LookupList[$lu] = $tag; } } } @@ -1233,7 +1245,7 @@ $ptr = 0; // Test each glyph sequentially - while($ptr < (count($this->OTLdata))) { // whilst there is another glyph ..0064 + while($ptr < (count(($this->OTLdata ?? [])))) { // whilst there is another glyph ..0064 $currGlyph = $this->OTLdata[$ptr]['hex']; $currGID = $this->OTLdata[$ptr]['uni']; $shift = 1; @@ -1243,7 +1255,7 @@ $Flag = $this->GSUBLookups[$lu]['Flag']; $MarkFilteringSet = $this->GSUBLookups[$lu]['MarkFilteringSet']; $tagInt = 1; - if (preg_match('/'.$tag.'([0-9]{1,2})/', $usetags, $m)) { + if (preg_match('/'.$tag.'([0-9]{1,2})/', ($usetags ?? ''), $m)) { $tagInt = $m[1]; } @@ -1272,7 +1284,7 @@ // ALL should be applied one syllable at a time // Implemented in functions checkContextMatch and checkContextMatchMultiple by failing to match if outside scope of current 'syllable' - $tags = explode(' ',$usetags); + $tags = explode(' ',($usetags ?? '')); foreach($tags AS $usetag) { $LookupList = array(); @@ -1289,13 +1301,13 @@ $Flag = $this->GSUBLookups[$lu]['Flag']; $MarkFilteringSet = $this->GSUBLookups[$lu]['MarkFilteringSet']; $tagInt = 1; - if (preg_match('/'.$tag.'([0-9]{1,2})/', $usetags, $m)) { + if (preg_match('/'.$tag.'([0-9]{1,2})/', ($usetags ?? ''), $m)) { $tagInt = $m[1]; } $ptr = 0; // Test each glyph sequentially - while($ptr < (count($this->OTLdata))) { // whilst there is another glyph ..0064 + while($ptr < (count(($this->OTLdata ?? [])))) { // whilst there is another glyph ..0064 $currGlyph = $this->OTLdata[$ptr]['hex']; $currGID = $this->OTLdata[$ptr]['uni']; $shift = 1; @@ -1325,7 +1337,7 @@ // ALL should be applied one syllable at a time // Implemented in functions checkContextMatch and checkContextMatchMultiple by failing to match if outside scope of current 'syllable' - $tags = explode(' ',$usetags); + $tags = explode(' ',($usetags ?? '')); foreach($tags AS $usetag) { $LookupList = array(); @@ -1342,20 +1354,20 @@ $Flag = $this->GSUBLookups[$lu]['Flag']; $MarkFilteringSet = $this->GSUBLookups[$lu]['MarkFilteringSet']; $tagInt = 1; - if (preg_match('/'.$tag.'([0-9]{1,2})/', $usetags, $m)) { + if (preg_match('/'.$tag.'([0-9]{1,2})/', ($usetags ?? ''), $m)) { $tagInt = $m[1]; } $ptr = 0; // Test each glyph sequentially - while($ptr < (count($this->OTLdata))) { // whilst there is another glyph ..0064 + while($ptr < (count(($this->OTLdata ?? [])))) { // whilst there is another glyph ..0064 $currGlyph = $this->OTLdata[$ptr]['hex']; $currGID = $this->OTLdata[$ptr]['uni']; $shift = 1; foreach($this->GSUBLookups[$lu]['Subtables'] AS $c=>$subtable_offset) { // NB Coverage only looks at glyphs for position 1 (esp. 7.3 and 8.3) if (isset($this->GSLuCoverage[$lu][$c][$currGID])) { - if (strpos('rphf pref blwf half pstf cfar init' , $usetag)!==false) { // only apply when mask indicates + if (strpos('rphf pref blwf half pstf cfar init' , ($usetag ?? ''))!==false) { // only apply when mask indicates $mask = 0; switch ($usetag) { case 'rphf': $mask = (1<<(INDIC::RPHF)); break; @@ -1380,9 +1392,9 @@ // incorrectly just moved old spec tables to new spec. Uniscribe seems to cope with this // See also ttffontsuni.php // First check if current glyph is a Halant/Virama - else if (_OTL_OLD_SPEC_COMPAT_1 && $Type==4 && !$is_old_spec && strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',$currGlyph)!== false) { + else if (_OTL_OLD_SPEC_COMPAT_1 && $Type==4 && !$is_old_spec && strpos('0094D 009CD 00A4D 00ACD 00B4D 00BCD 00C4D 00CCD 00D4D',($currGlyph ?? ''))!== false) { // only apply when 'pref blwf pstf' tags, and when mask indicates - if (strpos('pref blwf pstf' , $usetag)!==false) { + if (strpos('pref blwf pstf' , ($usetag ?? ''))!==false) { $mask = 0; switch ($usetag) { case 'pref': $mask = (1<<(INDIC::PREF)); break; @@ -1476,7 +1488,7 @@ return 0; } -function _applyGSUBsubtable($lookupID, $subtable, $ptr, $currGlyph, $currGID, $subtable_offset, $Type, $Flag, $MarkFilteringSet, $LuCoverage, $level=0, $currentTag, $is_old_spec, $tagInt) { +function _applyGSUBsubtable($lookupID, $subtable, $ptr, $currGlyph, $currGID, $subtable_offset, $Type, $Flag, $MarkFilteringSet, $LuCoverage, $level, $currentTag, $is_old_spec, $tagInt) { $ignore = $this->_getGCOMignoreString($Flag, $MarkFilteringSet); // Lets start @@ -1614,7 +1626,7 @@ $spos++; //while $this->OTLdata[$spos]['uni'] is an "ignore" => spos++ - while (isset($this->OTLdata[$spos]) && strpos($ignore, $this->OTLdata[$spos]['hex'])!==false) { $spos++; } + while (isset($this->OTLdata[$spos]) && strpos(($ignore ?? ''), ($this->OTLdata[$spos]['hex'] ?? ''))!==false) { $spos++; } if (isset($this->OTLdata[$spos]) && $this->OTLdata[$spos]['uni'] == $checkGlyph) { $GlyphPos[] = $spos; @@ -1771,7 +1783,7 @@ // Class 0 contains all the glyphs NOT in the other classes $class0excl = array(); - for ($gc=1;$gc<=count($InputClasses);$gc++) { + for ($gc=1;$gc<=count(($InputClasses ?? []));$gc++) { if (is_array($InputClasses[$gc])) $class0excl = $class0excl + $InputClasses[$gc]; } @@ -1990,7 +2002,7 @@ // Class 0 contains all the glyphs NOT in the other classes $class0excl = array(); - for ($gc=1;$gc<=count($InputClasses);$gc++) { + for ($gc=1;$gc<=count(($InputClasses ?? []));$gc++) { if (isset($InputClasses[$gc])) $class0excl = $class0excl + $InputClasses[$gc]; } @@ -2005,7 +2017,7 @@ // Class 0 contains all the glyphs NOT in the other classes $bclass0excl = array(); - for ($gc=1;$gc<=count($BacktrackClasses);$gc++) { + for ($gc=1;$gc<=count(($BacktrackClasses ?? []));$gc++) { if (isset($BacktrackClasses[$gc])) $bclass0excl = $bclass0excl + $BacktrackClasses[$gc]; } @@ -2021,7 +2033,7 @@ // Class 0 contains all the glyphs NOT in the other classes $lclass0excl = array(); - for ($gc=1;$gc<=count($LookaheadClasses);$gc++) { + for ($gc=1;$gc<=count(($LookaheadClasses ?? []));$gc++) { if (isset($LookaheadClasses[$gc])) $lclass0excl = $lclass0excl + $LookaheadClasses[$gc]; } @@ -2153,14 +2165,14 @@ // Any position lpos or mpos > $pos + count($substitute) // $this->assocMarks = array(); // assocMarks[$pos mpos] => array(compID, ligPos) // $this->assocLigs = array(); // Ligatures[$pos lpos] => nc - for ($p=count($this->OTLdata)-1;$p>=($pos+$n);$p--) { + for ($p=count(($this->OTLdata ?? []))-1;$p>=($pos+$n);$p--) { if (isset($this->assocLigs[$p])) { $tmp = $this->assocLigs[$p]; unset($this->assocLigs[$p]); $this->assocLigs[($p + $n)] = $tmp; } } - for ($p=count($this->OTLdata)-1;$p>=0;$p--) { + for ($p=count(($this->OTLdata ?? []))-1;$p>=0;$p--) { if (isset($this->assocMarks[$p])) { if ($this->assocMarks[$p]['ligPos'] >=($pos+$n)) { $this->assocMarks[$p]['ligPos'] += $n; } if ($p>=($pos+$n)) { @@ -2175,14 +2187,14 @@ else if ($n<1) { // glyphs removed $nrem = -$n; // Update position of pre-existing Ligatures and associated Marks - for ($p=($pos+1);$p<count($this->OTLdata);$p++) { + for ($p=($pos+1);$p<count(($this->OTLdata ?? []));$p++) { if (isset($this->assocLigs[$p])) { $tmp = $this->assocLigs[$p]; unset($this->assocLigs[$p]); $this->assocLigs[($p - $nrem)] = $tmp; } } - for ($p=0;$p<count($this->OTLdata);$p++) { + for ($p=0;$p<count(($this->OTLdata ?? []));$p++) { if (isset($this->assocMarks[$p])) { if ($this->assocMarks[$p]['ligPos'] >=($pos)) { $this->assocMarks[$p]['ligPos'] -= $nrem; } if ($p>$pos) { @@ -2206,7 +2218,7 @@ } // LookupType 2: Multiple Substitution Subtable : 1 to n else if ($Type == 2) { - for($i=0;$i<count($substitute);$i++) { + for($i=0;$i<count(($substitute ?? []));$i++) { $uni = $substitute[$i]; $newOTLdata[$i] = array(); $newOTLdata[$i]['uni'] = $uni; @@ -2219,7 +2231,7 @@ $bt = $this->OTLdata[$pos]['bidi_type']; // } - if (strpos($this->GlyphClassMarks, $newOTLdata[$i]['hex'] )!==false) { $gp = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($newOTLdata[$i]['hex'] ?? '') )!==false) { $gp = 'M'; } else if ($uni == 32) { $gp = 'S'; } else { $gp = 'C'; } @@ -2244,15 +2256,15 @@ } if ($this->shaper=='K' || $this->shaper=='T' || $this->shaper=='L') { - if ($this->OTLdata[$pos]['wordend']) { $newOTLdata[count($substitute)-1]['wordend'] = true; } + if ($this->OTLdata[$pos]['wordend']) { $newOTLdata[count(($substitute ?? []))-1]['wordend'] = true; } } array_splice($this->OTLdata, $pos, 1, $newOTLdata); // Replace 1 with n // Update position of Ligatures and associated Marks // count($substitute)-1 is the number of glyphs added - $nadd = count($substitute)-1; + $nadd = count(($substitute ?? []))-1; $this->_updateLigatureMarks($pos, $nadd); - return count($substitute); + return count(($substitute ?? [])); } // LookupType 4: Ligature Substitution Subtable : n to 1 else if ($Type == 4) { @@ -2264,13 +2276,13 @@ $contains_nonmarks = false; if (isset($this->OTLdata[$pos]['syllable'])) { $current_syllable = $this->OTLdata[$pos]['syllable']; } else { $current_syllable = 0; } - for($i=0;$i<count($GlyphPos);$i++) { + for($i=0;$i<count(($GlyphPos ?? []));$i++) { // If subsequent components are not Marks as well - don't ligate $unistr = $this->OTLdata[$GlyphPos[$i]]['hex']; if ($this->restrictToSyllable && isset($this->OTLdata[$GlyphPos[$i]]['syllable']) && $this->OTLdata[$GlyphPos[$i]]['syllable'] != $current_syllable) { return 0; } - if (strpos($this->GlyphClassMarks, $unistr )!==false) { $contains_marks = true; } + if (strpos(($this->GlyphClassMarks ?? ''), ($unistr ?? '') )!==false) { $contains_marks = true; } else { $contains_nonmarks = true; } } if ($contains_marks && !$contains_nonmarks) { @@ -2280,7 +2292,7 @@ $firstMarkAssoc = $this->assocMarks[$pos]; } // If all components of the ligature are marks, we call this a mark ligature. - for($i=1;$i<count($GlyphPos);$i++) { + for($i=1;$i<count(($GlyphPos ?? []));$i++) { // If subsequent components are not Marks as well - don't ligate // $unistr = $this->OTLdata[$GlyphPos[$i]]['hex']; @@ -2320,7 +2332,7 @@ */ // So if is_array($firstMarkAssoc) - the new (Mark) ligature should keep this association - $lastPos = $GlyphPos[(count($GlyphPos)-1)]; + $lastPos = $GlyphPos[(count(($GlyphPos ?? []))-1)]; } else { /* @@ -2353,7 +2365,7 @@ */ $currComp = 0; - for($i=0;$i<count($GlyphPos);$i++) { + for($i=0;$i<count(($GlyphPos ?? []));$i++) { if ($i>0 && isset($this->assocLigs[$GlyphPos[$i]])) { // One of the other components is already a ligature $nc = $this->assocLigs[$GlyphPos[$i]]; } @@ -2361,7 +2373,7 @@ // While next char to right is a mark (but not the next matched glyph) // ?? + also include a Mark Ligature here $ic = 1; - while((($i==count($GlyphPos)-1) || (isset($GlyphPos[$i+1]) && ($GlyphPos[$i]+$ic) < $GlyphPos[$i+1])) && isset($this->OTLdata[($GlyphPos[$i]+$ic)]) && strpos($this->GlyphClassMarks, $this->OTLdata[($GlyphPos[$i]+$ic)]['hex'])!== false) { + while((($i==count(($GlyphPos ?? []))-1) || (isset($GlyphPos[$i+1]) && ($GlyphPos[$i]+$ic) < $GlyphPos[$i+1])) && isset($this->OTLdata[($GlyphPos[$i]+$ic)]) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[($GlyphPos[$i]+$ic)]['hex'] ?? ''))!== false) { $newComp = $currComp; if (isset($this->assocMarks[$GlyphPos[$i]+$ic])) { // One of the inbetween Marks is already associated with a Lig // OK as long as it is associated with the current Lig @@ -2373,7 +2385,7 @@ } $currComp += $nc; } - $lastPos = $GlyphPos[(count($GlyphPos)-1)]+$ic-1; + $lastPos = $GlyphPos[(count(($GlyphPos ?? []))-1)]+$ic-1; $this->assocLigs[$pos] = $currComp ; // Number of components in new Ligature } @@ -2386,7 +2398,7 @@ $bt = $this->OTLdata[$pos]['bidi_type']; // } - if (strpos($this->GlyphClassMarks, $this->unicode_hex($substitute))!==false) { $gp = 'M'; } + if (strpos(($this->GlyphClassMarks ?? ''), ($this->unicode_hex($substitute) ?? ''))!==false) { $gp = 'M'; } else if ($substitute == 32) { $gp = 'S'; } else { $gp = 'C'; } @@ -2400,8 +2412,8 @@ // If previous/first component of ligature is a medial form, then keep this as a kashida point // TEST (Arabic Typesetting) يَنتُم $ka = 0; - if (isset($this->OTLdata[$GlyphPos[(count($GlyphPos)-1)]]['GPOSinfo']['kashida'])) { - $ka = $this->OTLdata[$GlyphPos[(count($GlyphPos)-1)]]['GPOSinfo']['kashida']; + if (isset($this->OTLdata[$GlyphPos[(count(($GlyphPos ?? []))-1)]]['GPOSinfo']['kashida'])) { + $ka = $this->OTLdata[$GlyphPos[(count(($GlyphPos ?? []))-1)]]['GPOSinfo']['kashida']; } if ($ka==1 && isset($this->OTLdata[$pos]['form']) && $this->OTLdata[$pos]['form']==3) { $newOTLdata[0]['GPOSinfo']['kashida'] = $ka; } @@ -2427,7 +2439,7 @@ // GlyphPos contains array of arr_pos to set null - not necessarily contiguous // +- Remove any assocMarks or assocLigs from the main components (the ones that are deleted) - for($i=count($GlyphPos)-1;$i>0;$i--) { + for($i=count(($GlyphPos ?? []))-1;$i>0;$i--) { $gpos = $GlyphPos[$i]; array_splice($this->OTLdata, $gpos, 1); unset($this->assocLigs[$gpos]); @@ -2439,9 +2451,9 @@ // Update position of pre-existing Ligatures and associated Marks // Start after first GlyphPos // count($GlyphPos)-1 is the number of glyphs removed from string - for($p=($GlyphPos[0]+1);$p<(count($this->OTLdata)+count($GlyphPos)-1) ;$p++ ) { + for($p=($GlyphPos[0]+1);$p<(count(($this->OTLdata ?? []))+count(($GlyphPos ?? []))-1) ;$p++ ) { $nrem = 0; // Number of Glyphs removed at this point in the string - for($i=0;$i<count($GlyphPos);$i++) { + for($i=0;$i<count(($GlyphPos ?? []));$i++) { if ($i>0 && $p > $GlyphPos[$i]) { $nrem++; } } if (isset($this->assocLigs[$p])) { @@ -2598,14 +2610,14 @@ function arabic_shaper($usetags, $scriptTag) { $chars = array(); - for($i=0;$i<count($this->OTLdata);$i++) { + for($i=0;$i<count(($this->OTLdata ?? []));$i++) { $chars[] = $this->OTLdata[$i]['hex']; } $crntChar = null; $prevChar = null; $nextChar = null; $output = array(); - $max = count($chars); + $max = count(($chars ?? [])); for ($i = $max - 1; $i >= 0; $i--) { $crntChar = $chars[$i]; if ($i > 0){ $prevChar = hexdec($chars[$i - 1]); } @@ -2646,7 +2658,7 @@ $nextChar = $crntChar; } $ra = array_reverse($output); - for($i=0;$i<count($this->OTLdata);$i++) { + for($i=0;$i<count(($this->OTLdata ?? []));$i++) { $this->OTLdata[$i]['uni'] = hexdec($ra[$i][0]); $this->OTLdata[$i]['hex'] = $ra[$i][0]; $this->OTLdata[$i]['form'] = $ra[$i][1]; // Actaul form substituted 0=ISOLATED FORM :: 1=FINAL :: 2=INITIAL :: 3=MEDIAL @@ -2657,7 +2669,7 @@ function get_arab_glyphs($char, $type, &$chars, $i, $scriptTag, $usetags) { // Optional Feature settings // doesn't control Syriac at present - if (($type===0 && strpos($usetags, 'isol')===false) || ($type===1 && strpos($usetags, 'fina')===false) || ($type===2 && strpos($usetags, 'init')===false) || ($type===3 && strpos($usetags, 'medi')===false)) { + if (($type===0 && strpos(($usetags ?? ''), 'isol')===false) || ($type===1 && strpos(($usetags ?? ''), 'fina')===false) || ($type===2 && strpos(($usetags ?? ''), 'init')===false) || ($type===3 && strpos(($usetags ?? ''), 'medi')===false)) { return array($char,0); } @@ -2672,11 +2684,11 @@ // not in $this->arabLeftJoining i.e. not a char which can join to the next one if (isset($chars[$n]) && isset($this->arabLeftJoining[hexdec($chars[$n])])) { // if in the middle of Syriac words - if (isset($chars[$i+1]) && preg_match('/[\x{0700}-\x{0745}]/u',code2utf(hexdec($chars[$n]))) && preg_match('/[\x{0700}-\x{0745}]/u',code2utf(hexdec($chars[$i+1]))) && isset($this->arabGlyphs[$char][4])) { $retk = 4; } + if (isset($chars[$i+1]) && preg_match('/[\x{0700}-\x{0745}]/u',(code2utf(hexdec($chars[$n])) ?? '')) && preg_match('/[\x{0700}-\x{0745}]/u',(code2utf(hexdec($chars[$i+1])) ?? '')) && isset($this->arabGlyphs[$char][4])) { $retk = 4; } // if at the end of Syriac words - else if(!isset($chars[$i+1]) || !preg_match('/[\x{0700}-\x{0745}]/u',code2utf(hexdec($chars[$i+1])))) { + else if(!isset($chars[$i+1]) || !preg_match('/[\x{0700}-\x{0745}]/u',(code2utf(hexdec($chars[$i+1])) ?? ''))) { // if preceding base character IS (00715|00716|0072A) - if (strpos('0715|0716|072A',$chars[$n])!==false && isset($this->arabGlyphs[$char][6])) { $retk = 6; } + if (strpos('0715|0716|072A',($chars[$n] ?? ''))!==false && isset($this->arabGlyphs[$char][6])) { $retk = 6; } // else if preceding base character is NOT (00715|00716|0072A) else if (isset($this->arabGlyphs[$char][5])) { $retk = 5; } @@ -2704,12 +2716,12 @@ $ig = 1; foreach($this->arabGlyphs[$char]['prel'][$retk] AS $k=>$v) { // $k starts 0, 1... if (!isset($chars[$i-$ig-$k])) { $match = false; } - else if (strpos($v,$chars[$i-$ig-$k])===false) { - while (strpos($this->arabGlyphs[$char]['ignore'][$retk],$chars[$i-$ig-$k])!==false) { // ignore + else if (strpos(($v ?? ''),($chars[$i-$ig-$k] ?? ''))===false) { + while (strpos(($this->arabGlyphs[$char]['ignore'][$retk] ?? ''),($chars[$i-$ig-$k] ?? ''))!==false) { // ignore $ig++; } if (!isset($chars[$i-$ig-$k])) { $match = false; } - else if (strpos($v,$chars[$i-$ig-$k])===false) { $match = false; } + else if (strpos(($v ?? ''),($chars[$i-$ig-$k] ?? ''))===false) { $match = false; } } } } @@ -2717,12 +2729,12 @@ $ig = 1; foreach($this->arabGlyphs[$char]['postl'][$retk] AS $k=>$v) { // $k starts 0, 1... if (!isset($chars[$i+$ig+$k])) { $match = false; } - else if (strpos($v,$chars[$i+$ig+$k])===false) { - while (strpos($this->arabGlyphs[$char]['ignore'][$retk],$chars[$i+$ig+$k])!==false) { // ignore + else if (strpos(($v ?? ''),($chars[$i+$ig+$k] ?? ''))===false) { + while (strpos(($this->arabGlyphs[$char]['ignore'][$retk] ?? ''),($chars[$i+$ig+$k] ?? ''))!==false) { // ignore $ig++; } if (!isset($chars[$i+$ig+$k])) { $match = false; } - else if (strpos($v,$chars[$i+$ig+$k])===false) { $match = false; } + else if (strpos(($v ?? ''),($chars[$i+$ig+$k] ?? ''))===false) { $match = false; } } } } @@ -2746,7 +2758,7 @@ //////////////////////////////////////////////////////////////// // Sets $this->OTLdata[$i]['wordend']=true at possible end of word boundaries function TibetanlineBreaking() { - for ($ptr=0; $ptr<count($this->OTLdata);$ptr++) { + for ($ptr=0; $ptr<count(($this->OTLdata ?? []));$ptr++) { // Break opportunities at U+0F0B Tsheg or U=0F0D if (isset($this->OTLdata[$ptr]['uni']) && ($this->OTLdata[$ptr]['uni']==0x0F0B || $this->OTLdata[$ptr]['uni']==0x0F0D)) { if (isset($this->OTLdata[$ptr+1]['uni']) && ($this->OTLdata[$ptr+1]['uni']==0x0F0D || $this->OTLdata[$ptr+1]['uni']==0xF0E)) { continue; } @@ -2778,15 +2790,15 @@ $rollover = array(); $ptr = 0; - while ($ptr<count($this->OTLdata)-3) { - if (count($rollover)) { + while ($ptr<count(($this->OTLdata ?? []))-3) { + if (count(($rollover ?? []))) { $matches = $rollover; $rollover = array(); } else { $matches = $this->checkwordmatch($dict, $ptr); } - if (count($matches)==1) { + if (count(($matches ?? []))==1) { $matchpos = $matches[0]; // Check for repeaters - if so $matchpos++ if (isset($this->OTLdata[$matchpos+1]['uni']) && ($this->OTLdata[$matchpos+1]['uni']==0x0E2F || $this->OTLdata[$matchpos+1]['uni']==0x0E46 || $this->OTLdata[$matchpos+1]['uni']==0x0EC6)) { $matchpos++; } @@ -2801,11 +2813,11 @@ } else { // Multiple matches $secondmatch = false; - for ($m=count($matches)-1;$m>=0;$m--) { + for ($m=count(($matches ?? []))-1;$m>=0;$m--) { //for ($m=0;$m<count($matches);$m++) { $firstmatch = $matches[$m]; $matches2 = $this->checkwordmatch($dict, $firstmatch+1); - if (count($matches2)) { + if (count(($matches2 ?? []))) { // Set end of word marker in OTLdata at matchpos $this->OTLdata[$firstmatch]['wordend'] = true; $ptr = $firstmatch + 1; @@ -2816,8 +2828,8 @@ } if (!$secondmatch) { // Set end of word marker in OTLdata at end of longest first match - $this->OTLdata[$matches[count($matches)-1]]['wordend'] = true; - $ptr = $matches[count($matches)-1] + 1; + $this->OTLdata[$matches[count(($matches ?? []))-1]]['wordend'] = true; + $ptr = $matches[count(($matches ?? []))-1] + 1; // Move past any ASCII characters while (isset($this->OTLdata[$ptr]['uni']) && ($this->OTLdata[$ptr]['uni'] >> 8) == 0) { $ptr++; } } @@ -2850,12 +2862,12 @@ $ok = true; $matches = array(); while ($ok) { - $x = ord($dict{$dictptr}); + $x = ord(($dict[$dictptr] ?? '')); $c = $this->OTLdata[$ptr]['uni'] & 0xFF; if ($x==_DICT_INTERMEDIATE_MATCH) { //echo "DICT_INTERMEDIATE_MATCH: ".dechex($c).'<br />'; // Do not match if next character in text is a Mark - if (isset($this->OTLdata[$ptr]['uni']) && strpos($this->GlyphClassMarks, $this->OTLdata[$ptr]['hex'])===false) { + if (isset($this->OTLdata[$ptr]['uni']) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$ptr]['hex'] ?? ''))===false) { $matches[] = $ptr - 1; } $dictptr++; @@ -2863,7 +2875,7 @@ else if ($x==_DICT_FINAL_MATCH) { //echo "DICT_FINAL_MATCH: ".dechex($c).'<br />'; // Do not match if next character in text is a Mark - if (isset($this->OTLdata[$ptr]['uni']) && strpos($this->GlyphClassMarks, $this->OTLdata[$ptr]['hex'])===false) { + if (isset($this->OTLdata[$ptr]['uni']) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$ptr]['hex'] ?? ''))===false) { $matches[] = $ptr - 1; } return $matches; @@ -2871,14 +2883,14 @@ else if ($x==_DICT_NODE_TYPE_LINEAR) { //echo "DICT_NODE_TYPE_LINEAR: ".dechex($c).'<br />'; $dictptr++; - $m = ord($dict{$dictptr}); + $m = ord(($dict[$dictptr] ?? '')); if ($c == $m) { $ptr++; - if ($ptr > count($this->OTLdata)-1) { - $next = ord($dict{$dictptr+1}); + if ($ptr > count(($this->OTLdata ?? []))-1) { + $next = ord(($dict[$dictptr+1] ?? '')); if ($next==_DICT_INTERMEDIATE_MATCH || $next==_DICT_FINAL_MATCH) { // Do not match if next character in text is a Mark - if (isset($this->OTLdata[$ptr]['uni']) && strpos($this->GlyphClassMarks, $this->OTLdata[$ptr]['hex'])===false) { + if (isset($this->OTLdata[$ptr]['uni']) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$ptr]['hex'] ?? ''))===false) { $matches[] = $ptr - 1; } } @@ -2895,14 +2907,14 @@ else if ($x==_DICT_NODE_TYPE_SPLIT) { //echo "DICT_NODE_TYPE_SPLIT ON ".dechex($d).": ".dechex($c).'<br />'; $dictptr++; - $d = ord($dict{$dictptr}); + $d = ord(($dict[$dictptr] ?? '')); if ($c < $d) { $dictptr += 5; } else { $dictptr++; // Unsigned long 32-bit offset - $offset = (ord($dict{$dictptr})*16777216) + (ord($dict{$dictptr+1})<<16) + (ord($dict{$dictptr+2})<<8) + ord($dict{$dictptr+3}); + $offset = (ord(($dict[$dictptr] ?? ''))*16777216) + (ord(($dict[$dictptr+1] ?? ''))<<16) + (ord(($dict[$dictptr+2] ?? ''))<<8) + ord(($dict[$dictptr+3] ?? '')); $dictptr = $offset; } } @@ -2932,7 +2944,7 @@ $MarkFilteringSet = $this->GPOSLookups[$lu]['MarkFilteringSet']; $ptr = 0; // Test each glyph sequentially - while($ptr < (count($this->OTLdata))) { // whilst there is another glyph ..0064 + while($ptr < (count(($this->OTLdata ?? [])))) { // whilst there is another glyph ..0064 $currGlyph = $this->OTLdata[$ptr]['hex']; $currGID = $this->OTLdata[$ptr]['uni']; $shift = 1; @@ -2969,7 +2981,7 @@ // If current glyph is a mark with a defined width, any XAdvance is considered to REPLACE the character Advance Width // Test case <div style="font-family:myanmartext">င်္က္ကျြွေိ</div> - if (strpos($this->GlyphClassMarks, $this->OTLdata[$basepos]['hex'])!==false) { + if (strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$basepos]['hex'] ?? ''))!==false) { $cw = round($this->mpdf->_getCharWidth($this->mpdf->CurrentFont['cw'], $this->OTLdata[$basepos]['uni']) * $this->mpdf->CurrentFont['unitsPerEm'] / 1000); // convert back to font design units } else { @@ -3012,16 +3024,16 @@ // NB Not all fonts have all marks specified in GlyphClassMarks // If the current glyph is not a base (but a mark) then ignore this, and apply to the current position - if (strpos($this->GlyphClassMarks, $this->OTLdata[$pos]['hex'])!==false) { return $pos; } - - while(isset($this->OTLdata[$pos+1]['hex']) && strpos($this->GlyphClassMarks, $this->OTLdata[$pos+1]['hex'])!==false) { $pos++; } + if (strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$pos]['hex'] ?? ''))!==false) { return $pos; } + + while(isset($this->OTLdata[$pos+1]['hex']) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$pos+1]['hex'] ?? ''))!==false) { $pos++; } return $pos ; } -function _applyGPOSsubtable($lookupID, $subtable, $ptr, $currGlyph, $currGID, $subtable_offset, $Type, $Flag, $MarkFilteringSet, $LuCoverage, $tag, $level=0, $is_old_spec) { +function _applyGPOSsubtable($lookupID, $subtable, $ptr, $currGlyph, $currGID, $subtable_offset, $Type, $Flag, $MarkFilteringSet, $LuCoverage, $tag, $level, $is_old_spec) { if (($Flag & 0x0001) == 1) { $dir = 'RTL'; } // only used for Type 3 else { $dir = 'LTR'; } $ignore = $this->_getGCOMignoreString($Flag, $MarkFilteringSet); @@ -3088,7 +3100,7 @@ $checkpos = $ptr; $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } if (isset($this->OTLdata[$checkpos]) && $this->OTLdata[$checkpos]['uni']==$SecondGlyph) { @@ -3138,7 +3150,7 @@ $FirstGlyph = $this->OTLdata[$ptr]['uni']; $checkpos = $ptr; $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } if (isset($this->OTLdata[$checkpos])) { $matchedpos = $checkpos; } @@ -3146,12 +3158,12 @@ $SecondGlyph = $this->OTLdata[$matchedpos]['uni']; for($i=0;$i<$Class1Count;$i++) { - if (isset($Class1[$i]) && count($Class1[$i])) { + if (isset($Class1[$i]) && count(($Class1[$i] ?? []))) { $FirstClassPos = array_search($FirstGlyph, $Class1[$i]); if ($FirstClassPos === false) { continue; } else { for($j=0;$j<$Class2Count;$j++) { - if (isset($Class2[$j]) && count($Class2[$j])) { + if (isset($Class2[$j]) && count(($Class2[$j] ?? []))) { $SecondClassPos = array_search($SecondGlyph, $Class2[$j]); if ($SecondClassPos === false) { continue; } @@ -3245,15 +3257,15 @@ // This Fix blocks the GPOS rule if the "mark" is not actually classified as a mark in the GlyphClasses of GDEF // but only in Indic old-spec. // Test cases: ನ್ನು and ಕ್ರೌ - if ($this->shaper=='I' && $is_old_spec && strpos($this->GlyphClassMarks, $this->OTLdata[$ptr]['hex'])===false) { return; } + if ($this->shaper=='I' && $is_old_spec && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$ptr]['hex'] ?? ''))===false) { return; } // "To identify the base glyph that combines with a mark, the text-processing client must look backward in the glyph string from the mark to the preceding base glyph." - while (isset($this->OTLdata[$checkpos]) && strpos($this->GlyphClassMarks, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } - if (isset($this->OTLdata[$checkpos]) && strpos($BaseGlyphs, $this->OTLdata[$checkpos]['hex'])!==false) { + if (isset($this->OTLdata[$checkpos]) && strpos(($BaseGlyphs ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $matchedpos = $checkpos; } else { $matchedpos = false; } @@ -3268,7 +3280,7 @@ // Get the relevant BaseRecord $this->seek($BaseArray); $BaseCount = $this->read_ushort(); - $BasePos = strpos($BaseGlyphs, $this->OTLdata[$matchedpos]['hex'])/6; + $BasePos = strpos(($BaseGlyphs ?? ''), ($this->OTLdata[$matchedpos]['hex'] ?? ''))/6; // Move to the BaseRecord we want $nSkip = (2 * $BasePos * $ClassCount ); @@ -3325,11 +3337,11 @@ $checkpos--; // "To position a combining mark using a MarkToLigature attachment subtable, the text-processing client must work backward from the mark to the preceding ligature glyph." - while (isset($this->OTLdata[$checkpos]) && strpos($this->GlyphClassMarks, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($this->GlyphClassMarks ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } - if (isset($this->OTLdata[$checkpos]) && strpos($LigatureGlyphs, $this->OTLdata[$checkpos]['hex'])!==false) { + if (isset($this->OTLdata[$checkpos]) && strpos(($LigatureGlyphs ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $matchedpos = $checkpos; } else { $matchedpos = false; } @@ -3345,7 +3357,7 @@ // Get the relevant LigatureRecord $this->seek($LigatureArray); $LigatureCount = $this->read_ushort(); - $LigaturePos = strpos($LigatureGlyphs, $this->OTLdata[$matchedpos]['hex'])/6; + $LigaturePos = strpos(($LigatureGlyphs ?? ''), ($this->OTLdata[$matchedpos]['hex'] ?? ''))/6; // Move to the LigatureAttach table Record we want $nSkip = (2 * $LigaturePos); @@ -3415,10 +3427,10 @@ $Mark2Glyphs = implode('|',$this->_getCoverage()); $checkpos = $ptr; $checkpos--; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } - if (isset($this->OTLdata[$checkpos]) && strpos($Mark2Glyphs, $this->OTLdata[$checkpos]['hex'])!==false) { + if (isset($this->OTLdata[$checkpos]) && strpos(($Mark2Glyphs ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $matchedpos = $checkpos; } else { $matchedpos = false; } @@ -3433,7 +3445,7 @@ // Get the relevant Mark2Record $this->seek($Mark2Array); $Mark2Count = $this->read_ushort(); - $Mark2Pos = strpos($Mark2Glyphs, $this->OTLdata[$matchedpos]['hex'])/6; + $Mark2Pos = strpos(($Mark2Glyphs ?? ''), ($this->OTLdata[$matchedpos]['hex'] ?? ''))/6; // Move to the Mark2Record we want $nSkip = (2 * $Mark2Pos * $ClassCount ); @@ -3564,7 +3576,7 @@ // Class 0 contains all the glyphs NOT in the other classes $class0excl = array(); - for ($gc=1;$gc<=count($InputClasses);$gc++) { + for ($gc=1;$gc<=count(($InputClasses ?? []));$gc++) { if (is_array($InputClasses[$gc])) $class0excl = $class0excl + $InputClasses[$gc]; } @@ -3698,7 +3710,7 @@ // Class 0 contains all the glyphs NOT in the other classes $class0excl = array(); - for ($gc=1;$gc<=count($InputClasses);$gc++) { + for ($gc=1;$gc<=count(($InputClasses ?? []));$gc++) { if (isset($InputClasses[$gc]) && is_array($InputClasses[$gc])) $class0excl = $class0excl + $InputClasses[$gc]; } @@ -3714,7 +3726,7 @@ // Class 0 contains all the glyphs NOT in the other classes $bclass0excl = array(); - for ($gc=1;$gc<=count($BacktrackClasses);$gc++) { + for ($gc=1;$gc<=count(($BacktrackClasses ?? []));$gc++) { if (isset($BacktrackClasses[$gc]) && is_array($BacktrackClasses[$gc])) $bclass0excl = $bclass0excl + $BacktrackClasses[$gc]; } @@ -3730,7 +3742,7 @@ // Class 0 contains all the glyphs NOT in the other classes $lclass0excl = array(); - for ($gc=1;$gc<=count($LookaheadClasses);$gc++) { + for ($gc=1;$gc<=count(($LookaheadClasses ?? []));$gc++) { if (isset($LookaheadClasses[$gc]) && is_array($LookaheadClasses[$gc])) $lclass0excl = $lclass0excl + $LookaheadClasses[$gc]; } @@ -3864,9 +3876,9 @@ // BACKTRACK $checkpos = $ptr; - for ($i=0;$i<count($Backtrack);$i++) { + for ($i=0;$i<count(($Backtrack ?? []));$i++) { $checkpos--; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos--; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -3879,9 +3891,9 @@ // INPUT $matched = array(0=>$ptr); $checkpos = $ptr; - for ($i=1;$i<count($Input);$i++) { + for ($i=1;$i<count(($Input ?? []));$i++) { $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -3893,9 +3905,9 @@ } // LOOKAHEAD - for ($i=0;$i<count($Lookahead);$i++) { + for ($i=0;$i<count(($Lookahead ?? []));$i++) { $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -3920,18 +3932,18 @@ // BACKTRACK $checkpos = $ptr; - for ($i=0;$i<count($Backtrack);$i++) { + for ($i=0;$i<count(($Backtrack ?? []));$i++) { $checkpos--; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos--; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; } // If Class 0 specified, matches anything NOT in $bclass0excl - else if (!$Backtrack[$i] && isset($this->OTLdata[$checkpos]) && strpos($bclass0excl,$this->OTLdata[$checkpos]['hex'])!==false) { + else if (!$Backtrack[$i] && isset($this->OTLdata[$checkpos]) && strpos(($bclass0excl ?? ''),($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { return false; } - else if (!isset($this->OTLdata[$checkpos]) || strpos($Backtrack[$i], $this->OTLdata[$checkpos]['hex'])===false) { + else if (!isset($this->OTLdata[$checkpos]) || strpos(($Backtrack[$i] ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))===false) { return false; } } @@ -3939,36 +3951,36 @@ // INPUT $matched = array(0=>$ptr); $checkpos = $ptr; - for ($i=1;$i<count($Input);$i++) { // Start at 1 - already matched the first InputGlyph + for ($i=1;$i<count(($Input ?? []));$i++) { // Start at 1 - already matched the first InputGlyph $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; } // If Input Class 0 specified, matches anything NOT in $class0excl - else if (!$Input[$i] && isset($this->OTLdata[$checkpos]) && strpos($class0excl,$this->OTLdata[$checkpos]['hex'])===false) { + else if (!$Input[$i] && isset($this->OTLdata[$checkpos]) && strpos(($class0excl ?? ''),($this->OTLdata[$checkpos]['hex'] ?? ''))===false) { $matched[] = $checkpos; } - else if (isset($this->OTLdata[$checkpos]) && strpos($Input[$i],$this->OTLdata[$checkpos]['hex'])!==false) { + else if (isset($this->OTLdata[$checkpos]) && strpos(($Input[$i] ?? ''),($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $matched[] = $checkpos; } else { return false; } } // LOOKAHEAD - for ($i=0;$i<count($Lookahead);$i++) { + for ($i=0;$i<count(($Lookahead ?? []));$i++) { $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; } // If Class 0 specified, matches anything NOT in $lclass0excl - else if (!$Lookahead[$i] && isset($this->OTLdata[$checkpos]) && strpos($lclass0excl,$this->OTLdata[$checkpos]['hex'])!==false) { + else if (!$Lookahead[$i] && isset($this->OTLdata[$checkpos]) && strpos(($lclass0excl ?? ''),($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { return false; } - else if (!isset($this->OTLdata[$checkpos]) || strpos($Lookahead[$i],$this->OTLdata[$checkpos]['hex'])===false) { + else if (!isset($this->OTLdata[$checkpos]) || strpos(($Lookahead[$i] ?? ''),($this->OTLdata[$checkpos]['hex'] ?? ''))===false) { return false; } } @@ -3986,9 +3998,9 @@ // BACKTRACK $checkpos = $ptr; - for ($i=0;$i<count($Backtrack);$i++) { + for ($i=0;$i<count(($Backtrack ?? []));$i++) { $checkpos--; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos--; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos--; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -4005,9 +4017,9 @@ // INPUT $matched = array(0=>$ptr); $checkpos = $ptr; - for ($i=1;$i<count($Input);$i++) { // Start at 1 - already matched the first InputGlyph + for ($i=1;$i<count(($Input ?? []));$i++) { // Start at 1 - already matched the first InputGlyph $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -4023,9 +4035,9 @@ } // LOOKAHEAD - for ($i=0;$i<count($Lookahead);$i++) { + for ($i=0;$i<count(($Lookahead ?? []));$i++) { $checkpos++; - while (isset($this->OTLdata[$checkpos]) && strpos($ignore, $this->OTLdata[$checkpos]['hex'])!==false) { $checkpos++; } + while (isset($this->OTLdata[$checkpos]) && strpos(($ignore ?? ''), ($this->OTLdata[$checkpos]['hex'] ?? ''))!==false) { $checkpos++; } // If outside scope of current syllable - return no match if ($this->restrictToSyllable && isset($this->OTLdata[$checkpos]['syllable']) && $this->OTLdata[$checkpos]['syllable'] != $current_syllable) { return false; @@ -4182,17 +4194,17 @@ function _checkGCOMignore($flag, $glyph, $MarkFilteringSet) { $ignore = false; // Flag & 0x0008 = Ignore Marks - (unless already done with MarkAttachmentType) - if (($flag & 0x0008 && ($flag & 0xFF00) == 0) && strpos($this->GlyphClassMarks,$glyph)) { $ignore = true; } - if (($flag & 0x0004) && strpos($this->GlyphClassLigatures,$glyph)) { $ignore = true; } - if (($flag & 0x0002) && strpos($this->GlyphClassBases,$glyph)) { $ignore = true; } + if (($flag & 0x0008 && ($flag & 0xFF00) == 0) && strpos(($this->GlyphClassMarks ?? ''),($glyph ?? ''))) { $ignore = true; } + if (($flag & 0x0004) && strpos(($this->GlyphClassLigatures ?? ''),($glyph ?? ''))) { $ignore = true; } + if (($flag & 0x0002) && strpos(($this->GlyphClassBases ?? ''),($glyph ?? ''))) { $ignore = true; } // Flag & 0xFF?? = MarkAttachmentType if ($flag & 0xFF00) { // "a lookup must ignore any mark glyphs that are not in the specified mark attachment class" // $this->MarkAttachmentType is already adjusted for this i.e. contains all Marks except those in the MarkAttachmentClassDef table - if (strpos($this->MarkAttachmentType[($flag >> 8)],$glyph)) { $ignore = true; } + if (strpos(($this->MarkAttachmentType[($flag >> 8)] ?? ''),($glyph ?? ''))) { $ignore = true; } } // Flag & 0x0010 = UseMarkFilteringSet - if (($flag & 0x0010) && strpos($this->MarkGlyphSets[$MarkFilteringSet],$glyph)) { $ignore = true; } + if (($flag & 0x0010) && strpos(($this->MarkGlyphSets[$MarkFilteringSet] ?? ''),($glyph ?? ''))) { $ignore = true; } return $ignore; } @@ -4235,11 +4247,11 @@ ON Other Neutrals All other characters, including OBJECT REPLACEMENT CHARACTER */ -function _bidiSort($ta, $str='', $dir, &$chunkOTLdata, $useGPOS) { +function _bidiSort($ta, $str, $dir, &$chunkOTLdata, $useGPOS) { $pel = 0; // paragraph embedding level $maxlevel = 0; - $numchars = count($chunkOTLdata['char_data']); + $numchars = count(($chunkOTLdata['char_data'] ?? [])); // Set the initial paragraph embedding level if ($dir == 'rtl') { $pel = 1; } @@ -4305,8 +4317,8 @@ } else if ($chunkOTLdata['char_data'][$i]['uni'] == 8236) { // PDF // X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override. - if (count($remember)) { - $last = count($remember ) - 1; + if (count(($remember ?? []))) { + $last = count(($remember ?? []) ) - 1; if (($remember[$last]['num'] == 8235) || ($remember[$last]['num'] == 8234) || ($remember[$last]['num'] == 8238) || ($remember[$last]['num'] == 8237)) { $match = array_pop($remember); @@ -4332,11 +4344,11 @@ // stores string characters and other information if (isset($chunkOTLdata['GPOSinfo'][$i])) { $gpos = $chunkOTLdata['GPOSinfo'][$i]; } else $gpos = ''; - $chardata[] = array('char' => $chunkOTLdata['char_data'][$i]['uni'], 'level' => $cel, 'type' => $chardir, 'group' => $chunkOTLdata['group']{$i}, 'GPOSinfo' => $gpos); - } - } - - $numchars = count($chardata); + $chardata[] = array('char' => $chunkOTLdata['char_data'][$i]['uni'], 'level' => $cel, 'type' => $chardir, 'group' => $chunkOTLdata['group'][$i], 'GPOSinfo' => $gpos); + } + } + + $numchars = count(($chardata ?? [])); // X8. All explicit directional embeddings and overrides are completely terminated at the end of each paragraph. // Paragraph separators are not included in the embedding. @@ -4641,11 +4653,11 @@ // Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase. // In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached. - $numchunks = count($para); + $numchunks = count(($para ?? [])); for ($nc=0;$nc<$numchunks;$nc++) { $chunkOTLdata =& $para[$nc][18]; - $numchars = count($chunkOTLdata['char_data']); + $numchars = count(($chunkOTLdata['char_data'] ?? [])); for ($i=0; $i < $numchars; ++$i) { if ($chunkOTLdata['char_data'][$i]['uni'] == 8235) { // RLE // X2. With each RLE, compute the least greater odd embedding level. @@ -4697,8 +4709,8 @@ } else if ($chunkOTLdata['char_data'][$i]['uni'] == 8236) { // PDF // X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override. - if (count($remember)) { - $last = count($remember ) - 1; + if (count(($remember ?? []))) { + $last = count(($remember ?? []) ) - 1; if (($remember[$last]['num'] == 8235) || ($remember[$last]['num'] == 8234) || ($remember[$last]['num'] == 8238) || ($remember[$last]['num'] == 8237)) { $match = array_pop($remember); @@ -4725,9 +4737,9 @@ $lvl = 0; $nc2 = $nc; $i2 = $i; - while (!($nc2==($numchunks-1) && $i2==((count($para[$nc2][18]['char_data']))-1))) { // while not at end of last chunk + while (!($nc2==($numchunks-1) && $i2==((count(($para[$nc2][18]['char_data'] ?? [])))-1))) { // while not at end of last chunk $i2++; - if ($i2 >= count($para[$nc2][18]['char_data'])) { + if ($i2 >= count(($para[$nc2][18]['char_data'] ?? []))) { $nc2++; $i2 = 0; } @@ -4774,8 +4786,8 @@ else if ($chunkOTLdata['char_data'][$i]['uni'] == 8297) { // PDI // X6a. With each PDI, perform the following steps: // Pop the last entry from the directional status stack and decrement the isolate count by one. - while (count($remember)) { - $last = count($remember ) - 1; + while (count(($remember ?? []))) { + $last = count(($remember ?? []) ) - 1; if (($remember[$last]['num'] == 8294) || ($remember[$last]['num'] == 8295) || ($remember[$last]['num'] == 8296)) { $match = array_pop($remember); $cel = $match['cel']; @@ -4827,18 +4839,18 @@ $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x80\xac"); $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x80\xad"); $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x80\xae"); - preg_replace("/\x{202a}-\x{202e}/u", '', $para[$nc][0]); + preg_replace("/\x{202a}-\x{202e}/u", '', ($para[$nc][0] ?? '')); } } // Remove any blank chunks made by removing directional codes - $numchunks = count($para); + $numchunks = count(($para ?? [])); for ($nc=($numchunks-1);$nc>=0;$nc--) { - if (count($para[$nc][18]['char_data'])==0) { array_splice($para, $nc, 1); } + if (count(($para[$nc][18]['char_data'] ?? []))==0) { array_splice($para, $nc, 1); } } if ($dir != 'rtl' && !$strongrtl && !$controlchars) { return; } - $numchunks = count($para); + $numchunks = count(($para ?? [])); // X10. Determine the start-of-sequence (sor) and end-of-sequence (eor) types, either L or R, for each isolating run sequence. These depend on the higher of the two levels on either side of the sequence boundary: // For sor, compare the level of the first character in the sequence with the level of the character preceding it in the paragraph or if there is none, with the paragraph embedding level. @@ -4851,15 +4863,15 @@ $firstchar = true; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run $right = $postlevel; $nc2 = $nc; $i2 = $i; - while (!($nc2==($numchunks-1) && $i2==((count($para[$nc2][18]['char_data']))-1))) { // while not at end of last chunk + while (!($nc2==($numchunks-1) && $i2==((count(($para[$nc2][18]['char_data'] ?? [])))-1))) { // while not at end of last chunk $i2++; - if ($i2 >= count($para[$nc2][18]['char_data'])) { + if ($i2 >= count(($para[$nc2][18]['char_data'] ?? []))) { $nc2++; $i2 = 0; } @@ -4890,7 +4902,7 @@ $prevtype = 0; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run if ($chardata[$i]['type'] == UCDN::BIDI_CLASS_NSM) { @@ -4911,7 +4923,7 @@ $laststrongtype = -1; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run if (isset($chardata[$i]['sor'])) { $laststrongtype = $chardata[$i]['sor']; } @@ -4929,7 +4941,7 @@ // W3. Change all ALs to R. for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (isset($chardata[$i]['type']) && $chardata[$i]['type'] == UCDN::BIDI_CLASS_AL) { $chardata[$i]['type'] = UCDN::BIDI_CLASS_R; } } @@ -4942,7 +4954,7 @@ $nexttype = -1; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run @@ -4950,9 +4962,9 @@ $nexttype = -1; $nc2 = $nc; $i2 = $i; - while (!($nc2==($numchunks-1) && $i2==((count($para[$nc2][18]['char_data']))-1))) { // while not at end of last chunk + while (!($nc2==($numchunks-1) && $i2==((count(($para[$nc2][18]['char_data'] ?? [])))-1))) { // while not at end of last chunk $i2++; - if ($i2 >= count($para[$nc2][18]['char_data'])) { + if ($i2 >= count(($para[$nc2][18]['char_data'] ?? []))) { $nc2++; $i2 = 0; } @@ -4982,7 +4994,7 @@ $nexttype = -1; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run if (isset($chardata[$i]['sor'])) { $prevtype = $chardata[$i]['sor']; } @@ -4995,9 +5007,9 @@ $nexttype = -1; $nc2 = $nc; $i2 = $i; - while (!($nc2==($numchunks-1) && $i2==((count($para[$nc2][18]['char_data']))-1))) { // while not at end of last chunk + while (!($nc2==($numchunks-1) && $i2==((count(($para[$nc2][18]['char_data'] ?? [])))-1))) { // while not at end of last chunk $i2++; - if ($i2 >= count($para[$nc2][18]['char_data'])) { + if ($i2 >= count(($para[$nc2][18]['char_data'] ?? []))) { $nc2++; $i2 = 0; } @@ -5020,7 +5032,7 @@ // W6. Otherwise, separators and terminators change to Other Neutral. for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (isset($chardata[$i]['type']) && (($chardata[$i]['type'] == UCDN::BIDI_CLASS_ET) || ($chardata[$i]['type'] == UCDN::BIDI_CLASS_ES) || ($chardata[$i]['type'] == UCDN::BIDI_CLASS_CS))) { $chardata[$i]['type'] = UCDN::BIDI_CLASS_ON; @@ -5033,7 +5045,7 @@ $laststrongtype = -1; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run if (isset($chardata[$i]['sor'])) { $laststrongtype = $chardata[$i]['sor']; } @@ -5052,7 +5064,7 @@ $laststrongtype = -1; for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (!isset($chardata[$i]['diid']) || $chardata[$i]['diid']!=$ir) { continue; } // Ignore characters in a different isolate run if (isset($chardata[$i]['sor'])) { $laststrongtype = $chardata[$i]['sor']; } @@ -5076,9 +5088,9 @@ $nexttype = -1; $nc2 = $nc; $i2 = $i; - while (!($nc2==($numchunks-1) && $i2==((count($para[$nc2][18]['char_data']))-1))) { // while not at end of last chunk + while (!($nc2==($numchunks-1) && $i2==((count(($para[$nc2][18]['char_data'] ?? [])))-1))) { // while not at end of last chunk $i2++; - if ($i2 >= count($para[$nc2][18]['char_data'])) { + if ($i2 >= count(($para[$nc2][18]['char_data'] ?? []))) { $nc2++; $i2 = 0; } @@ -5114,7 +5126,7 @@ // N2. Any remaining neutrals take the embedding direction for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (isset($chardata[$i]['type']) && ($chardata[$i]['type'] == UCDN::BIDI_CLASS_ON || $chardata[$i]['type'] == UCDN::BIDI_CLASS_WS)) { $chardata[$i]['orig_type'] = $chardata[$i]['type']; // Need to store the original 'WS' for reference in L1 below @@ -5127,7 +5139,7 @@ // I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level. for ($nc=0;$nc<$numchunks;$nc++) { $chardata =& $para[$nc][18]['char_data']; - $numchars = count($chardata); + $numchars = count(($chardata ?? [])); for ($i=0; $i < $numchars; ++$i) { if (isset($chardata[$i]['level'])) { $odd = $chardata[$i]['level'] % 2; @@ -5145,18 +5157,18 @@ } // Remove Isolate formatters - $numchunks = count($para); + $numchunks = count(($para ?? [])); if ($controlchars) { for ($nc=0;$nc<$numchunks;$nc++) { $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x81\xa6"); $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x81\xa7"); $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x81\xa8"); $this->removeChar($para[$nc][0], $para[$nc][18], "\xe2\x81\xa9"); - preg_replace("/\x{2066}-\x{2069}/u", '', $para[$nc][0]); + preg_replace("/\x{2066}-\x{2069}/u", '', ($para[$nc][0] ?? '')); } // Remove any blank chunks made by removing directional codes for ($nc=($numchunks-1);$nc>=0;$nc--) { - if (count($para[$nc][18]['char_data'])==0) { array_splice($para, $nc, 1); } + if (count(($para[$nc][18]['char_data'] ?? []))==0) { array_splice($para, $nc, 1); } } } @@ -5171,10 +5183,10 @@ $bidiData = array(); // First combine into one array (and get the highest level in use) - $numchunks = count($content); + $numchunks = count(($content ?? [])); $maxlevel = 0; for ($nc=0;$nc<$numchunks;$nc++) { - $numchars = count($cOTLdata[$nc]['char_data']); + $numchars = count(($cOTLdata[$nc]['char_data'] ?? [])); for ($i=0; $i < $numchars; ++$i) { $carac = array(); @@ -5183,7 +5195,7 @@ if (isset($cOTLdata[$nc]['char_data'][$i]['type'])) $carac['type'] = $cOTLdata[$nc]['char_data'][$i]['type']; if (isset($cOTLdata[$nc]['char_data'][$i]['level'])) $carac['level'] = $cOTLdata[$nc]['char_data'][$i]['level']; if (isset($cOTLdata[$nc]['char_data'][$i]['orig_type'])) { $carac['orig_type'] = $cOTLdata[$nc]['char_data'][$i]['orig_type']; } - $carac['group'] = $cOTLdata[$nc]['group']{$i}; + $carac['group'] = $cOTLdata[$nc]['group'][$i]; $carac['chunkid'] = $chunkorder[$nc]; // gives font id and/or object ID $maxlevel = max((isset($carac['level']) ? $carac['level'] : 0),$maxlevel); @@ -5192,7 +5204,7 @@ } if ($maxlevel==0) { return; } - $numchars = count($bidiData); + $numchars = count(($bidiData ?? [])); // L1. On each line, reset the embedding level of the following characters to the paragraph embedding level: // 1. Segment separators (Tab) 'S', @@ -5291,8 +5303,8 @@ function splitOTLdata(&$cOTLdata, $OTLcutoffpos, $OTLrestartpos='') { if (!$OTLrestartpos) { $OTLrestartpos = $OTLcutoffpos; } $newOTLdata = array('GPOSinfo' => array(), 'char_data' => array()); - $newOTLdata['group'] = substr($cOTLdata['group'],$OTLrestartpos); - $cOTLdata['group'] = substr($cOTLdata['group'],0,$OTLcutoffpos); + $newOTLdata['group'] = substr(($cOTLdata['group'] ?? ''),$OTLrestartpos); + $cOTLdata['group'] = substr(($cOTLdata['group'] ?? ''),0,$OTLcutoffpos); if (isset($cOTLdata['GPOSinfo']) && $cOTLdata['GPOSinfo']) { foreach($cOTLdata['GPOSinfo'] AS $k => $val) { @@ -5319,7 +5331,7 @@ function sliceOTLdata($OTLdata, $pos, $len) { $newOTLdata = array('GPOSinfo' => array(), 'char_data' => array()); - $newOTLdata['group'] = substr($OTLdata['group'],$pos,$len); + $newOTLdata['group'] = substr(($OTLdata['group'] ?? ''),$pos,$len); if ($OTLdata['GPOSinfo']) { foreach($OTLdata['GPOSinfo'] AS $k => $val) { @@ -5339,10 +5351,10 @@ // Remove one or more occurrences of $char (single character) from $txt and adjust OTLdata function removeChar(&$txt, &$cOTLdata, $char) { - while(mb_strpos($txt, $char, 0, $this->mpdf->mb_enc )!== false) { - $pos = mb_strpos($txt, $char, 0, $this->mpdf->mb_enc ); + while(mb_strpos(($txt ?? ''), ($char ?? ''), 0, $this->mpdf->mb_enc )!== false) { + $pos = mb_strpos(($txt ?? ''), ($char ?? ''), 0, $this->mpdf->mb_enc ); $newGPOSinfo = array(); - $cOTLdata['group'] = substr_replace($cOTLdata['group'], '', $pos, 1); + $cOTLdata['group'] = substr_replace(($cOTLdata['group'] ?? ''), '', $pos, 1); if ($cOTLdata['GPOSinfo']) { foreach($cOTLdata['GPOSinfo'] AS $k => $val) { if ($k > $pos) { @@ -5356,25 +5368,25 @@ } if (isset($cOTLdata['char_data'])) { array_splice($cOTLdata['char_data'], $pos, 1); } - $txt = preg_replace("/".$char."/",'',$txt, 1); + $txt = preg_replace("/".$char."/",'',($txt ?? ''), 1); } } // Remove one or more occurrences of $char (single character) from $txt and adjust OTLdata function replaceSpace(&$txt, &$cOTLdata) { $char = chr(194).chr(160); // NBSP - while(mb_strpos($txt, $char, 0, $this->mpdf->mb_enc )!== false) { - $pos = mb_strpos($txt, $char, 0, $this->mpdf->mb_enc ); + while(mb_strpos(($txt ?? ''), ($char ?? ''), 0, $this->mpdf->mb_enc )!== false) { + $pos = mb_strpos(($txt ?? ''), ($char ?? ''), 0, $this->mpdf->mb_enc ); if ($cOTLdata['char_data'][$pos]['uni'] == 160) { $cOTLdata['char_data'][$pos]['uni'] = 32; } - $txt = preg_replace("/".$char."/",' ',$txt, 1); + $txt = preg_replace("/".$char."/",' ',($txt ?? ''), 1); } } function trimOTLdata(&$cOTLdata, $Left=true, $Right=true) { - $len = count($cOTLdata['char_data']); + $len = count(($cOTLdata['char_data'] ?? [])); $nLeft = 0; $nRight = 0; for($i=0;$i<$len;$i++) { @@ -5388,7 +5400,7 @@ // Trim Right if ($Right && $nRight) { - $cOTLdata['group'] = substr($cOTLdata['group'],0,strlen($cOTLdata['group'])-$nRight); + $cOTLdata['group'] = substr(($cOTLdata['group'] ?? ''),0,strlen(($cOTLdata['group'] ?? ''))-$nRight); if ($cOTLdata['GPOSinfo']) { foreach($cOTLdata['GPOSinfo'] AS $k => $val) { if ($k >= $len-$nRight) { @@ -5404,7 +5416,7 @@ } // Trim Left if ($Left && $nLeft) { - $cOTLdata['group'] = substr($cOTLdata['group'],$nLeft); + $cOTLdata['group'] = substr(($cOTLdata['group'] ?? ''),$nLeft); if ($cOTLdata['GPOSinfo']) { $newPOSinfo = array(); foreach($cOTLdata['GPOSinfo'] AS $k => $val) { @@ -5431,11 +5443,11 @@ function glyphToChar($gid) { - return (ord($this->glyphIDtoUni[$gid*3]) << 16) + (ord($this->glyphIDtoUni[$gid*3+1]) << 8) + ord($this->glyphIDtoUni[$gid*3+2]); + return (ord(($this->glyphIDtoUni[$gid*3] ?? '')) << 16) + (ord(($this->glyphIDtoUni[$gid*3+1] ?? '')) << 8) + ord(($this->glyphIDtoUni[$gid*3+2] ?? '')); } function unicode_hex($unicode_dec) { - return (str_pad(strtoupper(dechex($unicode_dec)),5,'0',STR_PAD_LEFT)); + return (str_pad((strtoupper((dechex($unicode_dec) ?? '')) ?? ''),5,'0',STR_PAD_LEFT)); } function seek($pos) { @@ -5446,7 +5458,7 @@ $this->_pos += $delta; } function read_short() { - $a = (ord($this->ttfOTLdata[$this->_pos])<<8) + ord($this->ttfOTLdata[$this->_pos+1]); + $a = (ord(($this->ttfOTLdata[$this->_pos] ?? ''))<<8) + ord(($this->ttfOTLdata[$this->_pos+1] ?? '')); if ($a & (1 << 15) ) { $a = ($a - (1 << 16)); } @@ -5455,7 +5467,7 @@ } function read_ushort() { - $a = (ord($this->ttfOTLdata[$this->_pos])<<8) + ord($this->ttfOTLdata[$this->_pos+1]); + $a = (ord(($this->ttfOTLdata[$this->_pos] ?? ''))<<8) + ord(($this->ttfOTLdata[$this->_pos+1] ?? '')); $this->_pos += 2; return $a; } @@ -5657,23 +5669,23 @@ // http://www.microsoft.com/typography/otspec/languagetags.htm // IETF tag = e.g. en-US, und-Arab, sr-Cyrl cf. config_lang2fonts.php if ($available=='') { return ''; } - $tags = preg_split('/-/',$ietf); + $tags = preg_split('/-/',($ietf ?? '')); $lang = ''; $country = ''; $script = ''; - $lang = strtolower($tags[0]); + $lang = strtolower(($tags[0] ?? '')); if (isset($tags[1]) && $tags[1]) { - if (strlen($tags[1]) == 2) { $country = strtolower($tags[1]); } - } - if (isset($tags[2]) && $tags[2]) { $country = strtolower($tags[2]); } + if (strlen(($tags[1] ?? '')) == 2) { $country = strtolower(($tags[1] ?? '')); } + } + if (isset($tags[2]) && $tags[2]) { $country = strtolower(($tags[2] ?? '')); } if ($lang!='' && isset(UCDN::$ot_languages[$lang])) { $langsys = UCDN::$ot_languages[$lang]; } else if ($lang!='' && $country !='' && isset(UCDN::$ot_languages[$lang.''.$country])) { $langsys = UCDN::$ot_languages[$lang.''.$country]; } else { $langsys = "DFLT"; } - if (strpos($available, $langsys)===false) { - if (strpos($available, "DFLT")!==false) { return "DFLT"; } + if (strpos(($available ?? ''), ($langsys ?? ''))===false) { + if (strpos(($available ?? ''), "DFLT")!==false) { return "DFLT"; } else return ''; } return $langsys; @@ -5685,22 +5697,22 @@ echo '<div style="font-family:monospace">'; echo 'Glyph position: '.$ptr.' Current Glyph: '.$currGlyph.'<br />'; - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if ($i==$ptr) { echo '<b>'; } echo $this->OTLdata[$i]['hex'] . ' '; if ($i==$ptr) { echo '</b>'; } } echo '<br />'; - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if ($i==$ptr) { echo '<b>'; } - echo str_pad($this->OTLdata[$i]['uni'],5) . ' '; + echo str_pad(($this->OTLdata[$i]['uni'] ?? ''),5) . ' '; if ($i==$ptr) { echo '</b>'; } } echo '<br />'; if ($GPOSSUB == 'GPOS') { - for ($i=0;$i<count($this->OTLdata);$i++) { + for ($i=0;$i<count(($this->OTLdata ?? []));$i++) { if (!empty($this->OTLdata[$i]['GPOSinfo'])) { echo $this->OTLdata[$i]['hex'] . ' &#x'.$this->OTLdata[$i]['hex'].'; '; print_r($this->OTLdata[$i]['GPOSinfo']); --- a/intranet/mpdf60/classes/sea.php +++ b/intranet/mpdf60/classes/sea.php @@ -134,19 +134,19 @@ $ptr = 0; $syllable_serial = 1; $broken_syllables = false; - while($ptr < strlen($s)) { + while($ptr < strlen(($s ?? ''))) { $match = ''; $syllable_length = 1; $syllable_type = self::NON_SEA_CLUSTER ; // CONSONANT_SYLLABLE Consonant syllable - if (preg_match('/^(C|V|G)(p|a|b|t|HC|M|R|T|A)*/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + if (preg_match('/^(C|V|G)(p|a|b|t|HC|M|R|T|A)*/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::CONSONANT_SYLLABLE ; } // BROKEN_CLUSTER syllable - else if (preg_match('/^(p|a|b|t|HC|M|R|T|A)+/', substr($s,$ptr), $ma)) { - $syllable_length = strlen($ma[0]); + else if (preg_match('/^(p|a|b|t|HC|M|R|T|A)+/', (substr(($s ?? ''),$ptr) ?? ''), $ma)) { + $syllable_length = strlen(($ma[0] ?? '')); $syllable_type = self::BROKEN_CLUSTER ; $broken_syllables = true; } @@ -162,7 +162,7 @@ if ($broken_syllables && $dottedcircle) { self::insert_dotted_circles ($info, $dottedcircle); } - $count = count($info); + $count = count(($info ?? [])); if (!$count) return; $last = 0; $last_syllable = $info[0]['syllable']; @@ -179,7 +179,7 @@ public static function insert_dotted_circles(&$info, $dottedcircle) { $idx = 0; $last_syllable = 0; - while ($idx < count($info)) { + while ($idx < count(($info ?? []))) { $syllable = $info[$idx]['syllable']; $syllable_type = ($syllable & 0x0F); if ($last_syllable != $syllable && $syllable_type == self::BROKEN_CLUSTER) { @@ -234,7 +234,7 @@ } public static function final_reordering (&$info, $GSUBdata, $scriptblock) { - $count = count($info); + $count = count(($info ?? [])); if (!$count) return; $last = 0; $last_syllable = $info[0]['syllable']; --- a/intranet/mpdf60/classes/wmf.php +++ b/intranet/mpdf60/classes/wmf.php @@ -5,7 +5,7 @@ var $mpdf = null; var $gdiObjectArray; -function wmf(&$mpdf) { +function __construct(&$mpdf) { $this->mpdf = $mpdf; } @@ -18,7 +18,7 @@ if ($a['test']!=1) return array(0, 'Error parsing WMF image - Big-endian architecture not supported'); // check for Aldus placeable metafile header - $key = unpack('Lmagic', substr($data, 0, 4)); + $key = unpack('Lmagic', substr(($data ?? ''), 0, 4)); $p = 18; // WMF header if ($key['magic'] == (int)0x9AC6CDD7) { $p +=22; } // Aldus header // define some state variables @@ -29,14 +29,14 @@ $nullBrush = false; $endRecord = false; $wmfdata = ''; - while ($p < strlen($data) && !$endRecord) { - $recordInfo = unpack('Lsize/Sfunc', substr($data, $p, 6)); $p += 6; + while ($p < strlen(($data ?? '')) && !$endRecord) { + $recordInfo = unpack('Lsize/Sfunc', substr(($data ?? ''), $p, 6)); $p += 6; // size of record given in WORDs (= 2 bytes) $size = $recordInfo['size']; // func is number of GDI function $func = $recordInfo['func']; if ($size > 3) { - $parms = substr($data, $p, 2*($size-3)); $p += 2*($size-3); + $parms = substr(($data ?? ''), $p, 2*($size-3)); $p += 2*($size-3); } switch ($func) { case 0x020b: // SetWindowOrg @@ -126,9 +126,9 @@ } if (!empty($dashArray)) { $s = '['; - for ($i=0; $i<count($dashArray);$i++) { + for ($i=0; $i<count(($dashArray ?? []));$i++) { $s .= $dashArray[$i] * $k; - if ($i != count($dashArray)-1) { $s .= ' '; } + if ($i != count(($dashArray ?? []))-1) { $s .= ' '; } } $s .= '] 0 d'; $wmfdata .= $s."\n"; --- a/intranet/mpdf60/utils/font_coverage.php +++ b/intranet/mpdf60/utils/font_coverage.php @@ -35,8 +35,8 @@ -$mqr=ini_get("magic_quotes_runtime"); -if ($mqr) { set_magic_quotes_runtime(0); } +$mqr='0'; +if ($mqr) { false; } if (!class_exists('TTFontFile_Analysis', false)) { include(_MPDF_PATH .'classes/ttfontsuni_analysis.php'); } //============================================================== --- a/intranet/mpdf60/utils/font_names.php +++ b/intranet/mpdf60/utils/font_names.php @@ -31,8 +31,8 @@ } else { $ttfdir = _MPDF_TTFONTPATH; } -$mqr=ini_get("magic_quotes_runtime"); -if ($mqr) { set_magic_quotes_runtime(0); } +$mqr='0'; +if ($mqr) { false; } if (!class_exists('TTFontFile_Analysis', false)) { include(_MPDF_PATH .'classes/ttfontsuni_analysis.php'); } $ttf = new TTFontFile_Analysis(); --- a/intranet/mpdf60/utils/image_details.php +++ b/intranet/mpdf60/utils/image_details.php @@ -15,13 +15,13 @@ if ($orig_srcpath && $fileIsLocal && $check = @fopen($orig_srcpath,"rb")) { fclose($check); $file=$orig_srcpath; - $data = file_get_contents($file); + $data = file_get_contents(($file ?? '')); $type = _imageTypeFromString($data); echo 'File accessed using fopen on $orig_srcpath' . '<br />'; } if (!$data && $check = @fopen($file,"rb")) { fclose($check); - $data = file_get_contents($file); + $data = file_get_contents(($file ?? '')); $type = _imageTypeFromString($data); echo 'File accessed using fopen on $file' . '<br />'; } @@ -40,7 +40,7 @@ if (!$data) { echo 'Could not access image file' . '<br />'; exit; } - echo 'Image type determined: ' .strtoupper($type) . '<br />'; + echo 'Image type determined: ' .strtoupper(($type ?? '')) . '<br />'; // JPEG if ($type == 'jpeg' || $type == 'jpg') { @@ -54,12 +54,12 @@ echo 'BPC (bits per channel): ' . $a[3]. '<br />'; echo 'Channels: ' . $channels. '<br />'; - $j = strpos($data,'JFIF'); + $j = strpos(($data ?? ''),'JFIF'); if ($j) { //Read resolution - $unitSp=ord(substr($data,($j+7),1)); + $unitSp=ord((substr(($data ?? ''),($j+7),1) ?? '')); if ($unitSp > 0) { - $ppUx=_twobytes2int(substr($data,($j+8),2)); // horizontal pixels per meter, usually set to zero + $ppUx=_twobytes2int(substr(($data ?? ''),($j+8),2)); // horizontal pixels per meter, usually set to zero if ($unitSp == 2) { // = dots per cm (if == 1 set as dpi) $ppUx=round($ppUx/10 *25.4); } @@ -72,25 +72,25 @@ // mPDF 6 ICC profile $offset = 0; $icc = array(); - while (($pos = strpos($data, "ICC_PROFILE\0", $offset)) !== false) { + while (($pos = strpos(($data ?? ''), "ICC_PROFILE\0", $offset)) !== false) { // get ICC sequence length - $length = _twobytes2int(substr($data, ($pos - 2),2)) - 16; - $sn = max(1, ord($data[($pos + 12)])); - $nom = max(1, ord($data[($pos + 13)])); - $icc[($sn - 1)] = substr($data, ($pos + 14), $length); + $length = _twobytes2int(substr(($data ?? ''), ($pos - 2),2)) - 16; + $sn = max(1, ord(($data[($pos + 12)] ?? ''))); + $nom = max(1, ord(($data[($pos + 13)] ?? ''))); + $icc[($sn - 1)] = substr(($data ?? ''), ($pos + 14), $length); $offset = ($pos + 14 + $length); } // order and compact ICC segments - if (count($icc) > 0) { + if (count(($icc ?? [])) > 0) { echo 'ICC profile present' . '<br />'; ksort($icc); $icc = implode('', $icc); - if (substr($icc, 36, 4) != 'acsp') { + if (substr(($icc ?? ''), 36, 4) != 'acsp') { // invalid ICC profile echo 'ICC profile INVALID (no acsp flag)' . '<br />'; } - $input = substr($icc, 16, 4); - $output = substr($icc, 20, 4); + $input = substr(($icc ?? ''), 16, 4); + $output = substr(($icc ?? ''), 20, 4); echo 'ICC profile Input: ' . $input. '<br />'; echo 'ICC profile Output: ' . $output. '<br />'; // Ignore Color profiles for conversion to other colorspaces e.g. CMYK/Lab @@ -102,17 +102,17 @@ // PNG else if ($type == 'png') { //Check signature - if(substr($data,0,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { + if(substr(($data ?? ''),0,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { echo 'Error parsing PNG identifier<br />'; exit; } //Read header chunk - if(substr($data,12,4)!='IHDR') { + if(substr(($data ?? ''),12,4)!='IHDR') { echo 'Incorrect PNG file (no IHDR block found)<br />'; exit; } - $w=_fourbytes2int(substr($data,16,4)); - $h=_fourbytes2int(substr($data,20,4)); - $bpc=ord(substr($data,24,1)); + $w=_fourbytes2int(substr(($data ?? ''),16,4)); + $h=_fourbytes2int(substr(($data ?? ''),20,4)); + $bpc=ord((substr(($data ?? ''),24,1) ?? '')); $errpng = false; $pngalpha = false; $channels = 0; @@ -121,7 +121,7 @@ echo 'Height: ' .$h . '<br />'; echo 'BPC (bits per channel): ' .$bpc . '<br />'; - $ct=ord(substr($data,25,1)); + $ct=ord((substr(($data ?? ''),25,1) ?? '')); if($ct==0) { $colspace='DeviceGray'; $channels = 1; } elseif($ct==2) { $colspace='DeviceRGB'; $channels = 3; } elseif($ct==3) { $colspace='Indexed'; $channels = 1; } @@ -132,20 +132,20 @@ echo 'Channels: ' . $channels. '<br />'; if ($pngalpha) echo 'Alpha channel detected'. '<br />'; - if ($ct < 4 && strpos($data,'tRNS')!==false) { echo 'Transparency detected'. '<br />'; $errpng = 'transparency'; $pngalpha = true;} - - if ($ct == 3 && strpos($data,'iCCP')!==false) { echo 'Indexed plus ICC'. '<br />'; $errpng = 'indexed plus ICC'; } - - if(ord(substr($data,26,1))!=0) { echo 'compression method not set to zero<br />'; $errpng = 'compression method'; } // only 0 should be specified - if(ord(substr($data,27,1))!=0) { echo 'filter method not set to zero<br />'; $errpng = 'filter method'; } // only 0 should be specified - if(ord(substr($data,28,1))!=0) { echo 'interlaced file not set to zero<br />'; $errpng = 'interlaced file'; } - - $j = strpos($data,'pHYs'); + if ($ct < 4 && strpos(($data ?? ''),'tRNS')!==false) { echo 'Transparency detected'. '<br />'; $errpng = 'transparency'; $pngalpha = true;} + + if ($ct == 3 && strpos(($data ?? ''),'iCCP')!==false) { echo 'Indexed plus ICC'. '<br />'; $errpng = 'indexed plus ICC'; } + + if(ord((substr(($data ?? ''),26,1) ?? ''))!=0) { echo 'compression method not set to zero<br />'; $errpng = 'compression method'; } // only 0 should be specified + if(ord((substr(($data ?? ''),27,1) ?? ''))!=0) { echo 'filter method not set to zero<br />'; $errpng = 'filter method'; } // only 0 should be specified + if(ord((substr(($data ?? ''),28,1) ?? ''))!=0) { echo 'interlaced file not set to zero<br />'; $errpng = 'interlaced file'; } + + $j = strpos(($data ?? ''),'pHYs'); if ($j) { //Read resolution - $unitSp=ord(substr($data,($j+12),1)); + $unitSp=ord((substr(($data ?? ''),($j+12),1) ?? '')); if ($unitSp == 1) { - $ppUx=_fourbytes2int(substr($data,($j+4),4)); // horizontal pixels per meter, usually set to zero + $ppUx=_fourbytes2int(substr(($data ?? ''),($j+4),4)); // horizontal pixels per meter, usually set to zero $ppUx=round($ppUx/1000 *25.4); } echo 'Resolution ppUx: ' . $ppUx. '<br />'; @@ -154,9 +154,9 @@ // mPDF 6 Gamma correction $gamma_correction = 0; $gAMA = 0; - $j = strpos($data,'gAMA'); - if ($j && strpos($data,'sRGB')===false) { // sRGB colorspace - overrides gAMA - $gAMA=_fourbytes2int(substr($data,($j+4),4)); // Gamma value times 100000 + $j = strpos(($data ?? ''),'gAMA'); + if ($j && strpos(($data ?? ''),'sRGB')===false) { // sRGB colorspace - overrides gAMA + $gAMA=_fourbytes2int(substr(($data ?? ''),($j+4),4)); // Gamma value times 100000 $gAMA /= 100000; } @@ -169,8 +169,8 @@ if ($gamma_correction) { echo 'Gamma correction detected'. '<br />'; } // NOT supported at present - if (strpos($data,'sRGB')!==false) echo 'sRGB colorspace - NOT supported at present'. '<br />'; - if (strpos($data,'cHRM')!==false) echo 'Chromaticity and Whitepoint - NOT supported at present'. '<br />'; + if (strpos(($data ?? ''),'sRGB')!==false) echo 'sRGB colorspace - NOT supported at present'. '<br />'; + if (strpos(($data ?? ''),'cHRM')!==false) echo 'Chromaticity and Whitepoint - NOT supported at present'. '<br />'; if (($errpng || $pngalpha || $gamma_correction)) { if (function_exists('gd_info')) { $gd = gd_info(); } @@ -197,22 +197,22 @@ // ICC profile $icc = false; - $p = strpos($data,'iCCP'); + $p = strpos(($data ?? ''),'iCCP'); if ($p && $colspace=="Indexed") { $p += 4; - $n=_fourbytes2int(substr($data,($p-8),4)); - $nullsep = strpos(substr($data,$p,80), chr(0)); - $icc = substr($data, ($p+$nullsep+2), ($n-($nullsep+2)) ); + $n=_fourbytes2int(substr(($data ?? ''),($p-8),4)); + $nullsep = strpos((substr(($data ?? ''),$p,80) ?? ''), (chr(0) ?? '')); + $icc = substr(($data ?? ''), ($p+$nullsep+2), ($n-($nullsep+2)) ); // Test if file is gzcompressed - if (ord(substr($str, 0, 1)) == 0x1f && ord(substr($str, 1, 1)) == 0x8b) { + if (ord((substr(($str ?? ''), 0, 1) ?? '')) == 0x1f && ord((substr(($str ?? ''), 1, 1) ?? '')) == 0x8b) { $icc = @gzuncompress($icc); // Ignored if fails } if ($icc) { echo 'ICC profile present' . '<br />'; - if (substr($icc, 36, 4) != 'acsp') { echo 'ICC profile INVALID (no acsp flag)' . '<br />'; $icc = false; } // invalid ICC profile + if (substr(($icc ?? ''), 36, 4) != 'acsp') { echo 'ICC profile INVALID (no acsp flag)' . '<br />'; $icc = false; } // invalid ICC profile else { - $input = substr($icc, 16, 4); - $output = substr($icc, 20, 4); + $input = substr(($icc ?? ''), 16, 4); + $output = substr(($icc ?? ''), 20, 4); echo 'ICC profile Input: ' . $input. '<br />'; echo 'ICC profile Output: ' . $output. '<br />'; // Ignore Color profiles for conversion to other colorspaces e.g. CMYK/Lab @@ -242,17 +242,17 @@ //Check signature - if(substr($data,0,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { + if(substr(($data ?? ''),0,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { echo 'Error parsing PNG identifier<br />'; exit; } //Read header chunk - if(substr($data,12,4)!='IHDR') { + if(substr(($data ?? ''),12,4)!='IHDR') { echo 'Incorrect PNG file (no IHDR block found)<br />'; exit; } - $w=_fourbytes2int(substr($data,16,4)); - $h=_fourbytes2int(substr($data,20,4)); - $bpc=ord(substr($data,24,1)); + $w=_fourbytes2int(substr(($data ?? ''),16,4)); + $h=_fourbytes2int(substr(($data ?? ''),20,4)); + $bpc=ord((substr(($data ?? ''),24,1) ?? '')); $errpng = false; $pngalpha = false; $channels = 0; @@ -261,7 +261,7 @@ echo 'Height: ' .$h . '<br />'; echo 'BPC (bits per channel): ' .$bpc . '<br />'; - $ct=ord(substr($data,25,1)); + $ct=ord((substr(($data ?? ''),25,1) ?? '')); if($ct==0) { $colspace='DeviceGray'; $channels = 1; } elseif($ct==2) { $colspace='DeviceRGB'; $channels = 3; } elseif($ct==3) { $colspace='Indexed'; $channels = 1; } @@ -272,20 +272,20 @@ echo 'Channels: ' . $channels. '<br />'; if ($pngalpha) echo 'Alpha channel detected'. '<br />'; - if ($ct < 4 && strpos($data,'tRNS')!==false) { echo 'Transparency detected'. '<br />'; $errpng = 'transparency'; $pngalpha = true;} - - if ($ct == 3 && strpos($data,'iCCP')!==false) { echo 'Indexed plus ICC'. '<br />'; $errpng = 'indexed plus ICC'; } - - if(ord(substr($data,26,1))!=0) { echo 'compression method not set to zero<br />'; $errpng = 'compression method'; } // only 0 should be specified - if(ord(substr($data,27,1))!=0) { echo 'filter method not set to zero<br />'; $errpng = 'filter method'; } // only 0 should be specified - if(ord(substr($data,28,1))!=0) { echo 'interlaced file not set to zero<br />'; $errpng = 'interlaced file'; } - - $j = strpos($data,'pHYs'); + if ($ct < 4 && strpos(($data ?? ''),'tRNS')!==false) { echo 'Transparency detected'. '<br />'; $errpng = 'transparency'; $pngalpha = true;} + + if ($ct == 3 && strpos(($data ?? ''),'iCCP')!==false) { echo 'Indexed plus ICC'. '<br />'; $errpng = 'indexed plus ICC'; } + + if(ord((substr(($data ?? ''),26,1) ?? ''))!=0) { echo 'compression method not set to zero<br />'; $errpng = 'compression method'; } // only 0 should be specified + if(ord((substr(($data ?? ''),27,1) ?? ''))!=0) { echo 'filter method not set to zero<br />'; $errpng = 'filter method'; } // only 0 should be specified + if(ord((substr(($data ?? ''),28,1) ?? ''))!=0) { echo 'interlaced file not set to zero<br />'; $errpng = 'interlaced file'; } + + $j = strpos(($data ?? ''),'pHYs'); if ($j) { //Read resolution - $unitSp=ord(substr($data,($j+12),1)); + $unitSp=ord((substr(($data ?? ''),($j+12),1) ?? '')); if ($unitSp == 1) { - $ppUx=_fourbytes2int(substr($data,($j+4),4)); // horizontal pixels per meter, usually set to zero + $ppUx=_fourbytes2int(substr(($data ?? ''),($j+4),4)); // horizontal pixels per meter, usually set to zero $ppUx=round($ppUx/1000 *25.4); } echo 'Resolution ppUx: ' . $ppUx. '<br />'; @@ -294,9 +294,9 @@ //Gamma correction $gamma_correction = 0; $gAMA = 0; - $j = strpos($data,'gAMA'); - if ($j && strpos($data,'sRGB')===false) { // sRGB colorspace - overrides gAMA - $gAMA=_fourbytes2int(substr($data,($j+4),4)); // Gamma value times 100000 + $j = strpos(($data ?? ''),'gAMA'); + if ($j && strpos(($data ?? ''),'sRGB')===false) { // sRGB colorspace - overrides gAMA + $gAMA=_fourbytes2int(substr(($data ?? ''),($j+4),4)); // Gamma value times 100000 $gAMA /= 100000; } @@ -309,8 +309,8 @@ if ($gamma_correction) { echo 'Gamma correction detected'. '<br />'; } // NOT supported at present - if (strpos($data,'sRGB')!==false) echo 'sRGB colorspace - NOT supported at present'. '<br />'; - if (strpos($data,'cHRM')!==false) echo 'Chromaticity and Whitepoint - NOT supported at present'. '<br />'; + if (strpos(($data ?? ''),'sRGB')!==false) echo 'sRGB colorspace - NOT supported at present'. '<br />'; + if (strpos(($data ?? ''),'cHRM')!==false) echo 'Chromaticity and Whitepoint - NOT supported at present'. '<br />'; } @@ -322,41 +322,41 @@ $icc = false; $p = 33; do { - $n=_fourbytes2int(substr($data,$p,4)); $p += 4; - $type=substr($data,$p,4); $p += 4; + $n=_fourbytes2int(substr(($data ?? ''),$p,4)); $p += 4; + $type=substr(($data ?? ''),$p,4); $p += 4; if ($type=='PLTE') { //Read palette - $pal=substr($data,$p,$n); $p += $n; + $pal=substr(($data ?? ''),$p,$n); $p += $n; $p += 4; } else if($type=='tRNS') { //Read transparency info - $t=substr($data,$p,$n); $p += $n; - if ($ct==0) $trns=array(ord(substr($t,1,1))); - else if ($ct==2) $trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1))); + $t=substr(($data ?? ''),$p,$n); $p += $n; + if ($ct==0) $trns=array(ord((substr(($t ?? ''),1,1) ?? ''))); + else if ($ct==2) $trns=array(ord((substr(($t ?? ''),1,1) ?? '')),ord((substr(($t ?? ''),3,1) ?? '')),ord((substr(($t ?? ''),5,1) ?? ''))); else { - $pos=strpos($t,chr(0)); + $pos=strpos(($t ?? ''),(chr(0) ?? '')); if(is_int($pos)) $trns=array($pos); } $p += 4; } else if ($type=='IDAT') { - $pngdata.=substr($data,$p,$n); $p += $n; + $pngdata.=substr(($data ?? ''),$p,$n); $p += $n; $p += 4; } else if ($type=='iCCP') { - $nullsep = strpos(substr($data,$p,80), chr(0)); - $icc = substr($data, ($p+$nullsep+2), ($n-($nullsep+2)) ); + $nullsep = strpos((substr(($data ?? ''),$p,80) ?? ''), (chr(0) ?? '')); + $icc = substr(($data ?? ''), ($p+$nullsep+2), ($n-($nullsep+2)) ); // Test if file is gzcompressed - if (ord(substr($str, 0, 1)) == 0x1f && ord(substr($str, 1, 1)) == 0x8b) { + if (ord((substr(($str ?? ''), 0, 1) ?? '')) == 0x1f && ord((substr(($str ?? ''), 1, 1) ?? '')) == 0x8b) { $icc = @gzuncompress($icc); // Ignored if fails } if ($icc) { echo 'ICC profile present' . '<br />'; - if (substr($icc, 36, 4) != 'acsp') { echo 'ICC profile INVALID (no acsp flag)' . '<br />'; $icc = false; } // invalid ICC profile + if (substr(($icc ?? ''), 36, 4) != 'acsp') { echo 'ICC profile INVALID (no acsp flag)' . '<br />'; $icc = false; } // invalid ICC profile else { - $input = substr($icc, 16, 4); - $output = substr($icc, 20, 4); + $input = substr(($icc ?? ''), 16, 4); + $output = substr(($icc ?? ''), 20, 4); echo 'ICC profile Input: ' . $input. '<br />'; echo 'ICC profile Output: ' . $output. '<br />'; // Ignore Color profiles for conversion to other colorspaces e.g. CMYK/Lab @@ -369,7 +369,7 @@ else if($type=='IEND') { break; } - else if (preg_match('/[a-zA-Z]{4}/',$type)) { $p += $n+4; } + else if (preg_match('/[a-zA-Z]{4}/',($type ?? ''))) { $p += $n+4; } else { echo 'Error parsing PNG image data<br />'; } } while($n); @@ -410,33 +410,33 @@ function _fourbytes2int($s) { //Read a 4-byte integer from string - return (ord($s[0])<<24) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); + return (ord(($s[0] ?? ''))<<24) + (ord(($s[1] ?? ''))<<16) + (ord(($s[2] ?? ''))<<8) + ord(($s[3] ?? '')); } function _twobytes2int($s) { // equivalent to _get_ushort //Read a 2-byte integer from string - return (ord(substr($s, 0, 1))<<8) + ord(substr($s, 1, 1)); + return (ord((substr(($s ?? ''), 0, 1) ?? ''))<<8) + ord((substr(($s ?? ''), 1, 1) ?? '')); } function _jpgHeaderFromString(&$data) { $p = 4; - $p += _twobytes2int(substr($data, $p, 2)); // Length of initial marker block - $marker = substr($data, $p, 2); - while($marker != chr(255).chr(192) && $marker != chr(255).chr(194) && $p<strlen($data)) { + $p += _twobytes2int(substr(($data ?? ''), $p, 2)); // Length of initial marker block + $marker = substr(($data ?? ''), $p, 2); + while($marker != chr(255).chr(192) && $marker != chr(255).chr(194) && $p<strlen(($data ?? ''))) { // Start of frame marker (FFC0) or (FFC2) mPDF 4.4.004 - $p += (_twobytes2int(substr($data, $p+2, 2))) + 2; // Length of marker block - $marker = substr($data, $p, 2); + $p += (_twobytes2int(substr(($data ?? ''), $p+2, 2))) + 2; // Length of marker block + $marker = substr(($data ?? ''), $p, 2); } if ($marker != chr(255).chr(192) && $marker != chr(255).chr(194)) { return false; } - return substr($data, $p+2, 10); + return substr(($data ?? ''), $p+2, 10); } function _jpgDataFromHeader($hdr) { - $bpc = ord(substr($hdr, 2, 1)); + $bpc = ord((substr(($hdr ?? ''), 2, 1) ?? '')); if (!$bpc) { $bpc = 8; } - $h = _twobytes2int(substr($hdr, 3, 2)); - $w = _twobytes2int(substr($hdr, 5, 2)); - $channels = ord(substr($hdr, 7, 1)); + $h = _twobytes2int(substr(($hdr ?? ''), 3, 2)); + $w = _twobytes2int(substr(($hdr ?? ''), 5, 2)); + $channels = ord((substr(($hdr ?? ''), 7, 1) ?? '')); if ($channels==3) { $colspace='DeviceRGB'; } elseif($channels==4) { $colspace='DeviceCMYK'; } else { $colspace='DeviceGray'; } @@ -495,25 +495,25 @@ function _imageTypeFromString(&$data) { $type = ''; - if (substr($data, 6, 4)== 'JFIF' || substr($data, 6, 4)== 'Exif' || substr($data, 0, 2)== chr(255).chr(216)) { // 0xFF 0xD8 + if (substr(($data ?? ''), 6, 4)== 'JFIF' || substr(($data ?? ''), 6, 4)== 'Exif' || substr(($data ?? ''), 0, 2)== chr(255).chr(216)) { // 0xFF 0xD8 $type = 'jpeg'; } - else if (substr($data, 0, 6)== "GIF87a" || substr($data, 0, 6)== "GIF89a") { + else if (substr(($data ?? ''), 0, 6)== "GIF87a" || substr(($data ?? ''), 0, 6)== "GIF89a") { $type = 'gif'; } - else if (substr($data, 0, 8)== chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { + else if (substr(($data ?? ''), 0, 8)== chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) { $type = 'png'; } /*-- IMAGES-WMF --*/ - else if (substr($data, 0, 4)== chr(215).chr(205).chr(198).chr(154)) { + else if (substr(($data ?? ''), 0, 4)== chr(215).chr(205).chr(198).chr(154)) { $type = 'wmf'; } /*-- END IMAGES-WMF --*/ - else if (preg_match('/<svg.*<\/svg>/is',$data)) { + else if (preg_match('/<svg.*<\/svg>/is',($data ?? ''))) { $type = 'svg'; } // BMP images - else if (substr($data, 0, 2)== "BM") { + else if (substr(($data ?? ''), 0, 2)== "BM") { $type = 'bmp'; } return $type; --- a/intranet/mpdf60/utils/font_dump.php +++ b/intranet/mpdf60/utils/font_dump.php @@ -47,7 +47,7 @@ // This generates a .mtx.php file if not already generated $mpdf->WriteHTML('<style>td { border: 0.1mm solid #555555; } body { font-weight: normal; }</style>'); -$mpdf->WriteHTML('<h3 style="font-family:'.$font.'">'.strtoupper($font).'</h3>'); // Separate Paragraphs defined by font +$mpdf->WriteHTML('<h3 style="font-family:'.$font.'">'.strtoupper(($font ?? '')).'</h3>'); // Separate Paragraphs defined by font $html = ''; //============================================================== //============================================================== @@ -57,10 +57,10 @@ $unichars = array(); foreach($unifile AS $line) { - if ($smp && preg_match('/^(1[0-9A-Za-z]{4});/',$line,$m)) { + if ($smp && preg_match('/^(1[0-9A-Za-z]{4});/',($line ?? ''),$m)) { $unichars[hexdec($m[1])] = hexdec($m[1]); } - else if (preg_match('/^([0-9A-Za-z]{4});/',$line,$m)) { + else if (preg_match('/^([0-9A-Za-z]{4});/',($line ?? ''),$m)) { $unichars[hexdec($m[1])] = hexdec($m[1]); } } @@ -102,8 +102,8 @@ $lastrange = $range ; // create HTML content $html .= '<table cellpadding="2" cellspacing="0" style="font-family:'.$font.';text-align:center; border-collapse: collapse; ">'; - $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-weight:bold">'.strtoupper($font).'</td></tr>'; - $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper($range).' (U+'.$rangestart .'-U+'.$rangeend.')</td></tr>'; + $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-weight:bold">'.strtoupper(($font ?? '')).'</td></tr>'; + $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper(($range ?? '')).' (U+'.$rangestart .'-U+'.$rangeend.')</td></tr>'; $html .= '<tr><td></td>'; $html .= '<td></td>'; @@ -155,7 +155,7 @@ $html .= '</tr></table><br />'; $mpdf->WriteHTML($html); $html = ''; $html .= '<table cellpadding="2" cellspacing="0" style="font-family:'.$font.';text-align:center; border-collapse: collapse; ">'; - $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper($range).' (U+'.$rangestart.'-U+'.$rangeend.')</td></tr>'; + $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper(($range ?? '')).' (U+'.$rangestart.'-U+'.$rangeend.')</td></tr>'; $html .= '<tr><td></td>'; $html .= '<td></td>'; for ($k = 0; $k < 16; $k++) { @@ -184,7 +184,7 @@ $html .= '</tr></table><br />'; $mpdf->WriteHTML($html); $html = ''; $html .= '<table cellpadding="2" cellspacing="0" style="font-family:'.$font.';text-align:center; border-collapse: collapse; ">'; - $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper($range).' (U+'.$rangestart.'-U+'.$rangeend.')</td></tr>'; + $html .= '<tr><td colspan="18" style="font-family:dejavusanscondensed;font-size:8pt;font-weight:bold">'.strtoupper(($range ?? '')).' (U+'.$rangestart.'-U+'.$rangeend.')</td></tr>'; $html .= '<tr><td></td>'; $html .= '<td></td>'; for ($k = 0; $k < 16; $k++) { @@ -214,7 +214,7 @@ //============================================================== function _getCharWidth(&$cw, $u, $isdef=true) { if ($u==0) { $w = false; } - else { $w = (ord($cw[$u*2]) << 8) + ord($cw[$u*2+1]); } + else { $w = (ord(($cw[$u*2] ?? '')) << 8) + ord(($cw[$u*2+1] ?? '')); } if ($w == 65535) { return 0; } else if ($w) { return $w; } else if ($isdef) { return false; } --- a/intranet/mpdf60/utils/font_collections.php +++ b/intranet/mpdf60/utils/font_collections.php @@ -32,8 +32,8 @@ -$mqr=ini_get("magic_quotes_runtime"); -if ($mqr) { set_magic_quotes_runtime(0); } +$mqr='0'; +if ($mqr) { false; } if (!class_exists('TTFontFile_Analysis', false)) { include(_MPDF_PATH .'classes/ttfontsuni_analysis.php'); } $ttf = new TTFontFile_Analysis(); --- a/intranet/mpdf60/mpdfi/pdf_parser.php +++ b/intranet/mpdf60/mpdfi/pdf_parser.php @@ -42,6 +42,9 @@ class pdf_parser { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $actual_obj; + /** * Filename @@ -82,7 +85,7 @@ * * @param string $filename Source-Filename */ - function pdf_parser($filename) { + function __construct($filename) { $this->filename = $filename; // mPDF 4.0 $this->success = true; @@ -181,10 +184,10 @@ fseek ($this->f, -min(filesize($this->filename),1500), SEEK_END); $data = fread($this->f, 1500); - $pos = strlen($data) - strpos(strrev($data), strrev('startxref')); - $data = substr($data, $pos); + $pos = strlen(($data ?? '')) - strpos((strrev($data) ?? ''), (strrev('startxref') ?? '')); + $data = substr(($data ?? ''), $pos); - if (!preg_match('/\s*(\d+).*$/s', $data, $matches)) { + if (!preg_match('/\s*(\d+).*$/s', ($data ?? ''), $matches)) { // mPDF 4.0 $this->success = false; $this->errormsg = sprintf("Unable to find pointer to xref table"); @@ -205,19 +208,19 @@ function pdf_read_xref(&$result, $offset, $start = null, $end = null) { if (is_null ($start) || is_null ($end)) { fseek($this->f, $o_pos = $offset); - $data = trim(fgets($this->f,1024)); - - if (strlen($data) == 0) - $data = trim(fgets($this->f,1024)); + $data = trim((fgets($this->f,1024) ?? '')); + + if (strlen(($data ?? '')) == 0) + $data = trim((fgets($this->f,1024) ?? '')); if ($data !== 'xref') { fseek($this->f, $o_pos); - $data = trim(_fgets($this->f, true)); + $data = trim((_fgets($this->f, true) ?? '')); if ($data !== 'xref') { - if (preg_match('/(.*xref)(.*)/m', $data, $m)) { // xref 0 128 - in one line - fseek($this->f, $o_pos+strlen($m[1])); - } elseif (preg_match('/(x|r|e|f)+/', $data, $m)) { // correct invalid xref-pointer - $tmpOffset = $offset-4+strlen($m[0]); + if (preg_match('/(.*xref)(.*)/m', ($data ?? ''), $m)) { // xref 0 128 - in one line + fseek($this->f, $o_pos+strlen(($m[1] ?? ''))); + } elseif (preg_match('/(x|r|e|f)+/', ($data ?? ''), $m)) { // correct invalid xref-pointer + $tmpOffset = $offset-4+strlen(($m[0] ?? '')); $this->pdf_read_xref($result, $tmpOffset, $start, $end); return; } else { @@ -230,14 +233,14 @@ } $o_pos = ftell($this->f); - $data = explode(' ', trim(fgets($this->f,1024))); - if (count($data) != 2) { + $data = explode(' ', (trim((fgets($this->f,1024) ?? '')) ?? '')); + if (count(($data ?? [])) != 2) { fseek($this->f, $o_pos); - $data = explode(' ', trim(_fgets($this->f, true))); + $data = explode(' ', (trim((_fgets($this->f, true) ?? '')) ?? '')); - if (count($data) != 2) { - if (count($data) > 2) { // no lineending - $n_pos = $o_pos+strlen($data[0])+strlen($data[1])+2; + if (count(($data ?? [])) != 2) { + if (count(($data ?? [])) > 2) { // no lineending + $n_pos = $o_pos+strlen(($data[0] ?? ''))+strlen(($data[1] ?? ''))+2; fseek($this->f, $n_pos); } else { // mPDF 4.0 @@ -260,9 +263,9 @@ } for (; $start < $end; $start++) { - $data = ltrim(fread($this->f, 20)); // Spezifications says: 20 bytes including newlines - $offset = substr($data, 0, 10); - $generation = substr($data, 11, 5); + $data = ltrim((fread($this->f, 20) ?? '')); // Spezifications says: 20 bytes including newlines + $offset = substr(($data ?? ''), 0, 10); + $generation = substr(($data ?? ''), 11, 5); if (!isset ($result['xref'][$start][(int) $generation])) { $result['xref'][$start][(int) $generation] = (int) $offset; @@ -271,12 +274,12 @@ $o_pos = ftell($this->f); $data = fgets($this->f,1024); - if (strlen(trim($data)) == 0) + if (strlen((trim(($data ?? '')) ?? '')) == 0) $data = fgets($this->f, 1024); - if (preg_match("/trailer/",$data)) { - if (preg_match("/(.*trailer[ \n\r]*)/",$data,$m)) { - fseek($this->f, $o_pos+strlen($m[1])); + if (preg_match("/trailer/",($data ?? ''))) { + if (preg_match("/(.*trailer[ \n\r]*)/",($data ?? ''),$m)) { + fseek($this->f, $o_pos+strlen(($m[1] ?? ''))); } // mPDF 5.0 Removed pass by reference =& @@ -290,13 +293,13 @@ $result['trailer'] = $trailer; } } else { - $data = explode(' ', trim($data)); + $data = explode(' ', (trim(($data ?? '')) ?? '')); - if (count($data) != 2) { + if (count(($data ?? [])) != 2) { fseek($this->f, $o_pos); - $data = explode(' ', trim (_fgets ($this->f, true))); - - if (count($data) != 2) { + $data = explode(' ', (trim ((_fgets ($this->f, true) ?? '')) ?? '')); + + if (count(($data ?? [])) != 2) { // mPDF 4.0 $this->success = false; $this->errormsg = sprintf("Unexpected data in xref table"); @@ -334,7 +337,7 @@ while(1) { - $match = strpos ($c->buffer, '>', $pos); + $match = strpos (($c->buffer ?? ''), '>', $pos); // If you can't find it, try // reading more data from the stream @@ -347,7 +350,7 @@ } } - $result = substr ($c->buffer, $c->offset, $match - $c->offset); + $result = substr (($c->buffer ?? ''), $c->offset, $match - $c->offset); $c->offset = $match+1; return array (PDF_TYPE_HEX, $result); @@ -405,7 +408,7 @@ // Start by finding the next closed // parenthesis - $match = strpos ($c->buffer, ')', $pos); + $match = strpos (($c->buffer ?? ''), ')', $pos); // If you can't find it, try // reading more data from the stream @@ -421,9 +424,9 @@ // Make sure that there is no backslash // before the parenthesis. If there is, // move on. Otherwise, return the string. - $esc = preg_match('/([\\\\]+)$/', $tmpresult = substr($c->buffer, $c->offset, $match - $c->offset), $m); + $esc = preg_match('/([\\\\]+)$/', (($tmpresult = substr(($c->buffer ?? ''), $c->offset, $match - $c->offset) ?? '' ?? '')), $m); - if ($esc === 0 || strlen($m[1]) % 2 == 0) { + if ($esc === 0 || strlen(($m[1] ?? '')) % 2 == 0) { $result = $tmpresult; $c->offset = $match + 1; return array (PDF_TYPE_STRING, $result); @@ -437,7 +440,7 @@ } case "stream": - $o_pos = ftell($c->file)-strlen($c->buffer); + $o_pos = ftell($c->file)-strlen(($c->buffer ?? '')); $o_offset = $c->offset; $c->reset($startpos = $o_pos + $o_offset); @@ -564,7 +567,7 @@ // we encounter an end-of-object marker while(1) { $value = $this->pdf_read_value($c); - if ($value === false || count($result) > 4) { + if ($value === false || count(($result ?? [])) > 4) { // in this case the parser coudn't find an endobj so we break here break; } @@ -603,7 +606,7 @@ // on the stack, pop it out and // return it. - if (count($c->stack)) { + if (count(($c->stack ?? []))) { return array_pop($c->stack); } @@ -677,7 +680,7 @@ } } - $result = substr($c->buffer, $c->offset - 1, $pos + 1); + $result = substr(($c->buffer ?? ''), $c->offset - 1, $pos + 1); $c->offset += $pos; return $result; --- a/intranet/mpdf60/mpdfi/fpdi_pdf_parser.php +++ b/intranet/mpdf60/mpdfi/fpdi_pdf_parser.php @@ -60,11 +60,11 @@ * @param string $filename Source-Filename * @param object $fpdi Object of type fpdi */ - function fpdi_pdf_parser($filename,&$fpdi) { + function __construct($filename,&$fpdi) { $this->fpdi =& $fpdi; $this->filename = $filename; - parent::pdf_parser($filename); + parent::__construct($filename); if ($this->success == false) { return false; } // resolve Pages-Dictonary @@ -76,7 +76,7 @@ if ($this->success == false) { return false; } // count pages; - $this->page_count = count($this->pages); + $this->page_count = count(($this->pages ?? [])); } @@ -216,7 +216,7 @@ switch ($_filter[1]) { case "/FlateDecode": if (function_exists('gzuncompress')) { - $stream = (strlen($stream) > 0) ? @gzuncompress($stream) : ''; + $stream = (strlen(($stream ?? '')) > 0) ? @gzuncompress($stream) : ''; } else { $this->fpdi->error(sprintf("To handle %s filter, please compile php with zlib support.",$_filter[1])); } --- a/intranet/mpdf60/mpdfi/pdf_context.php +++ b/intranet/mpdf60/mpdfi/pdf_context.php @@ -28,7 +28,7 @@ // Constructor - function pdf_context($f) { + function __construct($f) { $this->file = $f; $this->reset(); } @@ -44,7 +44,7 @@ $this->buffer = $l > 0 ? fread($this->file, $l) : ''; $this->offset = 0; - $this->length = strlen($this->buffer); + $this->length = strlen(($this->buffer ?? '')); $this->stack = array(); } @@ -69,7 +69,7 @@ return false; } else { $this->buffer .= fread($this->file, $l); - $this->length = strlen($this->buffer); + $this->length = strlen(($this->buffer ?? '')); return true; } } --- a/intranet/mpdf60/mpdfi/filters/FilterLZW.php +++ b/intranet/mpdf60/mpdfi/filters/FilterLZW.php @@ -48,7 +48,7 @@ $this->initsTable(); $this->data = $data; - $this->dataLength = strlen($data); + $this->dataLength = strlen(($data ?? '')); // Initialize pointers $this->bytePointer = 0; @@ -104,7 +104,7 @@ $this->sTable = array(); for ($i = 0; $i < 256; $i++) - $this->sTable[$i] = chr($i); + $this->sTable[$i] = chr((int) ($i)); $this->tIdx = 258; $this->bitsToGet = 9; @@ -134,11 +134,11 @@ return 257; } - $this->nextData = ($this->nextData << 8) | (ord($this->data[$this->bytePointer++]) & 0xff); + $this->nextData = ($this->nextData << 8) | (ord(($this->data[$this->bytePointer++] ?? '')) & 0xff); $this->nextBits += 8; if ($this->nextBits < $this->bitsToGet) { - $this->nextData = ($this->nextData << 8) | (ord($this->data[$this->bytePointer++]) & 0xff); + $this->nextData = ($this->nextData << 8) | (ord(($this->data[$this->bytePointer++] ?? '')) & 0xff); $this->nextBits += 8; } --- a/intranet/mpdf60/mpdfi/filters/FilterASCII85.php +++ b/intranet/mpdf60/mpdfi/filters/FilterASCII85.php @@ -37,15 +37,15 @@ $state = 0; $chn = null; - $l = strlen($in); + $l = strlen(($in ?? '')); for ($k = 0; $k < $l; ++$k) { - $ch = ord($in[$k]) & 0xff; + $ch = ord(($in[$k] ?? '')) & 0xff; if ($ch == ORD_tilde) { break; } - if (preg_match('/^\s$/',chr($ch))) { + if (preg_match('/^\s$/',(chr((int) ($ch)) ?? ''))) { continue; } if ($ch == ORD_z && $state == 0) { @@ -63,10 +63,10 @@ $r = 0; for ($j = 0; $j < 5; ++$j) $r = $r * 85 + $chn[$j]; - $out .= chr($r >> 24); - $out .= chr($r >> 16); - $out .= chr($r >> 8); - $out .= chr($r); + $out .= chr((int) ($r >> 24)); + $out .= chr((int) ($r >> 16)); + $out .= chr((int) ($r >> 8)); + $out .= chr((int) ($r)); } } $r = 0; @@ -75,18 +75,18 @@ $this->error('Illegal length in ASCII85Decode.'); if ($state == 2) { $r = $chn[0] * 85 * 85 * 85 * 85 + ($chn[1]+1) * 85 * 85 * 85; - $out .= chr($r >> 24); + $out .= chr((int) ($r >> 24)); } else if ($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); + $out .= chr((int) ($r >> 24)); + $out .= chr((int) ($r >> 16)); } else if ($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); - $out .= chr($r >> 16); - $out .= chr($r >> 8); + $out .= chr((int) ($r >> 24)); + $out .= chr((int) ($r >> 16)); + $out .= chr((int) ($r >> 8)); } return $out; --- a/intranet/mpdf60/examples/index.php +++ b/intranet/mpdf60/examples/index.php @@ -6,9 +6,9 @@ $files = array(); foreach($ff AS $f) { - if (preg_match('/example[0]{0,1}(\d+)_(.*?)\.php/',$f,$m)) { + if (preg_match('/example[0]{0,1}(\d+)_(.*?)\.php/',($f ?? ''),$m)) { $num = intval($m[1]); - $files[$num] = array(ucfirst(preg_replace('/_/',' ',$m[2])), $m[0]); + $files[$num] = array(ucfirst((preg_replace('/_/',' ',($m[2] ?? '')) ?? '')), $m[0]); } } echo '<html><body><h3>mPDF Example Files</h3>'; --- a/intranet/mpdf60/examples/example52_new_mPDF_4-2_features.php +++ b/intranet/mpdf60/examples/example52_new_mPDF_4-2_features.php @@ -468,10 +468,10 @@ $red = imagecolorallocate($img, 255, 0, 0); $green = imagecolorallocate($img, 0, 255, 0); $blue = imagecolorallocate($img, 0, 0, 255); - imagearc($img, 100, 100, 200, 200, 0, 360, $white); - imagearc($img, 100, 100, 150, 150, 25, 155, $red); - imagearc($img, 60, 75, 50, 50, 0, 360, $green); - imagearc($img, 140, 75, 50, 50, 0, 360, $blue); + imagearc($img, 100, 100, 200, 200, 0, 360, (int) ($white)); + imagearc($img, 100, 100, 150, 150, 25, 155, (int) ($red)); + imagearc($img, 60, 75, 50, 50, 0, 360, (int) ($green)); + imagearc($img, 140, 75, 50, 50, 0, 360, (int) ($blue)); ob_start(); imagejpeg($img); $mpdf->smileyface = ob_get_clean(); --- a/intranet/mpdf60/examples/example26_RTL.php +++ b/intranet/mpdf60/examples/example26_RTL.php @@ -290,18 +290,18 @@ //============================================================== // Create Index entries from random words in $html // Split $html into words - $a =preg_split('/<(.*?)>/ms',$html,-1,PREG_SPLIT_DELIM_CAPTURE); + $a =preg_split('/<(.*?)>/ms',($html ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); $html = ''; foreach($a as $i => $e) { if($i%2==0) { - $words = preg_split('/([\s,\.]+)/',$e,-1,PREG_SPLIT_DELIM_CAPTURE); + $words = preg_split('/([\s,\.]+)/',($e ?? ''),-1,PREG_SPLIT_DELIM_CAPTURE); foreach($words as $w) { $y = rand(1,10); // every tenth word // If it is just a word use it as an index entry - if (preg_match("/^(&#x[0]{0,1}6[0-9a-f][0-9a-f];){4,30}$/i",$w) && ($y > 8)) { - $content = trim($w); + if (preg_match("/^(&#x[0]{0,1}6[0-9a-f][0-9a-f];){4,30}$/i",($w ?? '')) && ($y > 8)) { + $content = trim(($w ?? '')); $html .= '<indexentry content="'.$content.'" />'; } $html .= $w; --- a/intranet/mpdf60/examples/formsubmit.php +++ b/intranet/mpdf60/examples/formsubmit.php @@ -12,20 +12,20 @@ '; -if (count($_POST)) { +if (count(($_POST ?? []))) { // To display HTML output from PDF form echo '<h4>HTML format data sent as POST</h4>'; foreach($_POST AS $name=>$val) { - $t = mb_convert_encoding(PDFDocEncodingToWin1252($val), 'UTF-8', 'Windows-1252' ); // If from core fonts doc - echo '<p>PDFDocEnc: '.$name.' => '.htmlspecialchars($t).'</p>'; + $t = mb_convert_encoding((PDFDocEncodingToWin1252($val) ?? ''), 'UTF-8', 'Windows-1252' ); // If from core fonts doc + echo '<p>PDFDocEnc: '.$name.' => '.htmlspecialchars(($t ?? '')).'</p>'; } } -else if (count($_GET)) { +else if (count(($_GET ?? []))) { // To display HTML output from PDF form echo '<h4>HTML format data sent as GET</h4>'; foreach($_GET AS $name=>$val) { - $t = mb_convert_encoding(PDFDocEncodingToWin1252($val), 'UTF-8', 'Windows-1252' ); // If from core fonts doc - echo '<p>PDFDocEnc: '.$name.' => '.htmlspecialchars($t).'</p>'; + $t = mb_convert_encoding((PDFDocEncodingToWin1252($val) ?? ''), 'UTF-8', 'Windows-1252' ); // If from core fonts doc + echo '<p>PDFDocEnc: '.$name.' => '.htmlspecialchars(($t ?? '')).'</p>'; } } @@ -35,11 +35,11 @@ if ($postdata) { echo '<h4>XFDF format data detected</h4>'; // To parse XFDF - if (preg_match_all('/<field name="([^>]*)"\s*>\s*(<value\s*>(.*?)<\/value\s*>)\s*<\/field\s*>/s', $postdata, $m)) { - for($i=0; $i<count($m[0]); $i++) { + if (preg_match_all('/<field name="([^>]*)"\s*>\s*(<value\s*>(.*?)<\/value\s*>)\s*<\/field\s*>/s', ($postdata ?? ''), $m)) { + for($i=0; $i<count(($m[0] ?? [])); $i++) { // if multiple values in response e.g. from multiple selected options - preg_match_all('/<value\s*>(.*?)<\/value\s*>/s', $m[2][$i], $v); - if (count($v[0])>1) { + preg_match_all('/<value\s*>(.*?)<\/value\s*>/s', ($m[2][$i] ?? ''), $v); + if (count(($v[0] ?? []))>1) { $values = array(); foreach($v[1] AS $val) { $values[] = $val; } //foreach($v[1] AS $val) { $values[] = htmlspecialchars_decode($val); } @@ -51,13 +51,13 @@ } } } - if (preg_match_all('/<field name="([^>]*)"\s*>\s*<value\s*\/\s*>\s*<\/field\s*>/s', $postdata, $m)) { - for($i=0; $i<count($m[0]); $i++) { + if (preg_match_all('/<field name="([^>]*)"\s*>\s*<value\s*\/\s*>\s*<\/field\s*>/s', ($postdata ?? ''), $m)) { + for($i=0; $i<count(($m[0] ?? [])); $i++) { echo '<p>Field: '.$m[1][$i].' => [blank]</p>'; } } - if (preg_match_all('/<field name="([^>]*)"\s*\/\s*>/s', $postdata, $m)) { - for($i=0; $i<count($m[0]); $i++) { + if (preg_match_all('/<field name="([^>]*)"\s*\/\s*>/s', ($postdata ?? ''), $m)) { + for($i=0; $i<count(($m[0] ?? [])); $i++) { echo '<p>Field: '.$m[1][$i].' => [no value]</p>'; } } @@ -87,7 +87,7 @@ chr(0202) => chr(0221), chr(0232) => chr(0235), chr(0230) => chr(0037), chr(0231) => chr(0222), chr(0216) => chr(0231) ); - return strtr($txt, array_flip($Win1252ToPDFDocEncoding) ); + return strtr(($txt ?? ''), (array_flip($Win1252ToPDFDocEncoding) ?? '') ); } --- a/intranet/mpdf60/examples/example44_MPDFI_yearbook.php +++ b/intranet/mpdf60/examples/example44_MPDFI_yearbook.php @@ -110,7 +110,7 @@ $mpdf->page--; } // mPDF 2.4 Float Images - if (count($mpdf->floatbuffer)) { + if (count(($mpdf->floatbuffer ?? []))) { $mpdf->objectbuffer[] = $mpdf->floatbuffer['objattr']; $mpdf->printobjectbuffer(false); $mpdf->objectbuffer = array(); --- a/intranet/mpdf60/examples/example_test.php +++ b/intranet/mpdf60/examples/example_test.php @@ -1948,7 +1948,7 @@ //$mpdf->Output('test.pdf','D'); exit; -$s = $mpdf->Output('','S'); echo nl2br(htmlspecialchars($s)); exit; +$s = $mpdf->Output('','S'); echo nl2br(htmlspecialchars(($s ?? ''))); exit; exit; --- a/intranet/marketplaces-api/vendor/sabberworm/php-css-parser/lib/Sabberworm/CSS/OutputFormat.php +++ b/intranet/marketplaces-api/vendor/sabberworm/php-css-parser/lib/Sabberworm/CSS/OutputFormat.php @@ -9,6 +9,7 @@ * * @method OutputFormat setSemicolonAfterLastRule( bool $bSemicolonAfterLastRule ) Set whether semicolons are added after last rule. */ +#[\AllowDynamicProperties] class OutputFormat { /** * Value format --- a/intranet/marketplaces-api/vendor/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Charset.php +++ b/intranet/marketplaces-api/vendor/sabberworm/php-css-parser/lib/Sabberworm/CSS/Property/Charset.php @@ -10,6 +10,9 @@ * • Must not appear more than once. */ class Charset implements AtRule { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $aComments; + private $sCharset; protected $iLineNo; --- a/intranet/marketplaces-api/vendor/Intranet/Model.php +++ b/intranet/marketplaces-api/vendor/Intranet/Model.php @@ -1,6 +1,7 @@ <?php namespace Intranet; +#[\AllowDynamicProperties] class Model { private static $manager; --- a/intranet/marketplaces-api/vendor/Intranet/Product.php +++ b/intranet/marketplaces-api/vendor/Intranet/Product.php @@ -3,6 +3,9 @@ use Exception; class Product extends Model { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $images; + public const STATUS_ACTIVE = "A"; public const STATUS_DISCONTINUED = "D"; --- a/intranet/marketplaces-api/vendor/composer/html2pdf-5.2.4/src/MyPdf.php +++ b/intranet/marketplaces-api/vendor/composer/html2pdf-5.2.4/src/MyPdf.php @@ -16,6 +16,9 @@ class MyPdf extends \TCPDF { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $ws; + protected $_footerParam = array(); protected $_transf = array(); protected $_myLastPageGroup = null; --- a/intranet/marketplaces-api/vendor/composer/html2pdf-5.2.4/src/Html2Pdf.php +++ b/intranet/marketplaces-api/vendor/composer/html2pdf-5.2.4/src/Html2Pdf.php @@ -31,6 +31,9 @@ class Html2Pdf { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_pdfa; + /** * myPdf object, extends from TCPDF * @var MyPdf --- a/intranet/marketplaces-api/vendor/Spipu/Html2Pdf/MyPdf.php +++ b/intranet/marketplaces-api/vendor/Spipu/Html2Pdf/MyPdf.php @@ -16,6 +16,9 @@ class MyPdf extends \TCPDF { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $ws; + protected $_footerParam = array(); protected $_transf = array(); protected $_myLastPageGroup = null; --- a/intranet/marketplaces-api/vendor/Spipu/Html2Pdf/Html2Pdf.php +++ b/intranet/marketplaces-api/vendor/Spipu/Html2Pdf/Html2Pdf.php @@ -31,6 +31,9 @@ class Html2Pdf { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_pdfa; + /** * myPdf object, extends from TCPDF * @var MyPdf --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/BinaryStream.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/BinaryStream.php @@ -154,7 +154,7 @@ } public function readUInt8() { - return ord($this->read(1)); + return ord(($this->read(1) ?? '')); } public function readUInt8Many($count) { @@ -162,7 +162,7 @@ } public function writeUInt8($data) { - return $this->write(chr($data), 1); + return $this->write(chr((int) ($data)), 1); } public function readInt8() { @@ -282,7 +282,7 @@ $date = 0; } - return strftime("%Y-%m-%d %H:%M:%S", $date); + return date("Y-m-d H:i:s", $date); } public function writeLongDateTime($data) { @@ -439,6 +439,6 @@ * @return string The string */ public function convertUInt32ToStr($uint32) { - return chr(($uint32 >> 24) & 0xFF) . chr(($uint32 >> 16) & 0xFF) . chr(($uint32 >> 8) & 0xFF) . chr($uint32 & 0xFF); + return chr((int) (($uint32 >> 24) & 0xFF)) . chr((int) (($uint32 >> 16) & 0xFF)) . chr((int) (($uint32 >> 8) & 0xFF)) . chr((int) ($uint32 & 0xFF)); } } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EncodingMap.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EncodingMap.php @@ -24,7 +24,7 @@ $map = array(); while ($line = fgets($this->f)) { - if (preg_match('/^[\!\=]([0-9A-F]{2,})\s+U\+([0-9A-F]{2})([0-9A-F]{2})\s+([^\s]+)/', $line, $matches)) { + if (preg_match('/^[\!\=]([0-9A-F]{2,})\s+U\+([0-9A-F]{2})([0-9A-F]{2})\s+([^\s]+)/', ($line ?? ''), $matches)) { $unicode = (hexdec($matches[2]) << 8) + hexdec($matches[3]); $map[hexdec($matches[1])] = array($unicode, $matches[4]); } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Font.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Font.php @@ -28,7 +28,7 @@ throw new FontNotFoundException($file); } - $header = file_get_contents($file, false, null, null, 4); + $header = file_get_contents(($file ?? ''), (false ?? false), null, null, 4); $class = null; switch ($header) { @@ -52,7 +52,7 @@ // Unknown type or EOT default: - $magicNumber = file_get_contents($file, false, null, 34, 2); + $magicNumber = file_get_contents(($file ?? ''), (false ?? false), null, 34, 2); if ($magicNumber === "LP") { $class = "EOT\\File"; @@ -80,10 +80,10 @@ } static function UTF16ToUTF8($str) { - return mb_convert_encoding($str, "utf-8", "utf-16"); + return mb_convert_encoding(($str ?? ''), "utf-8", "utf-16"); } static function UTF8ToUTF16($str) { - return mb_convert_encoding($str, "utf-16", "utf-8"); + return mb_convert_encoding(($str ?? ''), "utf-16", "utf-8"); } } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Autoloader.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Autoloader.php @@ -29,9 +29,9 @@ * @param string */ public static function autoload($class) { - $prefixLength = strlen(self::PREFIX); + $prefixLength = strlen((self::PREFIX ?? '')); if (0 === strncmp(self::PREFIX, $class, $prefixLength)) { - $file = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, $prefixLength)); + $file = str_replace('\\', (DIRECTORY_SEPARATOR ?? ''), (substr(($class ?? ''), $prefixLength) ?? '')); $file = realpath(__DIR__ . (empty($file) ? '' : DIRECTORY_SEPARATOR) . $file . '.php'); if (file_exists($file)) { require_once $file; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/AdobeFontMetrics.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/AdobeFontMetrics.php @@ -32,7 +32,7 @@ $map_data = array(); if ($encoding) { - $encoding = preg_replace("/[^a-z0-9-_]/", "", $encoding); + $encoding = preg_replace("/[^a-z0-9-_]/", "", ($encoding ?? '')); $map_file = dirname(__FILE__) . "/../maps/$encoding.map"; if (!file_exists($map_file)) { throw new \Exception("Unkown encoding ($encoding)"); @@ -55,7 +55,7 @@ $records = $font->getData("name", "records"); foreach ($records as $id => $record) { - if (!isset(name::$nameIdCodes[$id]) || preg_match("/[\r\n]/", $record->string)) { + if (!isset(name::$nameIdCodes[$id]) || preg_match("/[\r\n]/", ($record->string ?? ''))) { continue; } @@ -98,7 +98,7 @@ $hmtx = $font->getData("hmtx"); $names = $font->getData("post", "names"); - $this->startSection("CharMetrics", count($hmtx)); + $this->startSection("CharMetrics", count(($hmtx ?? []))); if ($encoding) { foreach ($map_data as $code => $value) { @@ -143,7 +143,7 @@ if (!$encoding && is_array($tree)) { $this->startSection("KernData"); - $this->startSection("KernPairs", count($tree, COUNT_RECURSIVE) - count($tree)); + $this->startSection("KernPairs", count(($tree ?? []), COUNT_RECURSIVE) - count(($tree ?? []))); foreach ($tree as $left => $values) { if (!is_array($values)) { --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/WOFF/File.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/WOFF/File.php @@ -31,7 +31,7 @@ parent::load($file); $this->parseTableEntries(); - $dataOffset = $this->pos() + count($this->directory) * 20; + $dataOffset = $this->pos() + count(($this->directory ?? [])) * 20; $fw = $this->getTempFile(false); $fr = $this->f; @@ -50,7 +50,7 @@ } // Prepare data ... - $length = strlen($data); + $length = strlen(($data ?? '')); $entry->length = $entry->origLength = $length; $entry->offset = $dataOffset; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EOT/Header.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EOT/Header.php @@ -95,7 +95,7 @@ } if (!empty($this->data["RootString"])) { - $this->data["RootString"] = explode("\0", $this->data["RootString"]); + $this->data["RootString"] = explode("\0", ($this->data["RootString"] ?? '')); } } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EOT/File.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/EOT/File.php @@ -74,7 +74,7 @@ } $string = fread($this->f, $n); - $chunks = str_split($string, 2); + $chunks = str_split(($string ?? ''), 2); $chunks = array_map("strrev", $chunks); return implode("", $chunks); --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/OutlineComposite.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/OutlineComposite.php @@ -169,7 +169,7 @@ $flags |= self::WE_HAVE_A_TWO_BY_TWO; } - if ($_i < count($this->components) - 1) { + if ($_i < count(($this->components ?? [])) - 1) { $flags |= self::MORE_COMPONENTS; } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/OutlineSimple.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/OutlineSimple.php @@ -117,14 +117,14 @@ } public function splitSVGPath($path) { - preg_match_all('/([a-z])|(-?\d+(?:\.\d+)?)/i', $path, $matches, PREG_PATTERN_ORDER); + preg_match_all('/([a-z])|(-?\d+(?:\.\d+)?)/i', ($path ?? ''), $matches, PREG_PATTERN_ORDER); return $matches[0]; } public function makePoints($path) { $path = $this->splitSVGPath($path); - $l = count($path); + $l = count(($path ?? [])); $i = 0; $points = array(); @@ -170,7 +170,7 @@ // closePath /** @noinspection PhpMissingBreakStatementInspection */ case "z": - $points[count($points) - 1]["endOfContour"] = true; + $points[count(($points ?? [])) - 1]["endOfContour"] = true; default: $i++; @@ -239,18 +239,18 @@ $font = $this->getFont(); $l = 0; - $l += $font->writeInt16(count($endPtsOfContours)); // endPtsOfContours + $l += $font->writeInt16(count(($endPtsOfContours ?? []))); // endPtsOfContours $l += $font->writeFWord(isset($this->xMin) ? $this->xMin : $xMin); // xMin $l += $font->writeFWord(isset($this->yMin) ? $this->yMin : $yMin); // yMin $l += $font->writeFWord(isset($this->xMax) ? $this->xMax : $xMax); // xMax $l += $font->writeFWord(isset($this->yMax) ? $this->yMax : $yMax); // yMax // Simple glyf - $l += $font->w(array(self::uint16, count($endPtsOfContours)), $endPtsOfContours); // endPtsOfContours + $l += $font->w(array(self::uint16, count(($endPtsOfContours ?? []))), $endPtsOfContours); // endPtsOfContours $l += $font->writeUInt16(0); // instructionLength - $l += $font->w(array(self::uint8, count($flags)), $flags); // flags - $l += $font->w(array(self::int16, count($coords_x)), $coords_x); // xCoordinates - $l += $font->w(array(self::int16, count($coords_y)), $coords_y); // yCoordinates + $l += $font->w(array(self::uint8, count(($flags ?? []))), $flags); // flags + $l += $font->w(array(self::int16, count(($coords_x ?? []))), $coords_x); // xCoordinates + $l += $font->w(array(self::int16, count(($coords_y ?? []))), $coords_y); // yCoordinates return $l; } @@ -265,7 +265,7 @@ $points = $this->points; } - $length = count($points); + $length = count(($points ?? [])); $firstIndex = 0; $count = 0; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/Outline.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Glyph/Outline.php @@ -96,7 +96,7 @@ function encode() { $font = $this->getFont(); - return $font->write($this->raw, strlen($this->raw)); + return $font->write($this->raw, strlen(($this->raw ?? ''))); } function getSVGContours() { --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/DirectoryEntry.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/DirectoryEntry.php @@ -37,21 +37,21 @@ protected $origF; static function computeChecksum($data) { - $len = strlen($data); + $len = strlen(($data ?? '')); $mod = $len % 4; if ($mod) { - $data = str_pad($data, $len + (4 - $mod), "\0"); + $data = str_pad(($data ?? ''), $len + (4 - $mod), "\0"); } - $len = strlen($data); + $len = strlen(($data ?? '')); $hi = 0x0000; $lo = 0x0000; for ($i = 0; $i < $len; $i += 4) { - $hi += (ord($data[$i]) << 8) + ord($data[$i + 1]); - $lo += (ord($data[$i + 2]) << 8) + ord($data[$i + 3]); + $hi += (ord(($data[$i] ?? '')) << 8) + ord(($data[$i + 1] ?? '')); + $lo += (ord(($data[$i + 2] ?? '')) << 8) + ord(($data[$i + 3] ?? '')); $hi += $lo >> 16; $lo = $lo & 0xFFFF; $hi = $hi & 0xFFFF; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/nameRecord.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/nameRecord.php @@ -15,6 +15,7 @@ * * @package php-font-lib */ +#[\AllowDynamicProperties] class nameRecord extends BinaryStream { public $platformID; public $platformSpecificID; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/cmap.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/cmap.php @@ -211,7 +211,7 @@ $idDelta[] = $start[1] - $start[0]; } - $segCount = count($startCode); + $segCount = count(($startCode ?? [])); $idRangeOffset = array_fill(0, $segCount, 0); $searchRange = 1; @@ -249,7 +249,7 @@ $data = array( "version" => 0, - "numberSubtables" => count($subtables), + "numberSubtables" => count(($subtables ?? [])), "subtables" => $subtables, ); --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/maxp.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/maxp.php @@ -35,7 +35,7 @@ function _encode() { $font = $this->getFont(); - $this->data["numGlyphs"] = count($font->getSubset()); + $this->data["numGlyphs"] = count(($font->getSubset() ?? [])); return parent::_encode(); } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/hhea.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/hhea.php @@ -37,7 +37,7 @@ function _encode() { $font = $this->getFont(); - $this->data["numOfLongHorMetrics"] = count($font->getSubset()); + $this->data["numOfLongHorMetrics"] = count(($font->getSubset() ?? [])); return parent::_encode(); } --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/glyf.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/glyf.php @@ -76,7 +76,7 @@ $n = 500; - $s = "<h3>" . "Only the first $n simple glyphs are shown (" . count($this->data) . " total) + $s = "<h3>" . "Only the first $n simple glyphs are shown (" . count(($this->data ?? [])) . " total) <div class='glyph-view simple'>Simple glyph</div> <div class='glyph-view composite'>Composite glyph</div> Zoom: <input type='range' value='100' max='400' onchange='Glyph.resize(this.value)' /> --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/name.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/Table/Type/name.php @@ -168,7 +168,7 @@ /** @var nameRecord[] $records */ $records = $this->data["records"]; - $count_records = count($records); + $count_records = count(($records ?? [])); $this->data["count"] = $count_records; $this->data["stringOffset"] = 6 + $count_records * 12; // 6 => uint16 * 3, 12 => sizeof self::$record_format @@ -177,7 +177,7 @@ $offset = 0; foreach ($records as $record) { - $record->length = mb_strlen($record->getUTF16(), "8bit"); + $record->length = mb_strlen(($record->getUTF16() ?? ''), "8bit"); $record->offset = $offset; $offset += $record->length; $length += $font->pack(nameRecord::$format, (array)$record); @@ -185,7 +185,7 @@ foreach ($records as $record) { $str = $record->getUTF16(); - $length += $font->write($str, mb_strlen($str, "8bit")); + $length += $font->write($str, mb_strlen(($str ?? ''), "8bit")); } return $length; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/TrueType/Collection.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/TrueType/Collection.php @@ -70,29 +70,30 @@ return $this->collection[$fontId] = $font; } - function current() { + function current(): mixed { return $this->getFont($this->position); } - function key() { + function key(): mixed { return $this->position; } - function next() { + #[\ReturnTypeWillChange] + function next() { return ++$this->position; } - function rewind() { + function rewind(): void { $this->position = 0; } - function valid() { + function valid(): bool { $this->parse(); return isset($this->collectionOffsets[$this->position]); } - function count() { + function count(): int { $this->parse(); return $this->numFonts; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/TrueType/File.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/src/FontLib/TrueType/File.php @@ -124,25 +124,25 @@ } function utf8toUnicode($str) { - $len = strlen($str); + $len = strlen(($str ?? '')); $out = array(); for ($i = 0; $i < $len; $i++) { $uni = -1; - $h = ord($str[$i]); + $h = ord(($str[$i] ?? '')); if ($h <= 0x7F) { $uni = $h; } elseif ($h >= 0xC2) { if (($h <= 0xDF) && ($i < $len - 1)) { - $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F); + $uni = ($h & 0x1F) << 6 | (ord(($str[++$i] ?? '')) & 0x3F); } elseif (($h <= 0xEF) && ($i < $len - 2)) { - $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6 | (ord($str[++$i]) & 0x3F); + $uni = ($h & 0x0F) << 12 | (ord(($str[++$i] ?? '')) & 0x3F) << 6 | (ord(($str[++$i] ?? '')) & 0x3F); } elseif (($h <= 0xF4) && ($i < $len - 3)) { - $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12 | (ord($str[++$i]) & 0x3F) << 6 | (ord($str[++$i]) & 0x3F); + $uni = ($h & 0x0F) << 18 | (ord(($str[++$i] ?? '')) & 0x3F) << 12 | (ord(($str[++$i] ?? '')) & 0x3F) << 6 | (ord(($str[++$i] ?? '')) & 0x3F); } } @@ -223,7 +223,7 @@ $tags = array_keys($this->directory); } - $num_tables = count($tags); + $num_tables = count(($tags ?? [])); $n = 16; // @todo Font::d("Tables : " . implode(", ", $tags)); @@ -265,7 +265,7 @@ } function getFontType(){ - $class_parts = explode("\\", get_class($this)); + $class_parts = explode("\\", (get_class($this) ?? '')); return $class_parts[1]; } @@ -301,7 +301,7 @@ $this->parseTableEntries(); if (!self::$raw) { - $name_canon = preg_replace("/[^a-z0-9]/", "", strtolower($tag)); + $name_canon = preg_replace("/[^a-z0-9]/", "", (strtolower(($tag ?? '')) ?? '')); $class = "FontLib\\Table\\Type\\$name_canon"; --- a/intranet/marketplaces-api/vendor/phenx/php-font-lib/tests/FontLib/FontTest.php +++ b/intranet/marketplaces-api/vendor/phenx/php-font-lib/tests/FontLib/FontTest.php @@ -33,16 +33,16 @@ $this->assertEquals(4, $cmapFormat4Table['format']); $this->assertEquals(6, $cmapFormat4Table['segCount']); - $this->assertEquals($cmapFormat4Table['segCount'], count($cmapFormat4Table['startCode'])); - $this->assertEquals($cmapFormat4Table['segCount'], count($cmapFormat4Table['endCode'])); + $this->assertEquals($cmapFormat4Table['segCount'], count(($cmapFormat4Table['startCode'] ?? []))); + $this->assertEquals($cmapFormat4Table['segCount'], count(($cmapFormat4Table['endCode'] ?? []))); $cmapFormat12Table = $cmapTable[1]; $this->assertEquals(12, $cmapFormat12Table['format']); $this->assertEquals(6, $cmapFormat12Table['ngroups']); - $this->assertEquals(6, count($cmapFormat12Table['startCode'])); - $this->assertEquals(6, count($cmapFormat12Table['endCode'])); - $this->assertEquals(53, count($cmapFormat12Table['glyphIndexArray'])); + $this->assertEquals(6, count(($cmapFormat12Table['startCode'] ?? []))); + $this->assertEquals(6, count(($cmapFormat12Table['endCode'] ?? []))); + $this->assertEquals(53, count(($cmapFormat12Table['glyphIndexArray'] ?? []))); } } \ No newline at end of file --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/autoload.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/autoload.php @@ -7,8 +7,8 @@ */ spl_autoload_register(function($class) { - if (0 === strpos($class, "Svg")) { - $file = str_replace('\\', DIRECTORY_SEPARATOR, $class); + if (0 === strpos(($class ?? ''), "Svg")) { + $file = str_replace('\\', (DIRECTORY_SEPARATOR ?? ''), ($class ?? '')); $file = realpath(__DIR__ . DIRECTORY_SEPARATOR . $file . '.php'); if (file_exists($file)) { include_once $file; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Style.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Style.php @@ -10,6 +10,7 @@ use Svg\Tag\AbstractTag; +#[\AllowDynamicProperties] class Style { const TYPE_COLOR = 1; @@ -98,7 +99,7 @@ } public function fromStyleSheets(AbstractTag $tag, $attributes) { - $class = isset($attributes["class"]) ? preg_split('/\s+/', trim($attributes["class"])) : null; + $class = isset($attributes["class"]) ? preg_split('/\s+/', (trim(($attributes["class"] ?? '')) ?? '')) : null; $stylesheets = $tag->getDocument()->getStyleSheets(); @@ -171,11 +172,11 @@ static function parseColor($color) { - $color = strtolower(trim($color)); - - $parts = preg_split('/[^,]\s+/', $color, 2); - - if (count($parts) == 2) { + $color = strtolower((trim(($color ?? '')) ?? '')); + + $parts = preg_split('/[^,]\s+/', ($color ?? ''), 2); + + if (count(($parts ?? [])) == 2) { $color = $parts[1]; } else { @@ -197,12 +198,12 @@ } // RGB color - if (strpos($color, "rgb") !== false) { + if (strpos(($color ?? ''), "rgb") !== false) { return self::getTriplet($color); } // RGB color - if (strpos($color, "hsl") !== false) { + if (strpos(($color ?? ''), "hsl") !== false) { $triplet = self::getTriplet($color, true); if ($triplet == null) { @@ -267,41 +268,41 @@ } // Gradient - if (strpos($color, "url(#") !== false) { - $i = strpos($color, "("); - $j = strpos($color, ")"); + if (strpos(($color ?? ''), "url(#") !== false) { + $i = strpos(($color ?? ''), "("); + $j = strpos(($color ?? ''), ")"); // Bad url format if ($i === false || $j === false) { return null; } - return trim(substr($color, $i + 1, $j - $i - 1)); + return trim((substr(($color ?? ''), $i + 1, $j - $i - 1) ?? '')); } return null; } static function getTriplet($color, $percent = false) { - $i = strpos($color, "("); - $j = strpos($color, ")"); + $i = strpos(($color ?? ''), "("); + $j = strpos(($color ?? ''), ")"); // Bad color value if ($i === false || $j === false) { return null; } - $triplet = preg_split("/\\s*,\\s*/", trim(substr($color, $i + 1, $j - $i - 1))); - - if (count($triplet) != 3) { + $triplet = preg_split("/\\s*,\\s*/", (trim((substr(($color ?? ''), $i + 1, $j - $i - 1) ?? '')) ?? '')); + + if (count(($triplet ?? [])) != 3) { return null; } foreach (array_keys($triplet) as $c) { - $triplet[$c] = trim($triplet[$c]); + $triplet[$c] = trim(($triplet[$c] ?? '')); if ($percent) { - if ($triplet[$c][strlen($triplet[$c]) - 1] === "%") { + if ($triplet[$c][strlen(($triplet[$c] ?? '')) - 1] === "%") { $triplet[$c] = floatval($triplet[$c]) / 100; } else { @@ -309,7 +310,7 @@ } } else { - if ($triplet[$c][strlen($triplet[$c]) - 1] === "%") { + if ($triplet[$c][strlen(($triplet[$c] ?? '')) - 1] === "%") { $triplet[$c] = round(floatval($triplet[$c]) * 2.55); } } @@ -324,9 +325,9 @@ // #FFFFFF if (isset($hex[6])) { - $c[0] = hexdec(substr($hex, 1, 2)); - $c[1] = hexdec(substr($hex, 3, 2)); - $c[2] = hexdec(substr($hex, 5, 2)); + $c[0] = hexdec(substr(($hex ?? ''), 1, 2)); + $c[1] = hexdec(substr(($hex ?? ''), 3, 2)); + $c[2] = hexdec(substr(($hex ?? ''), 5, 2)); } else { $c[0] = hexdec($hex[1] . $hex[1]); $c[1] = hexdec($hex[2] . $hex[2]); @@ -346,7 +347,7 @@ static function parseCssStyle($style) { $matches = array(); - preg_match_all("/([a-z-]+)\\s*:\\s*([^;$]+)/si", $style, $matches, PREG_SET_ORDER); + preg_match_all("/([a-z-]+)\\s*:\\s*([^;$]+)/si", ($style ?? ''), $matches, PREG_SET_ORDER); $styles = array(); foreach ($matches as $match) { @@ -366,30 +367,30 @@ * @return float|null */ static function convertSize($size, $referenceSize = 11.0, $dpi = 96.0) { - $size = trim(strtolower($size)); + $size = trim((strtolower(($size ?? '')) ?? '')); if (is_numeric($size)) { return $size; } - if ($pos = strpos($size, "px")) { - return floatval(substr($size, 0, $pos)); - } - - if ($pos = strpos($size, "pt")) { - return floatval(substr($size, 0, $pos)); - } - - if ($pos = strpos($size, "cm")) { - return floatval(substr($size, 0, $pos)) * $dpi; - } - - if ($pos = strpos($size, "%")) { - return $referenceSize * substr($size, 0, $pos) / 100; - } - - if ($pos = strpos($size, "em")) { - return $referenceSize * substr($size, 0, $pos); + if ($pos = strpos(($size ?? ''), "px")) { + return floatval(substr(($size ?? ''), 0, $pos)); + } + + if ($pos = strpos(($size ?? ''), "pt")) { + return floatval(substr(($size ?? ''), 0, $pos)); + } + + if ($pos = strpos(($size ?? ''), "cm")) { + return floatval(substr(($size ?? ''), 0, $pos)) * $dpi; + } + + if ($pos = strpos(($size ?? ''), "%")) { + return $referenceSize * substr(($size ?? ''), 0, $pos) / 100; + } + + if ($pos = strpos(($size ?? ''), "em")) { + return $referenceSize * substr(($size ?? ''), 0, $pos); } // TODO cm, mm, pc, in, etc --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Document.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Document.php @@ -148,8 +148,8 @@ } if (isset($attributes['viewbox'])) { - $viewBox = preg_split('/[\s,]+/is', trim($attributes['viewbox'])); - if (count($viewBox) == 4) { + $viewBox = preg_split('/[\s,]+/is', (trim(($attributes['viewbox'] ?? '')) ?? '')); + if (count(($viewBox ?? [])) == 4) { $this->x = $viewBox[0]; $this->y = $viewBox[1]; @@ -236,7 +236,7 @@ } public function getDef($id) { - $id = ltrim($id, "#"); + $id = ltrim(($id ?? ''), "#"); return isset($this->defs[$id]) ? $this->defs[$id] : null; } @@ -250,13 +250,13 @@ $attributes = array_change_key_case($attributes, CASE_LOWER); - switch (strtolower($name)) { + switch (strtolower(($name ?? ''))) { case 'defs': $this->inDefs = true; return; case 'svg': - if (count($this->attributes)) { + if (count(($this->attributes ?? []))) { $tag = new Group($this, $name); } else { @@ -369,7 +369,7 @@ { /** @var AbstractTag $tag */ $tag = null; - switch (strtolower($name)) { + switch (strtolower(($name ?? ''))) { case 'defs': $this->inDefs = false; return; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Polyline.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Polyline.php @@ -13,10 +13,10 @@ public function start($attributes) { $tmp = array(); - preg_match_all('/([\-]*[0-9\.]+)/', $attributes['points'], $tmp); + preg_match_all('/([\-]*[0-9\.]+)/', ($attributes['points'] ?? ''), $tmp); $points = $tmp[0]; - $count = count($points); + $count = count(($points ?? [])); $surface = $this->document->getSurface(); list($x, $y) = $points; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php @@ -43,7 +43,7 @@ */ public function getParentGroup() { $stack = $this->getDocument()->getStack(); - for ($i = count($stack)-2; $i >= 0; $i--) { + for ($i = count(($stack ?? []))-2; $i >= 0; $i--) { $tag = $stack[$i]; if ($tag instanceof Group || $tag instanceof Document) { @@ -137,15 +137,15 @@ $match = array(); preg_match_all( '/(matrix|translate|scale|rotate|skewX|skewY)\((.*?)\)/is', - $transform, + ($transform ?? ''), $match, PREG_SET_ORDER ); $transformations = array(); - if (count($match[0])) { + if (count(($match[0] ?? []))) { foreach ($match as $_match) { - $arguments = preg_split('/[ ,]+/', $_match[2]); + $arguments = preg_split('/[ ,]+/', ($_match[2] ?? '')); array_unshift($arguments, $_match[1]); $transformations[] = $arguments; } --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Rect.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Rect.php @@ -27,16 +27,16 @@ } if (isset($attributes['width'])) { - if ('%' === substr($attributes['width'], -1)) { - $factor = substr($attributes['width'], 0, -1) / 100; + if ('%' === substr(($attributes['width'] ?? ''), -1)) { + $factor = substr(($attributes['width'] ?? ''), 0, -1) / 100; $this->width = $this->document->getWidth() * $factor; } else { $this->width = $attributes['width']; } } if (isset($attributes['height'])) { - if ('%' === substr($attributes['height'], -1)) { - $factor = substr($attributes['height'], 0, -1) / 100; + if ('%' === substr(($attributes['height'] ?? ''), -1)) { + $factor = substr(($attributes['height'] ?? ''), 0, -1) / 100; $this->height = $this->document->getHeight() * $factor; } else { $this->height = $attributes['height']; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Path.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Path.php @@ -38,25 +38,25 @@ } $commands = array(); - preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', $attributes['d'], $commands, PREG_SET_ORDER); + preg_match_all('/([MZLHVCSQTAmzlhvcsqta])([eE ,\-.\d]+)*/', ($attributes['d'] ?? ''), $commands, PREG_SET_ORDER); $path = array(); foreach ($commands as $c) { - if (count($c) == 3) { + if (count(($c ?? [])) == 3) { $arguments = array(); - preg_match_all('/([-+]?((\d+\.\d+)|((\d+)|(\.\d+)))(?:e[-+]?\d+)?)/i', $c[2], $arguments, PREG_PATTERN_ORDER); + preg_match_all('/([-+]?((\d+\.\d+)|((\d+)|(\.\d+)))(?:e[-+]?\d+)?)/i', ($c[2] ?? ''), $arguments, PREG_PATTERN_ORDER); $item = $arguments[0]; - $commandLower = strtolower($c[1]); + $commandLower = strtolower(($c[1] ?? '')); if ( isset(self::$commandLengths[$commandLower]) && ($commandLength = self::$commandLengths[$commandLower]) && - count($item) > $commandLength + count(($item ?? [])) > $commandLength ) { $repeatedCommand = isset(self::$repeatedCommands[$c[1]]) ? self::$repeatedCommands[$c[1]] : $c[1]; $command = $c[1]; - for ($k = 0, $klen = count($item); $k < $klen; $k += $commandLength) { + for ($k = 0, $klen = count(($item ?? [])); $k < $klen; $k += $commandLength) { $_item = array_slice($item, $k, $k + $commandLength); array_unshift($_item, $command); $path[] = $_item; @@ -182,7 +182,7 @@ $tempX = $x + $current[3]; $tempY = $y + $current[4]; - if (!preg_match('/[CcSs]/', $previous[0])) { + if (!preg_match('/[CcSs]/', ($previous[0] ?? ''))) { // If there is no previous command or if the previous command was not a C, c, S, or s, // the control point is coincident with the current point $controlX = $x; @@ -216,7 +216,7 @@ $tempX = $current[3]; $tempY = $current[4]; - if (!preg_match('/[CcSs]/', $previous[0])) { + if (!preg_match('/[CcSs]/', ($previous[0] ?? ''))) { // If there is no previous command or if the previous command was not a C, c, S, or s, // the control point is coincident with the current point $controlX = $x; @@ -287,7 +287,7 @@ $tempX = $x + $current[1]; $tempY = $y + $current[2]; - if (preg_match("/[QqTt]/", $previous[0])) { + if (preg_match("/[QqTt]/", ($previous[0] ?? ''))) { // If there is no previous command or if the previous command was not a Q, q, T or t, // assume the control point is coincident with the current point $controlX = $x; @@ -407,7 +407,7 @@ $segsNorm = $this->arcToSegments($tx - $fx, $ty - $fy, $rx, $ry, $large, $sweep, $rot); - for ($i = 0, $len = count($segsNorm); $i < $len; $i++) { + for ($i = 0, $len = count(($segsNorm ?? [])); $i < $len; $i++) { $segs[$i][0] = $segsNorm[$i][0] + $fx; $segs[$i][1] = $segsNorm[$i][1] + $fy; $segs[$i][2] = $segsNorm[$i][2] + $fx; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Text.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Text.php @@ -65,6 +65,6 @@ public function getText() { - return trim($this->text); + return trim(($this->text ?? '')); } } --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Polygon.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Tag/Polygon.php @@ -13,10 +13,10 @@ public function start($attributes) { $tmp = array(); - preg_match_all('/([\-]*[0-9\.]+)/', $attributes['points'], $tmp); + preg_match_all('/([\-]*[0-9\.]+)/', ($attributes['points'] ?? ''), $tmp); $points = $tmp[0]; - $count = count($points); + $count = count(($points ?? [])); $surface = $this->document->getSurface(); list($x, $y) = $points; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfacePDFLib.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfacePDFLib.php @@ -149,14 +149,14 @@ { if (self::DEBUG) echo __FUNCTION__ . "\n"; - if (strpos($image, "data:") === 0) { - $data = substr($image, strpos($image, ";") + 1); - if (strpos($data, "base64") === 0) { - $data = base64_decode(substr($data, 7)); + if (strpos(($image ?? ''), "data:") === 0) { + $data = substr(($image ?? ''), strpos(($image ?? ''), ";") + 1); + if (strpos(($data ?? ''), "base64") === 0) { + $data = base64_decode((substr(($data ?? ''), 7) ?? '')); } } else { - $data = file_get_contents($image); + $data = file_get_contents(($image ?? '')); } $image = tempnam("", "svg"); @@ -337,7 +337,7 @@ ); } - if ($fillRule = strtolower($style->fillRule)) { + if ($fillRule = strtolower(($style->fillRule ?? ''))) { $map = array( "nonzero" => "winding", "evenodd" => "evenodd", @@ -383,7 +383,7 @@ } } - if (count($opts)) { + if (count(($opts ?? []))) { $gs = $canvas->create_gstate(implode(" ", $opts)); $canvas->set_gstate($gs); } @@ -407,7 +407,7 @@ "verdana" => "Helvetica", ); - $family = strtolower($family); + $family = strtolower(($family ?? '')); if (isset($map[$family])) { $family = $map[$family]; } --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/CPdf.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/CPdf.php @@ -18,6 +18,7 @@ namespace Svg\Surface; +#[\AllowDynamicProperties] class CPdf { @@ -570,7 +571,7 @@ } if ($k >= 0) { - for ($j = count($o['info']['pages']) - 1; $j >= $k; $j--) { + for ($j = count(($o['info']['pages'] ?? [])) - 1; $j >= $k; $j--) { $o['info']['pages'][$j + 1] = $o['info']['pages'][$j]; } @@ -604,17 +605,17 @@ break; case 'out': - if (count($o['info']['pages'])) { + if (count(($o['info']['pages'] ?? []))) { $res = "\n$id 0 obj\n<< /Type /Pages\n/Kids ["; foreach ($o['info']['pages'] as $v) { $res .= "$v 0 R\n"; } - $res .= "]\n/Count " . count($this->objects[$id]['info']['pages']); - - if ((isset($o['info']['fonts']) && count($o['info']['fonts'])) || + $res .= "]\n/Count " . count(($this->objects[$id]['info']['pages'] ?? [])); + + if ((isset($o['info']['fonts']) && count(($o['info']['fonts'] ?? []))) || isset($o['info']['procset']) || - (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) + (isset($o['info']['extGStates']) && count(($o['info']['extGStates'] ?? []))) ) { $res .= "\n/Resources <<"; @@ -622,7 +623,7 @@ $res .= "\n/ProcSet " . $o['info']['procset'] . " 0 R"; } - if (isset($o['info']['fonts']) && count($o['info']['fonts'])) { + if (isset($o['info']['fonts']) && count(($o['info']['fonts'] ?? []))) { $res .= "\n/Font << "; foreach ($o['info']['fonts'] as $finfo) { $res .= "\n/F" . $finfo['fontNum'] . " " . $finfo['objNum'] . " 0 R"; @@ -630,7 +631,7 @@ $res .= "\n>>"; } - if (isset($o['info']['xObjects']) && count($o['info']['xObjects'])) { + if (isset($o['info']['xObjects']) && count(($o['info']['xObjects'] ?? []))) { $res .= "\n/XObject << "; foreach ($o['info']['xObjects'] as $finfo) { $res .= "\n/" . $finfo['label'] . " " . $finfo['objNum'] . " 0 R"; @@ -638,7 +639,7 @@ $res .= "\n>>"; } - if (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) { + if (isset($o['info']['extGStates']) && count(($o['info']['extGStates'] ?? []))) { $res .= "\n/ExtGState << "; foreach ($o['info']['extGStates'] as $gstate) { $res .= "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R"; @@ -688,13 +689,13 @@ break; case 'out': - if (count($o['info']['outlines'])) { + if (count(($o['info']['outlines'] ?? []))) { $res = "\n$id 0 obj\n<< /Type /Outlines /Kids ["; foreach ($o['info']['outlines'] as $v) { $res .= "$v 0 R "; } - $res .= "] /Count " . count($o['info']['outlines']) . " >>\nendobj"; + $res .= "] /Count " . count(($o['info']['outlines'] ?? [])) . " >>\nendobj"; } else { $res = "\n$id 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj"; } @@ -789,7 +790,7 @@ end EOT; - $res = "<</Length " . mb_strlen($stream, '8bit') . " >>\n"; + $res = "<</Length " . mb_strlen(($stream ?? ''), '8bit') . " >>\n"; $res .= "stream\n" . $stream . "endstream"; $this->objects[$toUnicodeId]['c'] = $res; @@ -916,7 +917,7 @@ case 'StemH': case 'XHeight': case 'CharSet': - if (mb_strlen($value, '8bit')) { + if (mb_strlen(($value ?? ''), '8bit')) { $res .= "/$label $value\n"; } @@ -1095,7 +1096,7 @@ case 'out': $res = "\n$id 0 obj\n"; $fontFileName = $o['info']['fontFileName']; - $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']); + $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode(($this->fonts[$fontFileName]['CIDtoGID'] ?? '')); $compressed = isset($this->fonts[$fontFileName]['CIDtoGID_Compressed']) && $this->fonts[$fontFileName]['CIDtoGID_Compressed']; @@ -1114,7 +1115,7 @@ $res .= "\n/Filter /FlateDecode"; } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . ">>\nstream\n$tmp\nendstream"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . ">>\nstream\n$tmp\nendstream"; } $res .= "\nendobj"; @@ -1404,7 +1405,7 @@ $res .= " ]"; } - $count = count($o['info']['contents']); + $count = count(($o['info']['contents'] ?? [])); if ($count == 1) { $res .= "\n/Contents " . $o['info']['contents'][0] . " 0 R"; } else { @@ -1439,7 +1440,7 @@ switch ($action) { case 'new': $this->objects[$id] = array('t' => 'contents', 'c' => '', 'info' => array()); - if (mb_strlen($options, '8bit') && intval($options)) { + if (mb_strlen(($options ?? ''), '8bit') && intval($options)) { // then this contents is the primary for a page $this->objects[$id]['onPage'] = $options; } else { @@ -1479,7 +1480,7 @@ $res .= "\n/$k $v"; } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . " >>\nstream\n$tmp\nendstream"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . " >>\nstream\n$tmp\nendstream"; } $res .= "\nendobj"; @@ -1599,8 +1600,8 @@ if ($options['isMask']) { $info['ColorSpace'] = '/DeviceGray'; } else { - if (mb_strlen($options['pdata'], '8bit')) { - $tmp = ' [ /Indexed /DeviceRGB ' . (mb_strlen($options['pdata'], '8bit') / 3 - 1) . ' '; + if (mb_strlen(($options['pdata'] ?? ''), '8bit')) { + $tmp = ' [ /Indexed /DeviceRGB ' . (mb_strlen(($options['pdata'] ?? ''), '8bit') / 3 - 1) . ' '; $this->numObj++; $this->o_contents($this->numObj, 'new'); $this->objects[$this->numObj]['c'] = $options['pdata']; @@ -1675,7 +1676,7 @@ $tmp = $this->ARC4($tmp); } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . ">>\nstream\n$tmp\nendstream\nendobj"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . ">>\nstream\n$tmp\nendstream\nendobj"; return $res; } @@ -1765,41 +1766,41 @@ . chr(0x2E) . chr(0x2E) . chr(0x00) . chr(0xB6) . chr(0xD0) . chr(0x68) . chr(0x3E) . chr(0x80) . chr(0x2F) . chr(0x0C) . chr(0xA9) . chr(0xFE) . chr(0x64) . chr(0x53) . chr(0x69) . chr(0x7A); - $len = mb_strlen($options['owner'], '8bit'); + $len = mb_strlen(($options['owner'] ?? ''), '8bit'); if ($len > 32) { - $owner = substr($options['owner'], 0, 32); + $owner = substr(($options['owner'] ?? ''), 0, 32); } else { if ($len < 32) { - $owner = $options['owner'] . substr($pad, 0, 32 - $len); + $owner = $options['owner'] . substr(($pad ?? ''), 0, 32 - $len); } else { $owner = $options['owner']; } } - $len = mb_strlen($options['user'], '8bit'); + $len = mb_strlen(($options['user'] ?? ''), '8bit'); if ($len > 32) { - $user = substr($options['user'], 0, 32); + $user = substr(($options['user'] ?? ''), 0, 32); } else { if ($len < 32) { - $user = $options['user'] . substr($pad, 0, 32 - $len); + $user = $options['user'] . substr(($pad ?? ''), 0, 32 - $len); } else { $user = $options['user']; } } $tmp = $this->md5_16($owner); - $okey = substr($tmp, 0, 5); + $okey = substr(($tmp ?? ''), 0, 5); $this->ARC4_init($okey); $ovalue = $this->ARC4($user); $this->objects[$id]['info']['O'] = $ovalue; // now make the u value, phew. $tmp = $this->md5_16( - $user . $ovalue . chr($options['p']) . chr(255) . chr(255) . chr(255) . $this->fileIdentifier + $user . $ovalue . chr((int) ($options['p'])) . chr(255) . chr(255) . chr(255) . $this->fileIdentifier ); - $ukey = substr($tmp, 0, 5); + $ukey = substr(($tmp ?? ''), 0, 5); $this->ARC4_init($ukey); $this->encryptionKey = $ukey; $this->encrypted = true; @@ -1835,10 +1836,10 @@ */ function md5_16($string) { - $tmp = md5($string); + $tmp = md5(($string ?? '')); $out = ''; for ($i = 0; $i <= 30; $i = $i + 2) { - $out .= chr(hexdec(substr($tmp, $i, 2))); + $out .= chr((int) (hexdec(substr(($tmp ?? ''), $i, 2)))); } return $out; @@ -1851,14 +1852,14 @@ { $tmp = $this->encryptionKey; $hex = dechex($id); - if (mb_strlen($hex, '8bit') < 6) { - $hex = substr('000000', 0, 6 - mb_strlen($hex, '8bit')) . $hex; - } - $tmp .= chr(hexdec(substr($hex, 4, 2))) . chr(hexdec(substr($hex, 2, 2))) . chr( - hexdec(substr($hex, 0, 2)) + if (mb_strlen(($hex ?? ''), '8bit') < 6) { + $hex = substr('000000', 0, 6 - mb_strlen(($hex ?? ''), '8bit')) . $hex; + } + $tmp .= chr((int) (hexdec(substr(($hex ?? ''), 4, 2)))) . chr((int) (hexdec(substr(($hex ?? ''), 2, 2)))) . chr( + (int) (hexdec(substr(($hex ?? ''), 0, 2))) ) . chr(0) . chr(0); $key = $this->md5_16($tmp); - $this->ARC4_init(substr($key, 0, 10)); + $this->ARC4_init(substr(($key ?? ''), 0, 10)); } /** @@ -1869,25 +1870,25 @@ $this->arc4 = ''; // setup the control array - if (mb_strlen($key, '8bit') == 0) { + if (mb_strlen(($key ?? ''), '8bit') == 0) { return; } $k = ''; - while (mb_strlen($k, '8bit') < 256) { + while (mb_strlen(($k ?? ''), '8bit') < 256) { $k .= $key; } - $k = substr($k, 0, 256); + $k = substr(($k ?? ''), 0, 256); for ($i = 0; $i < 256; $i++) { - $this->arc4 .= chr($i); + $this->arc4 .= chr((int) ($i)); } $j = 0; for ($i = 0; $i < 256; $i++) { $t = $this->arc4[$i]; - $j = ($j + ord($t) + ord($k[$i])) % 256; + $j = ($j + ord(($t ?? '')) + ord(($k[$i] ?? ''))) % 256; $this->arc4[$i] = $this->arc4[$j]; $this->arc4[$j] = $t; } @@ -1898,7 +1899,7 @@ */ function ARC4($text) { - $len = mb_strlen($text, '8bit'); + $len = mb_strlen(($text ?? ''), '8bit'); $a = 0; $b = 0; $c = $this->arc4; @@ -1906,11 +1907,11 @@ for ($i = 0; $i < $len; $i++) { $a = ($a + 1) % 256; $t = $c[$a]; - $b = ($b + ord($t)) % 256; + $b = ($b + ord(($t ?? ''))) % 256; $c[$a] = $c[$b]; $c[$b] = $t; - $k = ord($c[(ord($c[$a]) + ord($c[$b])) % 256]); - $out .= chr(ord($text[$i]) ^ $k); + $k = ord(($c[(ord(($c[$a] ?? '')) + ord(($c[$b] ?? ''))) % 256] ?? '')); + $out .= chr((int) (ord(($text[$i] ?? '')) ^ $k)); } return $out; @@ -1965,7 +1966,7 @@ if ($this->arc4_objnum == 0) { // then the block does not exist already, add it. $this->numObj++; - if (mb_strlen($ownerPass) == 0) { + if (mb_strlen(($ownerPass ?? '')) == 0) { $ownerPass = $userPass; } @@ -2010,30 +2011,30 @@ $xref = array(); $content = '%PDF-1.3'; - $pos = mb_strlen($content, '8bit'); + $pos = mb_strlen(($content ?? ''), '8bit'); foreach ($this->objects as $k => $v) { $tmp = 'o_' . $v['t']; $cont = $this->$tmp($k, 'out'); $content .= $cont; $xref[] = $pos; - $pos += mb_strlen($cont, '8bit'); - } - - $content .= "\nxref\n0 " . (count($xref) + 1) . "\n0000000000 65535 f \n"; + $pos += mb_strlen(($cont ?? ''), '8bit'); + } + + $content .= "\nxref\n0 " . (count(($xref ?? [])) + 1) . "\n0000000000 65535 f \n"; foreach ($xref as $p) { - $content .= str_pad($p, 10, "0", STR_PAD_LEFT) . " 00000 n \n"; - } - - $content .= "trailer\n<<\n/Size " . (count($xref) + 1) . "\n/Root 1 0 R\n/Info $this->infoObject 0 R\n"; + $content .= str_pad(($p ?? ''), 10, "0", STR_PAD_LEFT) . " 00000 n \n"; + } + + $content .= "trailer\n<<\n/Size " . (count(($xref ?? [])) + 1) . "\n/Root 1 0 R\n/Info $this->infoObject 0 R\n"; // if encryption has been applied to this document then add the marker for this dictionary if ($this->arc4_objnum > 0) { $content .= "/Encrypt $this->arc4_objnum 0 R\n"; } - if (mb_strlen($this->fileIdentifier, '8bit')) { + if (mb_strlen(($this->fileIdentifier ?? ''), '8bit')) { $content .= "/ID[<$this->fileIdentifier><$this->fileIdentifier>]\n"; } @@ -2091,14 +2092,14 @@ private function openFont($font) { // assume that $font contains the path and file but not the extension - $pos = strrpos($font, '/'); + $pos = strrpos(($font ?? ''), '/'); if ($pos === false) { $dir = './'; $name = $font; } else { - $dir = substr($font, 0, $pos + 1); - $name = substr($font, $pos + 1); + $dir = substr(($font ?? ''), 0, $pos + 1); + $name = substr(($font ?? ''), $pos + 1); } $fontcache = $this->fontcache; @@ -2156,7 +2157,7 @@ // Since we're not going to enable Unicode for the core fonts we need to use a font-based // setting for Unicode support rather than a global setting. - $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm'); + $data['isUnicode'] = (strtolower((substr(($metrics_name ?? ''), -3) ?? '')) !== 'afm'); $cidtogid = ''; if ($data['isUnicode']) { @@ -2166,12 +2167,12 @@ $file = file($dir . $metrics_name); foreach ($file as $rowA) { - $row = trim($rowA); - $pos = strpos($row, ' '); + $row = trim(($rowA ?? '')); + $pos = strpos(($row ?? ''), ' '); if ($pos) { // then there must be some keyword - $key = substr($row, 0, $pos); + $key = substr(($row ?? ''), 0, $pos); switch ($key) { case 'FontName': case 'FullName': @@ -2193,31 +2194,31 @@ case 'StdVW': case 'StartCharMetrics': case 'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font. Otherwise it's too big. - $data[$key] = trim(substr($row, $pos)); + $data[$key] = trim((substr(($row ?? ''), $pos) ?? '')); break; case 'FontBBox': - $data[$key] = explode(' ', trim(substr($row, $pos))); + $data[$key] = explode(' ', (trim((substr(($row ?? ''), $pos) ?? '')) ?? '')); break; //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ; case 'C': // Found in AFM files - $bits = explode(';', trim($row)); + $bits = explode(';', (trim(($row ?? '')) ?? '')); $dtmp = array(); foreach ($bits as $bit) { - $bits2 = explode(' ', trim($bit)); - if (mb_strlen($bits2[0], '8bit') == 0) { + $bits2 = explode(' ', (trim(($bit ?? '')) ?? '')); + if (mb_strlen(($bits2[0] ?? ''), '8bit') == 0) { continue; } - if (count($bits2) > 2) { + if (count(($bits2 ?? [])) > 2) { $dtmp[$bits2[0]] = array(); - for ($i = 1; $i < count($bits2); $i++) { + for ($i = 1; $i < count(($bits2 ?? [])); $i++) { $dtmp[$bits2[0]][] = $bits2[$i]; } } else { - if (count($bits2) == 2) { + if (count(($bits2 ?? [])) == 2) { $dtmp[$bits2[0]] = $bits2[1]; } } @@ -2248,22 +2249,22 @@ break; } - $bits = explode(';', trim($row)); + $bits = explode(';', (trim(($row ?? '')) ?? '')); $dtmp = array(); foreach ($bits as $bit) { - $bits2 = explode(' ', trim($bit)); - if (mb_strlen($bits2[0], '8bit') === 0) { + $bits2 = explode(' ', (trim(($bit ?? '')) ?? '')); + if (mb_strlen(($bits2[0] ?? ''), '8bit') === 0) { continue; } - if (count($bits2) > 2) { + if (count(($bits2 ?? [])) > 2) { $dtmp[$bits2[0]] = array(); - for ($i = 1; $i < count($bits2); $i++) { + for ($i = 1; $i < count(($bits2 ?? [])); $i++) { $dtmp[$bits2[0]][] = $bits2[$i]; } } else { - if (count($bits2) == 2) { + if (count(($bits2 ?? [])) == 2) { $dtmp[$bits2[0]] = $bits2[1]; } } @@ -2277,8 +2278,8 @@ if ($c >= 0) { // Set values in CID to GID map if ($c >= 0 && $c < 0xFFFF && $glyph) { - $cidtogid[$c * 2] = chr($glyph >> 8); - $cidtogid[$c * 2 + 1] = chr($glyph & 0xFF); + $cidtogid[$c * 2] = chr((int) ($glyph >> 8)); + $cidtogid[$c * 2 + 1] = chr((int) ($glyph & 0xFF)); } if ($c != hexdec($n)) { @@ -2298,7 +2299,7 @@ case 'KPX': break; // don't include them as they are not used yet //KPX Adieresis yacute -40 - $bits = explode(' ', trim($row)); + $bits = explode(' ', (trim(($row ?? '')) ?? '')); $data['KPX'][$bits[1]][$bits[2]] = $bits[3]; break; } @@ -2310,13 +2311,13 @@ $data['CIDtoGID_Compressed'] = true; $cidtogid = gzcompress($cidtogid, 6); } - $data['CIDtoGID'] = base64_encode($cidtogid); + $data['CIDtoGID'] = base64_encode(($cidtogid ?? '')); $data['_version_'] = $this->fontcacheVersion; $this->fonts[$font] = $data; //Because of potential trouble with php safe mode, expect that the folder already exists. //If not existing, this will hit performance because of missing cached results. - if (is_dir(substr($fontcache, 0, -1)) && is_writable(substr($fontcache, 0, -1))) { + if (is_dir(substr(($fontcache ?? ''), 0, -1)) && is_writable(substr(($fontcache ?? ''), 0, -1))) { file_put_contents($fontcache . $cache_name, '<?php return ' . var_export($data, true) . ';'); } $data = null; @@ -2339,9 +2340,9 @@ */ function selectFont($fontName, $encoding = '', $set = true) { - $ext = substr($fontName, -4); + $ext = substr(($fontName ?? ''), -4); if ($ext === '.afm' || $ext === '.ufm') { - $fontName = substr($fontName, 0, mb_strlen($fontName) - 4); + $fontName = substr(($fontName ?? ''), 0, mb_strlen(($fontName ?? '')) - 4); } if (!isset($this->fonts[$fontName])) { @@ -2357,9 +2358,9 @@ $font = &$this->fonts[$fontName]; //$this->numFonts = md5($fontName); - $pos = strrpos($fontName, '/'); + $pos = strrpos(($fontName ?? ''), '/'); // $dir = substr($fontName,0,$pos+1); - $name = substr($fontName, $pos + 1); + $name = substr(($fontName ?? ''), $pos + 1); $options = array('name' => $name, 'fontFileName' => $fontName); if (is_array($encoding)) { @@ -2372,7 +2373,7 @@ $options['differences'] = $encoding['differences']; } } else { - if (mb_strlen($encoding, '8bit')) { + if (mb_strlen(($encoding ?? ''), '8bit')) { // then perhaps only the encoding has been set $options['encoding'] = $encoding; } @@ -2490,7 +2491,7 @@ if (isset($font['StdVW'])) { $stemV = $font['StdVW']; } else { - if (isset($font['Weight']) && preg_match('!(bold|black)!i', $font['Weight'])) { + if (isset($font['Weight']) && preg_match('!(bold|black)!i', ($font['Weight'] ?? ''))) { $stemV = 120; } } @@ -2500,7 +2501,7 @@ // simple utility to convert them from pfa to pfb. // FIXME: should we move font subset creation to CPDF::output? See notes in issue #750. if (!$this->isUnicode || $fbtype !== 'ttf' || empty($this->stringSubsets)) { - $data = file_get_contents($fbfile); + $data = file_get_contents(($fbfile ?? '')); } else { $this->stringSubsets[$fontName][] = 32; // Force space if not in yet @@ -2543,20 +2544,20 @@ $font['CIDWidths'] = array(); foreach ($glyphIndexArray as $cid => $gid) { if ($cid >= 0 && $cid < 0xFFFF && $gid) { - $cidtogid[$cid * 2] = chr($gid >> 8); - $cidtogid[$cid * 2 + 1] = chr($gid & 0xFF); + $cidtogid[$cid * 2] = chr((int) ($gid >> 8)); + $cidtogid[$cid * 2 + 1] = chr((int) ($gid & 0xFF)); } $width = $font_obj->normalizeFUnit(isset($hmtx[$gid]) ? $hmtx[$gid][0] : $hmtx[0][0]); $font['CIDWidths'][$cid] = $width; } - $font['CIDtoGID'] = base64_encode(gzcompress($cidtogid)); + $font['CIDtoGID'] = base64_encode((gzcompress($cidtogid) ?? '')); $font['CIDtoGID_Compressed'] = true; - $data = file_get_contents($tmp_name); + $data = file_get_contents(($tmp_name ?? '')); } else { - $data = file_get_contents($fbfile); + $data = file_get_contents(($fbfile ?? '')); } $font_obj->close(); @@ -2618,9 +2619,9 @@ // determine the cruicial lengths within this file if ($fbtype === 'pfb') { - $l1 = strpos($data, 'eexec') + 6; - $l2 = strpos($data, '00000000') - $l1; - $l3 = mb_strlen($data, '8bit') - $l2 - $l1; + $l1 = strpos(($data ?? ''), 'eexec') + 6; + $l2 = strpos(($data ?? ''), '00000000') - $l1; + $l3 = mb_strlen(($data ?? ''), '8bit') - $l2 - $l1; $this->o_contents( $this->numObj, 'add', @@ -2628,7 +2629,7 @@ ); } else { if ($fbtype == 'ttf') { - $l1 = mb_strlen($data, '8bit'); + $l1 = mb_strlen(($data ?? ''), '8bit'); $this->o_contents($this->numObj, 'add', array('Length1' => $l1)); } } @@ -3269,7 +3270,7 @@ } // if there is a line style set, then put this in too - if (mb_strlen($this->currentLineStyle, '8bit')) { + if (mb_strlen(($this->currentLineStyle ?? ''), '8bit')) { $this->addContent("\n$this->currentLineStyle"); } @@ -3301,13 +3302,13 @@ } $debug = empty($options['compression']); - $tmp = ltrim($this->output($debug)); + $tmp = ltrim(($this->output($debug) ?? '')); header("Cache-Control: private"); header("Content-type: application/pdf"); //FIXME: I don't know that this is sufficient for determining content length (i.e. what about transport compression?) - header("Content-Length: " . mb_strlen($tmp, '8bit')); + header("Content-Length: " . mb_strlen(($tmp ?? ''), '8bit')); $fileName = (isset($options['Content-Disposition']) ? $options['Content-Disposition'] : 'file.pdf'); if (!isset($options["Attachment"])) { @@ -3318,9 +3319,9 @@ // detect the character encoding of the incoming file $encoding = mb_detect_encoding($fileName); - $fallbackfilename = mb_convert_encoding($fileName, "ISO-8859-1", $encoding); - $encodedfallbackfilename = rawurlencode($fallbackfilename); - $encodedfilename = rawurlencode($fileName); + $fallbackfilename = mb_convert_encoding(($fileName ?? ''), "ISO-8859-1", $encoding); + $encodedfallbackfilename = rawurlencode(($fallbackfilename ?? '')); + $encodedfilename = rawurlencode(($fileName ?? '')); header( "Content-Disposition: $attachment; filename=" . $encodedfallbackfilename . "; filename*=UTF-8''$encodedfilename" @@ -3328,7 +3329,7 @@ if (isset($options['Accept-Ranges']) && $options['Accept-Ranges'] == 1) { //FIXME: Is this the correct value ... spec says 1#range-unit - header("Accept-Ranges: " . mb_strlen($tmp, '8bit')); + header("Accept-Ranges: " . mb_strlen(($tmp ?? ''), '8bit')); } echo $tmp; @@ -3424,12 +3425,12 @@ $text = $this->utf8toUtf16BE($text, $bom); } else { //$text = html_entity_decode($text, ENT_QUOTES); - $text = mb_convert_encoding($text, self::$targetEncoding, 'UTF-8'); + $text = mb_convert_encoding(($text ?? ''), (self::$targetEncoding ?? ''), 'UTF-8'); } } // the chr(13) substitution fixes a bug seen in TCPDF (bug #1421290) - return strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r')); + return strtr(($text ?? ''), array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r')); } /** @@ -3442,8 +3443,8 @@ $w = $this->getTextWidth($size, $text); // need to adjust for the number of spaces in this text - $words = explode(' ', $text); - $nspaces = count($words) - 1; + $words = explode(' ', ($text ?? '')); + $nspaces = count(($words ?? [])) - 1; $w += $wa * $nspaces; $a = deg2rad((float)$angle); @@ -3499,14 +3500,14 @@ $this->selectFont($this->defaultFont); } - $text = str_replace(array("\r", "\n"), "", $text); + $text = str_replace(array("\r", "\n"), "", ($text ?? '')); if ($smallCaps) { - preg_match_all("/(\P{Ll}+)/u", $text, $matches, PREG_SET_ORDER); + preg_match_all("/(\P{Ll}+)/u", ($text ?? ''), $matches, PREG_SET_ORDER); $lower = $this->concatMatches($matches); d($lower); - preg_match_all("/(\p{Ll}+)/u", $text, $matches, PREG_SET_ORDER); + preg_match_all("/(\p{Ll}+)/u", ($text ?? ''), $matches, PREG_SET_ORDER); $other = $this->concatMatches($matches); d($other); @@ -3552,7 +3553,7 @@ $this->addContent(sprintf(" %.3F Tc", $charSpaceAdjust)); } - $len = mb_strlen($text); + $len = mb_strlen(($text ?? '')); $start = 0; if ($start < $len) { @@ -3563,7 +3564,7 @@ if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) { $space_scale = 1000 / $size; //$place_text = str_replace(' ', ') ( ) '.($this->getTextWidth($size, chr(32), $wordSpaceAdjust)*-75).' (', $place_text); - $place_text = str_replace(' ', ' ) ' . (-round($space_scale * $wordSpaceAdjust)) . ' (', $place_text); + $place_text = str_replace(' ', ' ) ' . (-round($space_scale * $wordSpaceAdjust)) . ' (', ($place_text ?? '')); } $this->addContent(" /F$this->currentFontNum " . sprintf('%.1F Tf ', $size)); $this->addContent(" [($place_text)] TJ"); @@ -3609,7 +3610,7 @@ $this->selectFont($this->defaultFont); } - $text = str_replace(array("\r", "\n"), "", $text); + $text = str_replace(array("\r", "\n"), "", ($text ?? '')); // converts a number or a float to a string so it can get the width $text = "$text"; @@ -3649,20 +3650,20 @@ // add additionnal char spacing if ($char_spacing != 0) { - $w += $char_spacing * $space_scale * (count($unicode) + $n_spaces); + $w += $char_spacing * $space_scale * (count(($unicode ?? [])) + $n_spaces); } } else { // If CPDF is in Unicode mode but the current font does not support Unicode we need to convert the character set to Windows-1252 if ($this->isUnicode) { - $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8'); + $text = mb_convert_encoding(($text ?? ''), 'Windows-1252', 'UTF-8'); } - $len = mb_strlen($text, 'Windows-1252'); + $len = mb_strlen(($text ?? ''), 'Windows-1252'); for ($i = 0; $i < $len; $i++) { $c = $text[$i]; - $char = isset($ord_cache[$c]) ? $ord_cache[$c] : ($ord_cache[$c] = ord($c)); + $char = isset($ord_cache[$c]) ? $ord_cache[$c] : ($ord_cache[$c] = ord(($c ?? ''))); // check if we have to replace character if (isset($current_font['differences'][$char])) { @@ -3925,7 +3926,7 @@ $ret = 0; for ($i = 0; $i < $num; $i++) { $ret *= 256; - $ret += ord($data[$pos + $i]); + $ret += ord(($data[$pos + $i] ?? '')); } return $ret; @@ -3953,7 +3954,7 @@ * @param bool $is_mask true if the image is a mask * @param bool $mask true if the image is masked */ - function addImagePng($file, $x, $y, $w = 0.0, $h = 0.0, &$img, $is_mask = false, $mask = null) + function addImagePng($file, $x, $y, $w, $h, &$img, $is_mask = false, $mask = null) { if (!function_exists("imagepng")) { throw new Exception("The PHP GD extension is required, but is not installed."); @@ -4025,12 +4026,12 @@ @unlink($tempfile_plain); $tempfile_plain = "$tempfile_plain.png"; - $imgalpha = imagecreate($wpx, $hpx); + $imgalpha = imagecreate((int) ($wpx), (int) ($hpx)); imagesavealpha($imgalpha, false); // generate gray scale palette (0 -> 255) for ($c = 0; $c < 256; ++$c) { - imagecolorallocate($imgalpha, $c, $c, $c); + imagecolorallocate($imgalpha, (int) ($c), (int) ($c), (int) ($c)); } // Use PECL gmagick + Graphics Magic to process transparent PNG images @@ -4051,7 +4052,7 @@ // Cast to 8bit+palette $imgalpha_ = imagecreatefrompng($tempfile_alpha); - imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx); + imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($imgalpha_); imagepng($imgalpha, $tempfile_alpha); @@ -4084,7 +4085,7 @@ // Cast to 8bit+palette $imgalpha_ = imagecreatefrompng($tempfile_alpha); - imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx); + imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($imgalpha_); imagepng($imgalpha, $tempfile_alpha); @@ -4104,8 +4105,8 @@ // extract alpha channel for ($xpx = 0; $xpx < $wpx; ++$xpx) { for ($ypx = 0; $ypx < $hpx; ++$ypx) { - $color = imagecolorat($img, $xpx, $ypx); - $col = imagecolorsforindex($img, $color); + $color = imagecolorat($img, (int) ($xpx), (int) ($ypx)); + $col = imagecolorsforindex($img, (int) ($color)); $alpha = $col['alpha']; if ($eight_bit) { @@ -4119,22 +4120,22 @@ $key = $col['red'] . $col['green'] . $col['blue']; if (!isset($allocated_colors[$key])) { - $pixel_img = imagecolorallocate($img, $col['red'], $col['green'], $col['blue']); + $pixel_img = imagecolorallocate($img, (int) ($col['red']), (int) ($col['green']), (int) ($col['blue'])); $allocated_colors[$key] = $pixel_img; } else { $pixel_img = $allocated_colors[$key]; } - imagesetpixel($img, $xpx, $ypx, $pixel_img); - } - - imagesetpixel($imgalpha, $xpx, $ypx, $pixel); + imagesetpixel($img, (int) ($xpx), (int) ($ypx), (int) ($pixel_img)); + } + + imagesetpixel($imgalpha, (int) ($xpx), (int) ($ypx), (int) ($pixel)); } } // extract image without alpha channel - $imgplain = imagecreatetruecolor($wpx, $hpx); - imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx); + $imgplain = imagecreatetruecolor((int) ($wpx), (int) ($hpx)); + imagecopy($imgplain, $img, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($img); imagepng($imgalpha, $tempfile_alpha); @@ -4168,7 +4169,7 @@ if (isset($this->imagelist[$file])) { $img = null; } else { - $info = file_get_contents($file, false, null, 24, 5); + $info = file_get_contents(($file ?? ''), (false ?? false), null, 24, 5); $meta = unpack("CbitDepth/CcolorType/CcompressionMethod/CfilterMethod/CinterlaceMethod", $info); $bit_depth = $meta["bitDepth"]; $color_type = $meta["colorType"]; @@ -4199,21 +4200,21 @@ } $sx = imagesx($imgtmp); $sy = imagesy($imgtmp); - $img = imagecreatetruecolor($sx, $sy); + $img = imagecreatetruecolor((int) ($sx), (int) ($sy)); imagealphablending($img, true); // @todo is it still needed ?? $ti = imagecolortransparent($imgtmp); if ($ti >= 0) { - $tc = imagecolorsforindex($imgtmp, $ti); - $ti = imagecolorallocate($img, $tc['red'], $tc['green'], $tc['blue']); - imagefill($img, 0, 0, $ti); + $tc = imagecolorsforindex($imgtmp, (int) ($ti)); + $ti = imagecolorallocate($img, (int) ($tc['red']), (int) ($tc['green']), (int) ($tc['blue'])); + imagefill($img, 0, 0, (int) ($ti)); imagecolortransparent($img, $ti); } else { - imagefill($img, 1, 1, imagecolorallocate($img, 255, 255, 255)); + imagefill($img, 1, 1, (int) (imagecolorallocate($img, 255, 255, 255))); } - imagecopy($img, $imgtmp, 0, 0, 0, 0, $sx, $sy); + imagecopy($img, $imgtmp, 0, 0, 0, 0, (int) ($sx), (int) ($sy)); imagedestroy($imgtmp); } $this->addImagePng($file, $x, $y, $w, $h, $img); @@ -4226,7 +4227,7 @@ /** * add a PNG image into the document, from a memory buffer of the file */ - function addPngFromBuf($file, $x, $y, $w = 0.0, $h = 0.0, &$data, $is_mask = false, $mask = null) + function addPngFromBuf($file, $x, $y, $w, $h, &$data, $is_mask = false, $mask = null) { if (isset($this->imagelist[$file])) { $data = null; @@ -4245,7 +4246,7 @@ if (!$error) { $header = chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10); - if (mb_substr($data, 0, 8, '8bit') != $header) { + if (mb_substr(($data ?? ''), 0, 8, '8bit') != $header) { $error = 1; $errormsg = 'this file does not have a valid header'; @@ -4255,7 +4256,7 @@ if (!$error) { // set pointer $p = 8; - $len = mb_strlen($data, '8bit'); + $len = mb_strlen(($data ?? ''), '8bit'); // cycle through the file, identifying chunks $haveHeader = 0; @@ -4265,18 +4266,18 @@ while ($p < $len) { $chunkLen = $this->getBytes($data, $p, 4); - $chunkType = mb_substr($data, $p + 4, 4, '8bit'); + $chunkType = mb_substr(($data ?? ''), $p + 4, 4, '8bit'); switch ($chunkType) { case 'IHDR': // this is where all the file information comes from $info['width'] = $this->getBytes($data, $p + 8, 4); $info['height'] = $this->getBytes($data, $p + 12, 4); - $info['bitDepth'] = ord($data[$p + 16]); - $info['colorType'] = ord($data[$p + 17]); - $info['compressionMethod'] = ord($data[$p + 18]); - $info['filterMethod'] = ord($data[$p + 19]); - $info['interlaceMethod'] = ord($data[$p + 20]); + $info['bitDepth'] = ord(($data[$p + 16] ?? '')); + $info['colorType'] = ord(($data[$p + 17] ?? '')); + $info['compressionMethod'] = ord(($data[$p + 18] ?? '')); + $info['filterMethod'] = ord(($data[$p + 19] ?? '')); + $info['interlaceMethod'] = ord(($data[$p + 20] ?? '')); //print_r($info); $haveHeader = 1; @@ -4304,11 +4305,11 @@ break; case 'PLTE': - $pdata .= mb_substr($data, $p + 8, $chunkLen, '8bit'); + $pdata .= mb_substr(($data ?? ''), $p + 8, $chunkLen, '8bit'); break; case 'IDAT': - $idata .= mb_substr($data, $p + 8, $chunkLen, '8bit'); + $idata .= mb_substr(($data ?? ''), $p + 8, $chunkLen, '8bit'); break; case 'tRNS': @@ -4330,7 +4331,7 @@ $trans = 0; for ($i = $chunkLen; $i >= 0; $i--) { - if (ord($data[$p + 8 + $i]) == 0) { + if (ord(($data[$p + 8 + $i] ?? '')) == 0) { $trans = $i; } } @@ -4345,7 +4346,7 @@ */ // $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale $transparency['type'] = 'indexed'; - $transparency['data'] = ord($data[$p + 8 + 1]); + $transparency['data'] = ord(($data[$p + 8 + 1] ?? '')); break; // truecolor @@ -4530,7 +4531,7 @@ $channels = 3; } - $data = file_get_contents($img); + $data = file_get_contents(($img ?? '')); } if ($w <= 0 && $h <= 0) { @@ -4555,11 +4556,11 @@ &$data, $x, $y, - $w = 0, - $h = 0, + $w, + $h, $imageWidth, $imageHeight, - $channels = 3, + $channels, $imgname ) { if ($this->image_iscached($imgname)) { @@ -4701,7 +4702,7 @@ // the user is trying to set a font family // note that this can also be used to set the base ones to something else - if (mb_strlen($family)) { + if (mb_strlen(($family ?? ''))) { $this->fontFamilies[$family] = $options; } } --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfaceCpdf.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfaceCpdf.php @@ -150,8 +150,8 @@ { if (self::DEBUG) echo __FUNCTION__ . "\n"; - if (strpos($image, "data:") === 0) { - $parts = explode(',', $image, 2); + if (strpos(($image ?? ''), "data:") === 0) { + $parts = explode(',', ($image ?? ''), 2); $data = $parts[1]; $base64 = false; @@ -166,11 +166,11 @@ } if ($base64) { - $data = base64_decode($data); + $data = base64_decode(($data ?? '')); } } else { - $data = file_get_contents($image); + $data = file_get_contents(($image ?? '')); } $image = tempnam("", "svg"); @@ -193,9 +193,9 @@ list($width, $height, $type) = getimagesize($filename); if ($width == null || $height == null) { - $data = file_get_contents($filename, null, null, 0, 26); - - if (substr($data, 0, 2) === "BM") { + $data = file_get_contents(($filename ?? ''), (null ?? false), null, 0, 26); + + if (substr(($data ?? ''), 0, 2) === "BM") { $meta = unpack('vtype/Vfilesize/Vreserved/Voffset/Vheadersize/Vwidth/Vheight', $data); $width = (int)$meta['width']; $height = (int)$meta['height']; @@ -384,7 +384,7 @@ $canvas->setColor(array((float)$fill[0]/255, (float)$fill[1]/255, (float)$fill[2]/255), true); } - if ($fillRule = strtolower($style->fillRule)) { + if ($fillRule = strtolower(($style->fillRule ?? ''))) { $canvas->setFillRule($fillRule); } @@ -412,7 +412,7 @@ $dashArray = null; if ($style->strokeDasharray) { - $dashArray = preg_split('/\s*,\s*/', $style->strokeDasharray); + $dashArray = preg_split('/\s*,\s*/', ($style->strokeDasharray ?? '')); } $canvas->setLineStyle( @@ -457,9 +457,9 @@ ), ); - $family = strtolower($family); - $style = strtolower($style); - $weight = strtolower($weight); + $family = strtolower(($family ?? '')); + $style = strtolower(($style ?? '')); + $weight = strtolower(($weight ?? '')); if (isset($map[$family])) { $family = $map[$family]; --- a/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfaceGmagick.php +++ b/intranet/marketplaces-api/vendor/phenx/php-svg-lib/src/Svg/Surface/SurfaceGmagick.php @@ -50,7 +50,7 @@ $image->write($tmp); - return file_get_contents($tmp); + return file_get_contents(($tmp ?? '')); } public function save() @@ -132,10 +132,10 @@ { if (self::DEBUG) echo __FUNCTION__ . "\n"; - if (strpos($image, "data:") === 0) { - $data = substr($image, strpos($image, ";") + 1); - if (strpos($data, "base64") === 0) { - $data = base64_decode(substr($data, 7)); + if (strpos(($image ?? ''), "data:") === 0) { + $data = substr(($image ?? ''), strpos(($image ?? ''), ";") + 1); + if (strpos(($data ?? ''), "base64") === 0) { + $data = base64_decode((substr(($data ?? ''), 7) ?? '')); } $image = tempnam("", "svg"); @@ -293,7 +293,7 @@ "monospance" => "Courier", ); - $family = strtolower($family); + $family = strtolower(($family ?? '')); if (isset($map[$family])) { $family = $map[$family]; } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/Cpdf.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/Cpdf.php @@ -18,6 +18,7 @@ use FontLib\Font; use FontLib\BinaryStream; +#[\AllowDynamicProperties] class Cpdf { @@ -343,7 +344,7 @@ function __construct($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') { $this->isUnicode = $isUnicode; - $this->fontcache = rtrim($fontcache, DIRECTORY_SEPARATOR."/\\"); + $this->fontcache = rtrim(($fontcache ?? ''), DIRECTORY_SEPARATOR."/\\"); $this->tmp = ($tmp !== '' ? $tmp : sys_get_temp_dir()); $this->newDocument($pageSize); @@ -648,7 +649,7 @@ } if ($k >= 0) { - for ($j = count($o['info']['pages']) - 1; $j >= $k; $j--) { + for ($j = count(($o['info']['pages'] ?? [])) - 1; $j >= $k; $j--) { $o['info']['pages'][$j + 1] = $o['info']['pages'][$j]; } @@ -682,17 +683,17 @@ break; case 'out': - if (count($o['info']['pages'])) { + if (count(($o['info']['pages'] ?? []))) { $res = "\n$id 0 obj\n<< /Type /Pages\n/Kids ["; foreach ($o['info']['pages'] as $v) { $res .= "$v 0 R\n"; } - $res .= "]\n/Count " . count($this->objects[$id]['info']['pages']); - - if ((isset($o['info']['fonts']) && count($o['info']['fonts'])) || + $res .= "]\n/Count " . count(($this->objects[$id]['info']['pages'] ?? [])); + + if ((isset($o['info']['fonts']) && count(($o['info']['fonts'] ?? []))) || isset($o['info']['procset']) || - (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) + (isset($o['info']['extGStates']) && count(($o['info']['extGStates'] ?? []))) ) { $res .= "\n/Resources <<"; @@ -700,7 +701,7 @@ $res .= "\n/ProcSet " . $o['info']['procset'] . " 0 R"; } - if (isset($o['info']['fonts']) && count($o['info']['fonts'])) { + if (isset($o['info']['fonts']) && count(($o['info']['fonts'] ?? []))) { $res .= "\n/Font << "; foreach ($o['info']['fonts'] as $finfo) { $res .= "\n/F" . $finfo['fontNum'] . " " . $finfo['objNum'] . " 0 R"; @@ -708,7 +709,7 @@ $res .= "\n>>"; } - if (isset($o['info']['xObjects']) && count($o['info']['xObjects'])) { + if (isset($o['info']['xObjects']) && count(($o['info']['xObjects'] ?? []))) { $res .= "\n/XObject << "; foreach ($o['info']['xObjects'] as $finfo) { $res .= "\n/" . $finfo['label'] . " " . $finfo['objNum'] . " 0 R"; @@ -716,7 +717,7 @@ $res .= "\n>>"; } - if (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) { + if (isset($o['info']['extGStates']) && count(($o['info']['extGStates'] ?? []))) { $res .= "\n/ExtGState << "; foreach ($o['info']['extGStates'] as $gstate) { $res .= "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R"; @@ -773,13 +774,13 @@ break; case 'out': - if (count($o['info']['outlines'])) { + if (count(($o['info']['outlines'] ?? []))) { $res = "\n$id 0 obj\n<< /Type /Outlines /Kids ["; foreach ($o['info']['outlines'] as $v) { $res .= "$v 0 R "; } - $res .= "] /Count " . count($o['info']['outlines']) . " >>\nendobj"; + $res .= "] /Count " . count(($o['info']['outlines'] ?? [])) . " >>\nendobj"; } else { $res = "\n$id 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj"; } @@ -1002,7 +1003,7 @@ EOT; $res = "\n$id 0 obj\n"; - $res .= "<</Length " . mb_strlen($stream, '8bit') . " >>\n"; + $res .= "<</Length " . mb_strlen(($stream ?? ''), '8bit') . " >>\n"; $res .= "stream\n" . $stream . "\nendstream" . "\nendobj";; return $res; @@ -1047,7 +1048,7 @@ case 'StemH': case 'XHeight': case 'CharSet': - if (mb_strlen($value, '8bit')) { + if (mb_strlen(($value ?? ''), '8bit')) { $res .= "/$label $value\n"; } @@ -1285,7 +1286,7 @@ case 'out': $res = "\n$id 0 obj\n"; $fontFileName = $o['info']['fontFileName']; - $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode($this->fonts[$fontFileName]['CIDtoGID']); + $tmp = $this->fonts[$fontFileName]['CIDtoGID'] = base64_decode(($this->fonts[$fontFileName]['CIDtoGID'] ?? '')); $compressed = isset($this->fonts[$fontFileName]['CIDtoGID_Compressed']) && $this->fonts[$fontFileName]['CIDtoGID_Compressed']; @@ -1309,7 +1310,7 @@ $tmp = $this->ARC4($tmp); } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . ">>\nstream\n$tmp\nendstream"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . ">>\nstream\n$tmp\nendstream"; } $res .= "\nendobj"; @@ -1645,7 +1646,7 @@ $res .= " ]"; } - $count = count($o['info']['contents']); + $count = count(($o['info']['contents'] ?? [])); if ($count == 1) { $res .= "\n/Contents " . $o['info']['contents'][0] . " 0 R"; } else { @@ -1687,7 +1688,7 @@ switch ($action) { case 'new': $this->objects[$id] = array('t' => 'contents', 'c' => '', 'info' => array()); - if (mb_strlen($options, '8bit') && intval($options)) { + if (mb_strlen(($options ?? ''), '8bit') && intval($options)) { // then this contents is the primary for a page $this->objects[$id]['onPage'] = $options; } else { @@ -1727,7 +1728,7 @@ $res .= "\n/$k $v"; } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . " >>\nstream\n$tmp\nendstream"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . " >>\nstream\n$tmp\nendstream"; } $res .= "\nendobj"; @@ -1860,8 +1861,8 @@ if ($options['isMask']) { $info['ColorSpace'] = '/DeviceGray'; } else { - if (mb_strlen($options['pdata'], '8bit')) { - $tmp = ' [ /Indexed /DeviceRGB ' . (mb_strlen($options['pdata'], '8bit') / 3 - 1) . ' '; + if (mb_strlen(($options['pdata'] ?? ''), '8bit')) { + $tmp = ' [ /Indexed /DeviceRGB ' . (mb_strlen(($options['pdata'] ?? ''), '8bit') / 3 - 1) . ' '; $this->numObj++; $this->o_contents($this->numObj, 'new'); $this->objects[$this->numObj]['c'] = $options['pdata']; @@ -1937,7 +1938,7 @@ $tmp = $this->ARC4($tmp); } - $res .= "\n/Length " . mb_strlen($tmp, '8bit') . ">>\nstream\n$tmp\nendstream\nendobj"; + $res .= "\n/Length " . mb_strlen(($tmp ?? ''), '8bit') . ">>\nstream\n$tmp\nendstream\nendobj"; return $res; } @@ -2038,41 +2039,41 @@ $info = $this->objects[$id]['info']; - $len = mb_strlen($info['owner'], '8bit'); + $len = mb_strlen(($info['owner'] ?? ''), '8bit'); if ($len > 32) { - $owner = substr($info['owner'], 0, 32); + $owner = substr(($info['owner'] ?? ''), 0, 32); } else { if ($len < 32) { - $owner = $info['owner'] . substr($pad, 0, 32 - $len); + $owner = $info['owner'] . substr(($pad ?? ''), 0, 32 - $len); } else { $owner = $info['owner']; } } - $len = mb_strlen($info['user'], '8bit'); + $len = mb_strlen(($info['user'] ?? ''), '8bit'); if ($len > 32) { - $user = substr($info['user'], 0, 32); + $user = substr(($info['user'] ?? ''), 0, 32); } else { if ($len < 32) { - $user = $info['user'] . substr($pad, 0, 32 - $len); + $user = $info['user'] . substr(($pad ?? ''), 0, 32 - $len); } else { $user = $info['user']; } } $tmp = $this->md5_16($owner); - $okey = substr($tmp, 0, 5); + $okey = substr(($tmp ?? ''), 0, 5); $this->ARC4_init($okey); $ovalue = $this->ARC4($user); $this->objects[$id]['info']['O'] = $ovalue; // now make the u value, phew. $tmp = $this->md5_16( - $user . $ovalue . chr($info['p']) . chr(255) . chr(255) . chr(255) . hex2bin($this->fileIdentifier) + $user . $ovalue . chr((int) ($info['p'])) . chr(255) . chr(255) . chr(255) . hex2bin(($this->fileIdentifier ?? '')) ); - $ukey = substr($tmp, 0, 5); + $ukey = substr(($tmp ?? ''), 0, 5); $this->ARC4_init($ukey); $this->encryptionKey = $ukey; $this->encrypted = true; @@ -2114,10 +2115,10 @@ */ function md5_16($string) { - $tmp = md5($string); + $tmp = md5(($string ?? '')); $out = ''; for ($i = 0; $i <= 30; $i = $i + 2) { - $out .= chr(hexdec(substr($tmp, $i, 2))); + $out .= chr((int) (hexdec(substr(($tmp ?? ''), $i, 2)))); } return $out; @@ -2132,17 +2133,17 @@ { $tmp = $this->encryptionKey; $hex = dechex($id); - if (mb_strlen($hex, '8bit') < 6) { - $hex = substr('000000', 0, 6 - mb_strlen($hex, '8bit')) . $hex; - } - $tmp .= chr(hexdec(substr($hex, 4, 2))) - . chr(hexdec(substr($hex, 2, 2))) - . chr(hexdec(substr($hex, 0, 2))) + if (mb_strlen(($hex ?? ''), '8bit') < 6) { + $hex = substr('000000', 0, 6 - mb_strlen(($hex ?? ''), '8bit')) . $hex; + } + $tmp .= chr((int) (hexdec(substr(($hex ?? ''), 4, 2)))) + . chr((int) (hexdec(substr(($hex ?? ''), 2, 2)))) + . chr((int) (hexdec(substr(($hex ?? ''), 0, 2)))) . chr(0) . chr(0) ; $key = $this->md5_16($tmp); - $this->ARC4_init(substr($key, 0, 10)); + $this->ARC4_init(substr(($key ?? ''), 0, 10)); } /** @@ -2155,25 +2156,25 @@ $this->arc4 = ''; // setup the control array - if (mb_strlen($key, '8bit') == 0) { + if (mb_strlen(($key ?? ''), '8bit') == 0) { return; } $k = ''; - while (mb_strlen($k, '8bit') < 256) { + while (mb_strlen(($k ?? ''), '8bit') < 256) { $k .= $key; } - $k = substr($k, 0, 256); + $k = substr(($k ?? ''), 0, 256); for ($i = 0; $i < 256; $i++) { - $this->arc4 .= chr($i); + $this->arc4 .= chr((int) ($i)); } $j = 0; for ($i = 0; $i < 256; $i++) { $t = $this->arc4[$i]; - $j = ($j + ord($t) + ord($k[$i])) % 256; + $j = ($j + ord(($t ?? '')) + ord(($k[$i] ?? ''))) % 256; $this->arc4[$i] = $this->arc4[$j]; $this->arc4[$j] = $t; } @@ -2187,7 +2188,7 @@ */ function ARC4($text) { - $len = mb_strlen($text, '8bit'); + $len = mb_strlen(($text ?? ''), '8bit'); $a = 0; $b = 0; $c = $this->arc4; @@ -2195,11 +2196,11 @@ for ($i = 0; $i < $len; $i++) { $a = ($a + 1) % 256; $t = $c[$a]; - $b = ($b + ord($t)) % 256; + $b = ($b + ord(($t ?? ''))) % 256; $c[$a] = $c[$b]; $c[$b] = $t; - $k = ord($c[(ord($c[$a]) + ord($c[$b])) % 256]); - $out .= chr(ord($text[$i]) ^ $k); + $k = ord(($c[(ord(($c[$a] ?? '')) + ord(($c[$b] ?? ''))) % 256] ?? '')); + $out .= chr((int) (ord(($text[$i] ?? '')) ^ $k)); } return $out; @@ -2270,7 +2271,7 @@ if ($this->arc4_objnum == 0) { // then the block does not exist already, add it. $this->numObj++; - if (mb_strlen($ownerPass) == 0) { + if (mb_strlen(($ownerPass ?? '')) == 0) { $ownerPass = $userPass; } @@ -2324,24 +2325,24 @@ $xref = array(); $content = '%PDF-1.3'; - $pos = mb_strlen($content, '8bit'); + $pos = mb_strlen(($content ?? ''), '8bit'); foreach ($this->objects as $k => $v) { $tmp = 'o_' . $v['t']; $cont = $this->$tmp($k, 'out'); $content .= $cont; $xref[] = $pos + 1; //+1 to account for \n at the start of each object - $pos += mb_strlen($cont, '8bit'); - } - - $content .= "\nxref\n0 " . (count($xref) + 1) . "\n0000000000 65535 f \n"; + $pos += mb_strlen(($cont ?? ''), '8bit'); + } + + $content .= "\nxref\n0 " . (count(($xref ?? [])) + 1) . "\n0000000000 65535 f \n"; foreach ($xref as $p) { - $content .= str_pad($p, 10, "0", STR_PAD_LEFT) . " 00000 n \n"; + $content .= str_pad(($p ?? ''), 10, "0", STR_PAD_LEFT) . " 00000 n \n"; } $content .= "trailer\n<<\n" . - '/Size ' . (count($xref) + 1) . "\n" . + '/Size ' . (count(($xref ?? [])) + 1) . "\n" . '/Root 1 0 R' . "\n" . '/Info ' . $this->infoObject . " 0 R\n" ; @@ -2416,7 +2417,7 @@ $fontcache = $this->fontcache; if ($fontcache == '') { - $fontcache = rtrim($dir, DIRECTORY_SEPARATOR."/\\"); + $fontcache = rtrim(($dir ?? ''), DIRECTORY_SEPARATOR."/\\"); } //$name filename without folder and extension of font metrics @@ -2470,7 +2471,7 @@ // Since we're not going to enable Unicode for the core fonts we need to use a font-based // setting for Unicode support rather than a global setting. - $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm'); + $data['isUnicode'] = (strtolower((substr(($metrics_name ?? ''), -3) ?? '')) !== 'afm'); $cidtogid = ''; if ($data['isUnicode']) { @@ -2480,12 +2481,12 @@ $file = file($dir . $metrics_name); foreach ($file as $rowA) { - $row = trim($rowA); - $pos = strpos($row, ' '); + $row = trim(($rowA ?? '')); + $pos = strpos(($row ?? ''), ' '); if ($pos) { // then there must be some keyword - $key = substr($row, 0, $pos); + $key = substr(($row ?? ''), 0, $pos); switch ($key) { case 'FontName': case 'FullName': @@ -2507,31 +2508,31 @@ case 'StdVW': case 'StartCharMetrics': case 'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font. Otherwise it's too big. - $data[$key] = trim(substr($row, $pos)); + $data[$key] = trim((substr(($row ?? ''), $pos) ?? '')); break; case 'FontBBox': - $data[$key] = explode(' ', trim(substr($row, $pos))); + $data[$key] = explode(' ', (trim((substr(($row ?? ''), $pos) ?? '')) ?? '')); break; //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ; case 'C': // Found in AFM files - $bits = explode(';', trim($row)); + $bits = explode(';', (trim(($row ?? '')) ?? '')); $dtmp = array(); foreach ($bits as $bit) { - $bits2 = explode(' ', trim($bit)); - if (mb_strlen($bits2[0], '8bit') == 0) { + $bits2 = explode(' ', (trim(($bit ?? '')) ?? '')); + if (mb_strlen(($bits2[0] ?? ''), '8bit') == 0) { continue; } - if (count($bits2) > 2) { + if (count(($bits2 ?? [])) > 2) { $dtmp[$bits2[0]] = array(); - for ($i = 1; $i < count($bits2); $i++) { + for ($i = 1; $i < count(($bits2 ?? [])); $i++) { $dtmp[$bits2[0]][] = $bits2[$i]; } } else { - if (count($bits2) == 2) { + if (count(($bits2 ?? [])) == 2) { $dtmp[$bits2[0]] = $bits2[1]; } } @@ -2562,22 +2563,22 @@ break; } - $bits = explode(';', trim($row)); + $bits = explode(';', (trim(($row ?? '')) ?? '')); $dtmp = array(); foreach ($bits as $bit) { - $bits2 = explode(' ', trim($bit)); - if (mb_strlen($bits2[0], '8bit') === 0) { + $bits2 = explode(' ', (trim(($bit ?? '')) ?? '')); + if (mb_strlen(($bits2[0] ?? ''), '8bit') === 0) { continue; } - if (count($bits2) > 2) { + if (count(($bits2 ?? [])) > 2) { $dtmp[$bits2[0]] = array(); - for ($i = 1; $i < count($bits2); $i++) { + for ($i = 1; $i < count(($bits2 ?? [])); $i++) { $dtmp[$bits2[0]][] = $bits2[$i]; } } else { - if (count($bits2) == 2) { + if (count(($bits2 ?? [])) == 2) { $dtmp[$bits2[0]] = $bits2[1]; } } @@ -2591,8 +2592,8 @@ if ($c >= 0) { // Set values in CID to GID map if ($c >= 0 && $c < 0xFFFF && $glyph) { - $cidtogid[$c * 2] = chr($glyph >> 8); - $cidtogid[$c * 2 + 1] = chr($glyph & 0xFF); + $cidtogid[$c * 2] = chr((int) ($glyph >> 8)); + $cidtogid[$c * 2 + 1] = chr((int) ($glyph & 0xFF)); } if ($c != hexdec($n)) { @@ -2624,7 +2625,7 @@ $data['CIDtoGID_Compressed'] = true; $cidtogid = gzcompress($cidtogid, 6); } - $data['CIDtoGID'] = base64_encode($cidtogid); + $data['CIDtoGID'] = base64_encode(($cidtogid ?? '')); $data['_version_'] = $this->fontcacheVersion; $this->fonts[$font] = $data; @@ -2657,9 +2658,9 @@ */ function selectFont($fontName, $encoding = '', $set = true) { - $ext = substr($fontName, -4); + $ext = substr(($fontName ?? ''), -4); if ($ext === '.afm' || $ext === '.ufm') { - $fontName = substr($fontName, 0, mb_strlen($fontName) - 4); + $fontName = substr(($fontName ?? ''), 0, mb_strlen(($fontName ?? '')) - 4); } if (!isset($this->fonts[$fontName])) { @@ -2688,7 +2689,7 @@ $options['differences'] = $encoding['differences']; } } else { - if (mb_strlen($encoding, '8bit')) { + if (mb_strlen(($encoding ?? ''), '8bit')) { // then perhaps only the encoding has been set $options['encoding'] = $encoding; } @@ -2808,7 +2809,7 @@ if (isset($font['StdVW'])) { $stemV = $font['StdVW']; } else { - if (isset($font['Weight']) && preg_match('!(bold|black)!i', $font['Weight'])) { + if (isset($font['Weight']) && preg_match('!(bold|black)!i', ($font['Weight'] ?? ''))) { $stemV = 120; } } @@ -2817,8 +2818,8 @@ // note that pdf supports only binary format type 1 font files, though there is a // simple utility to convert them from pfa to pfb. // FIXME: should we move font subset creation to CPDF::output? See notes in issue #750. - if (!$this->isUnicode || strtolower($fbtype) !== 'ttf' || empty($this->stringSubsets)) { - $data = file_get_contents($fbfile); + if (!$this->isUnicode || strtolower(($fbtype ?? '')) !== 'ttf' || empty($this->stringSubsets)) { + $data = file_get_contents(($fbfile ?? '')); } else { $this->stringSubsets[$fontName][] = 32; // Force space if not in yet @@ -2861,20 +2862,20 @@ $font['CIDWidths'] = array(); foreach ($glyphIndexArray as $cid => $gid) { if ($cid >= 0 && $cid < 0xFFFF && $gid) { - $cidtogid[$cid * 2] = chr($gid >> 8); - $cidtogid[$cid * 2 + 1] = chr($gid & 0xFF); + $cidtogid[$cid * 2] = chr((int) ($gid >> 8)); + $cidtogid[$cid * 2 + 1] = chr((int) ($gid & 0xFF)); } $width = $font_obj->normalizeFUnit(isset($hmtx[$gid]) ? $hmtx[$gid][0] : $hmtx[0][0]); $font['CIDWidths'][$cid] = $width; } - $font['CIDtoGID'] = base64_encode(gzcompress($cidtogid)); + $font['CIDtoGID'] = base64_encode((gzcompress($cidtogid) ?? '')); $font['CIDtoGID_Compressed'] = true; - $data = file_get_contents($tmp_name); + $data = file_get_contents(($tmp_name ?? '')); } else { - $data = file_get_contents($fbfile); + $data = file_get_contents(($fbfile ?? '')); } $font_obj->close(); @@ -2920,9 +2921,9 @@ } } - if (strtolower($fbtype) === 'pfb') { + if (strtolower(($fbtype ?? '')) === 'pfb') { $fdopt['FontFile'] = $pfbid; - } elseif (strtolower($fbtype) === 'ttf') { + } elseif (strtolower(($fbtype ?? '')) === 'ttf') { $fdopt['FontFile2'] = $pfbid; } @@ -2933,17 +2934,17 @@ $this->objects[$pfbid]['c'] .= $data; // determine the cruicial lengths within this file - if (strtolower($fbtype) === 'pfb') { - $l1 = strpos($data, 'eexec') + 6; - $l2 = strpos($data, '00000000') - $l1; - $l3 = mb_strlen($data, '8bit') - $l2 - $l1; + if (strtolower(($fbtype ?? '')) === 'pfb') { + $l1 = strpos(($data ?? ''), 'eexec') + 6; + $l2 = strpos(($data ?? ''), '00000000') - $l1; + $l3 = mb_strlen(($data ?? ''), '8bit') - $l2 - $l1; $this->o_contents( $this->numObj, 'add', array('Length1' => $l1, 'Length2' => $l2, 'Length3' => $l3) ); - } elseif (strtolower($fbtype) == 'ttf') { - $l1 = mb_strlen($data, '8bit'); + } elseif (strtolower(($fbtype ?? '')) == 'ttf') { + $l1 = mb_strlen(($data ?? ''), '8bit'); $this->o_contents($this->numObj, 'add', array('Length1' => $l1)); } @@ -2957,7 +2958,7 @@ 'FontDescriptor' => $fontDescriptorId ); - if (strtolower($fbtype) === 'ttf') { + if (strtolower(($fbtype ?? '')) === 'ttf') { $tmp['SubType'] = 'TrueType'; } @@ -3860,7 +3861,7 @@ } // if there is a line style set, then put this in too - if (mb_strlen($this->currentLineStyle, '8bit')) { + if (mb_strlen(($this->currentLineStyle ?? ''), '8bit')) { $this->addContent("\n$this->currentLineStyle"); } @@ -3884,19 +3885,19 @@ if (!isset($options["Attachment"])) $options["Attachment"] = true; $debug = !$options['compress']; - $tmp = ltrim($this->output($debug)); + $tmp = ltrim(($this->output($debug) ?? '')); header("Cache-Control: private"); header("Content-Type: application/pdf"); - header("Content-Length: " . mb_strlen($tmp, "8bit")); - - $filename = str_replace(array("\n", "'"), "", basename($filename, ".pdf")) . ".pdf"; + header("Content-Length: " . mb_strlen(($tmp ?? ''), "8bit")); + + $filename = str_replace(array("\n", "'"), "", (basename($filename, ".pdf") ?? '')) . ".pdf"; $attachment = $options["Attachment"] ? "attachment" : "inline"; $encoding = mb_detect_encoding($filename); - $fallbackfilename = mb_convert_encoding($filename, "ISO-8859-1", $encoding); - $fallbackfilename = str_replace("\"", "", $fallbackfilename); - $encodedfilename = rawurlencode($filename); + $fallbackfilename = mb_convert_encoding(($filename ?? ''), "ISO-8859-1", $encoding); + $fallbackfilename = str_replace("\"", "", ($fallbackfilename ?? '')); + $encodedfilename = rawurlencode(($filename ?? '')); $contentDisposition = "Content-Disposition: $attachment; filename=\"$fallbackfilename\""; if ($fallbackfilename !== $filename) { @@ -4011,14 +4012,14 @@ $text = $this->utf8toUtf16BE($text, $bom); } else { //$text = html_entity_decode($text, ENT_QUOTES); - $text = mb_convert_encoding($text, self::$targetEncoding, 'UTF-8'); + $text = mb_convert_encoding(($text ?? ''), (self::$targetEncoding ?? ''), 'UTF-8'); } } else if ($bom) { $text = $this->utf8toUtf16BE($text, $bom); } // the chr(13) substitution fixes a bug seen in TCPDF (bug #1421290) - return strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r')); + return strtr(($text ?? ''), array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r')); } /** @@ -4038,14 +4039,14 @@ */ function utf8toCodePointsArray(&$text) { - $length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040 + $length = mb_strlen(($text ?? ''), '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040 $unicode = array(); // array containing unicode values $bytes = array(); // array containing single character byte sequences $numbytes = 1; // number of octets needed to represent the UTF-8 character for ($i = 0; $i < $length; $i++) { - $c = ord($text[$i]); // get one string character at time - if (count($bytes) === 0) { // get starting octect + $c = ord(($text[$i] ?? '')); // get one string character at time + if (count(($bytes ?? [])) === 0) { // get starting octect if ($c <= 0x7F) { $unicode[] = $c; // use the character "as is" because is ASCII $numbytes = 1; @@ -4066,7 +4067,7 @@ } } elseif (($c >> 0x06) === 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN $bytes[] = $c - 0x80; - if (count($bytes) === $numbytes) { + if (count(($bytes ?? [])) === $numbytes) { // compose UTF-8 bytes to a single unicode value $c = $bytes[0]; for ($j = 1; $j < $numbytes; $j++) { @@ -4121,12 +4122,12 @@ if ($c === 0xFFFD) { $out .= "\xFF\xFD"; // replacement character } elseif ($c < 0x10000) { - $out .= chr($c >> 0x08) . chr($c & 0xFF); + $out .= chr((int) ($c >> 0x08)) . chr((int) ($c & 0xFF)); } else { $c -= 0x10000; $w1 = 0xD800 | ($c >> 0x10); $w2 = 0xDC00 | ($c & 0x3FF); - $out .= chr($w1 >> 0x08) . chr($w1 & 0xFF) . chr($w2 >> 0x08) . chr($w2 & 0xFF); + $out .= chr((int) ($w1 >> 0x08)) . chr((int) ($w1 & 0xFF)) . chr((int) ($w2 >> 0x08)) . chr((int) ($w2 & 0xFF)); } } @@ -4151,8 +4152,8 @@ $w = $this->getTextWidth($size, $text); // need to adjust for the number of spaces in this text - $words = explode(' ', $text); - $nspaces = count($words) - 1; + $words = explode(' ', ($text ?? '')); + $nspaces = count(($words ?? [])) - 1; $w += $wa * $nspaces; $a = deg2rad((float)$angle); @@ -4220,14 +4221,14 @@ $this->selectFont($this->defaultFont); } - $text = str_replace(array("\r", "\n"), "", $text); + $text = str_replace(array("\r", "\n"), "", ($text ?? '')); if ($smallCaps) { - preg_match_all("/(\P{Ll}+)/u", $text, $matches, PREG_SET_ORDER); + preg_match_all("/(\P{Ll}+)/u", ($text ?? ''), $matches, PREG_SET_ORDER); $lower = $this->concatMatches($matches); d($lower); - preg_match_all("/(\p{Ll}+)/u", $text, $matches, PREG_SET_ORDER); + preg_match_all("/(\p{Ll}+)/u", ($text ?? ''), $matches, PREG_SET_ORDER); $other = $this->concatMatches($matches); d($other); @@ -4271,7 +4272,7 @@ $this->addContent(sprintf(" %.3F Tc", $charSpaceAdjust)); } - $len = mb_strlen($text); + $len = mb_strlen(($text ?? '')); $start = 0; if ($start < $len) { @@ -4281,7 +4282,7 @@ $cf = $this->currentFont; if ($this->fonts[$cf]['isUnicode'] && $wordSpaceAdjust != 0) { $space_scale = 1000 / $size; - $place_text = str_replace("\x00\x20", "\x00\x20)\x00\x20" . (-round($space_scale * $wordSpaceAdjust)) . "\x00\x20(", $place_text); + $place_text = str_replace("\x00\x20", "\x00\x20)\x00\x20" . (-round($space_scale * $wordSpaceAdjust)) . "\x00\x20(", ($place_text ?? '')); } $this->addContent(" /F$this->currentFontNum " . sprintf('%.1F Tf ', $size)); $this->addContent(" [($place_text)] TJ"); @@ -4341,7 +4342,7 @@ $this->selectFont($this->defaultFont); } - $text = str_replace(array("\r", "\n"), "", $text); + $text = str_replace(array("\r", "\n"), "", ($text ?? '')); // converts a number or a float to a string so it can get the width $text = "$text"; @@ -4381,20 +4382,20 @@ // add additional char spacing if ($char_spacing != 0) { - $w += $char_spacing * $space_scale * (count($unicode) + $n_spaces); + $w += $char_spacing * $space_scale * (count(($unicode ?? [])) + $n_spaces); } } else { // If CPDF is in Unicode mode but the current font does not support Unicode we need to convert the character set to Windows-1252 if ($this->isUnicode) { - $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8'); + $text = mb_convert_encoding(($text ?? ''), 'Windows-1252', 'UTF-8'); } - $len = mb_strlen($text, 'Windows-1252'); + $len = mb_strlen(($text ?? ''), 'Windows-1252'); for ($i = 0; $i < $len; $i++) { $c = $text[$i]; - $char = isset($ord_cache[$c]) ? $ord_cache[$c] : ($ord_cache[$c] = ord($c)); + $char = isset($ord_cache[$c]) ? $ord_cache[$c] : ($ord_cache[$c] = ord(($c ?? ''))); // check if we have to replace character if (isset($current_font['differences'][$char])) { @@ -4688,7 +4689,7 @@ $ret = 0; for ($i = 0; $i < $num; $i++) { $ret *= 256; - $ret += ord($data[$pos + $i]); + $ret += ord(($data[$pos + $i] ?? '')); } return $ret; @@ -4720,7 +4721,7 @@ * @param bool $mask true if the image is masked * @throws Exception */ - function addImagePng($file, $x, $y, $w = 0.0, $h = 0.0, &$img, $is_mask = false, $mask = null) + function addImagePng($file, $x, $y, $w, $h, &$img, $is_mask = false, $mask = null) { if (!function_exists("imagepng")) { throw new \Exception("The PHP GD extension is required, but is not installed."); @@ -4810,12 +4811,12 @@ @unlink($tempfile_plain); $tempfile_plain = "$tempfile_plain.png"; - $imgalpha = imagecreate($wpx, $hpx); + $imgalpha = imagecreate((int) ($wpx), (int) ($hpx)); imagesavealpha($imgalpha, false); // generate gray scale palette (0 -> 255) for ($c = 0; $c < 256; ++$c) { - imagecolorallocate($imgalpha, $c, $c, $c); + imagecolorallocate($imgalpha, (int) ($c), (int) ($c), (int) ($c)); } // Use PECL gmagick + Graphics Magic to process transparent PNG images @@ -4836,7 +4837,7 @@ // Cast to 8bit+palette $imgalpha_ = imagecreatefrompng($tempfile_alpha); - imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx); + imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($imgalpha_); imagepng($imgalpha, $tempfile_alpha); @@ -4871,7 +4872,7 @@ // Cast to 8bit+palette $imgalpha_ = imagecreatefrompng($tempfile_alpha); - imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, $wpx, $hpx); + imagecopy($imgalpha, $imgalpha_, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($imgalpha_); imagepng($imgalpha, $tempfile_alpha); } else { @@ -4894,8 +4895,8 @@ // extract alpha channel for ($xpx = 0; $xpx < $wpx; ++$xpx) { for ($ypx = 0; $ypx < $hpx; ++$ypx) { - $color = imagecolorat($img, $xpx, $ypx); - $col = imagecolorsforindex($img, $color); + $color = imagecolorat($img, (int) ($xpx), (int) ($ypx)); + $col = imagecolorsforindex($img, (int) ($color)); $alpha = $col['alpha']; if ($eight_bit) { @@ -4909,22 +4910,22 @@ $key = $col['red'] . $col['green'] . $col['blue']; if (!isset($allocated_colors[$key])) { - $pixel_img = imagecolorallocate($img, $col['red'], $col['green'], $col['blue']); + $pixel_img = imagecolorallocate($img, (int) ($col['red']), (int) ($col['green']), (int) ($col['blue'])); $allocated_colors[$key] = $pixel_img; } else { $pixel_img = $allocated_colors[$key]; } - imagesetpixel($img, $xpx, $ypx, $pixel_img); - } - - imagesetpixel($imgalpha, $xpx, $ypx, $pixel); + imagesetpixel($img, (int) ($xpx), (int) ($ypx), (int) ($pixel_img)); + } + + imagesetpixel($imgalpha, (int) ($xpx), (int) ($ypx), (int) ($pixel)); } } // extract image without alpha channel - $imgplain = imagecreatetruecolor($wpx, $hpx); - imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx); + $imgplain = imagecreatetruecolor((int) ($wpx), (int) ($hpx)); + imagecopy($imgplain, $img, 0, 0, 0, 0, (int) ($wpx), (int) ($hpx)); imagedestroy($img); imagepng($imgalpha, $tempfile_alpha); @@ -4969,7 +4970,7 @@ if (isset($this->imagelist[$file])) { $img = null; } else { - $info = file_get_contents($file, false, null, 24, 5); + $info = file_get_contents(($file ?? ''), (false ?? false), null, 24, 5); $meta = unpack("CbitDepth/CcolorType/CcompressionMethod/CfilterMethod/CinterlaceMethod", $info); $bit_depth = $meta["bitDepth"]; $color_type = $meta["colorType"]; @@ -5001,21 +5002,21 @@ } $sx = imagesx($imgtmp); $sy = imagesy($imgtmp); - $img = imagecreatetruecolor($sx, $sy); + $img = imagecreatetruecolor((int) ($sx), (int) ($sy)); imagealphablending($img, true); // @todo is it still needed ?? $ti = imagecolortransparent($imgtmp); if ($ti >= 0) { - $tc = imagecolorsforindex($imgtmp, $ti); - $ti = imagecolorallocate($img, $tc['red'], $tc['green'], $tc['blue']); - imagefill($img, 0, 0, $ti); + $tc = imagecolorsforindex($imgtmp, (int) ($ti)); + $ti = imagecolorallocate($img, (int) ($tc['red']), (int) ($tc['green']), (int) ($tc['blue'])); + imagefill($img, 0, 0, (int) ($ti)); imagecolortransparent($img, $ti); } else { - imagefill($img, 1, 1, imagecolorallocate($img, 255, 255, 255)); + imagefill($img, 1, 1, (int) (imagecolorallocate($img, 255, 255, 255))); } - imagecopy($img, $imgtmp, 0, 0, 0, 0, $sx, $sy); + imagecopy($img, $imgtmp, 0, 0, 0, 0, (int) ($sx), (int) ($sy)); imagedestroy($imgtmp); } $this->addImagePng($file, $x, $y, $w, $h, $img); @@ -5063,7 +5064,7 @@ * @param bool $is_mask * @param null $mask */ - function addPngFromBuf($file, $x, $y, $w = 0.0, $h = 0.0, &$data, $is_mask = false, $mask = null) + function addPngFromBuf($file, $x, $y, $w, $h, &$data, $is_mask = false, $mask = null) { if (isset($this->imagelist[$file])) { $data = null; @@ -5082,7 +5083,7 @@ if (!$error) { $header = chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10); - if (mb_substr($data, 0, 8, '8bit') != $header) { + if (mb_substr(($data ?? ''), 0, 8, '8bit') != $header) { $error = 1; if (defined("DEBUGPNG") && DEBUGPNG) { @@ -5096,7 +5097,7 @@ if (!$error) { // set pointer $p = 8; - $len = mb_strlen($data, '8bit'); + $len = mb_strlen(($data ?? ''), '8bit'); // cycle through the file, identifying chunks $haveHeader = 0; @@ -5106,18 +5107,18 @@ while ($p < $len) { $chunkLen = $this->getBytes($data, $p, 4); - $chunkType = mb_substr($data, $p + 4, 4, '8bit'); + $chunkType = mb_substr(($data ?? ''), $p + 4, 4, '8bit'); switch ($chunkType) { case 'IHDR': // this is where all the file information comes from $info['width'] = $this->getBytes($data, $p + 8, 4); $info['height'] = $this->getBytes($data, $p + 12, 4); - $info['bitDepth'] = ord($data[$p + 16]); - $info['colorType'] = ord($data[$p + 17]); - $info['compressionMethod'] = ord($data[$p + 18]); - $info['filterMethod'] = ord($data[$p + 19]); - $info['interlaceMethod'] = ord($data[$p + 20]); + $info['bitDepth'] = ord(($data[$p + 16] ?? '')); + $info['colorType'] = ord(($data[$p + 17] ?? '')); + $info['compressionMethod'] = ord(($data[$p + 18] ?? '')); + $info['filterMethod'] = ord(($data[$p + 19] ?? '')); + $info['interlaceMethod'] = ord(($data[$p + 20] ?? '')); //print_r($info); $haveHeader = 1; @@ -5145,11 +5146,11 @@ break; case 'PLTE': - $pdata .= mb_substr($data, $p + 8, $chunkLen, '8bit'); + $pdata .= mb_substr(($data ?? ''), $p + 8, $chunkLen, '8bit'); break; case 'IDAT': - $idata .= mb_substr($data, $p + 8, $chunkLen, '8bit'); + $idata .= mb_substr(($data ?? ''), $p + 8, $chunkLen, '8bit'); break; case 'tRNS': @@ -5171,7 +5172,7 @@ $trans = 0; for ($i = $chunkLen; $i >= 0; $i--) { - if (ord($data[$p + 8 + $i]) == 0) { + if (ord(($data[$p + 8 + $i] ?? '')) == 0) { $trans = $i; } } @@ -5186,7 +5187,7 @@ */ // $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale $transparency['type'] = 'indexed'; - $transparency['data'] = ord($data[$p + 8 + 1]); + $transparency['data'] = ord(($data[$p + 8 + 1] ?? '')); break; // truecolor @@ -5377,7 +5378,7 @@ $channels = 3; } - $data = file_get_contents($img); + $data = file_get_contents(($img ?? '')); } if ($w <= 0 && $h <= 0) { @@ -5411,11 +5412,11 @@ &$data, $x, $y, - $w = 0, - $h = 0, + $w, + $h, $imageWidth, $imageHeight, - $channels = 3, + $channels, $imgname ) { if ($this->image_iscached($imgname)) { @@ -5569,7 +5570,7 @@ // the user is trying to set a font family // note that this can also be used to set the base ones to something else - if (mb_strlen($family)) { + if (mb_strlen(($family ?? ''))) { $this->fontFamilies[$family] = $options; } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/TreeBuilder.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/TreeBuilder.php @@ -35,6 +35,9 @@ // this is not (yet) in helper functions. class HTML5_TreeBuilder { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $pendingTableCharactersNull; + public $stack = array(); public $content_model; @@ -251,8 +254,8 @@ // So... don't. $this->dom->emptyDoctype = true; } - $public = is_null($token['public']) ? false : strtolower($token['public']); - $system = is_null($token['system']) ? false : strtolower($token['system']); + $public = is_null($token['public']) ? false : strtolower(($token['public'] ?? '')); + $system = is_null($token['system']) ? false : strtolower(($token['system'] ?? '')); $publicStartsWithForQuirks = array( "+//silmaril//dtd html pro v0r11 19970101//", "-//advasoft ltd//dtd html 3.0 aswedit + extensions//", @@ -328,14 +331,14 @@ // first, do easy checks if ( !empty($token['force-quirks']) || - strtolower($token['name']) !== 'html' + strtolower(($token['name'] ?? '')) !== 'html' ) { $this->quirks_mode = self::QUIRKS_MODE; } else { do { if ($system) { foreach ($publicStartsWithAndSystemForQuirks as $x) { - if (strncmp($public, $x, strlen($x)) === 0) { + if (strncmp($public, $x, strlen(($x ?? ''))) === 0) { $this->quirks_mode = self::QUIRKS_MODE; break; } @@ -344,7 +347,7 @@ break; } foreach ($publicStartsWithAndSystemForLimitedQuirks as $x) { - if (strncmp($public, $x, strlen($x)) === 0) { + if (strncmp($public, $x, strlen(($x ?? ''))) === 0) { $this->quirks_mode = self::LIMITED_QUIRKS_MODE; break; } @@ -363,7 +366,7 @@ break; } foreach ($publicStartsWithForLimitedQuirks as $x) { - if (strncmp($public, $x, strlen($x)) === 0) { + if (strncmp($public, $x, strlen(($x ?? ''))) === 0) { $this->quirks_mode = self::LIMITED_QUIRKS_MODE; } } @@ -375,7 +378,7 @@ break; } foreach ($publicStartsWithForQuirks as $x) { - if (strncmp($public, $x, strlen($x)) === 0) { + if (strncmp($public, $x, strlen(($x ?? ''))) === 0) { $this->quirks_mode = self::QUIRKS_MODE; break; } @@ -765,7 +768,7 @@ * U+000A LINE FEED (LF), U+000C FORM FEED (FF), or U+0020 * SPACE, then set the frameset-ok flag to "not ok". */ // i.e., if any of the characters is not whitespace - if (strlen($token['data']) !== strspn($token['data'], HTML5_Tokenizer::WHITESPACE)) { + if (strlen(($token['data'] ?? '')) !== strspn($token['data'], HTML5_Tokenizer::WHITESPACE)) { $this->flag_frameset_ok = false; } break; @@ -813,7 +816,7 @@ elements is not a body element, or, if the stack of open elements has only one node on it, then ignore the token. (fragment case) */ - if (count($this->stack) === 1 || $this->stack[1]->tagName !== 'body') { + if (count(($this->stack ?? [])) === 1 || $this->stack[1]->tagName !== 'body') { $this->ignored = true; // Ignore @@ -837,7 +840,7 @@ * not a body element, or, if the stack of open elements * has only one node on it, then ignore the token. * (fragment case) */ - if (count($this->stack) === 1 || $this->stack[1]->tagName !== 'body') { + if (count(($this->stack ?? [])) === 1 || $this->stack[1]->tagName !== 'body') { $this->ignored = true; // Ignore } elseif (!$this->flag_frameset_ok) { @@ -958,7 +961,7 @@ /* 1. Set the frameset-ok flag to "not ok". */ $this->flag_frameset_ok = false; - $stack_length = count($this->stack) - 1; + $stack_length = count(($this->stack ?? [])) - 1; for($n = $stack_length; 0 <= $n; $n--) { /* 2. Initialise node to be the current node (the bottommost node of the stack). */ @@ -1044,7 +1047,7 @@ of active formatting elements and the stack of open elements if the end tag didn't already remove it (it might not have if the element is not in table scope). */ - $leng = count($this->a_formatting); + $leng = count(($this->a_formatting ?? [])); for ($n = $leng - 1; $n >= 0; $n--) { if ($this->a_formatting[$n] === self::MARKER) { @@ -1709,7 +1712,7 @@ * has the same tag name as the token. */ while (true) { - for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) { + for ($a = count(($this->a_formatting ?? [])) - 1; $a >= 0; $a--) { if ($this->a_formatting[$a] === self::MARKER) { break; } elseif ($this->a_formatting[$a]->tagName === $token['name']) { @@ -1756,7 +1759,7 @@ the phrasing or formatting categories. There might not be one. */ $fe_s_pos = array_search($formatting_element, $this->stack, true); - $length = count($this->stack); + $length = count(($this->stack ?? [])); for ($s = $fe_s_pos + 1; $s < $length; $s++) { $category = $this->getElementCategory($this->stack[$s]); @@ -1952,7 +1955,7 @@ $keys = array_keys($this->a_formatting, self::MARKER, true); $marker = end($keys); - for ($n = count($this->a_formatting) - 1; $n > $marker; $n--) { + for ($n = count(($this->a_formatting ?? [])) - 1; $n > $marker; $n--) { array_pop($this->a_formatting); } } @@ -1971,7 +1974,7 @@ /* An end tag token not covered by the previous entries */ default: - for ($n = count($this->stack) - 1; $n >= 0; $n--) { + for ($n = count(($this->stack ?? [])) - 1; $n >= 0; $n--) { /* Initialise node to be the current node (the bottommost node of the stack). */ $node = $this->stack[$n]; @@ -2177,7 +2180,7 @@ * if it does, but that attribute's value is not an ASCII * case-insensitive match for the string "hidden", then: act as * described in the "anything else" entry below. */ - ($type = $this->getAttr($token, 'type')) && strtolower($type) === 'hidden') { + ($type = $this->getAttr($token, 'type')) && strtolower(($type ?? '')) === 'hidden') { // I.e., if its an input with the type attribute == 'hidden' /* Otherwise */ // parse error @@ -2716,7 +2719,7 @@ immediately before it in the stack of open elements is an optgroup element, then act as if an end tag with the tag name "option" had been seen. */ - $elements_in_stack = count($this->stack); + $elements_in_stack = count(($this->stack ?? [])); if ($this->stack[$elements_in_stack - 1]->tagName === 'option' && $this->stack[$elements_in_stack - 2]->tagName === 'optgroup') { @@ -2889,7 +2892,7 @@ if ($this->mode === self::IN_FOREIGN_CONTENT) { $found = false; // this basically duplicates elementInScope() - for ($i = count($this->stack) - 1; $i >= 0; $i--) { + for ($i = count(($this->stack ?? [])) - 1; $i >= 0; $i--) { // XDOM $node = $this->stack[$i]; if ($node->namespaceURI !== self::NS_HTML) { @@ -3199,7 +3202,7 @@ if (!empty($token['attr'])) { foreach ($token['attr'] as $attr) { - if (!$el->hasAttribute($attr['name']) && preg_match("/^[a-zA-Z_:]/", $attr['name'])) { + if (!$el->hasAttribute($attr['name']) && preg_match("/^[a-zA-Z_:]/", ($attr['name'] ?? ''))) { $el->setAttribute($attr['name'], $attr['value']); } } @@ -3221,7 +3224,7 @@ } if ($this->ignore_lf_token) { if ($data[0] === "\n") { - $data = substr($data, 1); + $data = substr(($data ?? ''), 1); if ($data === false) { return; } @@ -3276,7 +3279,7 @@ return false; } - $leng = count($this->stack); + $leng = count(($this->stack ?? [])); for ($n = 0; $n < $leng; $n++) { /* 1. Initialise node to be the current node (the bottommost node of @@ -3324,7 +3327,7 @@ private function reconstructActiveFormattingElements() { /* 1. If there are no entries in the list of active formatting elements, then there is nothing to reconstruct; stop this algorithm. */ - $formatting_elements = count($this->a_formatting); + $formatting_elements = count(($this->a_formatting ?? [])); if ($formatting_elements === 0) { return false; @@ -3481,7 +3484,7 @@ private function resetInsertionMode($context = null) { /* 1. Let last be false. */ $last = false; - $leng = count($this->stack); + $leng = count(($this->stack ?? [])); for ($n = $leng - 1; $n >= 0; $n--) { /* 2. Let node be the last node in the stack of open elements. */ @@ -3663,7 +3666,7 @@ * elements, if there is one. If there is no table element in the stack * of open elements (fragment case), then the current table is the * first element in the stack of open elements (the html element). */ - for ($i = count($this->stack) - 1; $i >= 0; $i--) { + for ($i = count(($this->stack ?? [])) - 1; $i >= 0; $i--) { if ($this->stack[$i]->tagName === 'table') { return $this->stack[$i]; } @@ -3686,7 +3689,7 @@ its parent node is not an element, then the foster parent element is the element before the last table element in the stack of open elements. */ - for ($n = count($this->stack) - 1; $n >= 0; $n--) { + for ($n = count(($this->stack ?? [])) - 1; $n >= 0; $n--) { if ($this->stack[$n]->tagName === 'table') { $table = $this->stack[$n]; break; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/Data.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/Data.php @@ -107,15 +107,15 @@ // set up the actual character $ret = ''; if ($w) { - $ret .= chr($w); + $ret .= chr((int) ($w)); } if ($z) { - $ret .= chr($z); + $ret .= chr((int) ($z)); } if ($y) { - $ret .= chr($y); + $ret .= chr((int) ($y)); } - $ret .= chr($x); + $ret .= chr((int) ($x)); return $ret; } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/Tokenizer.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/Tokenizer.php @@ -148,8 +148,8 @@ /* Consume the next input character */ $char = $this->stream->char(); $lastFourChars .= $char; - if (strlen($lastFourChars) > 4) { - $lastFourChars = substr($lastFourChars, -4); + if (strlen(($lastFourChars ?? '')) > 4) { + $lastFourChars = substr(($lastFourChars ?? ''), -4); } // see below for meaning @@ -228,7 +228,7 @@ } elseif ( $char === '>' && $gt_cond === true && - substr($lastFourChars, 1) === '-->' + substr(($lastFourChars ?? ''), 1) === '-->' ) { /* If the content model flag is set to either the RCDATA state or the CDATA state, and the escape flag is true, and the last three @@ -263,8 +263,8 @@ 'data' => $char . $chars )); $lastFourChars .= $chars; - if (strlen($lastFourChars) > 4) { - $lastFourChars = substr($lastFourChars, -4); + if (strlen(($lastFourChars ?? '')) > 4) { + $lastFourChars = substr(($lastFourChars ?? ''), -4); } } else { /* Anything else @@ -298,8 +298,8 @@ )); $lastFourChars .= $chars; - if (strlen($lastFourChars) > 4) { - $lastFourChars = substr($lastFourChars, -4); + if (strlen(($lastFourChars ?? '')) > 4) { + $lastFourChars = substr(($lastFourChars ?? ''), -4); } $state = 'data'; @@ -376,7 +376,7 @@ point), then switch to the tag name state. (Don't emit the token yet; further details will be filled in before it is emitted.) */ $this->token = array( - 'name' => strtolower($char), + 'name' => strtolower(($char ?? '')), 'type' => self::STARTTAG, 'attr' => array() ); @@ -452,7 +452,7 @@ ) { /* If the content model flag is set to the RCDATA or CDATA states... */ - $name = strtolower($this->stream->charsWhile(self::ALPHA)); + $name = strtolower(($this->stream->charsWhile(self::ALPHA) ?? '')); $following = $this->stream->char(); $this->stream->unget(); if ( @@ -514,7 +514,7 @@ switch to the tag name state. (Don't emit the token yet; further details will be filled in before it is emitted.) */ $this->token = array( - 'name' => strtolower($char), + 'name' => strtolower(($char ?? '')), 'type' => self::ENDTAG ); @@ -660,7 +660,7 @@ point), and its value to the empty string. Switch to the attribute name state.*/ $this->token['attr'][] = array( - 'name' => strtolower($char), + 'name' => strtolower(($char ?? '')), 'value' => '' ); @@ -741,7 +741,7 @@ state. */ $chars = $this->stream->charsWhile(self::UPPER_ALPHA); - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['name'] .= strtolower($char . $chars); $state = 'attribute name'; @@ -775,7 +775,7 @@ Stay in the attribute name state. */ $chars = $this->stream->charsUntil("\t\n\x0C /=>\"'" . self::UPPER_ALPHA); - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['name'] .= $char . $chars; $state = 'attribute name'; @@ -828,7 +828,7 @@ point), and its value to the empty string. Switch to the attribute name state. */ $this->token['attr'][] = array( - 'name' => strtolower($char), + 'name' => strtolower(($char ?? '')), 'value' => '' ); @@ -935,7 +935,7 @@ /* Anything else Append the current input character to the current attribute's value. Switch to the attribute value (unquoted) state. */ - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['value'] .= $char; $state = 'attribute value (unquoted)'; @@ -975,7 +975,7 @@ Stay in the attribute value (double-quoted) state. */ $chars = $this->stream->charsUntil('"&'); - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['value'] .= $char . $chars; $state = 'attribute value (double-quoted)'; @@ -1013,7 +1013,7 @@ Stay in the attribute value (single-quoted) state. */ $chars = $this->stream->charsUntil("'&"); - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['value'] .= $char . $chars; $state = 'attribute value (single-quoted)'; @@ -1074,7 +1074,7 @@ Stay in the attribute value (unquoted) state. */ $chars = $this->stream->charsUntil("\t\n\x0c &>\"'="); - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['value'] .= $char . $chars; $state = 'attribute value (unquoted)'; @@ -1204,7 +1204,7 @@ /* Otherwise if the next seven characters are a case-insensitive match for the word "DOCTYPE", then consume those characters and switch to the DOCTYPE state. */ - } elseif (strtoupper($alpha) === 'DOCTYPE') { + } elseif (strtoupper(($alpha ?? '')) === 'DOCTYPE') { $state = 'DOCTYPE'; // XXX not implemented @@ -1551,7 +1551,7 @@ the character's code point). Switch to the DOCTYPE name state. */ $this->token = array( - 'name' => strtolower($char), + 'name' => strtolower(($char ?? '')), 'type' => self::DOCTYPE, 'error' => true ); @@ -1614,7 +1614,7 @@ Append the lowercase version of the input character (add 0x0020 to the character's code point) to the current DOCTYPE token's name. Stay in the DOCTYPE name state. */ - $this->token['name'] .= strtolower($char); + $this->token['name'] .= strtolower(($char ?? '')); } elseif ($char === false) { /* EOF @@ -2330,7 +2330,7 @@ // alphanumeric so we can just concat it to whatever we get later). $this->stream->unget(); if ($char !== false) { - $chars = substr($chars, 0, -1); + $chars = substr(($chars ?? ''), 0, -1); } /* If no match can be made, then this is a parse error. @@ -2346,7 +2346,7 @@ /* If the last character matched is not a U+003B SEMICOLON (;), there is a parse error. */ $semicolon = true; - if (substr($id, -1) !== ';') { + if (substr(($id ?? ''), -1) !== ';') { $this->emitToken(array( 'type' => self::PARSEERROR, 'data' => 'named-entity-without-semicolon' @@ -2365,8 +2365,8 @@ and nothing is returned. */ if ($inattr && !$semicolon) { // The next character is either the next character in $chars or in the stream. - if (strlen($chars) > strlen($id)) { - $next = substr($chars, strlen($id), 1); + if (strlen(($chars ?? '')) > strlen(($id ?? ''))) { + $next = substr(($chars ?? ''), strlen(($id ?? '')), 1); } else { $next = $this->stream->char(); $this->stream->unget(); @@ -2383,7 +2383,7 @@ /* Otherwise, return a character token for the character corresponding to the character reference name (as given by the second column of the named character references table). */ - return HTML5_Data::utf8chr($codepoint) . substr($chars, strlen($id)); + return HTML5_Data::utf8chr($codepoint) . substr(($chars ?? ''), strlen(($id ?? ''))); } } @@ -2403,7 +2403,7 @@ ? '&' : $entity; - $last = count($this->token['attr']) - 1; + $last = count(($this->token['attr'] ?? [])) - 1; $this->token['attr'][$last]['value'] .= $char; /* Finally, switch back to the attribute value state that you @@ -2425,7 +2425,7 @@ } } if ($token['type'] === self::ENDTAG && !empty($token['attr'])) { - for ($i = 0; $i < count($token['attr']); $i++) { + for ($i = 0; $i < count(($token['attr'] ?? [])); $i++) { $this->emitToken(array( 'type' => self::PARSEERROR, 'data' => 'attributes-in-end-tag' --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/InputStream.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/lib/html5lib/InputStream.php @@ -74,7 +74,7 @@ // omitted. if (extension_loaded('iconv')) { // non-conforming - $data = @iconv('UTF-8', 'UTF-8//IGNORE', $data); + $data = @iconv('UTF-8', 'UTF-8//IGNORE', ($data ?? '')); } else { // we can make a conforming native implementation throw new Exception('Not implemented, please install iconv'); @@ -82,8 +82,8 @@ /* One leading U+FEFF BYTE ORDER MARK character must be ignored if any are present. */ - if (substr($data, 0, 3) === "\xEF\xBB\xBF") { - $data = substr($data, 3); + if (substr(($data ?? ''), 0, 3) === "\xEF\xBB\xBF") { + $data = substr(($data ?? ''), 3); } /* All U+0000 NULL characters in the input must be replaced @@ -113,7 +113,7 @@ "\n", "\n" ), - $data + ($data ?? '') ); /* Any occurrences of any characters in the ranges U+0001 to @@ -142,7 +142,7 @@ | [\xF0-\xF4][\x8F-\xBF]\xBF[\xBE\xBF] # U+nFFFE and U+nFFFF (1 <= n <= 10_{16}) )/x', - $data, + ($data ?? ''), $matches ); for ($i = 0; $i < $count; $i++) { @@ -157,7 +157,7 @@ $this->data = $data; $this->char = 0; - $this->EOF = strlen($data); + $this->EOF = strlen(($data ?? '')); } /** @@ -188,23 +188,23 @@ // one (to make it point to the next character, the one we want the // position of) added to it because strrpos's behaviour includes the // final offset byte. - $lastLine = strrpos($this->data, "\n", $this->char - 1 - strlen($this->data)); + $lastLine = strrpos(($this->data ?? ''), "\n", $this->char - 1 - strlen(($this->data ?? ''))); // However, for here we want the length up until the next byte to be // processed, so add one to the current byte ($this->char). if ($lastLine !== false) { - $findLengthOf = substr($this->data, $lastLine + 1, $this->char - 1 - $lastLine); - } else { - $findLengthOf = substr($this->data, 0, $this->char); + $findLengthOf = substr(($this->data ?? ''), $lastLine + 1, $this->char - 1 - $lastLine); + } else { + $findLengthOf = substr(($this->data ?? ''), 0, $this->char); } // Get the length for the string we need. if (extension_loaded('iconv')) { return iconv_strlen($findLengthOf, 'utf-8'); } elseif (extension_loaded('mbstring')) { - return mb_strlen($findLengthOf, 'utf-8'); + return mb_strlen(($findLengthOf ?? ''), 'utf-8'); } elseif (extension_loaded('xml')) { - return strlen(utf8_decode($findLengthOf)); + return strlen((mb_convert_encoding(($findLengthOf ?? ''), 'ISO-8859-1', 'UTF-8') ?? '')); } else { $count = count_chars($findLengthOf); // 0x80 = 0x7F - 0 + 1 (one added to get inclusive range) @@ -234,7 +234,7 @@ */ public function remainingChars() { if ($this->char < $this->EOF) { - $data = substr($this->data, $this->char); + $data = substr(($this->data ?? ''), $this->char); $this->char = $this->EOF; return $data; } else { @@ -257,7 +257,7 @@ } else { $len = strcspn($this->data, $bytes, $this->char); } - $string = (string) substr($this->data, $this->char, $len); + $string = (string) substr(($this->data ?? ''), $this->char, $len); $this->char += $len; return $string; } else { @@ -280,7 +280,7 @@ } else { $len = strspn($this->data, $bytes, $this->char); } - $string = (string) substr($this->data, $this->char, $len); + $string = (string) substr(($this->data ?? ''), $this->char, $len); $this->char += $len; return $string; } else { --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Canvas.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Canvas.php @@ -24,7 +24,7 @@ */ interface Canvas { - function __construct($paper = "letter", $orientation = "portrait", Dompdf $dompdf); + function __construct($paper, $orientation, Dompdf $dompdf); /** * @return Dompdf --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame.php @@ -227,7 +227,7 @@ $node = $this->_node; if ($node->nodeName === "#text" && !empty($node->nodeValue)) { - $node->nodeValue = preg_replace("/[ \t\r\n\f]+/u", " ", trim($node->nodeValue)); + $node->nodeValue = preg_replace("/[ \t\r\n\f]+/u", " ", (trim(($node->nodeValue ?? '')) ?? '')); self::$_ws_state = self::WS_TEXT; } } @@ -259,7 +259,7 @@ } if ($this->is_text_node()) { - return trim($node->nodeValue) !== ""; + return trim(($node->nodeValue ?? '')) !== ""; } return true; @@ -1144,9 +1144,9 @@ $str .= "Class: " . get_class($this) . "<br/>"; if ($this->is_text_node()) { - $tmp = htmlspecialchars($this->_node->nodeValue); - $str .= "<pre>'" . mb_substr($tmp, 0, 70) . - (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>"; + $tmp = htmlspecialchars(($this->_node->nodeValue ?? '')); + $str .= "<pre>'" . mb_substr(($tmp ?? ''), 0, 70) . + (mb_strlen(($tmp ?? '')) > 70 ? "..." : "") . "'</pre>"; } elseif ($css_class = $this->_node->getAttribute("class")) { $str .= "CSS class: '$css_class'<br/>"; } @@ -1188,7 +1188,7 @@ foreach ($line->get_frames() as $frame) { if ($frame instanceof FrameDecorator\Text) { $str .= "\ntext: "; - $str .= "'" . htmlspecialchars($frame->get_text()) . "'"; + $str .= "'" . htmlspecialchars(($frame->get_text() ?? '')) . "'"; } else { $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")"; } @@ -1208,7 +1208,7 @@ if (php_sapi_name() === "cli") { $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"), array("\n", "", ""), - $str)); + ($str ?? ''))); } return $str; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FontMetrics.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FontMetrics.php @@ -97,8 +97,8 @@ $cacheData .= sprintf(" '%s' => array(%s", addslashes($family), PHP_EOL); foreach ($variants as $variant => $path) { $path = sprintf("'%s'", $path); - $path = str_replace('\'' . $this->getOptions()->getFontDir() , '$fontDir . \'' , $path); - $path = str_replace('\'' . $this->getOptions()->getRootDir() , '$rootDir . \'' , $path); + $path = str_replace('\'' . $this->getOptions()->getFontDir() , '$fontDir . \'' , ($path ?? '')); + $path = str_replace('\'' . $this->getOptions()->getRootDir() , '$rootDir . \'' , ($path ?? '')); $cacheData .= sprintf(" '%s' => %s,%s", $variant, $path, PHP_EOL); } $cacheData .= sprintf(" ),%s", PHP_EOL); @@ -184,11 +184,11 @@ } $fontDir = $this->getOptions()->getFontDir(); - $remoteHash = md5($remoteFile); + $remoteHash = md5(($remoteFile ?? '')); $localFile = $fontDir . DIRECTORY_SEPARATOR . $remoteHash; $cacheEntry = $localFile; - $localFile .= ".".strtolower(pathinfo(parse_url($remoteFile, PHP_URL_PATH),PATHINFO_EXTENSION)); + $localFile .= ".".strtolower((pathinfo(parse_url($remoteFile, PHP_URL_PATH),PATHINFO_EXTENSION) ?? '')); $entry[$styleString] = $cacheEntry; @@ -349,10 +349,10 @@ * Only on checking the fallback font, check various subtypes on same font. */ - $subtype = strtolower($subtypeRaw); + $subtype = strtolower(($subtypeRaw ?? '')); if ($familyRaw) { - $family = str_replace(array("'", '"'), "", strtolower($familyRaw)); + $family = str_replace(array("'", '"'), "", (strtolower(($familyRaw ?? '')) ?? '')); if (isset($this->fontLookup[$family][$subtype])) { return $cache[$familyRaw][$subtypeRaw] = $this->fontLookup[$family][$subtype]; @@ -374,7 +374,7 @@ $family = $this->fontLookup[$family]; foreach ($family as $sub => $font) { - if (strpos($subtype, $sub) !== false) { + if (strpos(($subtype ?? ''), ($sub ?? '')) !== false) { return $cache[$familyRaw][$subtypeRaw] = $font; } } @@ -412,7 +412,7 @@ */ public function getFamily($family) { - $family = str_replace(array("'", '"'), "", mb_strtolower($family)); + $family = str_replace(array("'", '"'), "", (mb_strtolower($family) ?? '')); if (isset($this->fontLookup[$family])) { return $this->fontLookup[$family]; @@ -437,13 +437,13 @@ */ public function getType($type) { - if (preg_match("/bold/i", $type)) { - if (preg_match("/italic|oblique/i", $type)) { + if (preg_match("/bold/i", ($type ?? ''))) { + if (preg_match("/italic|oblique/i", ($type ?? ''))) { $type = "bold_italic"; } else { $type = "bold"; } - } elseif (preg_match("/italic|oblique/i", $type)) { + } elseif (preg_match("/italic|oblique/i", ($type ?? ''))) { $type = "italic"; } else { $type = "normal"; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Helpers.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Helpers.php @@ -57,13 +57,13 @@ public static function build_url($protocol, $host, $base_path, $url) { $protocol = mb_strtolower($protocol); - if (strlen($url) == 0) { + if (strlen(($url ?? '')) == 0) { //return $protocol . $host . rtrim($base_path, "/\\") . "/"; return $protocol . $host . $base_path; } // Is the url already fully qualified, a Data URI, or a reference to a named anchor? - if (mb_strpos($url, "://") !== false || mb_substr($url, 0, 1) === "#" || mb_strpos($url, "data:") === 0 || mb_strpos($url, "mailto:") === 0 || mb_strpos($url, "tel:") === 0) { + if (mb_strpos(($url ?? ''), "://") !== false || mb_substr(($url ?? ''), 0, 1) === "#" || mb_strpos(($url ?? ''), "data:") === 0 || mb_strpos(($url ?? ''), "mailto:") === 0 || mb_strpos(($url ?? ''), "tel:") === 0) { return $url; } @@ -74,18 +74,18 @@ //drive: followed by a relative path would be a drive specific default folder. //not known in php app code, treat as abs path //($url[1] !== ':' || ($url[2]!=='\\' && $url[2]!=='/')) - if ($url[0] !== '/' && (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' || (mb_strlen($url) > 1 && $url[0] !== '\\' && $url[1] !== ':'))) { + if ($url[0] !== '/' && (strtoupper((substr((PHP_OS ?? ''), 0, 3) ?? '')) !== 'WIN' || (mb_strlen(($url ?? '')) > 1 && $url[0] !== '\\' && $url[1] !== ':'))) { // For rel path and local acess we ignore the host, and run the path through realpath() $ret .= realpath($base_path) . '/'; } $ret .= $url; - $ret = preg_replace('/\?(.*)$/', "", $ret); + $ret = preg_replace('/\?(.*)$/', "", ($ret ?? '')); return $ret; } // Protocol relative urls (e.g. "//example.org/style.css") - if (strpos($url, '//') === 0) { - $ret .= substr($url, 2); + if (strpos(($url ?? ''), '//') === 0) { + $ret .= substr(($url ?? ''), 2); //remote urls with backslash in html/css are not really correct, but lets be genereous } elseif ($url[0] === '/' || $url[0] === '\\') { // Absolute path @@ -114,9 +114,9 @@ public static function buildContentDispositionHeader($dispositionType, $filename) { $encoding = mb_detect_encoding($filename); - $fallbackfilename = mb_convert_encoding($filename, "ISO-8859-1", $encoding); - $fallbackfilename = str_replace("\"", "", $fallbackfilename); - $encodedfilename = rawurlencode($filename); + $fallbackfilename = mb_convert_encoding(($filename ?? ''), "ISO-8859-1", $encoding); + $fallbackfilename = str_replace("\"", "", ($fallbackfilename ?? '')); + $encodedfilename = rawurlencode(($filename ?? '')); $contentDisposition = "Content-Disposition: $dispositionType; filename=\"$fallbackfilename\""; if ($fallbackfilename !== $filename) { @@ -153,7 +153,7 @@ $num = strrev((string)$num); $ret = ""; - switch (mb_strlen($num)) { + switch (mb_strlen(($num ?? ''))) { /** @noinspection PhpMissingBreakStatementInspection */ case 4: $ret .= $thou[$num[3]]; @@ -182,7 +182,7 @@ */ public static function is_percent($value) { - return false !== mb_strpos($value, "%"); + return false !== mb_strpos(($value ?? ''), "%"); } /** @@ -195,15 +195,15 @@ */ public static function parse_data_uri($data_uri) { - if (!preg_match('/^data:(?P<mime>[a-z0-9\/+-.]+)(;charset=(?P<charset>[a-z0-9-])+)?(?P<base64>;base64)?\,(?P<data>.*)?/is', $data_uri, $match)) { + if (!preg_match('/^data:(?P<mime>[a-z0-9\/+-.]+)(;charset=(?P<charset>[a-z0-9-])+)?(?P<base64>;base64)?\,(?P<data>.*)?/is', ($data_uri ?? ''), $match)) { return false; } - $match['data'] = rawurldecode($match['data']); + $match['data'] = rawurldecode(($match['data'] ?? '')); $result = array( 'charset' => $match['charset'] ? $match['charset'] : 'US-ASCII', 'mime' => $match['mime'] ? $match['mime'] : 'text/plain', - 'data' => $match['base64'] ? base64_decode($match['data']) : $match['data'], + 'data' => $match['base64'] ? base64_decode(($match['data'] ?? '')) : $match['data'], ); return $result; @@ -237,7 +237,7 @@ $score = array( '%23'=>'#' ); - return strtr(rawurlencode(rawurldecode($uri)), array_merge($reserved,$unescaped,$score)); + return strtr((rawurlencode((rawurldecode(($uri ?? '')) ?? '')) ?? ''), (array_merge($reserved,$unescaped,$score) ?? '')); } /** @@ -253,31 +253,31 @@ { $lineWidth = $width + (3 - ($width - 1) % 4); $out = ''; - $cnt = strlen($str); + $cnt = strlen(($str ?? '')); for ($i = 0; $i < $cnt; $i++) { - $o = ord($str[$i]); + $o = ord(($str[$i] ?? '')); switch ($o) { case 0: # ESCAPE $i++; - switch (ord($str[$i])) { + switch (ord(($str[$i] ?? ''))) { case 0: # NEW LINE - $padCnt = $lineWidth - strlen($out) % $lineWidth; + $padCnt = $lineWidth - strlen(($out ?? '')) % $lineWidth; if ($padCnt < $lineWidth) { - $out .= str_repeat(chr(0), $padCnt); # pad line + $out .= str_repeat((chr(0) ?? ''), $padCnt); # pad line } break; case 1: # END OF FILE - $padCnt = $lineWidth - strlen($out) % $lineWidth; + $padCnt = $lineWidth - strlen(($out ?? '')) % $lineWidth; if ($padCnt < $lineWidth) { - $out .= str_repeat(chr(0), $padCnt); # pad line + $out .= str_repeat((chr(0) ?? ''), $padCnt); # pad line } break 3; case 2: # DELTA $i += 2; break; default: # ABSOLUTE MODE - $num = ord($str[$i]); + $num = ord(($str[$i] ?? '')); for ($j = 0; $j < $num; $j++) { $out .= $str[++$i]; } @@ -287,7 +287,7 @@ } break; default: - $out .= str_repeat($str[++$i], $o); + $out .= str_repeat(($str[++$i] ?? ''), $o); } } return $out; @@ -307,22 +307,22 @@ $w = floor($width / 2) + ($width % 2); $lineWidth = $w + (3 - (($width - 1) / 2) % 4); $pixels = array(); - $cnt = strlen($str); + $cnt = strlen(($str ?? '')); $c = 0; for ($i = 0; $i < $cnt; $i++) { - $o = ord($str[$i]); + $o = ord(($str[$i] ?? '')); switch ($o) { case 0: # ESCAPE $i++; - switch (ord($str[$i])) { + switch (ord(($str[$i] ?? ''))) { case 0: # NEW LINE - while (count($pixels) % $lineWidth != 0) { + while (count(($pixels ?? [])) % $lineWidth != 0) { $pixels[] = 0; } break; case 1: # END OF FILE - while (count($pixels) % $lineWidth != 0) { + while (count(($pixels ?? [])) % $lineWidth != 0) { $pixels[] = 0; } break 3; @@ -330,10 +330,10 @@ $i += 2; break; default: # ABSOLUTE MODE - $num = ord($str[$i]); + $num = ord(($str[$i] ?? '')); for ($j = 0; $j < $num; $j++) { if ($j % 2 == 0) { - $c = ord($str[++$i]); + $c = ord(($str[++$i] ?? '')); $pixels[] = ($c & 240) >> 4; } else { $pixels[] = $c & 15; @@ -346,7 +346,7 @@ } break; default: - $c = ord($str[++$i]); + $c = ord(($str[++$i] ?? '')); for ($j = 0; $j < $o; $j++) { $pixels[] = ($j % 2 == 0 ? ($c & 240) >> 4 : $c & 15); } @@ -354,14 +354,14 @@ } $out = ''; - if (count($pixels) % 2) { + if (count(($pixels ?? [])) % 2) { $pixels[] = 0; } - $cnt = count($pixels) / 2; + $cnt = count(($pixels ?? [])) / 2; for ($i = 0; $i < $cnt; $i++) { - $out .= chr(16 * $pixels[2 * $i] + $pixels[2 * $i + 1]); + $out .= chr((int) (16 * $pixels[2 * $i] + $pixels[2 * $i + 1])); } return $out; @@ -387,7 +387,7 @@ } // Exclude windows drive letters... - if (isset($arr["scheme"]) && $arr["scheme"] !== "file" && strlen($arr["scheme"]) > 1) { + if (isset($arr["scheme"]) && $arr["scheme"] !== "file" && strlen(($arr["scheme"] ?? '')) > 1) { $protocol = $arr["scheme"] . "://"; if (isset($arr["user"])) { @@ -410,11 +410,11 @@ if (isset($arr["path"]) && $arr["path"] !== "") { // Do we have a trailing slash? - if ($arr["path"][mb_strlen($arr["path"]) - 1] === "/") { + if ($arr["path"][mb_strlen(($arr["path"] ?? '')) - 1] === "/") { $path = $arr["path"]; $file = ""; } else { - $path = rtrim(dirname($arr["path"]), '/\\') . "/"; + $path = rtrim((dirname($arr["path"]) ?? ''), '/\\') . "/"; $file = basename($arr["path"]); } } @@ -431,7 +431,7 @@ $i = mb_stripos($url, "file://"); if ($i !== false) { - $url = mb_substr($url, $i + 7); + $url = mb_substr(($url ?? ''), $i + 7); } $protocol = ""; // "file://"; ? why doesn't this work... It's because of @@ -452,10 +452,10 @@ $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n"); - if (substr($arr["path"], 0, 1) === '/') { + if (substr(($arr["path"] ?? ''), 0, 1) === '/') { $path = dirname($arr["path"]); } else { - $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"]; + $path = '/' . rtrim((dirname($_SERVER["SCRIPT_NAME"]) ?? ''), '/') . '/' . $arr["path"]; } } } @@ -524,16 +524,16 @@ public static function unichr($c) { if ($c <= 0x7F) { - return chr($c); + return chr((int) ($c)); } else if ($c <= 0x7FF) { - return chr(0xC0 | $c >> 6) . chr(0x80 | $c & 0x3F); + return chr((int) (0xC0 | $c >> 6)) . chr((int) (0x80 | $c & 0x3F)); } else if ($c <= 0xFFFF) { - return chr(0xE0 | $c >> 12) . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); + return chr((int) (0xE0 | $c >> 12)) . chr((int) (0x80 | $c >> 6 & 0x3F)) + . chr((int) (0x80 | $c & 0x3F)); } else if ($c <= 0x10FFFF) { - return chr(0xF0 | $c >> 18) . chr(0x80 | $c >> 12 & 0x3F) - . chr(0x80 | $c >> 6 & 0x3F) - . chr(0x80 | $c & 0x3F); + return chr((int) (0xF0 | $c >> 18)) . chr((int) (0x80 | $c >> 12 & 0x3F)) + . chr((int) (0x80 | $c >> 6 & 0x3F)) + . chr((int) (0x80 | $c & 0x3F)); } return false; } @@ -609,14 +609,14 @@ if ($width == null || $height == null) { list($data, $headers) = Helpers::getFileContent($filename, $context); - if (substr($data, 0, 2) === "BM") { + if (substr(($data ?? ''), 0, 2) === "BM") { $meta = unpack('vtype/Vfilesize/Vreserved/Voffset/Vheadersize/Vwidth/Vheight', $data); $width = (int)$meta['width']; $height = (int)$meta['height']; $type = "bmp"; } else { - if (strpos($data, "<svg") !== false) { + if (strpos(($data ?? ''), "<svg") !== false) { $doc = new \Svg\Document(); $doc->loadFile($filename); @@ -710,7 +710,7 @@ } // create gd image - $im = imagecreatetruecolor($meta['width'], $meta['height']); + $im = imagecreatetruecolor((int) ($meta['width']), (int) ($meta['height'])); $data = fread($fh, $meta['imagesize']); // uncompress data @@ -735,14 +735,14 @@ switch ($meta['bits']) { case 32: case 24: - if (!($part = substr($data, $p, 3 /*$meta['bytes']*/))) { + if (!($part = substr(($data ?? ''), $p, 3 /*$meta['bytes']*/))) { trigger_error($error, E_USER_WARNING); return $im; } $color = unpack('V', $part . $vide); break; case 16: - if (!($part = substr($data, $p, 2 /*$meta['bytes']*/))) { + if (!($part = substr(($data ?? ''), $p, 2 /*$meta['bytes']*/))) { trigger_error($error, E_USER_WARNING); return $im; } @@ -755,16 +755,16 @@ } break; case 8: - $color = unpack('n', $vide . substr($data, $p, 1)); + $color = unpack('n', $vide . substr(($data ?? ''), $p, 1)); $color[1] = $palette[$color[1] + 1]; break; case 4: - $color = unpack('n', $vide . substr($data, floor($p), 1)); + $color = unpack('n', $vide . substr(($data ?? ''), floor($p), 1)); $color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F; $color[1] = $palette[$color[1] + 1]; break; case 1: - $color = unpack('n', $vide . substr($data, floor($p), 1)); + $color = unpack('n', $vide . substr(($data ?? ''), floor($p), 1)); switch (($p * 8) % 8) { case 0: $color[1] = $color[1] >> 7; @@ -797,7 +797,7 @@ trigger_error('imagecreatefrombmp: ' . $filename . ' has ' . $meta['bits'] . ' bits and this is not supported!', E_USER_WARNING); return false; } - imagesetpixel($im, $x, $y, $color[1]); + imagesetpixel($im, (int) ($x), (int) ($y), (int) ($color[1])); $x++; $p += $meta['bytes']; } @@ -834,9 +834,9 @@ $uri = Helpers::encodeURI($uri); } if (isset($maxlen)) { - $result = file_get_contents($uri, null, $context, $offset, $maxlen); + $result = file_get_contents(($uri ?? ''), (null ?? false), $context, $offset, $maxlen); } else { - $result = file_get_contents($uri, null, $context, $offset); + $result = file_get_contents(($uri ?? ''), (null ?? false), $context, $offset); } if (isset($http_response_header)) { $headers = $http_response_header; @@ -855,9 +855,9 @@ } $data = curl_exec($curl); - $raw_headers = substr($data, 0, curl_getinfo($curl, CURLINFO_HEADER_SIZE)); - $headers = preg_split("/[\n\r]+/", trim($raw_headers)); - $result = substr($data, curl_getinfo($curl, CURLINFO_HEADER_SIZE)); + $raw_headers = substr(($data ?? ''), 0, curl_getinfo($curl, CURLINFO_HEADER_SIZE)); + $headers = preg_split("/[\n\r]+/", (trim(($raw_headers ?? '')) ?? '')); + $result = substr(($data ?? ''), curl_getinfo($curl, CURLINFO_HEADER_SIZE)); curl_close($curl); } @@ -867,24 +867,24 @@ } public static function mb_ucwords($str) { - $max_len = mb_strlen($str); + $max_len = mb_strlen(($str ?? '')); if ($max_len === 1) { return mb_strtoupper($str); } - $str = mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1); + $str = mb_strtoupper(mb_substr(($str ?? ''), 0, 1)) . mb_substr(($str ?? ''), 1); foreach (array(' ', '.', ',', '!', '?', '-', '+') as $s) { $pos = 0; - while (($pos = mb_strpos($str, $s, $pos)) !== false) { + while (($pos = mb_strpos(($str ?? ''), ($s ?? ''), $pos)) !== false) { $pos++; // Nothing to do if the separator is the last char of the string if ($pos !== false && $pos < $max_len) { // If the char we want to upper is the last char there is nothing to append behind if ($pos + 1 < $max_len) { - $str = mb_substr($str, 0, $pos) . mb_strtoupper(mb_substr($str, $pos, 1)) . mb_substr($str, $pos + 1); + $str = mb_substr(($str ?? ''), 0, $pos) . mb_strtoupper(mb_substr(($str ?? ''), $pos, 1)) . mb_substr(($str ?? ''), $pos + 1); } else { - $str = mb_substr($str, 0, $pos) . mb_strtoupper(mb_substr($str, $pos, 1)); + $str = mb_substr(($str ?? ''), 0, $pos) . mb_strtoupper(mb_substr(($str ?? ''), $pos, 1)); } } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/LineBox.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/LineBox.php @@ -102,7 +102,7 @@ { $floating_frames = $root->get_floating_frames(); - if (count($floating_frames) == 0) { + if (count(($floating_frames ?? [])) == 0) { return $floating_frames; } @@ -284,7 +284,7 @@ foreach ($props as $prop) { $s .= "$prop: " . $this->$prop . "\n"; } - $s .= count($this->_frames) . " frames\n"; + $s .= count(($this->_frames ?? [])) . " frames\n"; return $s; } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Dompdf.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Dompdf.php @@ -287,7 +287,7 @@ } $versionFile = realpath(__DIR__ . '/../VERSION'); - if (file_exists($versionFile) && ($version = file_get_contents($versionFile)) !== false && $version !== '$Format:<%h>$') { + if (file_exists($versionFile) && ($version = file_get_contents(($versionFile ?? ''))) !== false && $version !== '$Format:<%h>$') { $this->version = sprintf('dompdf %s', $version); } @@ -353,7 +353,7 @@ if (!$this->protocol && !$this->baseHost && !$this->basePath) { list($this->protocol, $this->baseHost, $this->basePath) = Helpers::explode_url($file); } - $protocol = strtolower($this->protocol); + $protocol = strtolower(($this->protocol ?? '')); if ( !in_array($protocol, $this->allowedProtocols) ) { throw new Exception("Permission denied on $file. The communication protocol is not supported."); @@ -367,11 +367,11 @@ $realfile = realpath($file); $chroot = realpath($this->options->getChroot()); - if ($chroot && strpos($realfile, $chroot) !== 0) { + if ($chroot && strpos(($realfile ?? ''), ($chroot ?? '')) !== 0) { throw new Exception("Permission denied on $file. The file could not be found under the directory specified by Options::chroot."); } - $ext = strtolower(pathinfo($realfile, PATHINFO_EXTENSION)); + $ext = strtolower((pathinfo($realfile, PATHINFO_EXTENSION) ?? '')); if (!in_array($ext, $this->allowedLocalFileExtensions)) { throw new Exception("Permission denied on $file. This file extension is forbidden"); } @@ -389,8 +389,8 @@ // See http://the-stickman.com/web-development/php/getting-http-response-headers-when-using-file_get_contents/ if (isset($http_response_header)) { foreach ($http_response_header as $_header) { - if (preg_match("@Content-Type:\s*[\w/]+;\s*?charset=([^\s]+)@i", $_header, $matches)) { - $encoding = strtoupper($matches[1]); + if (preg_match("@Content-Type:\s*[\w/]+;\s*?charset=([^\s]+)@i", ($_header ?? ''), $matches)) { + $encoding = strtoupper(($matches[1] ?? '')); break; } } @@ -429,8 +429,8 @@ if (($file_encoding = mb_detect_encoding($str, null, true)) === false) { $file_encoding = "auto"; } - if (in_array(strtoupper($file_encoding), array('UTF-8','UTF8')) === false) { - $str = mb_convert_encoding($str, 'UTF-8', $file_encoding); + if (in_array(strtoupper(($file_encoding ?? '')), array('UTF-8','UTF8')) === false) { + $str = mb_convert_encoding(($str ?? ''), 'UTF-8', $file_encoding); } $metatags = array( @@ -439,17 +439,17 @@ '@<meta [^>]*charset\s*=\s*["\']?\s*([^"\' ]+)@i', ); foreach ($metatags as $metatag) { - if (preg_match($metatag, $str, $matches)) { + if (preg_match(($metatag ?? ''), ($str ?? ''), $matches)) { if (isset($matches[1]) && in_array($matches[1], $known_encodings)) { $document_encoding = $matches[1]; break; } } } - if (isset($document_encoding) && in_array(strtoupper($document_encoding), array('UTF-8','UTF8')) === false) { - $str = preg_replace('/charset=([^\s"]+)/i', 'charset=UTF-8', $str); - } elseif (isset($document_encoding) === false && strpos($str, '<head>') !== false) { - $str = str_replace('<head>', '<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">', $str); + if (isset($document_encoding) && in_array(strtoupper(($document_encoding ?? '')), array('UTF-8','UTF8')) === false) { + $str = preg_replace('/charset=([^\s"]+)/i', 'charset=UTF-8', ($str ?? '')); + } elseif (isset($document_encoding) === false && strpos(($str ?? ''), '<head>') !== false) { + $str = str_replace('<head>', '<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">', ($str ?? '')); } elseif (isset($document_encoding) === false) { $str = '<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">' . $str; } @@ -458,8 +458,8 @@ // remove BOM mark from UTF-8, it's treated as document text by DOMDocument // FIXME: roll this into the encoding detection using UTF-8/16/32 BOM (http://us2.php.net/manual/en/function.mb-detect-encoding.php#91051)? - if (substr($str, 0, 3) == chr(0xEF) . chr(0xBB) . chr(0xBF)) { - $str = substr($str, 3); + if (substr(($str ?? ''), 0, 3) == chr(0xEF) . chr(0xBB) . chr(0xBF)) { + $str = substr(($str ?? ''), 3); } // Store parsing warnings as messages @@ -506,10 +506,10 @@ } // If some text is before the doctype, we are in quirksmode - if (preg_match("/^(.+)<!doctype/i", ltrim($str), $matches)) { + if (preg_match("/^(.+)<!doctype/i", (ltrim(($str ?? '')) ?? ''), $matches)) { $quirksmode = true; } // If no doctype is provided, we are in quirksmode - elseif (!preg_match("/^<!doctype/i", ltrim($str), $matches)) { + elseif (!preg_match("/^<!doctype/i", (ltrim(($str ?? '')) ?? ''), $matches)) { $quirksmode = true; } else { // HTML5 <!DOCTYPE html> @@ -518,7 +518,7 @@ } // not XHTML - if (!preg_match("/xhtml/i", $doc->doctype->publicId)) { + if (!preg_match("/xhtml/i", ($doc->doctype->publicId ?? ''))) { $quirksmode = true; } } @@ -591,19 +591,19 @@ /** @var \DOMElement $tag */ foreach ($stylesheets as $tag) { - switch (strtolower($tag->nodeName)) { + switch (strtolower(($tag->nodeName ?? ''))) { // load <link rel="STYLESHEET" ... /> tags case "link": - if (mb_strtolower(stripos($tag->getAttribute("rel"), "stylesheet") !== false) || // may be "appendix stylesheet" + if (mb_strtolower(stripos(($tag->getAttribute("rel") ?? ''), "stylesheet") !== false) || // may be "appendix stylesheet" mb_strtolower($tag->getAttribute("type")) === "text/css" ) { //Check if the css file is for an accepted media type //media not given then always valid - $formedialist = preg_split("/[\s\n,]/", $tag->getAttribute("media"), -1, PREG_SPLIT_NO_EMPTY); - if (count($formedialist) > 0) { + $formedialist = preg_split("/[\s\n,]/", ($tag->getAttribute("media") ?? ''), -1, PREG_SPLIT_NO_EMPTY); + if (count(($formedialist ?? [])) > 0) { $accept = false; foreach ($formedialist as $type) { - if (in_array(mb_strtolower(trim($type)), $acceptedmedia)) { + if (in_array(mb_strtolower(trim(($type ?? ''))), $acceptedmedia)) { $accept = true; break; } @@ -690,7 +690,7 @@ { $valid = array("XYZ", "Fit", "FitH", "FitV", "FitR", "FitB", "FitBH", "FitBV"); - $options = preg_split("/\s*,\s*/", trim($value)); + $options = preg_split("/\s*,\s*/", (trim(($value ?? '')) ?? '')); $defaultView = array_shift($options); if (!in_array($defaultView, $valid)) { @@ -792,7 +792,7 @@ // the hex-decoded text of the content property, duplicated from AbstrctFrameReflower::_parse_string $decoded_string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})/", function ($matches) { return \Dompdf\Helpers::unichr(hexdec($matches[1])); }, - $style->content); + ($style->content ?? '')); $chars = mb_strtoupper($style->content) . mb_strtolower($style->content) . mb_strtoupper($decoded_string) . mb_strtolower($decoded_string); $canvas->register_string_subset($style->font_family, $chars); continue; @@ -816,7 +816,7 @@ // Add meta information $title = $this->dom->getElementsByTagName("title"); if ($title->length) { - $canvas->add_info("Title", trim($title->item(0)->nodeValue)); + $canvas->add_info("Title", trim(($title->item(0)->nodeValue ?? ''))); } $metas = $this->dom->getElementsByTagName("meta"); @@ -828,7 +828,7 @@ /** @var \DOMElement $meta */ foreach ($metas as $meta) { $name = mb_strtolower($meta->getAttribute("name")); - $value = trim($meta->getAttribute("content")); + $value = trim(($meta->getAttribute("content") ?? '')); if (isset($labels[$name])) { $canvas->add_info($labels[$name], $value); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Autoloader.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Autoloader.php @@ -30,9 +30,9 @@ return; } - $prefixLength = strlen(self::PREFIX); + $prefixLength = strlen((self::PREFIX ?? '')); if (0 === strncmp(self::PREFIX, $class, $prefixLength)) { - $file = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, $prefixLength)); + $file = str_replace('\\', (DIRECTORY_SEPARATOR ?? ''), (substr(($class ?? ''), $prefixLength) ?? '')); $file = realpath(__DIR__ . (empty($file) ? '' : DIRECTORY_SEPARATOR) . $file . '.php'); if (file_exists($file)) { require_once $file; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Cellmap.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Cellmap.php @@ -650,7 +650,7 @@ $val = null; if (Helpers::is_percent($width)) { $var = "percent"; - $val = (float)rtrim($width, "% ") / $colspan; + $val = (float)rtrim(($width ?? ''), "% ") / $colspan; } else if ($width !== "auto") { $var = "absolute"; $val = $style->length_in_pt($frame_min) / $colspan; @@ -745,7 +745,7 @@ unset($this->_cells[$r][$c]); // has multiple rows? - if (isset($this->_frames[$id]) && count($this->_frames[$id]["rows"]) > 1) { + if (isset($this->_frames[$id]) && count(($this->_frames[$id]["rows"] ?? [])) > 1) { // remove just the desired row, but leave the frame if (($row_key = array_search($r, $this->_frames[$id]["rows"])) !== false) { unset($this->_frames[$id]["rows"][$row_key]); @@ -906,7 +906,7 @@ if (php_sapi_name() == "cli") { $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"), array("\n", chr(27) . "[01;33m", chr(27) . "[0m"), - $str)); + ($str ?? ''))); } return $str; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/CanvasFactory.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/CanvasFactory.php @@ -34,7 +34,7 @@ */ static function get_instance(Dompdf $dompdf, $paper = null, $orientation = null, $class = null) { - $backend = strtolower($dompdf->getOptions()->getPdfBackend()); + $backend = strtolower(($dompdf->getOptions()->getPdfBackend() ?? '')); if (isset($class) && class_exists($class, false)) { $class .= "_Adapter"; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Image/Cache.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Image/Cache.php @@ -67,7 +67,7 @@ $remote = ($protocol && $protocol !== "file://") || ($parsed_url['protocol'] != ""); - $data_uri = strpos($parsed_url['protocol'], "data:") === 0; + $data_uri = strpos(($parsed_url['protocol'] ?? ''), "data:") === 0; $full_url = null; $enable_remote = $dompdf->getOptions()->getIsRemoteEnabled(); @@ -100,7 +100,7 @@ } // Image not found or invalid - if (strlen($image) == 0) { + if (strlen(($image ?? '')) == 0) { $msg = ($data_uri ? "Data-URI could not be parsed" : "Image not found"); throw new ImageException($msg, E_WARNING); } // Image found, put in cache and process --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Image.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Image.php @@ -92,7 +92,7 @@ break; } } - $width = ((float)rtrim($width, "%") * $t) / 100; //maybe 0 + $width = ((float)rtrim(($width ?? ''), "%") * $t) / 100; //maybe 0 } else { // Don't set image original size if "%" branch was 0 or size not given. // Otherwise aspect changed on %/auto combination for width/height @@ -111,7 +111,7 @@ break; } } - $height = ((float)rtrim($height, "%") * $t) / 100; //maybe 0 + $height = ((float)rtrim(($height ?? ''), "%") * $t) / 100; //maybe 0 } else { // Don't set image original size if "%" branch was 0 or size not given. // Otherwise aspect changed on %/auto combination for width/height --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Text.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Text.php @@ -57,7 +57,7 @@ //$text = $this->_frame->get_text(); // if ( $this->_block_parent->get_current_line_box->w == 0 ) // $text = ltrim($text, " \n\r\t"); - return preg_replace(self::$_whitespace_pattern, " ", $text); + return preg_replace((self::$_whitespace_pattern ?? ''), " ", ($text ?? '')); } /** @@ -109,8 +109,8 @@ } // split the text into words - $words = preg_split('/([\s-]+)/u', $text, -1, PREG_SPLIT_DELIM_CAPTURE); - $wc = count($words); + $words = preg_split('/([\s-]+)/u', ($text ?? ''), -1, PREG_SPLIT_DELIM_CAPTURE); + $wc = count(($words ?? [])); // Determine the split point $width = 0; @@ -137,7 +137,7 @@ $last_width = 0; if ($break_word) { - for ($j = 0; $j < strlen($word); $j++) { + for ($j = 0; $j < strlen(($word ?? '')); $j++) { $s .= $word[$j]; $_width = $this->getFontMetrics()->getTextWidth($s, $font, $size, $word_spacing, $char_spacing); if ($_width > $available_width) { @@ -150,14 +150,14 @@ if ($break_word && $last_width > 0) { //$width += $last_width; - $str .= substr($s, 0, -1); + $str .= substr(($s ?? ''), 0, -1); } else { //$width += $word_width; $str .= $word; } } - $offset = mb_strlen($str); + $offset = mb_strlen(($str ?? '')); // More debugging: // var_dump($str); @@ -175,7 +175,7 @@ */ protected function _newline_break($text) { - if (($i = mb_strpos($text, "\n")) === false) { + if (($i = mb_strpos(($text ?? ''), "\n")) === false) { return false; } @@ -201,7 +201,7 @@ // Handle text transform: // http://www.w3.org/TR/CSS21/text.html#propdef-text-transform - switch (strtolower($style->text_transform)) { + switch (strtolower(($style->text_transform ?? ''))) { default: break; case "capitalize": @@ -250,7 +250,7 @@ case "pre-line": // Collapse white-space except for \n - $frame->set_text($text = preg_replace("/[ \t]+/u", " ", $text)); + $frame->set_text($text = preg_replace("/[ \t]+/u", " ", ($text ?? ''))); if ($text == "") { break; @@ -291,7 +291,7 @@ // Layout the new line $this->_layout_line(); - } else if ($split < mb_strlen($frame->get_text())) { + } else if ($split < mb_strlen(($frame->get_text() ?? ''))) { // split the line if required $frame->split_text($split); @@ -299,7 +299,7 @@ // Remove any trailing newlines if ($split > 1 && $t[$split - 1] === "\n" && !$frame->is_pre()) { - $frame->set_text(mb_substr($t, 0, -1)); + $frame->set_text(mb_substr(($t ?? ''), 0, -1)); } // Do we need to trim spaces on wrapped lines? This might be desired, however, we @@ -327,13 +327,13 @@ if ((!$is_inline_frame && !$frame->get_next_sibling()) /* || ( $is_inline_frame && !$parent->get_next_sibling())*/ ) { // fails <b>BOLD <u>UNDERLINED</u></b> becomes <b>BOLD<u>UNDERLINED</u></b> - $t = rtrim($t); + $t = rtrim(($t ?? '')); } if ((!$is_inline_frame && !$frame->get_prev_sibling()) /* || ( $is_inline_frame && !$parent->get_prev_sibling())*/ ) { // <span><span>A<span>B</span> C</span></span> fails (the whitespace is removed) - $t = ltrim($t); + $t = ltrim(($t ?? '')); } $frame->set_text($t); @@ -399,7 +399,7 @@ switch ($style->white_space) { default: case "normal": - $str = preg_replace(self::$_whitespace_pattern, " ", $str); + $str = preg_replace((self::$_whitespace_pattern ?? ''), " ", ($str ?? '')); case "pre-wrap": case "pre-line": @@ -408,7 +408,7 @@ // This technique (using arrays & an anonymous function) is actually // faster than doing a single-pass character by character scan. Heh, // yes I took the time to bench it ;) - $words = array_flip(preg_split("/[\s-]+/u", $str, -1, PREG_SPLIT_DELIM_CAPTURE)); + $words = array_flip(preg_split("/[\s-]+/u", ($str ?? ''), -1, PREG_SPLIT_DELIM_CAPTURE)); $root = $this; array_walk($words, function(&$val, $str) use ($font, $size, $word_spacing, $char_spacing, $root) { $val = $root->getFontMetrics()->getTextWidth($str, $font, $size, $word_spacing, $char_spacing); @@ -419,7 +419,7 @@ break; case "pre": - $lines = array_flip(preg_split("/\n/u", $str)); + $lines = array_flip(preg_split("/\n/u", ($str ?? ''))); $root = $this; array_walk($lines, function(&$val, $str) use ($font, $size, $word_spacing, $char_spacing, $root) { $val = $root->getFontMetrics()->getTextWidth($str, $font, $size, $word_spacing, $char_spacing); @@ -438,16 +438,16 @@ default: case "normal": case "nowrap": - $str = preg_replace(self::$_whitespace_pattern, " ", $text); + $str = preg_replace((self::$_whitespace_pattern ?? ''), " ", ($text ?? '')); break; case "pre-line": //XXX: Is this correct? - $str = preg_replace("/[ \t]+/u", " ", $text); + $str = preg_replace("/[ \t]+/u", " ", ($text ?? '')); case "pre-wrap": // Find the longest word (i.e. minimum length) - $lines = array_flip(preg_split("/\n/", $text)); + $lines = array_flip(preg_split("/\n/", ($text ?? ''))); $root = $this; array_walk($lines, function(&$val, $str) use ($font, $size, $word_spacing, $char_spacing, $root) { $val = $root->getFontMetrics()->getTextWidth($str, $font, $size, $word_spacing, $char_spacing); @@ -473,7 +473,7 @@ if ($style->word_wrap === 'break-word') { // If it is allowed to break words, the min width is the widest character. // But for performance reasons, we only check the first character. - $char = mb_substr($str, 0, 1); + $char = mb_substr(($str ?? ''), 0, 1); $min_char = $this->getFontMetrics()->getTextWidth($char, $font, $size, $word_spacing, $char_spacing); $min = $delta + $min_char; } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/TableCell.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/TableCell.php @@ -104,7 +104,7 @@ $height = max($style_height, (float)$this->_frame->get_content_height()); // Let the cellmap know our height - $cell_height = $height / count($cells["rows"]); + $cell_height = $height / count(($cells["rows"] ?? [])); if ($style_height <= $height) { $cell_height += $top_space + $bottom_space; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Table.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Table.php @@ -177,15 +177,15 @@ // Case 2 if ($absolute_used > 0 && $percent_used == 0) { - if (count($auto) > 0) { - $increment = ($width - $auto_min - $absolute_used) / count($auto); + if (count(($auto ?? [])) > 0) { + $increment = ($width - $auto_min - $absolute_used) / count(($auto ?? [])); } // Use the absolutely specified width or the increment foreach (array_keys($columns) as $i) { - if ($columns[$i]["absolute"] > 0 && count($auto)) { + if ($columns[$i]["absolute"] > 0 && count(($auto ?? []))) { $cellmap->set_column_width($i, $columns[$i]["min-width"]); - } else if (count($auto)) { + } else if (count(($auto ?? []))) { $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment); } else { // All absolute columns @@ -205,7 +205,7 @@ // Scale percent values if the total percentage is > 100, or if all // values are specified as percentages. - if ($percent_used > 100 || count($auto) == 0) { + if ($percent_used > 100 || count(($auto ?? [])) == 0) { $scale = 100 / $percent_used; } else { $scale = 1; @@ -232,8 +232,8 @@ // This works because $used_width includes the min-width of each // unassigned column - if (count($auto) > 0) { - $increment = ($width - $used_width) / count($auto); + if (count(($auto ?? [])) > 0) { + $increment = ($width - $used_width) / count(($auto ?? [])); foreach ($auto as $i) { $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment); @@ -256,7 +256,7 @@ // Scale percent values if the total percentage is > 100 or there // are no auto values to take up slack - if ($percent_used > 100 || count($auto) == 0) { + if ($percent_used > 100 || count(($auto ?? [])) == 0) { $scale = 100 / $percent_used; } else { $scale = 1; @@ -278,8 +278,8 @@ $used_width += $w; } - if (count($auto) > 0) { - $increment = ($width - $used_width) / count($auto); + if (count(($auto ?? [])) > 0) { + $increment = ($width - $used_width) / count(($auto ?? [])); foreach ($auto as $i) { $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment); @@ -331,12 +331,12 @@ $max_height = $style->length_in_pt($max_height, $cb["h"]); } else if (isset($cb["w"])) { - if (mb_strpos($min_height, "%") !== false) { + if (mb_strpos(($min_height ?? ''), "%") !== false) { $min_height = 0; } else { $min_height = $style->length_in_pt($min_height, $cb["w"]); } - if (mb_strpos($max_height, "%") !== false) { + if (mb_strpos(($max_height ?? ''), "%") !== false) { $max_height = "none"; } else { $max_height = $style->length_in_pt($max_height, $cb["w"]); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/AbstractFrameReflower.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/AbstractFrameReflower.php @@ -269,8 +269,8 @@ continue; } } - $min = count($low) ? max($low) : 0; - $max = count($high) ? max($high) : 0; + $min = count(($low ?? [])) ? max($low) : 0; + $max = count(($high ?? [])) ? max($high) : 0; // Use specified width if it is greater than the minimum defined by the // content. If the width is a percentage ignore it for now. @@ -300,19 +300,19 @@ protected function _parse_string($string, $single_trim = false) { if ($single_trim) { - $string = preg_replace('/^[\"\']/', "", $string); - $string = preg_replace('/[\"\']$/', "", $string); + $string = preg_replace('/^[\"\']/', "", ($string ?? '')); + $string = preg_replace('/[\"\']$/', "", ($string ?? '')); } else { - $string = trim($string, "'\""); + $string = trim(($string ?? ''), "'\""); } $string = str_replace(array("\\\n", '\\"', "\\'"), - array("", '"', "'"), $string); + array("", '"', "'"), ($string ?? '')); // Convert escaped hex characters into ascii characters (e.g. \A => newline) $string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})/", function ($matches) { return \Dompdf\Helpers::unichr(hexdec($matches[1])); }, - $string); + ($string ?? '')); return $string; } @@ -329,7 +329,7 @@ $quotes = $this->_frame->get_style()->quotes; // split on spaces, except within quotes - if (!preg_match_all($re, "$quotes", $matches, PREG_SET_ORDER)) { + if (!preg_match_all(($re ?? ''), "$quotes", $matches, PREG_SET_ORDER)) { return null; } @@ -367,7 +367,7 @@ $quotes = $this->_parse_quotes(); // split on spaces, except within quotes - if (!preg_match_all($re, $content, $matches, PREG_SET_ORDER)) { + if (!preg_match_all(($re ?? ''), ($content ?? ''), $matches, PREG_SET_ORDER)) { return null; } @@ -388,22 +388,22 @@ if (isset($match[1]) && $match[1] !== "") { // counters?(...) - $match[1] = mb_strtolower(trim($match[1])); + $match[1] = mb_strtolower(trim(($match[1] ?? ''))); // Handle counter() references: // http://www.w3.org/TR/CSS21/generate.html#content - $i = mb_strpos($match[1], ")"); + $i = mb_strpos(($match[1] ?? ''), ")"); if ($i === false) { continue; } - preg_match('/(counters?)(^\()*?\(\s*([^\s,]+)\s*(,\s*["\']?([^"\'\)]*)["\']?\s*(,\s*([^\s)]+)\s*)?)?\)/i', $match[1], $args); + preg_match('/(counters?)(^\()*?\(\s*([^\s,]+)\s*(,\s*["\']?([^"\'\)]*)["\']?\s*(,\s*([^\s)]+)\s*)?)?\)/i', ($match[1] ?? ''), $args); $counter_id = $args[3]; - if (strtolower($args[1]) == 'counter') { + if (strtolower(($args[1] ?? '')) == 'counter') { // counter(name [,style]) if (isset($args[5])) { - $type = trim($args[5]); + $type = trim(($args[5] ?? '')); } else { $type = null; } @@ -411,7 +411,7 @@ $text .= $p->counter_value($counter_id, $type); - } else if (strtolower($args[1]) == 'counters') { + } else if (strtolower(($args[1] ?? '')) == 'counters') { // counters(name, string [,style]) if (isset($args[5])) { $string = $this->_parse_string($args[5]); @@ -420,7 +420,7 @@ } if (isset($args[7])) { - $type = trim($args[7]); + $type = trim(($args[7] ?? '')); } else { $type = null; } @@ -456,13 +456,13 @@ // FIXME: } else if ($match[7] === "no-close-quote") { // FIXME: - } else if (mb_strpos($match[7], "attr(") === 0) { - $i = mb_strpos($match[7], ")"); + } else if (mb_strpos(($match[7] ?? ''), "attr(") === 0) { + $i = mb_strpos(($match[7] ?? ''), ")"); if ($i === false) { continue; } - $attr = mb_substr($match[7], 5, $i - 5); + $attr = mb_substr(($match[7] ?? ''), 5, $i - 5); if ($attr == "") { continue; } @@ -487,7 +487,7 @@ // if the element was pushed to a new page use the saved counter value, otherwise use the CSS reset value if ($style->counter_reset && ($reset = $style->counter_reset) !== "none") { - $vars = preg_split('/\s+/', trim($reset), 2); + $vars = preg_split('/\s+/', (trim(($reset ?? '')) ?? ''), 2); $frame->reset_counter($vars[0], (isset($frame->_counters['__' . $vars[0]]) ? $frame->_counters['__' . $vars[0]] : (isset($vars[1]) ? $vars[1] : 0))); } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Page.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Page.php @@ -53,7 +53,7 @@ $page_styles = $style->get_stylesheet()->get_page_styles(); // http://www.w3.org/TR/CSS21/page.html#page-selectors - if (count($page_styles) > 1) { + if (count(($page_styles ?? [])) > 1) { $odd = $page_number % 2 == 1; $first = $page_number == 1; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Block.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameReflower/Block.php @@ -237,7 +237,7 @@ { $height = 0; $lines = $this->_frame->get_line_boxes(); - if (count($lines) > 0) { + if (count(($lines ?? [])) > 0) { $last_line = end($lines); $content_box = $this->_frame->get_content_box(); $height = $last_line->y + $last_line->h - $content_box["y"]; @@ -391,13 +391,13 @@ $min_height = $style->length_in_pt($min_height, $cb["h"]); $max_height = $style->length_in_pt($max_height, $cb["h"]); } else if (isset($cb["w"])) { - if (mb_strpos($min_height, "%") !== false) { + if (mb_strpos(($min_height ?? ''), "%") !== false) { $min_height = 0; } else { $min_height = $style->length_in_pt($min_height, $cb["w"]); } - if (mb_strpos($max_height, "%") !== false) { + if (mb_strpos(($max_height ?? ''), "%") !== false) { $max_height = "none"; } else { $max_height = $style->length_in_pt($max_height, $cb["w"]); @@ -582,7 +582,7 @@ //FIXME: The 0.8 ratio applied to the height is arbitrary (used to accommodate descenders?) if($isInlineBlock) { $lineFrames = $line->get_frames(); - if (count($lineFrames) == 1) { + if (count(($lineFrames ?? [])) == 1) { continue; } $frameBox = $frame->get_frame()->get_border_box(); @@ -721,7 +721,7 @@ // Remove next frame's beginning whitespace $next = $child->get_next_sibling(); if ($next && $next instanceof TextFrameDecorator) { - $next->set_text(ltrim($next->get_text())); + $next->set_text(ltrim(($next->get_text() ?? ''))); } $line_box = $this->_frame->get_current_line_box(); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/GD.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/GD.php @@ -138,11 +138,11 @@ * @param float $aa_factor Anti-aliasing factor, 1 for no AA * @param array $bg_color Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1 */ - public function __construct($size = 'letter', $orientation = "portrait", Dompdf $dompdf, $aa_factor = 1.0, $bg_color = array(1, 1, 1, 0)) + public function __construct($size, $orientation, Dompdf $dompdf, $aa_factor = 1.0, $bg_color = array(1, 1, 1, 0)) { if (!is_array($size)) { - $size = strtolower($size); + $size = strtolower(($size ?? '')); if (isset(CPDF::$PAPER_SIZES[$size])) { $size = CPDF::$PAPER_SIZES[$size]; @@ -151,7 +151,7 @@ } } - if (strtolower($orientation) === "landscape") { + if (strtolower(($orientation ?? '')) === "landscape") { list($size[2], $size[3]) = array($size[3], $size[2]); } @@ -311,9 +311,9 @@ } if ($a != 0) { - $this->_colors[$key] = imagecolorallocatealpha($this->get_image(), $r, $g, $b, $a); + $this->_colors[$key] = imagecolorallocatealpha($this->get_image(), (int) ($r), (int) ($g), (int) ($b), (int) ($a)); } else { - $this->_colors[$key] = imagecolorallocate($this->get_image(), $r, $g, $b); + $this->_colors[$key] = imagecolorallocate($this->get_image(), (int) ($r), (int) ($g), (int) ($b)); } return $this->_colors[$key]; @@ -369,10 +369,10 @@ $c = $this->_allocate_color($color); // Convert the style array if required - if (is_array($style) && count($style) > 0) { + if (is_array($style) && count(($style ?? [])) > 0) { $gd_style = array(); - if (count($style) == 1) { + if (count(($style ?? [])) == 1) { for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) { $gd_style[] = $c; } @@ -405,9 +405,9 @@ } } - imagesetthickness($this->get_image(), $width); - - imageline($this->get_image(), $x1, $y1, $x2, $y2, $c); + imagesetthickness($this->get_image(), (int) ($width)); + + imageline($this->get_image(), (int) ($x1), (int) ($y1), (int) ($x2), (int) ($y2), (int) ($c)); } /** @@ -454,7 +454,7 @@ $c = $this->_allocate_color($color); // Convert the style array if required - if (is_array($style) && count($style) > 0) { + if (is_array($style) && count(($style ?? [])) > 0) { $gd_style = array(); foreach ($style as $length) { @@ -469,9 +469,9 @@ } } - imagesetthickness($this->get_image(), $width); - - imagerectangle($this->get_image(), $x1, $y1, $x1 + $w, $y1 + $h, $c); + imagesetthickness($this->get_image(), (int) ($width)); + + imagerectangle($this->get_image(), (int) ($x1), (int) ($y1), (int) ($x1 + $w), (int) ($y1 + $h), (int) ($c)); } /** @@ -495,7 +495,7 @@ $c = $this->_allocate_color($color); - imagefilledrectangle($this->get_image(), $x1, $y1, $x1 + $w, $y1 + $h, $c); + imagefilledrectangle($this->get_image(), (int) ($x1), (int) ($y1), (int) ($x1 + $w), (int) ($y1 + $h), (int) ($c)); } /** @@ -629,7 +629,7 @@ $c = $this->_allocate_color($color); // Convert the style array if required - if (is_array($style) && count($style) > 0 && !$fill) { + if (is_array($style) && count(($style ?? [])) > 0 && !$fill) { $gd_style = array(); foreach ($style as $length) { @@ -644,12 +644,12 @@ } } - imagesetthickness($this->get_image(), $width); + imagesetthickness($this->get_image(), (int) ($width)); if ($fill) { - imagefilledpolygon($this->get_image(), $points, count($points) / 2, $c); + imagefilledpolygon($this->get_image(), $points, (int) ($c)); } else { - imagepolygon($this->get_image(), $points, count($points) / 2, $c); + imagepolygon($this->get_image(), $points, (int) ($c)); } } @@ -678,7 +678,7 @@ $c = $this->_allocate_color($color); // Convert the style array if required - if (is_array($style) && count($style) > 0 && !$fill) { + if (is_array($style) && count(($style ?? [])) > 0 && !$fill) { $gd_style = array(); foreach ($style as $length) { @@ -693,12 +693,12 @@ } } - imagesetthickness($this->get_image(), $width); + imagesetthickness($this->get_image(), (int) ($width)); if ($fill) { - imagefilledellipse($this->get_image(), $x, $y, $r, $r, $c); + imagefilledellipse($this->get_image(), (int) ($x), (int) ($y), (int) ($r), (int) ($r), (int) ($c)); } else { - imageellipse($this->get_image(), $x, $y, $r, $r, $c); + imageellipse($this->get_image(), (int) ($x), (int) ($y), (int) ($r), (int) ($r), (int) ($c)); } } @@ -749,7 +749,7 @@ $img_w = imagesx($src); $img_h = imagesy($src); - imagecopyresampled($this->get_image(), $src, $x, $y, 0, 0, $w, $h, $img_w, $img_h); + imagecopyresampled($this->get_image(), $src, (int) ($x), (int) ($y), 0, 0, (int) ($w), (int) ($h), (int) ($img_w), (int) ($img_h)); } /** @@ -782,14 +782,14 @@ // character. Preserve any originally double encoded entities to be // represented as is. // eg: &#160; will render   rather than its character. - $text = preg_replace('/&(#(?:x[a-fA-F0-9]+|[0-9]+);)/', '&\1', $text); + $text = preg_replace('/&(#(?:x[a-fA-F0-9]+|[0-9]+);)/', '&\1', ($text ?? '')); $text = mb_encode_numericentity($text, array(0x0080, 0xff, 0, 0xff), 'UTF-8'); $font = $this->get_ttf_file($font); // FIXME: word spacing - imagettftext($this->get_image(), $size, $angle, $x, $y + $h, $c, $font, $text); + imagettftext($this->get_image(), $size, $angle, (int) ($x), (int) ($y + $h), (int) ($c), $font, $text); } public function javascript($code) @@ -861,7 +861,7 @@ // character. Preserve any originally double encoded entities to be // represented as is. // eg: &#160; will render   rather than its character. - $text = preg_replace('/&(#(?:x[a-fA-F0-9]+|[0-9]+);)/', '&\1', $text); + $text = preg_replace('/&(#(?:x[a-fA-F0-9]+|[0-9]+);)/', '&\1', ($text ?? '')); $text = mb_encode_numericentity($text, array(0x0080, 0xffff, 0, 0xffff), 'UTF-8'); @@ -878,7 +878,7 @@ */ public function get_ttf_file($font) { - if ( stripos($font, ".ttf") === false ) { + if ( stripos(($font ?? ''), ".ttf") === false ) { $font .= ".ttf"; } @@ -886,11 +886,11 @@ $font_metrics = $this->_dompdf->getFontMetrics(); $font = $font_metrics->getFont($this->_dompdf->getOptions()->getDefaultFont()) . ".ttf"; if (!file_exists($font)) { - if (strpos($font, "mono")) { + if (strpos(($font ?? ''), "mono")) { $font = $font_metrics->getFont("DejaVu Mono") . ".ttf"; - } elseif (strpos($font, "sans") !== false) { + } elseif (strpos(($font ?? ''), "sans") !== false) { $font = $font_metrics->getFont("DejaVu Sans") . ".ttf"; - } elseif (strpos($font, "serif")) { + } elseif (strpos(($font ?? ''), "serif")) { $font = $font_metrics->getFont("DejaVu Serif") . ".ttf"; } else { $font = $font_metrics->getFont("DejaVu Sans") . ".ttf"; @@ -948,12 +948,12 @@ $this->_page_number++; $this->_page_count++; - $this->_img = imagecreatetruecolor($this->_actual_width, $this->_actual_height); + $this->_img = imagecreatetruecolor((int) ($this->_actual_width), (int) ($this->_actual_height)); $this->_bg_color = $this->_allocate_color($this->_bg_color_array); imagealphablending($this->_img, true); imagesavealpha($this->_img, true); - imagefill($this->_img, 0, 0, $this->_bg_color); + imagefill($this->_img, 0, 0, (int) ($this->_bg_color)); $this->_imgs[] = $this->_img; } @@ -998,7 +998,7 @@ if (!isset($options["type"])) $options["type"] = "png"; if (!isset($options["Attachment"])) $options["Attachment"] = true; - $type = strtolower($options["type"]); + $type = strtolower(($options["type"] ?? '')); switch ($type) { case "jpg": @@ -1016,7 +1016,7 @@ header("Cache-Control: private"); header("Content-Type: $contentType"); - $filename = str_replace(array("\n", "'"), "", basename($filename, ".$type")) . $extension; + $filename = str_replace(array("\n", "'"), "", (basename($filename, ".$type") ?? '')) . $extension; $attachment = $options["Attachment"] ? "attachment" : "inline"; header(Helpers::buildContentDispositionHeader($attachment, $filename)); @@ -1050,7 +1050,7 @@ { if (!isset($options["type"])) $options["type"] = "png"; if (!isset($options["page"])) $options["page"] = 1; - $type = strtolower($options["type"]); + $type = strtolower(($options["type"] ?? '')); if (isset($this->_imgs[$options["page"] - 1])) { $img = $this->_imgs[$options["page"] - 1]; @@ -1062,10 +1062,10 @@ if ($this->_aa_factor != 1) { $dst_w = $this->_actual_width / $this->_aa_factor; $dst_h = $this->_actual_height / $this->_aa_factor; - $dst = imagecreatetruecolor($dst_w, $dst_h); + $dst = imagecreatetruecolor((int) ($dst_w), (int) ($dst_h)); imagecopyresampled($dst, $img, 0, 0, 0, 0, - $dst_w, $dst_h, - $this->_actual_width, $this->_actual_height); + (int) ($dst_w), (int) ($dst_h), + (int) ($this->_actual_width), (int) ($this->_actual_height)); } else { $dst = $img; } @@ -1077,7 +1077,7 @@ $options["quality"] = 75; } - imagejpeg($dst, null, $options["quality"]); + imagejpeg($dst, null, (int) ($options["quality"])); break; case "png": default: --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/PDFLib.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/PDFLib.php @@ -205,7 +205,7 @@ * @param string $orientation The orientation of the document (either 'landscape' or 'portrait') * @param Dompdf $dompdf */ - public function __construct($paper = "letter", $orientation = "portrait", Dompdf $dompdf) + public function __construct($paper, $orientation, Dompdf $dompdf) { if (is_array($paper)) { $size = $paper; @@ -227,7 +227,7 @@ $this->_pdf = new \PDFLib(); $license = $dompdf->getOptions()->getPdflibLicense(); - if (strlen($license) > 0) { + if (strlen(($license ?? '')) > 0) { $this->setPDFLibParameter("license", $license); } @@ -389,9 +389,9 @@ public function add_object($object, $where = 'all') { - if (mb_strpos($where, "next") !== false) { + if (mb_strpos(($where ?? ''), "next") !== false) { $this->_objs[$object]["start_page"]++; - $where = str_replace("next", "", $where); + $where = str_replace("next", "", ($where ?? '')); if ($where == "") { $where = "add"; } @@ -513,18 +513,18 @@ */ protected function _set_line_style($width, $cap, $join, $dash) { - if (count($dash) == 1) { + if (count(($dash ?? [])) == 1) { $dash[] = $dash[0]; } if ($this->getPDFLibMajorVersion() >= 9) { - if (count($dash) > 1) { + if (count(($dash ?? [])) > 1) { $this->_pdf->set_graphics_option("dasharray={" . implode(" ", $dash) . "}"); } else { $this->_pdf->set_graphics_option("dasharray=none"); } } else { - if (count($dash) > 1) { + if (count(($dash ?? [])) > 1) { $this->_pdf->setdashpattern("dasharray={" . implode(" ", $dash) . "}"); } else { $this->_pdf->setdash(0, 0); @@ -752,7 +752,7 @@ // Check if the font is a native PDF font // Embed non-native fonts - $test = strtolower($baseFont); + $test = strtolower(($baseFont ?? '')); if (in_array($test, DOMPDF::$nativeFonts)) { $font = basename($font); } else { @@ -763,7 +763,7 @@ if (is_null($encoding)) { // Unicode encoding is only available for the commerical // version of PDFlib and not PDFlib-Lite - if (strlen($this->_dompdf->getOptions()->getPdflibLicense()) > 0) { + if (strlen(($this->_dompdf->getOptions()->getPdflibLicense() ?? '')) > 0) { $encoding = "unicode"; } else { $encoding = "auto"; @@ -1092,7 +1092,7 @@ $x = array_pop($points); $this->_pdf->moveto($x, $y); - while (count($points) > 1) { + while (count(($points ?? [])) > 1) { $y = $this->y(array_pop($points)); $x = array_pop($points); $this->_pdf->lineto($x, $y); @@ -1199,7 +1199,7 @@ */ public function javascript($code) { - if (strlen($this->_dompdf->getOptions()->getPdflibLicense()) > 0) { + if (strlen(($this->_dompdf->getOptions()->getPdflibLicense() ?? '')) > 0) { $this->_pdf->create_action("JavaScript", $code); } } @@ -1226,12 +1226,12 @@ public function add_link($url, $x, $y, $width, $height) { $y = $this->y($y) - $height; - if (strpos($url, '#') === 0) { + if (strpos(($url ?? ''), '#') === 0) { // Local link - $name = substr($url, 1); + $name = substr(($url ?? ''), 1); if ($name) { $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', - "contents={$url} destname=" . substr($url, 1) . " linewidth=0"); + "contents={$url} destname=" . substr(($url ?? ''), 1) . " linewidth=0"); } } else { list($proto, $host, $path, $file) = Helpers::explode_url($url); @@ -1240,7 +1240,7 @@ return; // Local links are not allowed } $url = Helpers::build_url($proto, $host, $path, $file); - $url = '{' . rawurldecode($url) . '}'; + $url = '{' . rawurldecode(($url ?? '')) . '}'; $action = $this->_pdf->create_action("URI", "url=" . $url); $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0"); @@ -1264,7 +1264,7 @@ $delta = $word_spacing * $num_spaces; if ($letter_spacing) { - $num_chars = mb_strlen($text); + $num_chars = mb_strlen(($text ?? '')); $delta += ($num_chars - $num_spaces) * $letter_spacing; } @@ -1364,7 +1364,7 @@ */ protected function _add_page_text() { - if (!count($this->_page_text)) { + if (!count(($this->_page_text ?? []))) { return; } @@ -1380,7 +1380,7 @@ switch ($_t) { case "text": $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"), - array($p, $this->_page_count), $text); + array($p, $this->_page_count), ($text ?? '')); $this->text($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle); break; @@ -1438,7 +1438,7 @@ if (self::$IN_MEMORY) { $data = $this->_pdf->get_buffer(); - $size = mb_strlen($data, "8bit"); + $size = mb_strlen(($data ?? ''), "8bit"); } else { $size = filesize($this->_file); } @@ -1447,7 +1447,7 @@ header("Content-Type: application/pdf"); header("Content-Length: " . $size); - $filename = str_replace(array("\n", "'"), "", basename($filename, ".pdf")) . ".pdf"; + $filename = str_replace(array("\n", "'"), "", (basename($filename, ".pdf") ?? '')) . ".pdf"; $attachment = $options["Attachment"] ? "attachment" : "inline"; header(Helpers::buildContentDispositionHeader($attachment, $filename)); @@ -1505,7 +1505,7 @@ if (self::$IN_MEMORY) { $data = $this->_pdf->get_buffer(); } else { - $data = file_get_contents($this->_file); + $data = file_get_contents(($this->_file ?? '')); //debugpng if ($this->_dompdf->getOptions()->getDebugPng()) { --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/CPDF.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Adapter/CPDF.php @@ -179,7 +179,7 @@ * @param string $orientation The orientation of the document (either 'landscape' or 'portrait') * @param Dompdf $dompdf The Dompdf instance */ - public function __construct($paper = "letter", $orientation = "portrait", Dompdf $dompdf) + public function __construct($paper, $orientation, Dompdf $dompdf) { if (is_array($paper)) { $size = $paper; @@ -203,7 +203,7 @@ ); $this->_pdf->addInfo("Producer", sprintf("%s + CPDF", $dompdf->version)); - $time = substr_replace(date('YmdHisO'), '\'', -2, 0) . '\''; + $time = substr_replace((date('YmdHisO') ?? ''), '\'', -2, 0) . '\''; $this->_pdf->addInfo("CreationDate", "D:$time"); $this->_pdf->addInfo("ModDate", "D:$time"); @@ -791,11 +791,11 @@ $this->_set_stroke_color($color); // Adjust y values - for ($i = 1; $i < count($points); $i += 2) { + for ($i = 1; $i < count(($points ?? [])); $i += 2) { $points[$i] = $this->y($points[$i]); } - $this->_pdf->polygon($points, count($points) / 2, $fill); + $this->_pdf->polygon($points, count(($points ?? [])) / 2, $fill); $this->_set_fill_transparency("Normal", $this->_current_opacity); $this->_set_line_transparency("Normal", $this->_current_opacity); @@ -962,14 +962,14 @@ { $y = $this->y($y) - $height; - if (strpos($url, '#') === 0) { + if (strpos(($url ?? ''), '#') === 0) { // Local link - $name = substr($url, 1); + $name = substr(($url ?? ''), 1); if ($name) { $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height); } } else { - $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height); + $this->_pdf->addLink(rawurldecode(($url ?? '')), $x, $y, $x + $width, $y + $height); } } @@ -1085,7 +1085,7 @@ */ protected function _add_page_text() { - if (!count($this->_page_text)) { + if (!count(($this->_page_text ?? []))) { return; } @@ -1101,7 +1101,7 @@ switch ($_t) { case "text": $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"), - array($page_number, $this->_page_count), $text); + array($page_number, $this->_page_count), ($text ?? '')); $this->text($x, $y, $text, $font, $size, $color, $word_space, $char_space, $angle); break; @@ -1141,13 +1141,13 @@ $this->_add_page_text(); $debug = !$options['compress']; - $tmp = ltrim($this->_pdf->output($debug)); + $tmp = ltrim(($this->_pdf->output($debug) ?? '')); header("Cache-Control: private"); header("Content-Type: application/pdf"); - header("Content-Length: " . mb_strlen($tmp, "8bit")); - - $filename = str_replace(array("\n", "'"), "", basename($filename, ".pdf")) . ".pdf"; + header("Content-Length: " . mb_strlen(($tmp ?? ''), "8bit")); + + $filename = str_replace(array("\n", "'"), "", (basename($filename, ".pdf") ?? '')) . ".pdf"; $attachment = $options["Attachment"] ? "attachment" : "inline"; header(Helpers::buildContentDispositionHeader($attachment, $filename)); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Image.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Image.php @@ -115,9 +115,9 @@ } if ($msg = $frame->get_image_msg()) { - $parts = preg_split("/\s*\n\s*/", $msg); + $parts = preg_split("/\s*\n\s*/", ($msg ?? '')); $height = 10; - $_y = $alt ? $y + $h - count($parts) * $height : $y; + $_y = $alt ? $y + $h - count(($parts ?? [])) * $height : $y; foreach ($parts as $i => $_part) { $this->_canvas->text($x, $_y + $i * $height, $_part, "times", $height * 0.8, array(0.5, 0.5, 0.5)); @@ -132,7 +132,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/TableRowGroup.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/TableRowGroup.php @@ -43,7 +43,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Inline.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Inline.php @@ -182,7 +182,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Text.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Text.php @@ -46,7 +46,7 @@ function render(Frame $frame) { $text = $frame->get_text(); - if (trim($text) === "") { + if (trim(($text ?? '')) === "") { return; } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/TableCell.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/TableCell.php @@ -25,7 +25,7 @@ { $style = $frame->get_style(); - if (trim($frame->get_node()->nodeValue) === "" && $style->empty_cells === "hide") { + if (trim(($frame->get_node()->nodeValue ?? '')) === "" && $style->empty_cells === "hide") { return; } @@ -172,7 +172,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/AbstractRenderer.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/AbstractRenderer.php @@ -251,9 +251,9 @@ $bg = null; } else { // Create a new image to fit over the background rectangle - $bg = imagecreatetruecolor($bg_width, $bg_height); - - switch (strtolower($type)) { + $bg = imagecreatetruecolor((int) ($bg_width), (int) ($bg_height)); + + switch (strtolower(($type ?? ''))) { case "png": $is_png = true; imagesavealpha($bg, true); @@ -289,9 +289,9 @@ $ti = imagecolortransparent($src); if ($ti >= 0) { - $tc = imagecolorsforindex($src, $ti); - $ti = imagecolorallocate($bg, $tc['red'], $tc['green'], $tc['blue']); - imagefill($bg, 0, 0, $ti); + $tc = imagecolorsforindex($src, (int) ($ti)); + $ti = imagecolorallocate($bg, (int) ($tc['red']), (int) ($tc['green']), (int) ($tc['blue'])); + imagefill($bg, 0, 0, (int) ($ti)); imagecolortransparent($bg, $ti); } @@ -321,7 +321,7 @@ // Copy regions from the source image to the background if ($repeat === "no-repeat") { // Simply place the image on the background - imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h); + imagecopy($bg, $src, (int) ($dst_x), (int) ($dst_y), (int) ($src_x), (int) ($src_y), (int) ($img_w), (int) ($img_h)); } else if ($repeat === "repeat-x") { for ($bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w) { @@ -334,7 +334,7 @@ $src_x = 0; $w = $img_w; } - imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $img_h); + imagecopy($bg, $src, (int) ($dst_x), (int) ($dst_y), (int) ($src_x), (int) ($src_y), (int) ($w), (int) ($img_h)); } } else if ($repeat === "repeat-y") { @@ -348,7 +348,7 @@ $src_y = 0; $h = $img_h; } - imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $h); + imagecopy($bg, $src, (int) ($dst_x), (int) ($dst_y), (int) ($src_x), (int) ($src_y), (int) ($img_w), (int) ($h)); } } else if ($repeat === "repeat") { for ($bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h) { @@ -372,7 +372,7 @@ $src_y = 0; $h = $img_h; } - imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $h); + imagecopy($bg, $src, (int) ($dst_x), (int) ($dst_y), (int) ($src_x), (int) ($src_y), (int) ($w), (int) ($h)); } } } else { @@ -824,7 +824,7 @@ * * @var $top */ - protected function _border_line($x, $y, $length, $color, $widths, $side, $corner_style = "bevel", $pattern_name, $r1 = 0, $r2 = 0) + protected function _border_line($x, $y, $length, $color, $widths, $side, $corner_style, $pattern_name, $r1 = 0, $r2 = 0) { /** used by $$side */ list($top, $right, $bottom, $left) = $widths; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Block.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/Block.php @@ -83,7 +83,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/ListBullet.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Renderer/ListBullet.php @@ -68,7 +68,7 @@ } if ($uppercase) { - $text = strtoupper($text); + $text = strtoupper(($text ?? '')); } return $cache[$type] = "$text."; @@ -92,7 +92,7 @@ case "decimal": case "1": if ($pad) { - $text = str_pad($n, $pad, "0", STR_PAD_LEFT); + $text = str_pad(($n ?? ''), $pad, "0", STR_PAD_LEFT); } else { $text = $n; } @@ -105,7 +105,7 @@ case "lower-alpha": case "lower-latin": case "a": - $text = chr(($n % 26) + ord('a') - 1); + $text = chr((int) (($n % 26) + ord('a') - 1)); break; case "upper-roman": @@ -122,7 +122,7 @@ } if ($uppercase) { - $text = strtoupper($text); + $text = strtoupper(($text ?? '')); } return "$text."; @@ -159,8 +159,8 @@ //$h = $frame->get_height(); list($width, $height) = Helpers::dompdf_getimagesize($img, $this->_dompdf->getHttpContext()); $dpi = $this->_dompdf->getOptions()->getDpi(); - $w = ((float)rtrim($width, "px") * 72) / $dpi; - $h = ((float)rtrim($height, "px") * 72) / $dpi; + $w = ((float)rtrim(($width ?? ''), "px") * 72) / $dpi; + $h = ((float)rtrim(($height ?? ''), "px") * 72) / $dpi; $x -= $w; $y -= ($line_height - $font_size) / 2; //Reverse hinting of list_bullet_positioner @@ -210,7 +210,7 @@ case "I": $pad = null; if ($bullet_style === "decimal-leading-zero") { - $pad = strlen($li->get_parent()->get_node()->getAttribute("dompdf-children-count")); + $pad = strlen(($li->get_parent()->get_node()->getAttribute("dompdf-children-count") ?? '')); } $node = $frame->get_node(); @@ -222,7 +222,7 @@ $index = $node->getAttribute("dompdf-counter"); $text = $this->make_counter($index, $bullet_style, $pad); - if (trim($text) == "") { + if (trim(($text ?? '')) == "") { return; } @@ -248,7 +248,7 @@ } $id = $frame->get_node()->getAttribute("id"); - if (strlen($id) > 0) { + if (strlen(($id ?? '')) > 0) { $this->_canvas->add_named_dest($id); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Style.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Style.php @@ -564,60 +564,60 @@ continue; } - if (($i = mb_strpos($l, "px")) !== false) { + if (($i = mb_strpos(($l ?? ''), "px")) !== false) { $dpi = $this->_stylesheet->get_dompdf()->getOptions()->getDpi(); - $ret += ((float)mb_substr($l, 0, $i) * 72) / $dpi; + $ret += ((float)mb_substr(($l ?? ''), 0, $i) * 72) / $dpi; continue; } - if (($i = mb_strpos($l, "pt")) !== false) { - $ret += (float)mb_substr($l, 0, $i); + if (($i = mb_strpos(($l ?? ''), "pt")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i); continue; } - if (($i = mb_strpos($l, "%")) !== false) { - $ret += (float)mb_substr($l, 0, $i) / 100 * (float)$ref_size; + if (($i = mb_strpos(($l ?? ''), "%")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) / 100 * (float)$ref_size; continue; } - if (($i = mb_strpos($l, "rem")) !== false) { + if (($i = mb_strpos(($l ?? ''), "rem")) !== false) { if ($this->_stylesheet->get_dompdf()->getTree()->get_root()->get_style() === null) { // Interpreting it as "em", see https://github.com/dompdf/dompdf/issues/1406 - $ret += (float)mb_substr($l, 0, $i) * $this->__get("font_size"); + $ret += (float)mb_substr(($l ?? ''), 0, $i) * $this->__get("font_size"); } else { - $ret += (float)mb_substr($l, 0, $i) * $this->_stylesheet->get_dompdf()->getTree()->get_root()->get_style()->font_size; + $ret += (float)mb_substr(($l ?? ''), 0, $i) * $this->_stylesheet->get_dompdf()->getTree()->get_root()->get_style()->font_size; } continue; } - if (($i = mb_strpos($l, "em")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * $this->__get("font_size"); + if (($i = mb_strpos(($l ?? ''), "em")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * $this->__get("font_size"); continue; } - if (($i = mb_strpos($l, "cm")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * 72 / 2.54; + if (($i = mb_strpos(($l ?? ''), "cm")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * 72 / 2.54; continue; } - if (($i = mb_strpos($l, "mm")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * 72 / 25.4; + if (($i = mb_strpos(($l ?? ''), "mm")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * 72 / 25.4; continue; } // FIXME: em:ex ratio? - if (($i = mb_strpos($l, "ex")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * $this->__get("font_size") / 2; + if (($i = mb_strpos(($l ?? ''), "ex")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * $this->__get("font_size") / 2; continue; } - if (($i = mb_strpos($l, "in")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * 72; + if (($i = mb_strpos(($l ?? ''), "in")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * 72; continue; } - if (($i = mb_strpos($l, "pc")) !== false) { - $ret += (float)mb_substr($l, 0, $i) * 12; + if (($i = mb_strpos(($l ?? ''), "pc")) !== false) { + $ret += (float)mb_substr(($l ?? ''), 0, $i) * 12; continue; } @@ -709,7 +709,7 @@ // Clear out "inherit" shorthand properties if specific properties have been set $shorthands = array_filter($shorthand_properties, function($el) use ($prop) { - return ( strpos($prop, $el."_") !== false ); + return ( strpos(($prop ?? ''), $el."_") !== false ); }); foreach ($shorthands as $shorthand) { if (array_key_exists($shorthand, $this->_props) && $this->_props[$shorthand] === "inherit") { @@ -744,7 +744,7 @@ */ function important_set($prop) { - $prop = str_replace("-", "_", $prop); + $prop = str_replace("-", "_", ($prop ?? '')); $this->_important_props[$prop] = true; } @@ -786,7 +786,7 @@ */ function __set($prop, $val) { - $prop = str_replace("-", "_", $prop); + $prop = str_replace("-", "_", ($prop ?? '')); $this->_prop_cache[$prop] = null; if (!isset(self::$_defaults[$prop])) { @@ -795,9 +795,9 @@ return; } - if ($prop !== "content" && is_string($val) && strlen($val) > 5 && mb_strpos($val, "url") === false) { - $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val))); - $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val); + if ($prop !== "content" && is_string($val) && strlen(($val ?? '')) > 5 && mb_strpos(($val ?? ''), "url") === false) { + $val = mb_strtolower(trim((str_replace(array("\n", "\t"), array(" "), ($val ?? '')) ?? ''))); + $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", ($val ?? '')); } $method = "set_$prop"; @@ -903,7 +903,7 @@ */ function get_font_family_raw() { - return trim($this->_props["font_family"], " \t\n\r\x0B\"'"); + return trim(($this->_props["font_family"] ?? ''), " \t\n\r\x0B\"'"); } /** @@ -961,13 +961,13 @@ print '(' . $this->_props["font_family"] . '.' . $font_style . '.' . $this->__get("font_weight") . '.' . $weight . '.' . $subtype . ')'; } - $families = preg_split("/\s*,\s*/", $this->_props["font_family"]); + $families = preg_split("/\s*,\s*/", ($this->_props["font_family"] ?? '')); $font = null; foreach ($families as $family) { //remove leading and trailing string delimiters, e.g. on font names with spaces; //remove leading and trailing whitespace - $family = trim($family, " \t\n\r\x0B\"'"); + $family = trim(($family ?? ''), " \t\n\r\x0B\"'"); if ($DEBUGCSS) { print '(' . $family . ')'; } @@ -1045,10 +1045,10 @@ } // Ensure relative sizes resolve to something - if (($i = mb_strpos($fs, "em")) !== false) { - $fs = (float)mb_substr($fs, 0, $i) * $this->_parent_font_size; - } else if (($i = mb_strpos($fs, "ex")) !== false) { - $fs = (float)mb_substr($fs, 0, $i) * $this->_parent_font_size; + if (($i = mb_strpos(($fs ?? ''), "em")) !== false) { + $fs = (float)mb_substr(($fs ?? ''), 0, $i) * $this->_parent_font_size; + } else if (($i = mb_strpos(($fs ?? ''), "ex")) !== false) { + $fs = (float)mb_substr(($fs ?? ''), 0, $i) * $this->_parent_font_size; } else { $fs = (float)$this->length_in_pt($fs); } @@ -1147,7 +1147,7 @@ */ function get_background_position() { - $tmp = explode(" ", $this->_props["background_position"]); + $tmp = explode(" ", ($this->_props["background_position"] ?? '')); switch ($tmp[0]) { case "left": @@ -1572,8 +1572,8 @@ */ function get_border_spacing() { - $arr = explode(" ", $this->_props["border_spacing"]); - if (count($arr) == 1) { + $arr = explode(" ", ($this->_props["border_spacing"] ?? '')); + if (count(($arr ?? [])) == 1) { $arr[1] = $arr[0]; } return $arr; @@ -1678,10 +1678,10 @@ */ protected function _set_style_type($style, $type, $val, $important) { - $val = preg_replace("/\s*\,\s*/", ",", $val); // when rgb() has spaces - $arr = explode(" ", $val); - - switch (count($arr)) { + $val = preg_replace("/\s*\,\s*/", ",", ($val ?? '')); // when rgb() has spaces + $arr = explode(" ", ($val ?? '')); + + switch (count(($arr ?? []))) { case 1: $this->_set_style_sides_type($style, $arr[0], $arr[0], $arr[0], $arr[0], $type, $important); break; @@ -1726,7 +1726,7 @@ } //see __set and __get, on all assignments clear cache! $this->_prop_cache[$style . '_' . $side] = null; - $this->_props[$style . '_' . $side] = str_replace("none", "0px", $val); + $this->_props[$style . '_' . $side] = str_replace("none", "0px", ($val ?? '')); } /** @@ -1755,10 +1755,10 @@ $DEBUGCSS = $this->_stylesheet->get_dompdf()->getOptions()->getDebugCss(); $parsed_url = "none"; - if (mb_strpos($val, "url") === false) { + if (mb_strpos(($val ?? ''), "url") === false) { $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none } else { - $val = preg_replace("/url\(\s*['\"]?([^'\")]+)['\"]?\s*\)/", "\\1", trim($val)); + $val = preg_replace("/url\(\s*['\"]?([^'\")]+)['\"]?\s*\)/", "\\1", (trim(($val ?? '')) ?? '')); // Resolve the url now in the context of the current stylesheet $parsed_url = Helpers::explode_url($val); @@ -1908,7 +1908,7 @@ */ function set_background($val) { - $val = trim($val); + $val = trim(($val ?? '')); $important = isset($this->_important_props["background"]); if ($val === "none") { @@ -1916,11 +1916,11 @@ $this->_set_style("background_color", "transparent", $important); } else { $pos = array(); - $tmp = preg_replace("/\s*\,\s*/", ",", $val); // when rgb() has spaces - $tmp = preg_split("/\s+/", $tmp); + $tmp = preg_replace("/\s*\,\s*/", ",", ($val ?? '')); // when rgb() has spaces + $tmp = preg_split("/\s+/", ($tmp ?? '')); foreach ($tmp as $attr) { - if (mb_substr($attr, 0, 3) === "url" || $attr === "none") { + if (mb_substr(($attr ?? ''), 0, 3) === "url" || $attr === "none") { $this->_set_style("background_image", $this->_image($attr), $important); } elseif ($attr === "fixed" || $attr === "scroll") { $this->_set_style("background_attachment", $attr, $important); @@ -1933,7 +1933,7 @@ } } - if (count($pos)) { + if (count(($pos ?? []))) { $this->_set_style("background_position", implode(" ", $pos), $important); } } @@ -1992,14 +1992,14 @@ $important = isset($this->_important_props["font"]); - if (preg_match("/^(italic|oblique|normal)\s*(.*)$/i", $val, $match)) { + if (preg_match("/^(italic|oblique|normal)\s*(.*)$/i", ($val ?? ''), $match)) { $this->_set_style("font_style", $match[1], $important); $val = $match[2]; } else { $this->_set_style("font_style", self::$_defaults["font_style"], $important); } - if (preg_match("/^(small-caps|normal)\s*(.*)$/i", $val, $match)) { + if (preg_match("/^(small-caps|normal)\s*(.*)$/i", ($val ?? ''), $match)) { $this->_set_style("font_variant", $match[1], $important); $val = $match[2]; } else { @@ -2007,8 +2007,8 @@ } //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip! - if (preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i", $val, $match) && - !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/", $match[2]) + if (preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i", ($val ?? ''), $match) && + !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/", ($match[2] ?? '')) ) { $this->_set_style("font_weight", $match[1], $important); $val = $match[2]; @@ -2016,10 +2016,10 @@ $this->_set_style("font_weight", self::$_defaults["font_weight"], $important); } - if (preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))(?:\/|\s*)(.*)$/i", $val, $match)) { + if (preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))(?:\/|\s*)(.*)$/i", ($val ?? ''), $match)) { $this->_set_style("font_size", $match[1], $important); $val = $match[2]; - if (preg_match("/^(?:\/|\s*)(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%)?)\s*(.*)$/i", $val, $match)) { + if (preg_match("/^(?:\/|\s*)(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%)?)\s*(.*)$/i", ($val ?? ''), $match)) { $this->_set_style("line_height", $match[1], $important); $val = $match[2]; } else { @@ -2030,7 +2030,7 @@ $this->_set_style("line_height", self::$_defaults["line_height"], $important); } - if (strlen($val) != 0) { + if (strlen(($val ?? '')) != 0) { $this->_set_style("font_family", $val, $important); } else { $this->_set_style("font_family", self::$_defaults["font_family"], $important); @@ -2108,7 +2108,7 @@ */ function set_margin($val) { - $val = str_replace("none", "0px", $val); + $val = str_replace("none", "0px", ($val ?? '')); $this->_set_style_type_important('margin', '', $val); } @@ -2152,7 +2152,7 @@ */ function set_padding($val) { - $val = str_replace("none", "0px", $val); + $val = str_replace("none", "0px", ($val ?? '')); $this->_set_style_type_important('padding', '', $val); } /**#@-*/ @@ -2166,9 +2166,9 @@ */ protected function _set_border($side, $border_spec, $important) { - $border_spec = preg_replace("/\s*\,\s*/", ",", $border_spec); + $border_spec = preg_replace("/\s*\,\s*/", ",", ($border_spec ?? '')); //$border_spec = str_replace(",", " ", $border_spec); // Why did we have this ?? rbg(10, 102, 10) > rgb(10 102 10) - $arr = explode(" ", $border_spec); + $arr = explode(" ", ($border_spec ?? '')); // FIXME: handle partial values @@ -2179,10 +2179,10 @@ $this->_set_style_side_type('border', $side, '_color', self::$_defaults['border_' . $side . '_color'], $important); foreach ($arr as $value) { - $value = trim($value); + $value = trim(($value ?? '')); if (in_array($value, self::$BORDER_STYLES)) { $this->_set_style_side_type('border', $side, '_style', $value, $important); - } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value)) { + } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", ($value ?? ''))) { $this->_set_style_side_type('border', $side, '_width', $value, $important); } else { // must be color @@ -2310,10 +2310,10 @@ */ function set_border_radius($val) { - $val = preg_replace("/\s*\,\s*/", ",", $val); // when border-radius has spaces - $arr = explode(" ", $val); - - switch (count($arr)) { + $val = preg_replace("/\s*\,\s*/", ",", ($val ?? '')); // when border-radius has spaces + $arr = explode(" ", ($val ?? '')); + + switch (count(($arr ?? []))) { case 1: $this->_set_border_radii($arr[0], $arr[0], $arr[0], $arr[0]); break; @@ -2431,14 +2431,14 @@ } } - $val = preg_replace("/\s*\,\s*/", ",", $val); // when rgb() has spaces - $arr = explode(" ", $val); + $val = preg_replace("/\s*\,\s*/", ",", ($val ?? '')); // when rgb() has spaces + $arr = explode(" ", ($val ?? '')); foreach ($arr as $value) { - $value = trim($value); + $value = trim(($value ?? '')); if (in_array($value, self::$BORDER_STYLES)) { $this->set_outline_style($value); - } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value)) { + } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", ($value ?? ''))) { $this->set_outline_width($value); } else { // must be color @@ -2483,9 +2483,9 @@ */ function set_border_spacing($val) { - $arr = explode(" ", $val); - - if (count($arr) == 1) { + $arr = explode(" ", ($val ?? '')); + + if (count(($arr ?? [])) == 1) { $arr[1] = $arr[0]; } @@ -2516,7 +2516,7 @@ function set_list_style($val) { $important = isset($this->_important_props["list_style"]); - $arr = explode(" ", str_replace(",", " ", $val)); + $arr = explode(" ", (str_replace(",", " ", ($val ?? '')) ?? '')); static $types = array( "disc", "circle", "square", @@ -2547,7 +2547,7 @@ //Firefox is wrong here (list_style_image gets overwritten on explicit list_style_type) //Internet Explorer 7/8 and dompdf is right. - if (mb_substr($value, 0, 3) === "url") { + if (mb_substr(($value ?? ''), 0, 3) === "url") { $this->_set_style("list_style_image", $this->_image($value), $important); continue; } @@ -2577,13 +2577,13 @@ return; } - $parts = preg_split("/\s+/", $val); + $parts = preg_split("/\s+/", ($val ?? '')); $computed = array(); - if (preg_match($length_re, $parts[0])) { + if (preg_match(($length_re ?? ''), ($parts[0] ?? ''))) { $computed[] = $this->length_in_pt($parts[0]); - if (isset($parts[1]) && preg_match($length_re, $parts[1])) { + if (isset($parts[1]) && preg_match(($length_re ?? ''), ($parts[1] ?? ''))) { $computed[] = $this->length_in_pt($parts[1]); } else { $computed[] = $computed[0]; @@ -2617,7 +2617,7 @@ $tr_value = "\s*([^,\s]+)\s*"; $angle = "\s*([^,\s]+(?:deg|rad)?)\s*"; - if (!preg_match_all("/[a-z]+\([^\)]+\)/i", $this->_props["transform"], $parts, PREG_SET_ORDER)) { + if (!preg_match_all("/[a-z]+\([^\)]+\)/i", ($this->_props["transform"] ?? ''), $parts, PREG_SET_ORDER)) { return null; } @@ -2645,7 +2645,7 @@ $t = $part[0]; foreach ($functions as $name => $pattern) { - if (preg_match("/$name\s*$pattern/i", $t, $matches)) { + if (preg_match("/$name\s*$pattern/i", ($t ?? ''), $matches)) { $values = array_slice($matches, 1); switch ($name) { @@ -2656,7 +2656,7 @@ case "skewY": foreach ($values as $i => $value) { - if (strpos($value, "rad")) { + if (strpos(($value ?? ''), "rad")) { $values[$i] = rad2deg(floatval($value)); } else { $values[$i] = floatval($value); @@ -2776,10 +2776,10 @@ * @return mixed[] */ function get_transform_origin() { - $values = preg_split("/\s+/", $this->_props['transform_origin']); - - if (count($values) === 0) { - $values = preg_split("/\s+/", self::$_defaults["transform_origin"]); + $values = preg_split("/\s+/", ($this->_props['transform_origin'] ?? '')); + + if (count(($values ?? [])) === 0) { + $values = preg_split("/\s+/", (self::$_defaults["transform_origin"] ?? '')); } $values = array_map(function($value) { @@ -2810,7 +2810,7 @@ $re = '/^\s*(\d+|normal|auto)\s*$/'; - if (!preg_match($re, $val, $matches)) { + if (!preg_match(($re ?? ''), ($val ?? ''), $matches)) { return null; } @@ -2877,13 +2877,13 @@ */ function set_counter_increment($val) { - $val = trim($val); + $val = trim(($val ?? '')); $value = null; if (in_array($val, array("none", "inherit"))) { $value = $val; } else { - if (preg_match_all("/(" . self::CSS_IDENTIFIER . ")(?:\s+(" . self::CSS_INTEGER . "))?/", $val, $matches, PREG_SET_ORDER)) { + if (preg_match_all("/(" . self::CSS_IDENTIFIER . ")(?:\s+(" . self::CSS_INTEGER . "))?/", ($val ?? ''), $matches, PREG_SET_ORDER)) { $value = array(); foreach ($matches as $match) { $value[$match[1]] = isset($match[2]) ? $match[2] : 1; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Color.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Color.php @@ -178,7 +178,7 @@ static $cache = array(); - $color = strtolower($color); + $color = strtolower(($color ?? '')); if (isset($cache[$color])) { return $cache[$color]; @@ -192,7 +192,7 @@ return $cache[$color] = self::getArray(self::$cssColorNames[$color]); } - $length = mb_strlen($color); + $length = mb_strlen(($color ?? '')); // #rgb format if ($length == 4 && $color[0] === "#") { @@ -203,40 +203,40 @@ return $cache[$color] = self::getArray($color[1] . $color[1] . $color[2] . $color[2] . $color[3] . $color[3], $alpha); } // #rrggbb format else if ($length == 7 && $color[0] === "#") { - return $cache[$color] = self::getArray(mb_substr($color, 1, 6)); + return $cache[$color] = self::getArray(mb_substr(($color ?? ''), 1, 6)); } // #rrggbbaa format else if ($length == 9 && $color[0] === "#") { - $alpha = round(hexdec(mb_substr($color, 7, 2))/255, 2); - return $cache[$color] = self::getArray(mb_substr($color, 1, 8), $alpha); + $alpha = round(hexdec(mb_substr(($color ?? ''), 7, 2))/255, 2); + return $cache[$color] = self::getArray(mb_substr(($color ?? ''), 1, 8), $alpha); } // rgb( r,g,b ) / rgba( r,g,b,α ) format - else if (mb_strpos($color, "rgb") !== false) { - $i = mb_strpos($color, "("); - $j = mb_strpos($color, ")"); + else if (mb_strpos(($color ?? ''), "rgb") !== false) { + $i = mb_strpos(($color ?? ''), "("); + $j = mb_strpos(($color ?? ''), ")"); // Bad color value if ($i === false || $j === false) { return null; } - $triplet = explode(",", mb_substr($color, $i + 1, $j - $i - 1)); + $triplet = explode(",", (mb_substr(($color ?? ''), $i + 1, $j - $i - 1) ?? '')); // alpha transparency // FIXME: not currently using transparency $alpha = 1.0; - if (count($triplet) == 4) { - $alpha = (float)(trim(array_pop($triplet))); + if (count(($triplet ?? [])) == 4) { + $alpha = (float)(trim((array_pop($triplet) ?? ''))); // bad value, set to fully opaque if ($alpha > 1.0 || $alpha < 0.0) { $alpha = 1.0; } } - if (count($triplet) != 3) { + if (count(($triplet ?? [])) != 3) { return null; } foreach (array_keys($triplet) as $c) { - $triplet[$c] = trim($triplet[$c]); + $triplet[$c] = trim(($triplet[$c] ?? '')); if (Helpers::is_percent($triplet[$c])) { $triplet[$c] = round((float)$triplet[$c] * 2.55); @@ -249,23 +249,23 @@ // cmyk( c,m,y,k ) format // http://www.w3.org/TR/css3-gcpm/#cmyk-colors - else if (mb_strpos($color, "cmyk") !== false) { - $i = mb_strpos($color, "("); - $j = mb_strpos($color, ")"); + else if (mb_strpos(($color ?? ''), "cmyk") !== false) { + $i = mb_strpos(($color ?? ''), "("); + $j = mb_strpos(($color ?? ''), ")"); // Bad color value if ($i === false || $j === false) { return null; } - $values = explode(",", mb_substr($color, $i + 1, $j - $i - 1)); - - if (count($values) != 4) { + $values = explode(",", (mb_substr(($color ?? ''), $i + 1, $j - $i - 1) ?? '')); + + if (count(($values ?? [])) != 4) { return null; } $values = array_map(function($c) { - return min(1.0, max(0.0, floatval(trim($c)))); + return min(1.0, max(0.0, floatval(trim(($c ?? ''))))); }, $values); return $cache[$color] = self::getArray($values); @@ -292,14 +292,14 @@ $c["alpha"] = $alpha; $c["hex"] = "cmyk($c[0],$c[1],$c[2],$c[3])"; } else { - $c[0] = hexdec(mb_substr($color, 0, 2)) / 0xff; - $c[1] = hexdec(mb_substr($color, 2, 2)) / 0xff; - $c[2] = hexdec(mb_substr($color, 4, 2)) / 0xff; + $c[0] = hexdec(mb_substr(($color ?? ''), 0, 2)) / 0xff; + $c[1] = hexdec(mb_substr(($color ?? ''), 2, 2)) / 0xff; + $c[2] = hexdec(mb_substr(($color ?? ''), 4, 2)) / 0xff; $c["r"] = $c[0]; $c["g"] = $c[1]; $c["b"] = $c[2]; $c["alpha"] = $alpha; - $c["hex"] = sprintf("#%s%02X", mb_substr($color, 0, 6), round($alpha * 255)); + $c["hex"] = sprintf("#%s%02X", mb_substr(($color ?? ''), 0, 6), round($alpha * 255)); } return $c; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/AttributeTranslator.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/AttributeTranslator.php @@ -220,7 +220,7 @@ $valid_attrs = self::$__ATTRIBUTE_LOOKUP[$tag]; $attrs = $node->attributes; - $style = rtrim($node->getAttribute(self::$_style_attr), "; "); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), "; "); if ($style != "") { $style .= ";"; } @@ -246,7 +246,7 @@ } if (!is_null($style)) { - $style = ltrim($style); + $style = ltrim(($style ?? '')); $node->setAttribute(self::$_style_attr, $style); } @@ -263,7 +263,7 @@ { if ($target[0] === "!") { // Function call - $func = "_" . mb_substr($target, 1); + $func = "_" . mb_substr(($target ?? ''), 1); return self::$func($node, $value); } @@ -277,9 +277,9 @@ */ static function append_style(\DOMElement $node, $new_style) { - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); $style .= $new_style; - $style = ltrim($style, ";"); + $style = ltrim(($style ?? ''), ";"); $node->setAttribute(self::$_style_attr, $style); } @@ -319,7 +319,7 @@ */ static protected function _get_valid_color($value) { - if (preg_match('/^#?([0-9A-F]{6})$/i', $value, $matches)) { + if (preg_match('/^#?([0-9A-F]{6})$/i', ($value ?? ''), $matches)) { $value = "#$matches[1]"; } @@ -380,16 +380,16 @@ $cell_list = self::get_cell_list($node); foreach ($cell_list as $cell) { - $style = rtrim($cell->getAttribute(self::$_style_attr)); + $style = rtrim(($cell->getAttribute(self::$_style_attr) ?? '')); $style .= "; border-width: " . ($value > 0 ? 1 : 0) . "pt; border-style: inset;"; - $style = ltrim($style, ";"); + $style = ltrim(($style ?? ''), ";"); $cell->setAttribute(self::$_style_attr, $style); } - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); $style .= "; border-width: $value" . "px; "; - return ltrim($style, "; "); + return ltrim(($style ?? ''), "; "); } /** @@ -400,7 +400,7 @@ */ static protected function _set_table_cellspacing(\DOMElement $node, $value) { - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); if ($value == 0) { $style .= "; border-collapse: collapse;"; @@ -408,7 +408,7 @@ $style .= "; border-spacing: {$value}px; border-collapse: separate;"; } - return ltrim($style, ";"); + return ltrim(($style ?? ''), ";"); } /** @@ -455,10 +455,10 @@ $cell->setAttribute(self::$_style_attr, $style); } - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); $style .= "; border-collapse: collapse; "; - return ltrim($style, "; "); + return ltrim(($style ?? ''), "; "); } /** @@ -469,10 +469,10 @@ */ static protected function _set_hr_size(\DOMElement $node, $value) { - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); $style .= "; border-width: " . max(0, $value - 2) . "; "; - return ltrim($style, "; "); + return ltrim(($style ?? ''), "; "); } /** @@ -483,14 +483,14 @@ */ static protected function _set_hr_align(\DOMElement $node, $value) { - $style = rtrim($node->getAttribute(self::$_style_attr), ";"); + $style = rtrim(($node->getAttribute(self::$_style_attr) ?? ''), ";"); $width = $node->getAttribute("width"); if ($width == "") { $width = "100%"; } - $remainder = 100 - (double)rtrim($width, "% "); + $remainder = 100 - (double)rtrim(($width ?? ''), "% "); switch ($value) { case "left": @@ -509,7 +509,7 @@ return null; } - return ltrim($style, "; "); + return ltrim(($style ?? ''), "; "); } /** @@ -522,7 +522,7 @@ { if (empty($value)) { return null; } - if ($node->hasAttribute("type") && in_array(strtolower($node->getAttribute("type")), array("text","password"))) { + if ($node->hasAttribute("type") && in_array(strtolower(($node->getAttribute("type") ?? '')), array("text","password"))) { return sprintf("width: %Fem", (((int)$value * .65)+2)); } else { return sprintf("width: %upx;", (int)$value); @@ -634,6 +634,6 @@ $style .= "; font-size: $value;"; } - return ltrim($style, "; "); + return ltrim(($style ?? ''), "; "); } } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Stylesheet.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Css/Stylesheet.php @@ -349,7 +349,7 @@ $this->_loaded_files[$file] = true; - if (strpos($file, "data:") === 0) { + if (strpos(($file ?? ''), "data:") === 0) { $parsed = Helpers::parse_data_uri($file); $css = $parsed["data"]; } else { @@ -371,7 +371,7 @@ // See http://the-stickman.com/web-development/php/getting-http-response-headers-when-using-file_get_contents/ if (isset($http_response_header) && !$this->_dompdf->getQuirksmode()) { foreach ($http_response_header as $_header) { - if (preg_match("@Content-Type:\s*([\w/]+)@i", $_header, $matches) && + if (preg_match("@Content-Type:\s*([\w/]+)@i", ($_header ?? ''), $matches) && ($matches[1] !== "text/css") ) { $good_mime_type = false; @@ -482,7 +482,7 @@ } $tok = ""; - $len = mb_strlen($selector); + $len = mb_strlen(($selector ?? '')); $i = 0; while ($i < $len) { @@ -530,12 +530,12 @@ // the current token $expr = $s === " " ? "descendant" : "child"; - if (mb_substr($query, -1, 1) !== "/") { + if (mb_substr(($query ?? ''), -1, 1) !== "/") { $query .= "/"; } // Tag names are case-insensitive - $tok = strtolower($tok); + $tok = strtolower(($tok ?? '')); if (!$tok) { $tok = "*"; @@ -553,7 +553,7 @@ $attr = $s === "." ? "class" : "id"; // empty class/id == * - if (mb_substr($query, -1, 1) === "/") { + if (mb_substr(($query ?? ''), -1, 1) === "/") { $query .= "*"; } @@ -571,7 +571,7 @@ case "+": // All sibling elements that follow the current token - if (mb_substr($query, -1, 1) !== "/") { + if (mb_substr(($query ?? ''), -1, 1) !== "/") { $query .= "/"; } @@ -580,8 +580,8 @@ break; case ":": - $i2 = $i - strlen($tok) - 2; // the char before ":" - if (($i2 < 0 || !isset($selector[$i2]) || (in_array($selector[$i2], $delimiters) && $selector[$i2] != ":")) && substr($query, -1) != "*") { + $i2 = $i - strlen(($tok ?? '')) - 2; // the char before ":" + if (($i2 < 0 || !isset($selector[$i2]) || (in_array($selector[$i2], $delimiters) && $selector[$i2] != ":")) && substr(($query ?? ''), -1) != "*") { $query .= "*"; } @@ -616,17 +616,17 @@ $last = true; case "nth-of-type": //FIXME: this fix-up is pretty ugly, would parsing the selector in reverse work better generally? - $descendant_delimeter = strrpos($query, "::"); - $isChild = substr($query, $descendant_delimeter-5, 5) == "child"; - $el = substr($query, $descendant_delimeter+2); - $query = substr($query, 0, strrpos($query, "/")) . ($isChild ? "/" : "//") . $el; + $descendant_delimeter = strrpos(($query ?? ''), "::"); + $isChild = substr(($query ?? ''), $descendant_delimeter-5, 5) == "child"; + $el = substr(($query ?? ''), $descendant_delimeter+2); + $query = substr(($query ?? ''), 0, strrpos(($query ?? ''), "/")) . ($isChild ? "/" : "//") . $el; $pseudo_classes[$tok] = true; $p = $i + 1; - $nth = trim(mb_substr($selector, $p, strpos($selector, ")", $i) - $p)); + $nth = trim((mb_substr(($selector ?? ''), $p, strpos(($selector ?? ''), ")", $i) - $p) ?? '')); // 1 - if (preg_match("/^\d+$/", $nth)) { + if (preg_match("/^\d+$/", ($nth ?? ''))) { $condition = "position() = $nth"; } // odd elseif ($nth === "odd") { @@ -647,17 +647,17 @@ $last = true; case "nth-child": //FIXME: this fix-up is pretty ugly, would parsing the selector in reverse work better generally? - $descendant_delimeter = strrpos($query, "::"); - $isChild = substr($query, $descendant_delimeter-5, 5) == "child"; - $el = substr($query, $descendant_delimeter+2); - $query = substr($query, 0, strrpos($query, "/")) . ($isChild ? "/" : "//") . "*"; + $descendant_delimeter = strrpos(($query ?? ''), "::"); + $isChild = substr(($query ?? ''), $descendant_delimeter-5, 5) == "child"; + $el = substr(($query ?? ''), $descendant_delimeter+2); + $query = substr(($query ?? ''), 0, strrpos(($query ?? ''), "/")) . ($isChild ? "/" : "//") . "*"; $pseudo_classes[$tok] = true; $p = $i + 1; - $nth = trim(mb_substr($selector, $p, strpos($selector, ")", $i) - $p)); + $nth = trim((mb_substr(($selector ?? ''), $p, strpos(($selector ?? ''), ")", $i) - $p) ?? '')); // 1 - if (preg_match("/^\d+$/", $nth)) { + if (preg_match("/^\d+$/", ($nth ?? ''))) { $condition = "position() = $nth"; } // odd elseif ($nth === "odd") { @@ -681,10 +681,10 @@ case "matches": $pseudo_classes[$tok] = true; $p = $i + 1; - $matchList = trim(mb_substr($selector, $p, strpos($selector, ")", $i) - $p)); + $matchList = trim((mb_substr(($selector ?? ''), $p, strpos(($selector ?? ''), ")", $i) - $p) ?? '')); // Tag names are case-insensitive - $elements = array_map("trim", explode(",", strtolower($matchList))); + $elements = array_map("trim", explode(",", (strtolower(($matchList ?? '')) ?? ''))); foreach ($elements as &$element) { $element = "name() = '$element'"; } @@ -703,7 +703,7 @@ case "first-letter": case ":first-letter": // TODO - $el = trim($tok, ":"); + $el = trim(($tok ?? ''), ":"); $pseudo_elements[$el] = true; break; @@ -721,7 +721,7 @@ case ":before": case "after": case ":after": - $pos = trim($tok, ":"); + $pos = trim(($tok ?? ''), ":"); $pseudo_elements[$pos] = true; if (!$first_pass) { $query .= "/*[@$pos]"; @@ -758,7 +758,7 @@ case "[": // Attribute selectors. All with an attribute matching the following token(s) $attr_delimiters = array("=", "]", "~", "|", "$", "^", "*"); - $tok_len = mb_strlen($tok); + $tok_len = mb_strlen(($tok ?? '')); $j = 0; $attr = ""; @@ -809,7 +809,7 @@ throw new Exception("Invalid CSS selector syntax: missing attribute name"); } - $value = trim($value, "\"'"); + $value = trim(($value ?? ''), "\"'"); switch ($op) { @@ -824,29 +824,29 @@ case "~=": // FIXME: this will break if $value contains quoted strings // (e.g. [type~="a b c" "d e f"]) - $values = explode(" ", $value); + $values = explode(" ", ($value ?? '')); $query .= "["; foreach ($values as $val) { $query .= "@$attr=\"$val\" or "; } - $query = rtrim($query, " or ") . "]"; + $query = rtrim(($query ?? ''), " or ") . "]"; break; case "|=": - $values = explode("-", $value); + $values = explode("-", ($value ?? '')); $query .= "["; foreach ($values as $val) { $query .= "starts-with(@$attr, \"$val\") or "; } - $query = rtrim($query, " or ") . "]"; + $query = rtrim(($query ?? ''), " or ") . "]"; break; case "$=": - $query .= "[substring(@$attr, string-length(@$attr)-" . (strlen($value) - 1) . ")=\"$value\"]"; + $query .= "[substring(@$attr, string-length(@$attr)-" . (strlen(($value ?? '')) - 1) . ")=\"$value\"]"; break; case "^=": @@ -885,8 +885,8 @@ // Trim the trailing '/' from the query - if (mb_strlen($query) > 2) { - $query = rtrim($query, "/"); + if (mb_strlen(($query ?? '')) > 2) { + $query = rtrim(($query ?? ''), "/"); } return array("query" => $query, "pseudo_elements" => $pseudo_elements); @@ -901,8 +901,8 @@ */ protected function _selector_an_plus_b($expr, $last = false) { - $expr = preg_replace("/\s/", "", $expr); - if (!preg_match("/^(?P<a>-?[0-9]*)?n(?P<b>[-+]?[0-9]+)?$/", $expr, $matches)) { + $expr = preg_replace("/\s/", "", ($expr ?? '')); + if (!preg_match("/^(?P<a>-?[0-9]*)?n(?P<b>[-+]?[0-9]+)?$/", ($expr ?? ''), $matches)) { return "false()"; } @@ -954,7 +954,7 @@ foreach ($this->_styles as $selector => $selector_styles) { /** @var Style $style */ foreach ($selector_styles as $style) { - if (strpos($selector, ":before") === false && strpos($selector, ":after") === false) { + if (strpos(($selector ?? ''), ":before") === false && strpos(($selector ?? ''), ":after") === false) { continue; } @@ -1079,7 +1079,7 @@ // Locate any additional style attributes if (($str = $frame->get_node()->getAttribute("style")) !== "") { // Destroy CSS comments - $str = preg_replace("'/\*.*?\*/'si", "", $str); + $str = preg_replace("'/\*.*?\*/'si", "", ($str ?? '')); $spec = $this->_specificity("!attr", self::ORIG_AUTHOR); $styles[$id][$spec][] = $this->_parse_properties($str); @@ -1120,7 +1120,7 @@ // if any of the Style's media queries fail then do not apply the style //TODO: When the media query logic is fully developed we should not apply the Style when any of the media queries fail or are bad, per https://www.w3.org/TR/css3-mediaqueries/#error-handling if (in_array($media_query_feature, self::$VALID_MEDIA_TYPES)) { - if ((strlen($media_query_feature) === 0 && !in_array($media_query, $acceptedmedia)) || (in_array($media_query, $acceptedmedia) && $media_query_value == "not")) { + if ((strlen(($media_query_feature ?? '')) === 0 && !in_array($media_query, $acceptedmedia)) || (in_array($media_query, $acceptedmedia) && $media_query_value == "not")) { continue (3); } } else { @@ -1235,14 +1235,14 @@ private function _parse_css($str) { - $str = trim($str); + $str = trim(($str ?? '')); // Destroy comments and remove HTML comments $css = preg_replace(array( "'/\*.*?\*/'si", "/^<!--/", "/-->$/" - ), "", $str); + ), "", ($str ?? '')); // FIXME: handle '{' within strings, e.g. [attr="string {}"] @@ -1260,7 +1260,7 @@ "([^{]*{[^}]*})) # Parse normal rulesets \n" . "/xs"; - if (preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false) { + if (preg_match_all(($re ?? ''), ($css ?? ''), $matches, PREG_SET_ORDER) === false) { // An error occurred throw new Exception("Error parsing css file: preg_match_all() failed."); } @@ -1281,7 +1281,7 @@ //Helpers::pre_r($matches); foreach ($matches as $match) { - $match[2] = trim($match[2]); + $match[2] = trim(($match[2] ?? '')); if ($match[2] !== "") { // Handle @rules @@ -1295,7 +1295,7 @@ $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES; $acceptedmedia[] = $this->_dompdf->getOptions()->getDefaultMediaType(); - $media_queries = preg_split("/\s*,\s*/", mb_strtolower(trim($match[3]))); + $media_queries = preg_split("/\s*,\s*/", (mb_strtolower(trim(($match[3] ?? ''))) ?? '')); foreach ($media_queries as $media_query) { if (in_array($media_query, $acceptedmedia)) { //if we have a media type match go ahead and parse the stylesheet @@ -1303,16 +1303,16 @@ break; } elseif (!in_array($media_query, self::$VALID_MEDIA_TYPES)) { // otherwise conditionally parse the stylesheet assuming there are parseable media queries - if (preg_match_all($media_query_regex, $media_query, $media_query_matches, PREG_SET_ORDER) !== false) { + if (preg_match_all(($media_query_regex ?? ''), ($media_query ?? ''), $media_query_matches, PREG_SET_ORDER) !== false) { $mq = array(); foreach ($media_query_matches as $media_query_match) { if (empty($media_query_match[1]) === false) { - $media_query_feature = strtolower($media_query_match[3]); - $media_query_value = strtolower($media_query_match[2]); + $media_query_feature = strtolower(($media_query_match[3] ?? '')); + $media_query_value = strtolower(($media_query_match[2] ?? '')); $mq[] = array($media_query_feature, $media_query_value); } else if (empty($media_query_match[4]) === false) { - $media_query_feature = strtolower($media_query_match[5]); - $media_query_value = (array_key_exists(8, $media_query_match) ? strtolower($media_query_match[8]) : null); + $media_query_feature = strtolower(($media_query_match[5] ?? '')); + $media_query_value = (array_key_exists(8, $media_query_match) ? strtolower(($media_query_match[8] ?? '')) : null); $mq[] = array($media_query_feature, $media_query_value); } } @@ -1344,7 +1344,7 @@ //assign it to the <body> tag, possibly only for the css of the correct media type. // If the page has a name, skip the style. - $page_selector = trim($match[3]); + $page_selector = trim(($match[3] ?? '')); $key = null; switch ($page_selector) { @@ -1402,10 +1402,10 @@ $DEBUGCSS = $this->_dompdf->getOptions()->getDebugCss(); $parsed_url = "none"; - if (mb_strpos($val, "url") === false) { + if (mb_strpos(($val ?? ''), "url") === false) { $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none } else { - $val = preg_replace("/url\(\s*['\"]?([^'\")]+)['\"]?\s*\)/", "\\1", trim($val)); + $val = preg_replace("/url\(\s*['\"]?([^'\")]+)['\"]?\s*\)/", "\\1", (trim(($val ?? '')) ?? '')); // Resolve the url now in the context of the current stylesheet $parsed_url = Helpers::explode_url($val); @@ -1448,17 +1448,17 @@ */ private function _parse_import($url) { - $arr = preg_split("/[\s\n,]/", $url, -1, PREG_SPLIT_NO_EMPTY); + $arr = preg_split("/[\s\n,]/", ($url ?? ''), -1, PREG_SPLIT_NO_EMPTY); $url = array_shift($arr); $accept = false; - if (count($arr) > 0) { + if (count(($arr ?? [])) > 0) { $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES; $acceptedmedia[] = $this->_dompdf->getOptions()->getDefaultMediaType(); // @import url media_type [media_type...] foreach ($arr as $type) { - if (in_array(mb_strtolower(trim($type)), $acceptedmedia)) { + if (in_array(mb_strtolower(trim(($type ?? ''))), $acceptedmedia)) { $accept = true; break; } @@ -1503,16 +1503,16 @@ { $descriptors = $this->_parse_properties($str); - preg_match_all("/(url|local)\s*\([\"\']?([^\"\'\)]+)[\"\']?\)\s*(format\s*\([\"\']?([^\"\'\)]+)[\"\']?\))?/i", $descriptors->src, $src); + preg_match_all("/(url|local)\s*\([\"\']?([^\"\'\)]+)[\"\']?\)\s*(format\s*\([\"\']?([^\"\'\)]+)[\"\']?\))?/i", ($descriptors->src ?? ''), $src); $sources = array(); $valid_sources = array(); foreach ($src[0] as $i => $value) { $source = array( - "local" => strtolower($src[1][$i]) === "local", + "local" => strtolower(($src[1][$i] ?? '')) === "local", "uri" => $src[2][$i], - "format" => strtolower($src[4][$i]), + "format" => strtolower(($src[4][$i] ?? '')), "path" => Helpers::build_url($this->_protocol, $this->_base_host, $this->_base_path, $src[2][$i]), ); @@ -1548,7 +1548,7 @@ */ private function _parse_properties($str) { - $properties = preg_split("/;(?=(?:[^\(]*\([^\)]*\))*(?![^\)]*\)))/", $str); + $properties = preg_split("/;(?=(?:[^\(]*\([^\)]*\))*(?![^\)]*\)))/", ($str ?? '')); $DEBUGCSS = $this->_dompdf->getOptions()->getDebugCss(); if ($DEBUGCSS) { @@ -1584,13 +1584,13 @@ if ($DEBUGCSS) print '('; $important = false; - $prop = trim($prop); - - if (substr($prop, -9) === 'important') { - $prop_tmp = rtrim(substr($prop, 0, -9)); - - if (substr($prop_tmp, -1) === '!') { - $prop = rtrim(substr($prop_tmp, 0, -1)); + $prop = trim(($prop ?? '')); + + if (substr(($prop ?? ''), -9) === 'important') { + $prop_tmp = rtrim((substr(($prop ?? ''), 0, -9) ?? '')); + + if (substr(($prop_tmp ?? ''), -1) === '!') { + $prop = rtrim((substr(($prop_tmp ?? ''), 0, -1) ?? '')); $important = true; } } @@ -1600,14 +1600,14 @@ continue; } - $i = mb_strpos($prop, ":"); + $i = mb_strpos(($prop ?? ''), ":"); if ($i === false) { if ($DEBUGCSS) print 'novalue' . $prop . ')'; continue; } - $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i))); - $value = ltrim(mb_substr($prop, $i + 1)); + $prop_name = rtrim((mb_strtolower(mb_substr(($prop ?? ''), 0, $i)) ?? '')); + $value = ltrim((mb_substr(($prop ?? ''), $i + 1) ?? '')); if ($DEBUGCSS) print $prop_name . ':=' . $value . ($important ? '!IMPORTANT' : '') . ')'; //New style, anyway empty //if ($important || !$style->important_get($prop_name) ) { @@ -1640,24 +1640,24 @@ $patterns = array("/[\\s\n]+/", "/\\s+([>.:+#])\\s+/"); $replacements = array(" ", "\\1"); - $str = preg_replace($patterns, $replacements, $str); + $str = preg_replace(($patterns ?? ''), ($replacements ?? ''), ($str ?? '')); $DEBUGCSS = $this->_dompdf->getOptions()->getDebugCss(); - $sections = explode("}", $str); + $sections = explode("}", ($str ?? '')); if ($DEBUGCSS) print '[_parse_sections'; foreach ($sections as $sect) { - $i = mb_strpos($sect, "{"); + $i = mb_strpos(($sect ?? ''), "{"); if ($i === false) { continue; } //$selectors = explode(",", mb_substr($sect, 0, $i)); - $selectors = preg_split("/,(?![^\(]*\))/", mb_substr($sect, 0, $i),0, PREG_SPLIT_NO_EMPTY); + $selectors = preg_split("/,(?![^\(]*\))/", (mb_substr(($sect ?? ''), 0, $i) ?? ''),0, PREG_SPLIT_NO_EMPTY); if ($DEBUGCSS) print '[section'; - $style = $this->_parse_properties(trim(mb_substr($sect, $i + 1))); + $style = $this->_parse_properties(trim((mb_substr(($sect ?? ''), $i + 1) ?? ''))); // Assign it to the selected elements foreach ($selectors as $selector) { - $selector = trim($selector); + $selector = trim(($selector ?? '')); if ($selector == "") { if ($DEBUGCSS) print '#empty#'; @@ -1667,7 +1667,7 @@ //if ($DEBUGCSS) { if (strpos($selector,'p') !== false) print '!!!p!!!#'; } //FIXME: tag the selector with a hash of the media query to separate it from non-conditional styles (?), xpath comments are probably not what we want to do here - if (count($media_queries) > 0) { + if (count(($media_queries ?? [])) > 0) { $style->set_media_queries($media_queries); } $this->add_style($selector, $style); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameListIterator.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameListIterator.php @@ -44,7 +44,7 @@ /** * */ - public function rewind() + public function rewind(): void { $this->_cur = $this->_parent->get_first_child(); $this->_num = 0; @@ -53,7 +53,7 @@ /** * @return bool */ - public function valid() + public function valid(): bool { return isset($this->_cur); // && ($this->_cur->get_prev_sibling() === $this->_prev); } @@ -61,7 +61,7 @@ /** * @return int */ - public function key() + public function key(): mixed { return $this->_num; } @@ -69,7 +69,7 @@ /** * @return Frame */ - public function current() + public function current(): mixed { return $this->_cur; } @@ -77,6 +77,7 @@ /** * @return Frame */ + #[\ReturnTypeWillChange] public function next() { $ret = $this->_cur; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTreeList.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTreeList.php @@ -28,7 +28,7 @@ /** * @return FrameTreeIterator */ - public function getIterator() + public function getIterator(): \Traversable { return new FrameTreeIterator($this->_root); } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTreeIterator.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTreeIterator.php @@ -41,7 +41,7 @@ /** * */ - public function rewind() + public function rewind(): void { $this->_stack = array($this->_root); $this->_num = 0; @@ -50,15 +50,15 @@ /** * @return bool */ - public function valid() + public function valid(): bool { - return count($this->_stack) > 0; + return count(($this->_stack ?? [])) > 0; } /** * @return int */ - public function key() + public function key(): mixed { return $this->_num; } @@ -66,7 +66,7 @@ /** * @return Frame */ - public function current() + public function current(): mixed { return end($this->_stack); } @@ -74,6 +74,7 @@ /** * @return Frame */ + #[\ReturnTypeWillChange] public function next() { $b = end($this->_stack); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameList.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameList.php @@ -28,7 +28,7 @@ /** * @return FrameListIterator */ - function getIterator() + function getIterator(): \Traversable { return new FrameListIterator($this->_frame); } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTree.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/Frame/FrameTree.php @@ -246,9 +246,9 @@ } $index = 0; // INFO: We don't advance $index if a node is removed to avoid skipping nodes - while ($index < count($children)) { + while ($index < count(($children ?? []))) { $child = $children[$index]; - $nodeName = strtolower($child->nodeName); + $nodeName = strtolower(($child->nodeName ?? '')); // Skip non-displaying nodes if (in_array($nodeName, self::$HIDDEN_TAGS)) { --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/AbstractFrameDecorator.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/AbstractFrameDecorator.php @@ -744,7 +744,7 @@ // If this node resets a counter save the current value to use when rendering on the next page if ($style->counter_reset && ($reset = $style->counter_reset) !== "none") { - $vars = preg_split('/\s+/', trim($reset), 2); + $vars = preg_split('/\s+/', (trim(($reset ?? '')) ?? ''), 2); $split->_counters['__' . $vars[0]] = $this->lookup_counter_frame($vars[0])->_counters[$vars[0]]; } } @@ -842,7 +842,7 @@ return $value; case "decimal-leading-zero": - return str_pad($value, 2, "0", STR_PAD_LEFT); + return str_pad(($value ?? ''), 2, "0", STR_PAD_LEFT); case "lower-roman": return Helpers::dec2roman($value); @@ -852,11 +852,11 @@ case "lower-latin": case "lower-alpha": - return chr(($value % 26) + ord('a') - 1); + return chr((int) (($value % 26) + ord('a') - 1)); case "upper-latin": case "upper-alpha": - return chr(($value % 26) + ord('A') - 1); + return chr((int) (($value % 26) + ord('A') - 1)); case "lower-greek": return Helpers::unichr($value + 944); --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/ListBulletImage.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/ListBulletImage.php @@ -60,8 +60,8 @@ // See also Image::get_min_max_width // Tested php ver: value measured in px, suffix "px" not in value: rtrim unnecessary. $dpi = $this->_dompdf->getOptions()->getDpi(); - $this->_width = ((float)rtrim($width, "px") * 72) / $dpi; - $this->_height = ((float)rtrim($height, "px") * 72) / $dpi; + $this->_width = ((float)rtrim(($width ?? ''), "px") * 72) / $dpi; + $this->_height = ((float)rtrim(($height ?? ''), "px") * 72) / $dpi; //If an image is taller as the containing block/box, the box should be extended. //Neighbour elements are overwriting the overlapping image areas. --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Table.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Table.php @@ -129,7 +129,7 @@ // If $child is a header or if it is the first non-header row, do // not duplicate headers, simply move the table to the next page. - if (count($this->_headers) && !in_array($child, $this->_headers, true) && + if (count(($this->_headers ?? [])) && !in_array($child, $this->_headers, true) && !in_array($child->get_prev_sibling(), $this->_headers, true) ) { $first_header = null; --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Page.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Page.php @@ -363,7 +363,7 @@ // Rule C $block_parent = $frame->find_block_parent(); - if (count($block_parent->get_line_boxes()) < $frame->get_style()->orphans) { + if (count(($block_parent->get_line_boxes() ?? [])) < $frame->get_style()->orphans) { Helpers::dompdf_debug("page-break", "orphans"); return false; @@ -387,7 +387,7 @@ // page-break-inside: avoid, ensure that at least one frame with // some content is on the page before splitting. $prev = $frame->get_prev_sibling(); - while ($prev && ($prev->is_text_node() && trim($prev->get_node()->nodeValue) == "")) { + while ($prev && ($prev->is_text_node() && trim(($prev->get_node()->nodeValue ?? '')) == "")) { $prev = $prev->get_prev_sibling(); } --- a/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Block.php +++ b/intranet/marketplaces-api/vendor/dompdf/dompdf/src/FrameDecorator/Block.php @@ -87,7 +87,7 @@ */ function set_current_line_number($line_number) { - $line_boxes_count = count($this->_line_boxes); + $line_boxes_count = count(($this->_line_boxes ?? [])); $cl = max(min($line_number, $line_boxes_count), 0); return ($this->_cl = $cl); } @@ -148,7 +148,7 @@ $frame->is_text_node() && !$frame->is_pre() ) { - $frame->set_text(ltrim($frame->get_text())); + $frame->set_text(ltrim(($frame->get_text() ?? ''))); $frame->recalculate_width(); } @@ -188,7 +188,7 @@ $current_line->add_frame($frame); if ($frame->is_text_node()) { - $current_line->wc += count(preg_split("/\s+/", trim($frame->get_text()))); + $current_line->wc += count((preg_split("/\s+/", (trim(($frame->get_text() ?? '')) ?? '')) ?? [])); } $this->increase_line_width($w); @@ -218,7 +218,7 @@ } // Remove $frame and all frames that follow - while ($j < count($this->_line_boxes[$i]->get_frames())) { + while ($j < count(($this->_line_boxes[$i]->get_frames() ?? []))) { $frames = $this->_line_boxes[$i]->get_frames(); $f = $frames[$j]; $frames[$j] = null; --- a/intranet/marketplaces-api/vendor/Mailer/phpmailer.php +++ b/intranet/marketplaces-api/vendor/Mailer/phpmailer.php @@ -28,6 +28,7 @@ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net> * @author Brent R. Matzelle (original founder) */ +#[\AllowDynamicProperties] class PHPMailer { const CHARSET_ISO88591 = 'iso-8859-1'; @@ -801,7 +802,7 @@ private function mailPassthru($to, $subject, $body, $header, $params) { //Check overloading of mail function to avoid double-encoding - if (ini_get('mbstring.func_overload') & 1) { + if ('0' & 1) { $subject = $this->secureHeader($subject); } else { $subject = $this->encodeHeader($this->secureHeader($subject)); @@ -4328,11 +4329,11 @@ $privKey = openssl_pkey_get_private($privKeyStr); } if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { - openssl_pkey_free($privKey); + unset($privKey); return base64_encode($signature); } - openssl_pkey_free($privKey); + unset($privKey); return ''; } --- a/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/GDLuminanceSource.php +++ b/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/GDLuminanceSource.php @@ -52,7 +52,7 @@ $this->dataHeight = $height; $this->left = 0; $this->top = 0; - $this->$gdImage = $gdImage; + $this->gdImage = $gdImage; // In order to measure pure decoding speed, we convert the entire image to a greyscale array @@ -65,8 +65,8 @@ for ($j = 0; $j < $height; $j++) { for ($i = 0; $i < $width; $i++) { - $argb = imagecolorat($this->$gdImage, $i, $j); - $pixel = imagecolorsforindex($this->$gdImage, $argb); + $argb = imagecolorat($this->gdImage, (int) ($i), (int) ($j)); + $pixel = imagecolorsforindex($this->gdImage, (int) ($argb)); $r = $pixel['red']; $g = $pixel['green']; $b = $pixel['blue']; @@ -76,7 +76,7 @@ $this->luminances[] = $r;//(($r + 128) % 256) - 128; } else { // Calculate luminance cheaply, favoring green. - $this->luminances[] = ($r + 2 * $g + $b) / 4;//(((($r + 2 * $g + $b) / 4) + 128) % 256) - 128; + $this->luminances[] = intdiv($r + 2 * $g + $b, 4);//(((intdiv($r + 2 * $g + $b, 4)) + 128) % 256) - 128; } } } @@ -95,7 +95,7 @@ $this->luminances[(int)($offset + $x)] = (($r+128) % 256) - 128; } else { // Calculate luminance cheaply, favoring green. - $this->luminances[(int)($offset + $x)] = (((($r + 2 * $g + $b) / 4)+128)%256) - 128; + $this->luminances[(int)($offset + $x)] = (((intdiv($r + 2 * $g + $b, 4))+128)%256) - 128; } --- a/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/QrReader.php +++ b/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/QrReader.php @@ -62,7 +62,7 @@ $height = $im->getImageHeight(); $source = new IMagickLuminanceSource($im, $width, $height); } else { - if (!is_resource($im)) { + if (!($im instanceof \GdImage)) { throw new \InvalidArgumentException('Invalid image source.'); } $width = imagesx($im); --- a/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Common/BitMatrix.php +++ b/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Common/BitMatrix.php @@ -39,7 +39,7 @@ $nRows = 0; $pos = 0; while ($pos < strlen($stringRepresentation)) { - if ($stringRepresentation{$pos} == '\n' || + if ($stringRepresentation[$pos] == '\n' || $stringRepresentation->{$pos} == '\r') { if ($bitsPos > $rowStartPos) { if ($rowLength == -1) { @@ -93,6 +93,8 @@ */ public function set($x, $y) { + $x = (int) $x; + $y = (int) $y; $offset = (int)($y * $this->rowSize + ($x / 32)); if (!isset($this->bits[$offset])) { $this->bits[$offset] = 0; @@ -111,7 +113,9 @@ } public function _unset($x, $y) - {//было unset, php не позволяет использовать unset + { + $x = (int) $x; + $y = (int) $y;//было unset, php не позволяет использовать unset $offset = (int)($y * $this->rowSize + ($x / 32)); $this->bits[$offset] &= ~(1 << ($x & 0x1f)); } @@ -124,6 +128,8 @@ */ public function flip($x, $y) { + $x = (int) $x; + $y = (int) $y; $offset = $y * $this->rowSize + (int)($x / 32); $this->bits[$offset] = ($this->bits[$offset] ^ (1 << ($x & 0x1f))); @@ -439,6 +445,8 @@ */ public function get($x, $y) { + $x = (int) $x; + $y = (int) $y; $offset = (int)($y * $this->rowSize + ($x / 32)); if (!isset($this->bits[$offset])) { --- a/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Common/BitArray.php +++ b/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Common/BitArray.php @@ -30,6 +30,7 @@ * @author Sean Owen */ +#[\AllowDynamicProperties] final class BitArray { --- a/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Qrcode/Decoder/DecodedBitStreamParser.php +++ b/intranet/libs/qrlib/vendor/khanamiryan/qrcode-detector-decoder/lib/Qrcode/Decoder/DecodedBitStreamParser.php @@ -266,8 +266,8 @@ if ($fc1InEffect) { // We need to massage the result a bit if in an FNC1 mode: for ($i = $start; $i < strlen($result); $i++) { - if ($result{$i} == '%') { - if ($i < strlen($result) - 1 && $result{$i + 1} == '%') { + if ($result[$i] == '%') { + if ($i < strlen($result) - 1 && $result[$i + 1] == '%') { // %% is rendered as % $result = substr_replace($result, '', $i + 1, 1);//deleteCharAt(i + 1); } else { --- a/intranet/libs/qrlib/vendor/dasprid/enum/src/EnumMap.php +++ b/intranet/libs/qrlib/vendor/dasprid/enum/src/EnumMap.php @@ -261,6 +261,11 @@ public function serialize() : string { + return serialize($this->__serialize()); + } + + public function __serialize() : array + { $values = []; foreach ($this->values as $ordinal => $value) { @@ -271,17 +276,21 @@ $values[$ordinal] = $this->unmaskNull($value); } - return serialize([ + return [ 'keyType' => $this->keyType, 'valueType' => $this->valueType, 'allowNullValues' => $this->allowNullValues, 'values' => $values, - ]); + ]; } public function unserialize($serialized) : void { - $data = unserialize($serialized); + $this->__unserialize(unserialize($serialized)); + } + + public function __unserialize(array $data) : void + { $this->__construct($data['keyType'], $data['valueType'], $data['allowNullValues']); foreach ($this->keyUniverse as $key) { --- a/intranet/libs/qrlib/vendor/dasprid/enum/src/AbstractEnum.php +++ b/intranet/libs/qrlib/vendor/dasprid/enum/src/AbstractEnum.php @@ -85,7 +85,7 @@ /** * @return static */ - final private static function createValue(string $name, int $ordinal, array $arguments) : self + private static function createValue(string $name, int $ordinal, array $arguments) : self { $instance = new static(...$arguments); $instance->name = $name; @@ -125,7 +125,7 @@ return self::$values[static::class]; } - final private static function constants() : array + private static function constants() : array { if (isset(self::$constants[static::class])) { return self::$constants[static::class]; @@ -214,7 +214,7 @@ * * @throws SerializeNotSupportedException */ - final public function __sleep() : void + final public function __sleep() : array { throw new SerializeNotSupportedException(); } --- a/intranet/libs/qrlib/vendor/dasprid/enum/src/NullValue.php +++ b/intranet/libs/qrlib/vendor/dasprid/enum/src/NullValue.php @@ -38,7 +38,7 @@ * * @throws SerializeNotSupportedException */ - final public function __sleep() : void + final public function __sleep() : array { throw new SerializeNotSupportedException(); } --- a/intranet/libs/qrlib/vendor/bacon/bacon-qr-code/src/Encoder/MaskUtil.php +++ b/intranet/libs/qrlib/vendor/bacon/bacon-qr-code/src/Encoder/MaskUtil.php @@ -204,7 +204,7 @@ break; case 4: - $intermediate = (BitUtils::unsignedRightShift($y, 1) + ($x / 3)) & 0x1; + $intermediate = (BitUtils::unsignedRightShift($y, 1) + intdiv($x, 3)) & 0x1; break; case 5: --- a/intranet/libs/qrlib/vendor/endroid/qr-code/src/Writer/PngWriter.php +++ b/intranet/libs/qrlib/vendor/endroid/qr-code/src/Writer/PngWriter.php @@ -62,20 +62,20 @@ /** @return resource */ private function createBaseImage(int $baseSize, array $data, QrCodeInterface $qrCode) { - $image = imagecreatetruecolor($data['block_count'] * $baseSize, $data['block_count'] * $baseSize); - - if (!is_resource($image)) { + $image = imagecreatetruecolor((int) ($data['block_count'] * $baseSize), (int) ($data['block_count'] * $baseSize)); + + if (!($image instanceof \GdImage)) { throw new GenerateImageException('Unable to generate image: check your GD installation'); } - $foregroundColor = imagecolorallocatealpha($image, $qrCode->getForegroundColor()['r'], $qrCode->getForegroundColor()['g'], $qrCode->getForegroundColor()['b'], $qrCode->getForegroundColor()['a']); - $backgroundColor = imagecolorallocatealpha($image, $qrCode->getBackgroundColor()['r'], $qrCode->getBackgroundColor()['g'], $qrCode->getBackgroundColor()['b'], $qrCode->getBackgroundColor()['a']); - imagefill($image, 0, 0, $backgroundColor); + $foregroundColor = imagecolorallocatealpha($image, (int) ($qrCode->getForegroundColor()['r']), (int) ($qrCode->getForegroundColor()['g']), (int) ($qrCode->getForegroundColor()['b']), (int) ($qrCode->getForegroundColor()['a'])); + $backgroundColor = imagecolorallocatealpha($image, (int) ($qrCode->getBackgroundColor()['r']), (int) ($qrCode->getBackgroundColor()['g']), (int) ($qrCode->getBackgroundColor()['b']), (int) ($qrCode->getBackgroundColor()['a'])); + imagefill($image, 0, 0, (int) ($backgroundColor)); foreach ($data['matrix'] as $row => $values) { foreach ($values as $column => $value) { if (1 === $value) { - imagefilledrectangle($image, $column * $baseSize, $row * $baseSize, intval(($column + 1) * $baseSize), intval(($row + 1) * $baseSize), $foregroundColor); + imagefilledrectangle($image, (int) ($column * $baseSize), (int) ($row * $baseSize), (int) (intval(($column + 1) * $baseSize)), (int) (intval(($row + 1) * $baseSize)), (int) ($foregroundColor)); } } } @@ -90,15 +90,15 @@ */ private function createInterpolatedImage($baseImage, array $data, QrCodeInterface $qrCode) { - $image = imagecreatetruecolor($data['outer_width'], $data['outer_height']); - - if (!is_resource($image)) { + $image = imagecreatetruecolor((int) ($data['outer_width']), (int) ($data['outer_height'])); + + if (!($image instanceof \GdImage)) { throw new GenerateImageException('Unable to generate image: check your GD installation'); } - $backgroundColor = imagecolorallocatealpha($image, $qrCode->getBackgroundColor()['r'], $qrCode->getBackgroundColor()['g'], $qrCode->getBackgroundColor()['b'], $qrCode->getBackgroundColor()['a']); - imagefill($image, 0, 0, $backgroundColor); - imagecopyresampled($image, $baseImage, (int) $data['margin_left'], (int) $data['margin_left'], 0, 0, (int) $data['inner_width'], (int) $data['inner_height'], imagesx($baseImage), imagesy($baseImage)); + $backgroundColor = imagecolorallocatealpha($image, (int) ($qrCode->getBackgroundColor()['r']), (int) ($qrCode->getBackgroundColor()['g']), (int) ($qrCode->getBackgroundColor()['b']), (int) ($qrCode->getBackgroundColor()['a'])); + imagefill($image, 0, 0, (int) ($backgroundColor)); + imagecopyresampled($image, $baseImage, (int) $data['margin_left'], (int) $data['margin_left'], 0, 0, (int) $data['inner_width'], (int) $data['inner_height'], (int) (imagesx($baseImage)), (int) (imagesy($baseImage))); imagesavealpha($image, true); return $image; @@ -118,7 +118,7 @@ throw new MissingLogoHeightException('SVG Logos require an explicit height set via setLogoSize($width, $height)'); } - if (!is_resource($logoImage)) { + if (!($logoImage instanceof \GdImage)) { throw new GenerateImageException('Unable to generate image: check your GD installation or logo path'); } @@ -137,7 +137,7 @@ $logoX = imagesx($sourceImage) / 2 - $logoWidth / 2; $logoY = imagesy($sourceImage) / 2 - $logoHeight / 2; - imagecopyresampled($sourceImage, $logoImage, intval($logoX), intval($logoY), 0, 0, $logoWidth, $logoHeight, $logoSourceWidth, $logoSourceHeight); + imagecopyresampled($sourceImage, $logoImage, (int) (intval($logoX)), (int) (intval($logoY)), 0, 0, (int) ($logoWidth), (int) ($logoHeight), (int) ($logoSourceWidth), (int) ($logoSourceHeight)); return $sourceImage; } @@ -163,18 +163,18 @@ $targetHeight = $sourceHeight + $labelBoxHeight + $labelMargin['t'] + $labelMargin['b']; // Create empty target image - $targetImage = imagecreatetruecolor($targetWidth, $targetHeight); - - if (!is_resource($targetImage)) { + $targetImage = imagecreatetruecolor((int) ($targetWidth), (int) ($targetHeight)); + + if (!($targetImage instanceof \GdImage)) { throw new GenerateImageException('Unable to generate image: check your GD installation'); } - $foregroundColor = imagecolorallocate($targetImage, $foregroundColor['r'], $foregroundColor['g'], $foregroundColor['b']); - $backgroundColor = imagecolorallocate($targetImage, $backgroundColor['r'], $backgroundColor['g'], $backgroundColor['b']); - imagefill($targetImage, 0, 0, $backgroundColor); + $foregroundColor = imagecolorallocate($targetImage, (int) ($foregroundColor['r']), (int) ($foregroundColor['g']), (int) ($foregroundColor['b'])); + $backgroundColor = imagecolorallocate($targetImage, (int) ($backgroundColor['r']), (int) ($backgroundColor['g']), (int) ($backgroundColor['b'])); + imagefill($targetImage, 0, 0, (int) ($backgroundColor)); // Copy source image to target image - imagecopyresampled($targetImage, $sourceImage, 0, 0, 0, 0, $sourceWidth, $sourceHeight, $sourceWidth, $sourceHeight); + imagecopyresampled($targetImage, $sourceImage, 0, 0, 0, 0, (int) ($sourceWidth), (int) ($sourceHeight), (int) ($sourceWidth), (int) ($sourceHeight)); switch ($labelAlignment) { case LabelAlignment::LEFT: @@ -189,7 +189,7 @@ } $labelY = $targetHeight - $labelMargin['b']; - imagettftext($targetImage, $labelFontSize, 0, $labelX, $labelY, $foregroundColor, $labelFontPath, $label); + imagettftext($targetImage, $labelFontSize, 0, (int) ($labelX), (int) ($labelY), (int) ($foregroundColor), $labelFontPath, $label); return $targetImage; } --- a/intranet/libs/qrlib/vendor/endroid/qr-code/src/Writer/SvgWriter.php +++ b/intranet/libs/qrlib/vendor/endroid/qr-code/src/Writer/SvgWriter.php @@ -97,7 +97,7 @@ if (null === $logoHeight || null === $logoWidth) { $logoImage = imagecreatefromstring(strval($imageData)); - if (!is_resource($logoImage)) { + if (!($logoImage instanceof \GdImage)) { throw new GenerateImageException('Unable to generate image: check your GD installation or logo path'); } --- a/intranet/libs/qrlib/vendor/endroid/qr-code/tests/QrCodeTest.php +++ b/intranet/libs/qrlib/vendor/endroid/qr-code/tests/QrCodeTest.php @@ -167,7 +167,7 @@ $image = imagecreatefromstring(file_get_contents($filename)); - $this->assertTrue(is_resource($image)); + $this->assertTrue(($image instanceof \GdImage)); } public function testData(): void --- a/intranet/libs/qrlib/vendor/symfony/http-foundation/HeaderBag.php +++ b/intranet/libs/qrlib/vendor/symfony/http-foundation/HeaderBag.php @@ -252,7 +252,7 @@ * * @return \ArrayIterator An \ArrayIterator instance */ - public function getIterator() + public function getIterator(): \Traversable { return new \ArrayIterator($this->headers); } @@ -262,7 +262,7 @@ * * @return int The number of headers */ - public function count() + public function count(): int { return \count($this->headers); } --- a/intranet/libs/qrlib/vendor/symfony/http-foundation/ParameterBag.php +++ b/intranet/libs/qrlib/vendor/symfony/http-foundation/ParameterBag.php @@ -188,7 +188,7 @@ * * @return \ArrayIterator An \ArrayIterator instance */ - public function getIterator() + public function getIterator(): \Traversable { return new \ArrayIterator($this->parameters); } @@ -198,7 +198,7 @@ * * @return int The number of parameters */ - public function count() + public function count(): int { return \count($this->parameters); } --- a/intranet/libs/qrlib/vendor/symfony/http-foundation/Session/Session.php +++ b/intranet/libs/qrlib/vendor/symfony/http-foundation/Session/Session.php @@ -121,7 +121,7 @@ * * @return \ArrayIterator An \ArrayIterator instance */ - public function getIterator() + public function getIterator(): \Traversable { return new \ArrayIterator($this->getAttributeBag()->all()); } @@ -131,7 +131,7 @@ * * @return int */ - public function count() + public function count(): int { return \count($this->getAttributeBag()->all()); } --- a/intranet/libs/qrlib/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php +++ b/intranet/libs/qrlib/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php @@ -131,7 +131,7 @@ * * @return \ArrayIterator An \ArrayIterator instance */ - public function getIterator() + public function getIterator(): \Traversable { return new \ArrayIterator($this->attributes); } @@ -141,7 +141,7 @@ * * @return int The number of attributes */ - public function count() + public function count(): int { return \count($this->attributes); } --- a/intranet/libs/qrlib/vendor/symfony/property-access/PropertyPath.php +++ b/intranet/libs/qrlib/vendor/symfony/property-access/PropertyPath.php @@ -154,7 +154,7 @@ * * @return PropertyPathIteratorInterface */ - public function getIterator() + public function getIterator(): \Traversable { return new PropertyPathIterator($this); } --- a/intranet/libs/qrlib/vendor/symfony/mime/RawMessage.php +++ b/intranet/libs/qrlib/vendor/symfony/mime/RawMessage.php @@ -16,7 +16,7 @@ /** * @author Fabien Potencier <fabien@symfony.com> */ -class RawMessage implements \Serializable +class RawMessage { private $message; --- a/intranet/libs/qrlib/vendor/symfony/mime/Part/SMimePart.php +++ b/intranet/libs/qrlib/vendor/symfony/mime/Part/SMimePart.php @@ -18,6 +18,9 @@ */ class SMimePart extends AbstractPart { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_headers; + private $body; private $type; private $subtype; --- a/intranet/libs/qrlib/vendor/symfony/mime/Part/TextPart.php +++ b/intranet/libs/qrlib/vendor/symfony/mime/Part/TextPart.php @@ -23,6 +23,9 @@ */ class TextPart extends AbstractPart { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_headers; + private static $encoders = []; private $body; --- a/intranet/libs/qrlib/vendor/symfony/mime/Part/DataPart.php +++ b/intranet/libs/qrlib/vendor/symfony/mime/Part/DataPart.php @@ -20,6 +20,10 @@ */ class DataPart extends TextPart { + // Properties used by this legacy class, declared explicitly for PHP 8.2+. + public $_parent; + public $_headers; + private static $mimeTypes; private $filename; --- a/intranet/libs/qrlib/vendor/symfony/polyfill-intl-idn/bootstrap.php +++ b/intranet/libs/qrlib/vendor/symfony/polyfill-intl-idn/bootstrap.php @@ -49,11 +49,6 @@ define('IDNA_ERROR_BIDI', 2048); define('IDNA_ERROR_CONTEXTJ', 4096); - if (PHP_VERSION_ID < 70400) { - function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); } - function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); } - } else { function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); } function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); } - } } --- a/intranet/libs/qrlib/vendor/myclabs/php-enum/src/Enum.php +++ b/intranet/libs/qrlib/vendor/myclabs/php-enum/src/Enum.php @@ -232,7 +232,7 @@ * @link http://php.net/manual/en/jsonserializable.jsonserialize.php * @psalm-pure */ - public function jsonSerialize() + public function jsonSerialize(): mixed { return $this->getValue(); } --- a/intranet/mailer/mailer.php +++ b/intranet/mailer/mailer.php @@ -28,6 +28,7 @@ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net> * @author Brent R. Matzelle (original founder) */ +#[\AllowDynamicProperties] class PHPMailer { const CHARSET_ISO88591 = 'iso-8859-1'; @@ -801,7 +802,7 @@ private function mailPassthru($to, $subject, $body, $header, $params) { //Check overloading of mail function to avoid double-encoding - if (ini_get('mbstring.func_overload') & 1) { + if ('0' & 1) { $subject = $this->secureHeader($subject); } else { $subject = $this->encodeHeader($this->secureHeader($subject)); @@ -2668,13 +2669,21 @@ throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL); } } elseif ($this->sign_key_file) { + $fileHandle = null; + $signedHandle = null; try { if (!defined('PKCS7_TEXT')) { throw new Exception($this->lang('extension_missing') . 'openssl'); } - $file = fopen('php://temp', 'rb+'); - $signed = fopen('php://temp', 'rb+'); - fwrite($file, $body); + // OpenSSL requires filesystem paths, not PHP stream resources. + $fileHandle = tmpfile(); + $signedHandle = tmpfile(); + if ($fileHandle === false || $signedHandle === false) { + throw new Exception($this->lang('signing') . 'Cannot create signing files.'); + } + $file = stream_get_meta_data($fileHandle)['uri']; + $signed = stream_get_meta_data($signedHandle)['uri']; + fwrite($fileHandle, $body); //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 if (empty($this->sign_extracerts_file)) { @@ -2696,16 +2705,13 @@ $this->sign_extracerts_file ); } - fclose($file); if ($sign) { $body = file_get_contents($signed); - fclose($signed); //The message returned by openssl contains both headers and body, so need to split them up $parts = explode("\n\n", $body, 2); $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE; $body = $parts[1]; } else { - fclose($signed); throw new Exception($this->lang('signing') . openssl_error_string()); } } catch (Exception $exc) { @@ -2713,6 +2719,9 @@ if ($this->exceptions) { throw $exc; } + } finally { + if (is_resource($fileHandle)) fclose($fileHandle); + if (is_resource($signedHandle)) fclose($signedHandle); } } @@ -4328,11 +4337,11 @@ $privKey = openssl_pkey_get_private($privKeyStr); } if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { - openssl_pkey_free($privKey); + unset($privKey); return base64_encode($signature); } - openssl_pkey_free($privKey); + unset($privKey); return ''; } --- a/intranet/mailer2/mailer.php +++ b/intranet/mailer2/mailer.php @@ -28,6 +28,7 @@ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net> * @author Brent R. Matzelle (original founder) */ +#[\AllowDynamicProperties] class PHPMailer { const CHARSET_ISO88591 = 'iso-8859-1'; @@ -801,7 +802,7 @@ private function mailPassthru($to, $subject, $body, $header, $params) { //Check overloading of mail function to avoid double-encoding - if (ini_get('mbstring.func_overload') & 1) { + if ('0' & 1) { $subject = $this->secureHeader($subject); } else { $subject = $this->encodeHeader($this->secureHeader($subject)); @@ -2668,13 +2669,21 @@ throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL); } } elseif ($this->sign_key_file) { + $fileHandle = null; + $signedHandle = null; try { if (!defined('PKCS7_TEXT')) { throw new Exception($this->lang('extension_missing') . 'openssl'); } - $file = fopen('php://temp', 'rb+'); - $signed = fopen('php://temp', 'rb+'); - fwrite($file, $body); + // OpenSSL requires filesystem paths, not PHP stream resources. + $fileHandle = tmpfile(); + $signedHandle = tmpfile(); + if ($fileHandle === false || $signedHandle === false) { + throw new Exception($this->lang('signing') . 'Cannot create signing files.'); + } + $file = stream_get_meta_data($fileHandle)['uri']; + $signed = stream_get_meta_data($signedHandle)['uri']; + fwrite($fileHandle, $body); //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 if (empty($this->sign_extracerts_file)) { @@ -2696,16 +2705,13 @@ $this->sign_extracerts_file ); } - fclose($file); if ($sign) { $body = file_get_contents($signed); - fclose($signed); //The message returned by openssl contains both headers and body, so need to split them up $parts = explode("\n\n", $body, 2); $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE; $body = $parts[1]; } else { - fclose($signed); throw new Exception($this->lang('signing') . openssl_error_string()); } } catch (Exception $exc) { @@ -2713,6 +2719,9 @@ if ($this->exceptions) { throw $exc; } + } finally { + if (is_resource($fileHandle)) fclose($fileHandle); + if (is_resource($signedHandle)) fclose($signedHandle); } } @@ -4328,11 +4337,11 @@ $privKey = openssl_pkey_get_private($privKeyStr); } if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) { - openssl_pkey_free($privKey); + unset($privKey); return base64_encode($signature); } - openssl_pkey_free($privKey); + unset($privKey); return ''; } --- a/intranet/phpqrcode/qrinput.php +++ b/intranet/phpqrcode/qrinput.php @@ -467,7 +467,7 @@ } //---------------------------------------------------------------------- - public function estimateBitsModeKanji($size) + public static function estimateBitsModeKanji($size) { return (int)(($size / 2) * 13); }