From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 22 Aug 2012 14:18:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dd39dc8321431cca2ef80801062af8bc3ef91981;p=cubeextranet.git

---

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 482078ab6..dbb874206 100644
--- 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'),
 			'fieldsnames' => array('offlineLink'));
 
-		$this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 5,
+		$this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 3,
 			'datas' => array(__('Rediriger vers le PDF') => 'pdf',
 				__('Version HTML5') => 'html5',
 				__("Version HTML5 en images") => 'html5-images')
@@ -230,7 +230,7 @@ class wsBookParametres extends wsParametres {
 				__('En cours de développement') => 'dev')
 		);
 
-		$this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 5,
+		$this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'none', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3,
 			'datas' => array(__('Aucune transition') => 'none',
 				__('Glisser') => 'slide',
 				__('Tourner') => 'flip')
diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index e7bbb3423..ee89e31b3 100644
--- 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;
 	}