(no commit message)

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 482078ab61ee616967bd2321273e9b55bc4221ff..dbb874206148099354b7f4b1eca1cc876d1e880e 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -219,7 +219,7 @@ class wsBookParametres extends wsParametres {
                $this->forms['offline'] = array('label' => __('Version offline'),\r
                        'fieldsnames' => array('offlineLink'));\r
 \r
-               $this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 5,\r
+               $this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 3,\r
                        'datas' => array(__('Rediriger vers le PDF') => 'pdf',\r
                                __('Version HTML5') => 'html5',\r
                                __("Version HTML5 en images") => 'html5-images')\r
@@ -230,7 +230,7 @@ class wsBookParametres extends wsParametres {
                                __('En cours de développement') => 'dev')\r
                );\r
 \r
-               $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 5,\r
+               $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3,\r
                        'datas' => array(__('Aucune transition') => 'none',\r
                                __('Glisser') => 'slide',\r
                                __('Tourner') => 'flip')\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index e7bbb342371dcafec015a6e6c34c7e13a7cbf0c3..ee89e31b33233b23e409669ec911cba0f09e794a 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -106,7 +106,7 @@ class wsPackagerV1 extends wsPackagerHTML {
                                $link['to'] = $this->__virtualToPhysical($link['to']);
                        }
 
-                       if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array(1, 4, 6))) {
+                       if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array( 4, 6))) {
                                $link['to'] = 'data/' . $link['to'];
                        }
 
@@ -269,6 +269,7 @@ class wsPackagerV1 extends wsPackagerHTML {
        }
 
        protected function _copyWorkingFile($file, $dir = null) {
+               
                $e = explode("$", $file);
                $file = array_shift($e);
                if (is_null($dir)) {
@@ -277,7 +278,8 @@ class wsPackagerV1 extends wsPackagerHTML {
 
                $src = $this->workingDir . '/' . $file;
                if (file_exists($src) && is_file($src)) {
-                       return copy($src, $dir . $file);
+                       $res= copy($src, $dir . $file);
+                       return $res;
                }
                return false;
        }