From 0e1ba979663032fdff0e22f94d1889ca251dd354 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 27 Jan 2012 13:29:35 +0000
Subject: [PATCH]

---
 inc/ws/Util/packager/class.ws.packager.v1.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 5f808b9e9..14fc72112 100644
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -120,8 +120,8 @@ class wsPackagerV1 extends wsPackagerHTML {
 	protected function copyConfig() {
 		global $core;
 
-		$mapping = array('width' => 'sizeX'
-			, 'height' => 'sizeY',
+		$mapping = array('width' => 'sizeX',
+			'height' => 'sizeY',
 			'repeat' => 'patternFlag',
 			'zoom' => 'maxZoom',
 			'zoomw' => 'maxZoomScroll',
@@ -139,7 +139,10 @@ class wsPackagerV1 extends wsPackagerHTML {
 		$more = array('id' => $this->book_id,
 			'pagesSplit' => 1,
 			'pdfName' => 'document.pdf',
-			'readingDir' => 'ltr');
+			'readingDir' => 'ltr',
+			'ws' => '2');
+
+		$booleans = array('pdfFlag', 'printFlag', 'searchFlag', 'sendfriendFlag', 'bookmarkFlag', 'emailEditable');
 
 		$xml = simplexml_load_string('<?xml version="1.0" encoding="UTF-8" ?><movie />');
 		$extras = $xml->addChild('extras');
@@ -181,6 +184,10 @@ class wsPackagerV1 extends wsPackagerHTML {
 				$k = $mapping[$k];
 			}
 
+			if (in_array($k, $booleans)) {
+				$v = $v ? 'true' : 'false';
+			}
+
 			$this->_copyWorkingFile($v);
 
 			$xml->addChild($k, $v);
@@ -215,11 +222,9 @@ class wsPackagerV1 extends wsPackagerHTML {
 		}
 
 		$cp = new cubeCommandLine('cp');
-		$cp->setArg(null, WS_ICONS .'/'. $this->theme->parametres->iconSet . '/v1/*');
+		$cp->setArg(null, WS_ICONS . '/' . $this->theme->parametres->iconSet . '/v1/*');
 		$cp->setArg(null, $this->vdir . '/images');
 		$cp->execute();
-		
-		fb($cp->output);
 	}
 
 	protected function copyLang() {
-- 
2.39.5