(no commit message)

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index 5f808b9e9cab1ac8b7bb9ac9fd10fe9c9f28a326..14fc7211281da644bd929049a0bc5f554179e432 100644 (file)
--- 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() {