From 77de693c9f6b98e631ea9cd441bb83ab7acaa45a Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Tue, 7 Sep 2010 12:04:00 +0000
Subject: [PATCH] Minor fixes to reading standard/extended properties, and
 reading custom properties for the Excel2003XML Reader

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60519 2327b42d-5241-43d6-9e2a-de5ac946f064
---
 Classes/PHPExcel/Reader/Excel2003XML.php      |  55 +++++++++++++++---
 .../Functionality Cross-Reference.xls         | Bin 35328 -> 35840 bytes
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Classes/PHPExcel/Reader/Excel2003XML.php b/Classes/PHPExcel/Reader/Excel2003XML.php
index f78579d4..70e52902 100644
--- a/Classes/PHPExcel/Reader/Excel2003XML.php
+++ b/Classes/PHPExcel/Reader/Excel2003XML.php
@@ -272,6 +272,11 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $pixels;
 	}
 
+
+	private static function _hex2str($hex) {
+		return chr(hexdec($hex[1]));
+	}
+
 	/**
 	 * Loads PHPExcel from file into PHPExcel instance
 	 *
@@ -307,6 +312,9 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 				PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY
 			);
 
+		$timezoneObj = new DateTimeZone('Europe/London');
+		$GMT = new DateTimeZone('UTC');
+
 
 		// Check if file exists
 		if (!file_exists($pFilename)) {
@@ -315,14 +323,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 
 		$xml = simplexml_load_file($pFilename);
 		$namespaces = $xml->getNamespaces(true);
-//		echo '<pre>';
-//		print_r($namespaces);
-//		echo '</pre><hr />';
-//
-//		echo '<pre>';
-//		print_r($xml);
-//		echo '</pre><hr />';
-//
+
 		$docProps = $objPHPExcel->getProperties();
 		foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
 			switch ($propertyName) {
@@ -342,12 +343,19 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 				case 'LastAuthor' :
 						$docProps->setLastModifiedBy($propertyValue);
 						break;
+				case 'LastSaved' :
+						$lastSaveDate = strtotime($propertyValue);
+						$docProps->setModified($lastSaveDate);
+						break;
 				case 'Company' :
 						$docProps->setCompany($propertyValue);
 						break;
 				case 'Category' :
 						$docProps->setCategory($propertyValue);
 						break;
+				case 'Manager' :
+						$docProps->setManager($propertyValue);
+						break;
 				case 'Keywords' :
 						$docProps->setKeywords($propertyValue);
 						break;
@@ -356,7 +364,36 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 						break;
 			}
 		}
-
+		if (isset($xml->CustomDocumentProperties)) {
+			foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
+				$propertyAttributes = $propertyValue->attributes($namespaces['dt']);
+				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
+				$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
+				switch((string) $propertyAttributes) {
+					case 'string' :
+						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
+						$propertyValue = trim($propertyValue);
+						break;
+					case 'boolean' :
+						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
+						$propertyValue = (bool) $propertyValue;
+						break;
+					case 'integer' :
+						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER;
+						$propertyValue = intval($propertyValue);
+						break;
+					case 'float' :
+						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
+						$propertyValue = floatval($propertyValue);
+						break;
+					case 'dateTime.tz' :
+						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
+						$propertyValue = strtotime(trim($propertyValue));
+						break;
+				}
+				$docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
+			}
+		}
 
 		foreach($xml->Styles[0] as $style) {
 			$style_ss = $style->attributes($namespaces['ss']);
diff --git a/Documentation/Functionality Cross-Reference.xls b/Documentation/Functionality Cross-Reference.xls
index a37229b0832b8b45a640119ff0fc2f54933bc0b5..fecb98eef6edcaddc829cd620256551c7e7604ef 100644
GIT binary patch
delta 909
zcma)4OGs2v82--j&h5@+oVkuO<28$ND$)o{C#VeaHAD=Snl+9sB1gw0G)EmJ1<^&C
zJr?F^;i96Vr6F;kRfGjakQ<>z6i9AE60D&2^xsJtZ54-mzwdv3|9K4G;KP%Ad=Cp=
zFV0h{06eUlW-`hAjOB{0HdEZmu>TL!?HFfN&XFq9J!#WWOnomN^OdNf<WoaK@i{nh
z(pi>PyJBe>ibq^gGFRBt3N!Wn=^m7<A6i#S3TyQLDwuj%y2R>w!De+GwOL_HZ^pK&
zH=l|urXo&t2gRN0CQ++eai{7Nan(g^SfxsNPkm$eyoZPO12AZSk)n`&Mku3ZzRa>z
z)VIZAiQ*ABG1#=mQ(}2Co7Z>(*Pu|J-FV70`T+kEhM(YiHSsR#@-*1lc~NKP=bnuv
zs(O18ogKB^o$*+AqCec!-Ww|@)J3h&?_M7|(I1bA1@HEuo_~u93X>S1v3I!v2hGt%
zSWmc2_}a3w$tLL~+Tk4CTAL3DDZsfLpxOpxnZPGPM=tPD1)_w(4ZsJ&S;ELhpp;JK
z5#gjpXXDNTK9ggKaLz8@ZjNqq&IIY$B0%|RN;)G$6%L!ng?Ia0^ny4BX)uFUM?juB
z{DScam;NJ88w<+fqthA-iiMM9%p>x{*`mBg&GEv8<LIQ>e?f<r3M&x@#DQ>tay!CT
z>HjVDA88;ivm#!`UW%QKMeM$8XndeKy(DT~rk57y!X3TKV^I;RxGCzIm-&}wi^_$T
zEle6!ZZ^^ST+^CvUp)4TWyrbKBA1Adsgn0SGqe(F^E;VLirG<9D_u1fM@?2K*rgv6
ZV_*5L7V&*-fCWVF<srvGN?CnBe*o5i&no}`

delta 749
zcma)2OK1~O6g_V;^D;A})1gh$sV!D3>PBpvx{wM+617^S^dqKL#ZL@oA+-3x;-+z-
zlvJ?IbJ2x}y7WUV4|Jgm5p-igDuUv|t()S)cA-Ht-WMaOI~m?R=iYPgJ#SuaPRrfY
zW;$7NwyQ-?0GJ;vGU>B+#>T`t!xMJ`*8ecu!VIHv4V5uFTuWWuv$x^7R#jbnJuP(g
zXh=g-txI{G)s>g4heckmtFnhx=Goh8JE+;-`Ohpltn&Zk;Mwuoh}t?~sIAuwB`d!d
z#$UhB6=kWSID8}N4sR6$T<H#vig8{~EXQe5-s2xFS#b9THhFRSCvXgBGnorrSK;8s
ziB*-Ds<fRF<;K>!XWbfp;;7X}k2EGXhf~(1k8?25&;W#J=rG|h;U~iPDsQBmnm>er
zMS8n|DA1<^LruT|1NcF>Ot|6!UpZ;b!0sUMj&Ol+*BYS51a1?~5tay72-9Yi4jIS?
zYf~GXQW9uS(b{9c{o~S2gbdxqlbG!6ea!^l=SY3OX0W6T_7_doE1n*T2RuZ?m4hu}
zOKK}sj-;k3eyPOsBgCaY5@GDIh>Uiy>vGTNBhv|jZVHAVeTGp;-_<Ui6mH^{h@bwZ
z1=EVkx0yCp$i6be&GTpa->`sO%y!g^@jRE>#7oyK`@Y{zOT@yIS4noLWNFH?l=6#C
dd3JEQkpHd~)1s8W%wpo=^kk@qy5On+{06@jxT^pF