1
0
mirror of https://github.com/shuchkin/simplexlsxgen.git synced 2023-08-10 21:12:59 +03:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sergey Shuchkin 2020-10-04 16:08:32 +06:00
commit a8093b9d8e

View File

@ -216,14 +216,14 @@ class SimpleXLSXGen {
$cs = 6; // [22] m/d/yy h:mm $cs = 6; // [22] m/d/yy h:mm
} elseif ( mb_strlen( $v ) > 160 ) { } elseif ( mb_strlen( $v ) > 160 ) {
$ct = 'inlineStr'; $ct = 'inlineStr';
$cv = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v); $cv = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
} else { } else {
if ( preg_match('/^[0-9+-.]+$/', $v ) ) { // Long ? if ( preg_match('/^[0-9+-.]+$/', $v ) ) { // Long ?
$cs = 7; // Align Right $cs = 7; // Align Right
} }
$v = ltrim($v,"\0"); // disabled type detection $v = ltrim($v,"\0"); // disabled type detection
$ct = 's'; // shared string $ct = 's'; // shared string
$v = str_replace(['&','<','>'],['&amp;','&lt;','&gt;'], $v); $v = str_replace(['&','<','>',"\x03"],['&amp;','&lt;','&gt;',''], $v);
$cv = false; $cv = false;
$skey = '~'.$v; $skey = '~'.$v;
if ( isset($SI_KEYS[ $skey ]) ) { if ( isset($SI_KEYS[ $skey ]) ) {