Server geändert
This commit is contained in:
@ -446,7 +446,7 @@ class Statistical
|
||||
{
|
||||
// Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
|
||||
// PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
|
||||
// a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
|
||||
// a guide. https://home.online.no/~pjacklam/notes/invnorm/index.html
|
||||
// I have not checked the accuracy of this implementation. Be aware that PHP
|
||||
// will truncate the coeficcients to 14 digits.
|
||||
|
||||
@ -2069,7 +2069,7 @@ class Statistical
|
||||
*
|
||||
* @TODO Try implementing P J Acklam's refinement algorithm for greater
|
||||
* accuracy if I can get my head round the mathematics
|
||||
* (as described at) http://home.online.no/~pjacklam/notes/invnorm/
|
||||
* (as described at) https://home.online.no/~pjacklam/notes/invnorm/
|
||||
*/
|
||||
public static function LOGINV($probability, $mean, $stdDev)
|
||||
{
|
||||
|
@ -2,7 +2,7 @@
|
||||
## PhpSpreadsheet
|
||||
##
|
||||
##
|
||||
## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
|
||||
## Data in this file derived from information provided by web-junior (https://www.web-junior.net/)
|
||||
##
|
||||
##
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
##
|
||||
## PhpSpreadsheet
|
||||
##
|
||||
## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
|
||||
## Data in this file derived from information provided by web-junior (https://www.web-junior.net/)
|
||||
##
|
||||
##
|
||||
|
||||
|
@ -2,19 +2,19 @@ ChartDirector
|
||||
https://www.advsofteng.com/cdphp.html
|
||||
|
||||
GraPHPite
|
||||
http://graphpite.sourceforge.net/
|
||||
https://graphpite.sourceforge.net/
|
||||
|
||||
JpGraph
|
||||
http://www.aditus.nu/jpgraph/
|
||||
https://www.aditus.nu/jpgraph/
|
||||
|
||||
LibChart
|
||||
https://naku.dohcrew.com/libchart/pages/introduction/
|
||||
|
||||
pChart
|
||||
http://pchart.sourceforge.net/
|
||||
https://pchart.sourceforge.net/
|
||||
|
||||
TeeChart
|
||||
https://www.steema.com/
|
||||
|
||||
PHPGraphLib
|
||||
http://www.ebrueggeman.com/phpgraphlib
|
||||
https://www.ebrueggeman.com/phpgraphlib
|
@ -52,7 +52,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
// Code works for PHP 5.x
|
||||
|
||||
// Primary changes made by canyoncasa (dvc) for ParseXL 1.10 ...
|
||||
// http://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
|
||||
// https://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
|
||||
// Decoding of formula conditions, results, and tokens.
|
||||
// Support for user-defined named cells added as an array "namedcells"
|
||||
// Patch code for user-defined named cells supports single cells only.
|
||||
@ -4685,7 +4685,7 @@ class Xls extends BaseReader
|
||||
switch ($hyperlinkType) {
|
||||
case 'URL':
|
||||
// section 5.58.2: Hyperlink containing a URL
|
||||
// e.g. http://example.org/index.php
|
||||
// e.g. https://example.org/index.php
|
||||
|
||||
// offset: var; size: 16; GUID of URL Moniker
|
||||
$offset += 16;
|
||||
@ -7926,7 +7926,7 @@ class Xls extends BaseReader
|
||||
public static function getInt4d($data, $pos)
|
||||
{
|
||||
// FIX: represent numbers correctly on 64-bit system
|
||||
// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
|
||||
// https://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
|
||||
// Changed by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
|
||||
$_or_24 = ord($data[$pos + 3]);
|
||||
if ($_or_24 >= 128) {
|
||||
|
@ -107,14 +107,14 @@ class Xlsx extends BaseReader
|
||||
$zip->open($pFilename);
|
||||
|
||||
// The files we're looking at here are small enough that simpleXML is more efficient than XMLReader
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships");
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships");
|
||||
$rels = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels'))
|
||||
);
|
||||
foreach ($rels->Relationship as $rel) {
|
||||
switch ($rel['Type']) {
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlWorkbook = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "{$rel['Target']}"))
|
||||
);
|
||||
@ -149,17 +149,17 @@ class Xlsx extends BaseReader
|
||||
$zip = new ZipArchive();
|
||||
$zip->open($pFilename);
|
||||
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$rels = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels')),
|
||||
'SimpleXMLElement',
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
);
|
||||
foreach ($rels->Relationship as $rel) {
|
||||
if ($rel['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument') {
|
||||
if ($rel['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument') {
|
||||
$dir = dirname($rel['Target']);
|
||||
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorkbook = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')
|
||||
@ -167,16 +167,16 @@ class Xlsx extends BaseReader
|
||||
'SimpleXMLElement',
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
);
|
||||
$relsWorkbook->registerXPathNamespace('rel', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$relsWorkbook->registerXPathNamespace('rel', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
$worksheets = [];
|
||||
foreach ($relsWorkbook->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet') {
|
||||
$worksheets[(string) $ele['Id']] = $ele['Target'];
|
||||
}
|
||||
}
|
||||
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlWorkbook = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, "{$rel['Target']}")
|
||||
@ -196,7 +196,7 @@ class Xlsx extends BaseReader
|
||||
'totalColumns' => 0,
|
||||
];
|
||||
|
||||
$fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
|
||||
$fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
|
||||
|
||||
$xml = new XMLReader();
|
||||
$xml->xml(
|
||||
@ -332,7 +332,7 @@ class Xlsx extends BaseReader
|
||||
$zip->open($pFilename);
|
||||
|
||||
// Read the theme first, because we need the colour scheme when reading the styles
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$workbookBasename = $this->getWorkbookBaseName($zip);
|
||||
$wbRels = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "xl/_rels/${workbookBasename}.rels")),
|
||||
@ -341,7 +341,7 @@ class Xlsx extends BaseReader
|
||||
);
|
||||
foreach ($wbRels->Relationship as $rel) {
|
||||
switch ($rel['Type']) {
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
|
||||
$themeOrderArray = ['lt1', 'dk1', 'lt2', 'dk2'];
|
||||
$themeOrderAdditional = count($themeOrderArray);
|
||||
|
||||
@ -352,12 +352,12 @@ class Xlsx extends BaseReader
|
||||
);
|
||||
if (is_object($xmlTheme)) {
|
||||
$xmlThemeName = $xmlTheme->attributes();
|
||||
$xmlTheme = $xmlTheme->children('http://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$xmlTheme = $xmlTheme->children('https://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$themeName = (string) $xmlThemeName['name'];
|
||||
|
||||
$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
|
||||
$colourSchemeName = (string) $colourScheme['name'];
|
||||
$colourScheme = $xmlTheme->themeElements->clrScheme->children('http://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$colourScheme = $xmlTheme->themeElements->clrScheme->children('https://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
|
||||
$themeColours = [];
|
||||
foreach ($colourScheme as $k => $xmlColour) {
|
||||
@ -380,7 +380,7 @@ class Xlsx extends BaseReader
|
||||
}
|
||||
}
|
||||
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$rels = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, '_rels/.rels')),
|
||||
'SimpleXMLElement',
|
||||
@ -390,40 +390,40 @@ class Xlsx extends BaseReader
|
||||
$propertyReader = new PropertyReader($this->securityScanner, $excel->getProperties());
|
||||
foreach ($rels->Relationship as $rel) {
|
||||
switch ($rel['Type']) {
|
||||
case 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties':
|
||||
case 'https://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties':
|
||||
$propertyReader->readCoreProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
|
||||
|
||||
break;
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties':
|
||||
$propertyReader->readExtendedProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
|
||||
|
||||
break;
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties':
|
||||
$propertyReader->readCustomProperties($this->getFromZipArchive($zip, "{$rel['Target']}"));
|
||||
|
||||
break;
|
||||
//Ribbon
|
||||
case 'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility':
|
||||
case 'https://schemas.microsoft.com/office/2006/relationships/ui/extensibility':
|
||||
$customUI = $rel['Target'];
|
||||
if ($customUI !== null) {
|
||||
$this->readRibbon($excel, $customUI, $zip);
|
||||
}
|
||||
|
||||
break;
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
$dir = dirname($rel['Target']);
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorkbook = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/_rels/" . basename($rel['Target']) . '.rels')),
|
||||
'SimpleXMLElement',
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
);
|
||||
$relsWorkbook->registerXPathNamespace('rel', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$relsWorkbook->registerXPathNamespace('rel', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
$sharedStrings = [];
|
||||
$xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
|
||||
$xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='https://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
|
||||
if ($xpath) {
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlStrings = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")),
|
||||
'SimpleXMLElement',
|
||||
@ -444,12 +444,12 @@ class Xlsx extends BaseReader
|
||||
$macros = $customUI = null;
|
||||
foreach ($relsWorkbook->Relationship as $ele) {
|
||||
switch ($ele['Type']) {
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet':
|
||||
$worksheets[(string) $ele['Id']] = $ele['Target'];
|
||||
|
||||
break;
|
||||
// a vbaProject ? (: some macros)
|
||||
case 'http://schemas.microsoft.com/office/2006/relationships/vbaProject':
|
||||
case 'https://schemas.microsoft.com/office/2006/relationships/vbaProject':
|
||||
$macros = $ele['Target'];
|
||||
|
||||
break;
|
||||
@ -469,8 +469,8 @@ class Xlsx extends BaseReader
|
||||
}
|
||||
}
|
||||
|
||||
$xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xpath = self::getArrayItem($relsWorkbook->xpath("rel:Relationship[@Type='https://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlStyles = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$xpath[Target]")),
|
||||
'SimpleXMLElement',
|
||||
@ -484,7 +484,7 @@ class Xlsx extends BaseReader
|
||||
$numFmts = $xmlStyles->numFmts[0];
|
||||
}
|
||||
if (isset($numFmts) && ($numFmts !== null)) {
|
||||
$numFmts->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$numFmts->registerXPathNamespace('sml', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
}
|
||||
if (!$this->readDataOnly && $xmlStyles) {
|
||||
foreach ($xmlStyles->cellXfs->xf as $xf) {
|
||||
@ -563,7 +563,7 @@ class Xlsx extends BaseReader
|
||||
$dxfs = $styleReader->dxfs($this->readDataOnly);
|
||||
$styles = $styleReader->styles();
|
||||
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlWorkbook = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "{$rel['Target']}")),
|
||||
'SimpleXMLElement',
|
||||
@ -614,8 +614,8 @@ class Xlsx extends BaseReader
|
||||
// and we're simply bringing the worksheet name in line with the formula, not the
|
||||
// reverse
|
||||
$docSheet->setTitle((string) $eleSheet['name'], false, false);
|
||||
$fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
|
||||
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
|
||||
//~ https://schemas.openxmlformats.org/spreadsheetml/2006/main"
|
||||
$xmlSheet = simplexml_load_string(
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, "$dir/$fileWorksheet")),
|
||||
'SimpleXMLElement',
|
||||
@ -790,7 +790,7 @@ class Xlsx extends BaseReader
|
||||
|
||||
// unparsed sheet AlternateContent
|
||||
if ($xmlSheet && !$this->readDataOnly) {
|
||||
$mc = $xmlSheet->children('http://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
$mc = $xmlSheet->children('https://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
if ($mc->AlternateContent) {
|
||||
foreach ($mc->AlternateContent as $alternateContent) {
|
||||
$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['AlternateContents'][] = $alternateContent->asXML();
|
||||
@ -804,7 +804,7 @@ class Xlsx extends BaseReader
|
||||
// Locate hyperlink relations
|
||||
$relationsFileName = dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels';
|
||||
if ($zip->locateName($relationsFileName)) {
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, $relationsFileName)
|
||||
@ -827,7 +827,7 @@ class Xlsx extends BaseReader
|
||||
if (!$this->readDataOnly) {
|
||||
// Locate comment relations
|
||||
if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
|
||||
@ -836,10 +836,10 @@ class Xlsx extends BaseReader
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
);
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/comments') {
|
||||
$comments[(string) $ele['Id']] = (string) $ele['Target'];
|
||||
}
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
|
||||
$vmlComments[(string) $ele['Id']] = (string) $ele['Target'];
|
||||
}
|
||||
}
|
||||
@ -968,7 +968,7 @@ class Xlsx extends BaseReader
|
||||
// Header/footer images
|
||||
if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
|
||||
if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
|
||||
@ -979,14 +979,14 @@ class Xlsx extends BaseReader
|
||||
$vmlRelationship = '';
|
||||
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing') {
|
||||
$vmlRelationship = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
|
||||
}
|
||||
}
|
||||
|
||||
if ($vmlRelationship != '') {
|
||||
// Fetch linked images
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsVML = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels')
|
||||
@ -997,7 +997,7 @@ class Xlsx extends BaseReader
|
||||
$drawings = [];
|
||||
if (isset($relsVML->Relationship)) {
|
||||
foreach ($relsVML->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
$drawings[(string) $ele['Id']] = self::dirAdd($vmlRelationship, $ele['Target']);
|
||||
}
|
||||
}
|
||||
@ -1050,7 +1050,7 @@ class Xlsx extends BaseReader
|
||||
|
||||
// TODO: Autoshapes from twoCellAnchors!
|
||||
if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
|
||||
@ -1060,16 +1060,16 @@ class Xlsx extends BaseReader
|
||||
);
|
||||
$drawings = [];
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
|
||||
$drawings[(string) $ele['Id']] = self::dirAdd("$dir/$fileWorksheet", $ele['Target']);
|
||||
}
|
||||
}
|
||||
if ($xmlSheet->drawing && !$this->readDataOnly) {
|
||||
$unparsedDrawings = [];
|
||||
foreach ($xmlSheet->drawing as $drawing) {
|
||||
$drawingRelId = (string) self::getArrayItem($drawing->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id');
|
||||
$drawingRelId = (string) self::getArrayItem($drawing->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id');
|
||||
$fileDrawing = $drawings[$drawingRelId];
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsDrawing = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname($fileDrawing) . '/_rels/' . basename($fileDrawing) . '.rels')
|
||||
@ -1081,12 +1081,12 @@ class Xlsx extends BaseReader
|
||||
$hyperlinks = [];
|
||||
if ($relsDrawing && $relsDrawing->Relationship) {
|
||||
foreach ($relsDrawing->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
|
||||
$hyperlinks[(string) $ele['Id']] = (string) $ele['Target'];
|
||||
}
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
$images[(string) $ele['Id']] = self::dirAdd($fileDrawing, $ele['Target']);
|
||||
} elseif ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart') {
|
||||
} elseif ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/chart') {
|
||||
if ($this->includeCharts) {
|
||||
$charts[self::dirAdd($fileDrawing, $ele['Target'])] = [
|
||||
'id' => (string) $ele['Id'],
|
||||
@ -1101,19 +1101,19 @@ class Xlsx extends BaseReader
|
||||
'SimpleXMLElement',
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
);
|
||||
$xmlDrawingChildren = $xmlDrawing->children('http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
$xmlDrawingChildren = $xmlDrawing->children('https://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
|
||||
if ($xmlDrawingChildren->oneCellAnchor) {
|
||||
foreach ($xmlDrawingChildren->oneCellAnchor as $oneCellAnchor) {
|
||||
if ($oneCellAnchor->pic->blipFill) {
|
||||
/** @var SimpleXMLElement $blip */
|
||||
$blip = $oneCellAnchor->pic->blipFill->children('http://schemas.openxmlformats.org/drawingml/2006/main')->blip;
|
||||
$blip = $oneCellAnchor->pic->blipFill->children('https://schemas.openxmlformats.org/drawingml/2006/main')->blip;
|
||||
/** @var SimpleXMLElement $xfrm */
|
||||
$xfrm = $oneCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
|
||||
$xfrm = $oneCellAnchor->pic->spPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
|
||||
/** @var SimpleXMLElement $outerShdw */
|
||||
$outerShdw = $oneCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
|
||||
$outerShdw = $oneCellAnchor->pic->spPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
|
||||
/** @var SimpleXMLElement $hlinkClick */
|
||||
$hlinkClick = $oneCellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
$hlinkClick = $oneCellAnchor->pic->nvPicPr->cNvPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
|
||||
$objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
|
||||
$objDrawing->setName((string) self::getArrayItem($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
|
||||
@ -1121,7 +1121,7 @@ class Xlsx extends BaseReader
|
||||
$objDrawing->setPath(
|
||||
'zip://' . File::realpath($pFilename) . '#' .
|
||||
$images[(string) self::getArrayItem(
|
||||
$blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
|
||||
$blip->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships'),
|
||||
'embed'
|
||||
)],
|
||||
false
|
||||
@ -1163,17 +1163,17 @@ class Xlsx extends BaseReader
|
||||
if ($xmlDrawingChildren->twoCellAnchor) {
|
||||
foreach ($xmlDrawingChildren->twoCellAnchor as $twoCellAnchor) {
|
||||
if ($twoCellAnchor->pic->blipFill) {
|
||||
$blip = $twoCellAnchor->pic->blipFill->children('http://schemas.openxmlformats.org/drawingml/2006/main')->blip;
|
||||
$xfrm = $twoCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
|
||||
$outerShdw = $twoCellAnchor->pic->spPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
|
||||
$hlinkClick = $twoCellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
$blip = $twoCellAnchor->pic->blipFill->children('https://schemas.openxmlformats.org/drawingml/2006/main')->blip;
|
||||
$xfrm = $twoCellAnchor->pic->spPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->xfrm;
|
||||
$outerShdw = $twoCellAnchor->pic->spPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->effectLst->outerShdw;
|
||||
$hlinkClick = $twoCellAnchor->pic->nvPicPr->cNvPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
$objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
|
||||
$objDrawing->setName((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name'));
|
||||
$objDrawing->setDescription((string) self::getArrayItem($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), 'descr'));
|
||||
$objDrawing->setPath(
|
||||
'zip://' . File::realpath($pFilename) . '#' .
|
||||
$images[(string) self::getArrayItem(
|
||||
$blip->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'),
|
||||
$blip->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships'),
|
||||
'embed'
|
||||
)],
|
||||
false
|
||||
@ -1210,10 +1210,10 @@ class Xlsx extends BaseReader
|
||||
$toCoordinate = Coordinate::stringFromColumnIndex(((string) $twoCellAnchor->to->col) + 1) . ($twoCellAnchor->to->row + 1);
|
||||
$toOffsetX = Drawing::EMUToPixels($twoCellAnchor->to->colOff);
|
||||
$toOffsetY = Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
|
||||
$graphic = $twoCellAnchor->graphicFrame->children('http://schemas.openxmlformats.org/drawingml/2006/main')->graphic;
|
||||
$graphic = $twoCellAnchor->graphicFrame->children('https://schemas.openxmlformats.org/drawingml/2006/main')->graphic;
|
||||
/** @var SimpleXMLElement $chartRef */
|
||||
$chartRef = $graphic->graphicData->children('http://schemas.openxmlformats.org/drawingml/2006/chart')->chart;
|
||||
$thisChart = (string) $chartRef->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$chartRef = $graphic->graphicData->children('https://schemas.openxmlformats.org/drawingml/2006/chart')->chart;
|
||||
$thisChart = (string) $chartRef->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
|
||||
$chartDetails[$docSheet->getTitle() . '!' . $thisChart] = [
|
||||
'fromCoordinate' => $fromCoordinate,
|
||||
@ -1236,7 +1236,7 @@ class Xlsx extends BaseReader
|
||||
// store original rId of drawing files
|
||||
$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'] = [];
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing') {
|
||||
$drawingRelId = (string) $ele['Id'];
|
||||
$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['drawingOriginalIds'][(string) $ele['Target']] = $drawingRelId;
|
||||
if (isset($unparsedDrawings[$drawingRelId])) {
|
||||
@ -1250,7 +1250,7 @@ class Xlsx extends BaseReader
|
||||
$this->securityScanner->scan($this->getFromZipArchive($zip, $fileDrawing)),
|
||||
'SimpleXMLElement',
|
||||
Settings::getLibXmlLoaderOptions()
|
||||
)->children('http://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
)->children('https://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
|
||||
if ($xmlAltDrawing->AlternateContent) {
|
||||
foreach ($xmlAltDrawing->AlternateContent as $alternateContent) {
|
||||
@ -1600,7 +1600,7 @@ class Xlsx extends BaseReader
|
||||
$docStyle->getFill()->setFillType((string) $gradientFill['type']);
|
||||
}
|
||||
$docStyle->getFill()->setRotation((float) ($gradientFill['degree']));
|
||||
$gradientFill->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$gradientFill->registerXPathNamespace('sml', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$docStyle->getFill()->getStartColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color));
|
||||
$docStyle->getFill()->getEndColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color));
|
||||
} elseif ($style->fill->patternFill) {
|
||||
@ -1779,7 +1779,7 @@ class Xlsx extends BaseReader
|
||||
if (false !== $UIRels) {
|
||||
// we need to save id and target to avoid parsing customUI.xml and "guess" if it's a pseudo callback who load the image
|
||||
foreach ($UIRels->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image') {
|
||||
// an image ?
|
||||
$customUIImagesNames[(string) $ele['Id']] = (string) $ele['Target'];
|
||||
$customUIImagesBinaries[(string) $ele['Target']] = $this->getFromZipArchive($zip, $baseDir . '/' . (string) $ele['Target']);
|
||||
@ -1865,13 +1865,13 @@ class Xlsx extends BaseReader
|
||||
*/
|
||||
private function readHyperLinkDrawing($objDrawing, $cellAnchor, $hyperlinks): void
|
||||
{
|
||||
$hlinkClick = $cellAnchor->pic->nvPicPr->cNvPr->children('http://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
$hlinkClick = $cellAnchor->pic->nvPicPr->cNvPr->children('https://schemas.openxmlformats.org/drawingml/2006/main')->hlinkClick;
|
||||
|
||||
if ($hlinkClick->count() === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$hlinkId = (string) $hlinkClick->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships')['id'];
|
||||
$hlinkId = (string) $hlinkClick->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships')['id'];
|
||||
$hyperlink = new Hyperlink(
|
||||
$hyperlinks[$hlinkId],
|
||||
(string) self::getArrayItem($cellAnchor->pic->nvPicPr->cNvPr->attributes(), 'name')
|
||||
@ -1912,7 +1912,7 @@ class Xlsx extends BaseReader
|
||||
return;
|
||||
}
|
||||
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
|
||||
@ -1922,7 +1922,7 @@ class Xlsx extends BaseReader
|
||||
);
|
||||
$ctrlProps = [];
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp') {
|
||||
$ctrlProps[(string) $ele['Id']] = $ele;
|
||||
}
|
||||
}
|
||||
@ -1944,7 +1944,7 @@ class Xlsx extends BaseReader
|
||||
return;
|
||||
}
|
||||
|
||||
//~ http://schemas.openxmlformats.org/package/2006/relationships"
|
||||
//~ https://schemas.openxmlformats.org/package/2006/relationships"
|
||||
$relsWorksheet = simplexml_load_string(
|
||||
$this->securityScanner->scan(
|
||||
$this->getFromZipArchive($zip, dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')
|
||||
@ -1954,7 +1954,7 @@ class Xlsx extends BaseReader
|
||||
);
|
||||
$sheetPrinterSettings = [];
|
||||
foreach ($relsWorksheet->Relationship as $ele) {
|
||||
if ($ele['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings') {
|
||||
if ($ele['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings') {
|
||||
$sheetPrinterSettings[(string) $ele['Id']] = $ele;
|
||||
}
|
||||
}
|
||||
@ -2013,7 +2013,7 @@ class Xlsx extends BaseReader
|
||||
if ($rels !== false) {
|
||||
foreach ($rels->Relationship as $rel) {
|
||||
switch ($rel['Type']) {
|
||||
case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
case 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument':
|
||||
$basename = basename($rel['Target']);
|
||||
if (preg_match('/workbook.*\.xml/', $basename)) {
|
||||
$workbookBasename = $basename;
|
||||
|
@ -20,7 +20,7 @@ class Hyperlinks
|
||||
public function readHyperlinks(SimpleXMLElement $relsWorksheet): void
|
||||
{
|
||||
foreach ($relsWorksheet->Relationship as $element) {
|
||||
if ($element['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
|
||||
if ($element['Type'] == 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink') {
|
||||
$this->hyperlinks[(string) $element['Id']] = (string) $element['Target'];
|
||||
}
|
||||
}
|
||||
@ -36,7 +36,7 @@ class Hyperlinks
|
||||
private function setHyperlink(SimpleXMLElement $hyperlink, Worksheet $worksheet): void
|
||||
{
|
||||
// Link url
|
||||
$linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$linkRel = $hyperlink->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
|
||||
foreach (Coordinate::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
|
||||
$cell = $worksheet->getCell($cellReference);
|
||||
|
@ -70,7 +70,7 @@ class PageSetup extends BaseParserClass
|
||||
$docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
|
||||
}
|
||||
|
||||
$relAttributes = $xmlSheet->pageSetup->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$relAttributes = $xmlSheet->pageSetup->attributes('https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
if (isset($relAttributes['id'])) {
|
||||
$unparsedLoadedData['sheets'][$worksheet->getCodeName()]['pageSetupRelId'] = (string) $relAttributes['id'];
|
||||
}
|
||||
|
@ -33,9 +33,9 @@ class Properties
|
||||
$xmlCore = $this->extractPropertyData($propertyData);
|
||||
|
||||
if (is_object($xmlCore)) {
|
||||
$xmlCore->registerXPathNamespace('dc', 'http://purl.org/dc/elements/1.1/');
|
||||
$xmlCore->registerXPathNamespace('dcterms', 'http://purl.org/dc/terms/');
|
||||
$xmlCore->registerXPathNamespace('cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
|
||||
$xmlCore->registerXPathNamespace('dc', 'https://purl.org/dc/elements/1.1/');
|
||||
$xmlCore->registerXPathNamespace('dcterms', 'https://purl.org/dc/terms/');
|
||||
$xmlCore->registerXPathNamespace('cp', 'https://schemas.openxmlformats.org/package/2006/metadata/core-properties');
|
||||
|
||||
$this->docProps->setCreator((string) self::getArrayItem($xmlCore->xpath('dc:creator')));
|
||||
$this->docProps->setLastModifiedBy((string) self::getArrayItem($xmlCore->xpath('cp:lastModifiedBy')));
|
||||
@ -73,7 +73,7 @@ class Properties
|
||||
$cellDataOfficeAttributes = $xmlProperty->attributes();
|
||||
if (isset($cellDataOfficeAttributes['name'])) {
|
||||
$propertyName = (string) $cellDataOfficeAttributes['name'];
|
||||
$cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
$cellDataOfficeChildren = $xmlProperty->children('https://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
|
||||
$attributeType = $cellDataOfficeChildren->getName();
|
||||
$attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
|
||||
|
@ -93,7 +93,7 @@ class Styles extends BaseParserClass
|
||||
$fillStyle->setFillType((string) $gradientFill['type']);
|
||||
}
|
||||
$fillStyle->setRotation((float) ($gradientFill['degree']));
|
||||
$gradientFill->registerXPathNamespace('sml', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$gradientFill->registerXPathNamespace('sml', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$fillStyle->getStartColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=0]'))->color));
|
||||
$fillStyle->getEndColor()->setARGB(self::readColor(self::getArrayItem($gradientFill->xpath('sml:stop[@position=1]'))->color));
|
||||
} elseif ($fillStyleXml->patternFill) {
|
||||
|
@ -148,7 +148,7 @@ class Drawing
|
||||
/**
|
||||
* Create a new image from file. By alexander at alexauto dot nl.
|
||||
*
|
||||
* @see http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
|
||||
* @see https://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
|
||||
*
|
||||
* @param string $p_sFile Path to Windows DIB (BMP) image
|
||||
*
|
||||
@ -168,7 +168,7 @@ class Drawing
|
||||
$header = substr($hex, 0, 108);
|
||||
|
||||
// Process the header
|
||||
// Structure: http://www.fastgraph.com/help/bmp_header_format.html
|
||||
// Structure: https://www.fastgraph.com/help/bmp_header_format.html
|
||||
if (substr($header, 0, 4) == '424d') {
|
||||
// Cut it in parts of 2 bytes
|
||||
$header_parts = str_split($header, 2);
|
||||
|
@ -11,7 +11,7 @@ namespace PhpOffice\PhpSpreadsheet\Shared;
|
||||
// | This source file is subject to version 2.02 of the PHP license, |
|
||||
// | that is bundled with this package in the file LICENSE, and is |
|
||||
// | available at through the world-wide-web at |
|
||||
// | http://www.php.net/license/2_02.txt. |
|
||||
// | https://www.php.net/license/2_02.txt. |
|
||||
// | If you did not receive a copy of the PHP license and are unable to |
|
||||
// | obtain it through the world-wide-web, please send a note to |
|
||||
// | license@php.net so we can mail you a copy immediately. |
|
||||
|
@ -11,7 +11,7 @@ namespace PhpOffice\PhpSpreadsheet\Shared\OLE;
|
||||
// | This source file is subject to version 2.02 of the PHP license, |
|
||||
// | that is bundled with this package in the file LICENSE, and is |
|
||||
// | available at through the world-wide-web at |
|
||||
// | http://www.php.net/license/2_02.txt. |
|
||||
// | https://www.php.net/license/2_02.txt. |
|
||||
// | If you did not receive a copy of the PHP license and are unable to |
|
||||
// | obtain it through the world-wide-web, please send a note to |
|
||||
// | license@php.net so we can mail you a copy immediately. |
|
||||
|
@ -11,7 +11,7 @@ namespace PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
|
||||
// | This source file is subject to version 2.02 of the PHP license, |
|
||||
// | that is bundled with this package in the file LICENSE, and is |
|
||||
// | available at through the world-wide-web at |
|
||||
// | http://www.php.net/license/2_02.txt. |
|
||||
// | https://www.php.net/license/2_02.txt. |
|
||||
// | If you did not receive a copy of the PHP license and are unable to |
|
||||
// | obtain it through the world-wide-web, please send a note to |
|
||||
// | license@php.net so we can mail you a copy immediately. |
|
||||
|
@ -11,7 +11,7 @@ namespace PhpOffice\PhpSpreadsheet\Shared\OLE\PPS;
|
||||
// | This source file is subject to version 2.02 of the PHP license, |
|
||||
// | that is bundled with this package in the file LICENSE, and is |
|
||||
// | available at through the world-wide-web at |
|
||||
// | http://www.php.net/license/2_02.txt. |
|
||||
// | https://www.php.net/license/2_02.txt. |
|
||||
// | If you did not receive a copy of the PHP license and are unable to |
|
||||
// | obtain it through the world-wide-web, please send a note to |
|
||||
// | license@php.net so we can mail you a copy immediately. |
|
||||
|
@ -335,7 +335,7 @@ class OLERead
|
||||
}
|
||||
|
||||
// FIX: represent numbers correctly on 64-bit system
|
||||
// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
|
||||
// https://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
|
||||
// Changed by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
|
||||
$_or_24 = ord($data[$pos + 3]);
|
||||
if ($_or_24 >= 128) {
|
||||
|
@ -361,8 +361,8 @@ class Html extends BaseWriter
|
||||
{
|
||||
// Construct HTML
|
||||
$properties = $this->spreadsheet->getProperties();
|
||||
$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . PHP_EOL;
|
||||
$html .= '<html xmlns="http://www.w3.org/1999/xhtml">' . PHP_EOL;
|
||||
$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . PHP_EOL;
|
||||
$html .= '<html xmlns="https://www.w3.org/1999/xhtml">' . PHP_EOL;
|
||||
$html .= ' <head>' . PHP_EOL;
|
||||
$html .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . PHP_EOL;
|
||||
$html .= ' <meta name="generator" content="PhpSpreadsheet, https://github.com/PHPOffice/PhpSpreadsheet" />' . PHP_EOL;
|
||||
|
@ -48,32 +48,32 @@ class Content extends WriterPart
|
||||
$objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
|
||||
$objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
|
||||
$objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'https://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'https://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
|
||||
$objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
|
||||
$objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
|
||||
$objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
|
||||
$objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
|
||||
$objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
|
||||
$objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
|
||||
$objWriter->writeAttribute('xmlns:math', 'https://www.w3.org/1998/Math/MathML');
|
||||
$objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
|
||||
$objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
|
||||
$objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
|
||||
$objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
|
||||
$objWriter->writeAttribute('xmlns:xforms', 'http://www.w3.org/2002/xforms');
|
||||
$objWriter->writeAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema');
|
||||
$objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
|
||||
$objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'https://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:ooow', 'https://openoffice.org/2004/writer');
|
||||
$objWriter->writeAttribute('xmlns:oooc', 'https://openoffice.org/2004/calc');
|
||||
$objWriter->writeAttribute('xmlns:dom', 'https://www.w3.org/2001/xml-events');
|
||||
$objWriter->writeAttribute('xmlns:xforms', 'https://www.w3.org/2002/xforms');
|
||||
$objWriter->writeAttribute('xmlns:xsd', 'https://www.w3.org/2001/XMLSchema');
|
||||
$objWriter->writeAttribute('xmlns:xsi', 'https://www.w3.org/2001/XMLSchema-instance');
|
||||
$objWriter->writeAttribute('xmlns:rpt', 'https://openoffice.org/2005/report');
|
||||
$objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
|
||||
$objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
|
||||
$objWriter->writeAttribute('xmlns:xhtml', 'https://www.w3.org/1999/xhtml');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'https://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('xmlns:tableooo', 'https://openoffice.org/2009/table');
|
||||
$objWriter->writeAttribute('xmlns:field', 'urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0');
|
||||
$objWriter->writeAttribute('xmlns:formx', 'urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0');
|
||||
$objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
|
||||
$objWriter->writeAttribute('xmlns:css3t', 'https://www.w3.org/TR/css3-text/');
|
||||
$objWriter->writeAttribute('office:version', '1.2');
|
||||
|
||||
$objWriter->writeElement('office:scripts');
|
||||
|
@ -34,11 +34,11 @@ class Meta extends WriterPart
|
||||
$objWriter->startElement('office:document-meta');
|
||||
|
||||
$objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'https://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'https://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'https://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'https://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('office:version', '1.2');
|
||||
|
||||
$objWriter->startElement('office:meta');
|
||||
|
@ -29,9 +29,9 @@ class Settings extends WriterPart
|
||||
// Settings
|
||||
$objWriter->startElement('office:document-settings');
|
||||
$objWriter->writeAttribute('xmlns:office', 'urn:oasis:names:tc:opendocument:xmlns:office:1.0');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'https://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:config', 'urn:oasis:names:tc:opendocument:xmlns:config:1.0');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'https://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('office:version', '1.2');
|
||||
|
||||
$objWriter->startElement('office:settings');
|
||||
|
@ -34,27 +34,27 @@ class Styles extends WriterPart
|
||||
$objWriter->writeAttribute('xmlns:table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0');
|
||||
$objWriter->writeAttribute('xmlns:draw', 'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0');
|
||||
$objWriter->writeAttribute('xmlns:fo', 'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:xlink', 'https://www.w3.org/1999/xlink');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'https://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:meta', 'urn:oasis:names:tc:opendocument:xmlns:meta:1.0');
|
||||
$objWriter->writeAttribute('xmlns:number', 'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0');
|
||||
$objWriter->writeAttribute('xmlns:presentation', 'urn:oasis:names:tc:opendocument:xmlns:presentation:1.0');
|
||||
$objWriter->writeAttribute('xmlns:svg', 'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0');
|
||||
$objWriter->writeAttribute('xmlns:chart', 'urn:oasis:names:tc:opendocument:xmlns:chart:1.0');
|
||||
$objWriter->writeAttribute('xmlns:dr3d', 'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0');
|
||||
$objWriter->writeAttribute('xmlns:math', 'http://www.w3.org/1998/Math/MathML');
|
||||
$objWriter->writeAttribute('xmlns:math', 'https://www.w3.org/1998/Math/MathML');
|
||||
$objWriter->writeAttribute('xmlns:form', 'urn:oasis:names:tc:opendocument:xmlns:form:1.0');
|
||||
$objWriter->writeAttribute('xmlns:script', 'urn:oasis:names:tc:opendocument:xmlns:script:1.0');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'http://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:ooow', 'http://openoffice.org/2004/writer');
|
||||
$objWriter->writeAttribute('xmlns:oooc', 'http://openoffice.org/2004/calc');
|
||||
$objWriter->writeAttribute('xmlns:dom', 'http://www.w3.org/2001/xml-events');
|
||||
$objWriter->writeAttribute('xmlns:rpt', 'http://openoffice.org/2005/report');
|
||||
$objWriter->writeAttribute('xmlns:ooo', 'https://openoffice.org/2004/office');
|
||||
$objWriter->writeAttribute('xmlns:ooow', 'https://openoffice.org/2004/writer');
|
||||
$objWriter->writeAttribute('xmlns:oooc', 'https://openoffice.org/2004/calc');
|
||||
$objWriter->writeAttribute('xmlns:dom', 'https://www.w3.org/2001/xml-events');
|
||||
$objWriter->writeAttribute('xmlns:rpt', 'https://openoffice.org/2005/report');
|
||||
$objWriter->writeAttribute('xmlns:of', 'urn:oasis:names:tc:opendocument:xmlns:of:1.2');
|
||||
$objWriter->writeAttribute('xmlns:xhtml', 'http://www.w3.org/1999/xhtml');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'http://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('xmlns:tableooo', 'http://openoffice.org/2009/table');
|
||||
$objWriter->writeAttribute('xmlns:css3t', 'http://www.w3.org/TR/css3-text/');
|
||||
$objWriter->writeAttribute('xmlns:xhtml', 'https://www.w3.org/1999/xhtml');
|
||||
$objWriter->writeAttribute('xmlns:grddl', 'https://www.w3.org/2003/g/data-view#');
|
||||
$objWriter->writeAttribute('xmlns:tableooo', 'https://openoffice.org/2009/table');
|
||||
$objWriter->writeAttribute('xmlns:css3t', 'https://www.w3.org/TR/css3-text/');
|
||||
$objWriter->writeAttribute('office:version', '1.2');
|
||||
|
||||
$objWriter->writeElement('office:font-face-decls');
|
||||
|
@ -518,7 +518,7 @@ class Worksheet extends BIFFwriter
|
||||
if (strpos($url, 'sheet://') !== false) {
|
||||
// internal to current workbook
|
||||
$url = str_replace('sheet://', 'internal:', $url);
|
||||
} elseif (preg_match('/^(http:|https:|ftp:|mailto:)/', $url)) {
|
||||
} elseif (preg_match('/^(https:|https:|ftp:|mailto:)/', $url)) {
|
||||
// URL
|
||||
} else {
|
||||
// external (local file)
|
||||
|
@ -51,9 +51,9 @@ class Chart extends WriterPart
|
||||
|
||||
// c:chartSpace
|
||||
$objWriter->startElement('c:chartSpace');
|
||||
$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns:c', 'https://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->writeAttribute('xmlns:a', 'https://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
|
||||
$objWriter->startElement('c:date1904');
|
||||
$objWriter->writeAttribute('val', 0);
|
||||
@ -1466,10 +1466,10 @@ class Chart extends WriterPart
|
||||
private function writeAlternateContent($objWriter): void
|
||||
{
|
||||
$objWriter->startElement('mc:AlternateContent');
|
||||
$objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
$objWriter->writeAttribute('xmlns:mc', 'https://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
|
||||
$objWriter->startElement('mc:Choice');
|
||||
$objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
|
||||
$objWriter->writeAttribute('xmlns:c14', 'https://schemas.microsoft.com/office/drawing/2007/8/2/chart');
|
||||
$objWriter->writeAttribute('Requires', 'c14');
|
||||
|
||||
$objWriter->startElement('c14:style');
|
||||
|
@ -40,7 +40,7 @@ class Comments extends WriterPart
|
||||
|
||||
// comments
|
||||
$objWriter->startElement('comments');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
|
||||
// Loop through authors
|
||||
$objWriter->startElement('authors');
|
||||
|
@ -32,7 +32,7 @@ class ContentTypes extends WriterPart
|
||||
|
||||
// Types
|
||||
$objWriter->startElement('Types');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/content-types');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/content-types');
|
||||
|
||||
// Theme
|
||||
$this->writeOverrideContentType($objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml');
|
||||
|
@ -27,8 +27,8 @@ class DocProps extends WriterPart
|
||||
|
||||
// Properties
|
||||
$objWriter->startElement('Properties');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
|
||||
$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
|
||||
$objWriter->writeAttribute('xmlns:vt', 'https://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
|
||||
// Application
|
||||
$objWriter->writeElement('Application', 'Microsoft Excel');
|
||||
@ -122,11 +122,11 @@ class DocProps extends WriterPart
|
||||
|
||||
// cp:coreProperties
|
||||
$objWriter->startElement('cp:coreProperties');
|
||||
$objWriter->writeAttribute('xmlns:cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:dcterms', 'http://purl.org/dc/terms/');
|
||||
$objWriter->writeAttribute('xmlns:dcmitype', 'http://purl.org/dc/dcmitype/');
|
||||
$objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
|
||||
$objWriter->writeAttribute('xmlns:cp', 'https://schemas.openxmlformats.org/package/2006/metadata/core-properties');
|
||||
$objWriter->writeAttribute('xmlns:dc', 'https://purl.org/dc/elements/1.1/');
|
||||
$objWriter->writeAttribute('xmlns:dcterms', 'https://purl.org/dc/terms/');
|
||||
$objWriter->writeAttribute('xmlns:dcmitype', 'https://purl.org/dc/dcmitype/');
|
||||
$objWriter->writeAttribute('xmlns:xsi', 'https://www.w3.org/2001/XMLSchema-instance');
|
||||
|
||||
// dc:creator
|
||||
$objWriter->writeElement('dc:creator', $spreadsheet->getProperties()->getCreator());
|
||||
@ -192,8 +192,8 @@ class DocProps extends WriterPart
|
||||
|
||||
// cp:coreProperties
|
||||
$objWriter->startElement('Properties');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
|
||||
$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
|
||||
$objWriter->writeAttribute('xmlns:vt', 'https://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
|
||||
|
||||
foreach ($customPropertyList as $key => $customProperty) {
|
||||
$propertyValue = $spreadsheet->getProperties()->getCustomPropertyValue($customProperty);
|
||||
|
@ -33,8 +33,8 @@ class Drawing extends WriterPart
|
||||
|
||||
// xdr:wsDr
|
||||
$objWriter->startElement('xdr:wsDr');
|
||||
$objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:xdr', 'https://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
$objWriter->writeAttribute('xmlns:a', 'https://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
|
||||
// Loop through images and write drawings
|
||||
$i = 1;
|
||||
@ -129,10 +129,10 @@ class Drawing extends WriterPart
|
||||
|
||||
$objWriter->startElement('a:graphic');
|
||||
$objWriter->startElement('a:graphicData');
|
||||
$objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->writeAttribute('uri', 'https://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->startElement('c:chart');
|
||||
$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns:c', 'https://schemas.openxmlformats.org/drawingml/2006/chart');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('r:id', 'rId' . $pRelationId);
|
||||
$objWriter->endElement();
|
||||
$objWriter->endElement();
|
||||
@ -209,7 +209,7 @@ class Drawing extends WriterPart
|
||||
|
||||
// a:blip
|
||||
$objWriter->startElement('a:blip');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
|
||||
$objWriter->endElement();
|
||||
|
||||
@ -498,7 +498,7 @@ class Drawing extends WriterPart
|
||||
}
|
||||
|
||||
$objWriter->startElement('a:hlinkClick');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('r:id', 'rId' . $hlinkClickId);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ class Rels extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
$customPropertyList = $spreadsheet->getProperties()->getCustomProperties();
|
||||
if (!empty($customPropertyList)) {
|
||||
@ -37,7 +37,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
4,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
|
||||
'docProps/custom.xml'
|
||||
);
|
||||
}
|
||||
@ -46,7 +46,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
3,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
|
||||
'docProps/app.xml'
|
||||
);
|
||||
|
||||
@ -54,7 +54,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
2,
|
||||
'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
|
||||
'https://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
|
||||
'docProps/core.xml'
|
||||
);
|
||||
|
||||
@ -62,7 +62,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
1,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
|
||||
'xl/workbook.xml'
|
||||
);
|
||||
// a custom UI in workbook ?
|
||||
@ -70,7 +70,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationShip(
|
||||
$objWriter,
|
||||
5,
|
||||
'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
|
||||
'https://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
|
||||
$spreadsheet->getRibbonXMLData('target')
|
||||
);
|
||||
}
|
||||
@ -100,13 +100,13 @@ class Rels extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
// Relationship styles.xml
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
1,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
|
||||
'styles.xml'
|
||||
);
|
||||
|
||||
@ -114,7 +114,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
2,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
|
||||
'theme/theme1.xml'
|
||||
);
|
||||
|
||||
@ -122,7 +122,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
3,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
|
||||
'sharedStrings.xml'
|
||||
);
|
||||
|
||||
@ -132,7 +132,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
($i + 1 + 3),
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
|
||||
'worksheets/sheet' . ($i + 1) . '.xml'
|
||||
);
|
||||
}
|
||||
@ -142,7 +142,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationShip(
|
||||
$objWriter,
|
||||
($i + 1 + 3),
|
||||
'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
|
||||
'https://schemas.microsoft.com/office/2006/relationships/vbaProject',
|
||||
'vbaProject.bin'
|
||||
);
|
||||
++$i; //increment i if needed for an another relation
|
||||
@ -180,7 +180,7 @@ class Rels extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
// Write drawing relationships?
|
||||
$drawingOriginalIds = [];
|
||||
@ -212,7 +212,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
$rId,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
|
||||
$relPath
|
||||
);
|
||||
}
|
||||
@ -224,7 +224,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
'_hyperlink_' . $i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
|
||||
$hyperlink->getUrl(),
|
||||
'External'
|
||||
);
|
||||
@ -239,14 +239,14 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
'_comments_vml' . $i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
|
||||
'../drawings/vmlDrawing' . $pWorksheetId . '.vml'
|
||||
);
|
||||
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
'_comments' . $i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
|
||||
'../comments' . $pWorksheetId . '.xml'
|
||||
);
|
||||
}
|
||||
@ -257,14 +257,14 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
'_headerfooter_vml' . $i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
|
||||
'../drawings/vmlDrawingHF' . $pWorksheetId . '.vml'
|
||||
);
|
||||
}
|
||||
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'ctrlProps', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp');
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'vmlDrawings', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing');
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'printerSettings', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings');
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'ctrlProps', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp');
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'vmlDrawings', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing');
|
||||
$this->writeUnparsedRelationship($pWorksheet, $objWriter, 'printerSettings', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings');
|
||||
|
||||
$objWriter->endElement();
|
||||
|
||||
@ -311,7 +311,7 @@ class Rels extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
// Loop through images and write relationships
|
||||
$i = 1;
|
||||
@ -325,7 +325,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
$i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
|
||||
'../media/' . str_replace(' ', '', $drawing->getIndexedFilename())
|
||||
);
|
||||
|
||||
@ -344,7 +344,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
$i++,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
|
||||
'../charts/chart' . ++$chartRef . '.xml'
|
||||
);
|
||||
}
|
||||
@ -376,7 +376,7 @@ class Rels extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
|
||||
// Loop through images and write relationships
|
||||
foreach ($pWorksheet->getHeaderFooter()->getImages() as $key => $value) {
|
||||
@ -384,7 +384,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
$key,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
|
||||
'../media/' . $value->getIndexedFilename()
|
||||
);
|
||||
}
|
||||
@ -439,7 +439,7 @@ class Rels extends WriterPart
|
||||
$this->writeRelationship(
|
||||
$objWriter,
|
||||
$i,
|
||||
'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
|
||||
'https://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
|
||||
$drawing->getHyperlink()->getUrl(),
|
||||
$drawing->getHyperlink()->getTypeHyperlink()
|
||||
);
|
||||
|
@ -27,13 +27,13 @@ class RelsRibbon extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$localRels = $spreadsheet->getRibbonBinObjects('names');
|
||||
if (is_array($localRels)) {
|
||||
foreach ($localRels as $aId => $aTarget) {
|
||||
$objWriter->startElement('Relationship');
|
||||
$objWriter->writeAttribute('Id', $aId);
|
||||
$objWriter->writeAttribute('Type', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image');
|
||||
$objWriter->writeAttribute('Type', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships/image');
|
||||
$objWriter->writeAttribute('Target', $aTarget);
|
||||
$objWriter->endElement();
|
||||
}
|
||||
|
@ -27,10 +27,10 @@ class RelsVBA extends WriterPart
|
||||
|
||||
// Relationships
|
||||
$objWriter->startElement('Relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/package/2006/relationships');
|
||||
$objWriter->startElement('Relationship');
|
||||
$objWriter->writeAttribute('Id', 'rId1');
|
||||
$objWriter->writeAttribute('Type', 'http://schemas.microsoft.com/office/2006/relationships/vbaProjectSignature');
|
||||
$objWriter->writeAttribute('Type', 'https://schemas.microsoft.com/office/2006/relationships/vbaProjectSignature');
|
||||
$objWriter->writeAttribute('Target', 'vbaProjectSignature.bin');
|
||||
$objWriter->endElement();
|
||||
$objWriter->endElement();
|
||||
|
@ -78,7 +78,7 @@ class StringTable extends WriterPart
|
||||
|
||||
// String table
|
||||
$objWriter->startElement('sst');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('uniqueCount', count($pStringTable));
|
||||
|
||||
// Loop through string table
|
||||
|
@ -36,7 +36,7 @@ class Style extends WriterPart
|
||||
// styleSheet
|
||||
$objWriter->startElement('styleSheet');
|
||||
$objWriter->writeAttribute('xml:space', 'preserve');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
|
||||
// numFmts
|
||||
$objWriter->startElement('numFmts');
|
||||
|
@ -121,7 +121,7 @@ class Theme extends WriterPart
|
||||
|
||||
// a:theme
|
||||
$objWriter->startElement('a:theme');
|
||||
$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:a', 'https://schemas.openxmlformats.org/drawingml/2006/main');
|
||||
$objWriter->writeAttribute('name', 'Office Theme');
|
||||
|
||||
// a:themeElements
|
||||
|
@ -34,8 +34,8 @@ class Workbook extends WriterPart
|
||||
// workbook
|
||||
$objWriter->startElement('workbook');
|
||||
$objWriter->writeAttribute('xml:space', 'preserve');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
|
||||
// fileVersion
|
||||
$this->writeFileVersion($objWriter);
|
||||
|
@ -39,14 +39,14 @@ class Worksheet extends WriterPart
|
||||
// Worksheet
|
||||
$objWriter->startElement('worksheet');
|
||||
$objWriter->writeAttribute('xml:space', 'preserve');
|
||||
$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
$objWriter->writeAttribute('xmlns', 'https://schemas.openxmlformats.org/spreadsheetml/2006/main');
|
||||
$objWriter->writeAttribute('xmlns:r', 'https://schemas.openxmlformats.org/officeDocument/2006/relationships');
|
||||
|
||||
$objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
$objWriter->writeAttribute('xmlns:x14', 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/main');
|
||||
$objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
$objWriter->writeAttribute('xmlns:xdr', 'https://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
|
||||
$objWriter->writeAttribute('xmlns:x14', 'https://schemas.microsoft.com/office/spreadsheetml/2009/9/main');
|
||||
$objWriter->writeAttribute('xmlns:mc', 'https://schemas.openxmlformats.org/markup-compatibility/2006');
|
||||
$objWriter->writeAttribute('mc:Ignorable', 'x14ac');
|
||||
$objWriter->writeAttribute('xmlns:x14ac', 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac');
|
||||
$objWriter->writeAttribute('xmlns:x14ac', 'https://schemas.microsoft.com/office/spreadsheetml/2009/9/ac');
|
||||
|
||||
// sheetPr
|
||||
$this->writeSheetPr($objWriter, $pSheet);
|
||||
|
Reference in New Issue
Block a user