From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 16 Sep 2010 14:28:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3b28c25238ae269a7a266f5e37a22eec73677b92;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 019746d48..535933fe0 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -16,19 +16,19 @@ class wsAjax extends cubeAjax {
 
 	public static function pageBooks($args, &$x)
 	{
-		self::page('books', $args[1]);
+		extranetAjax::page('books', $args[1]);
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 	}
 
 	public static function parPageBooks($args, &$x)
 	{
-		self::parPage('books', $_POST['par_page']);
+		extranetAjax::parPage('books', $_POST['par_page']);
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 	}
 
 	public static function sortBooks($args, &$x)
 	{
-		self::sort('books', $args[1]);
+		extranetAjax::sort('books', $args[1]);
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 	}
 
@@ -40,11 +40,11 @@ class wsAjax extends cubeAjax {
 	public static function filtreBooks($args, &$x)
 	{
 		if (isset($args[1]) && $args[1] == 'efface') {
-			self::filtre('books');
+			extranetAjax::filtre('books');
 			$x->addReload();
 			return;
 		} else {
-			self::filtre('books', $_POST);
+			extranetAjax::filtre('books', $_POST);
 			$x->addContent('listeBooks', wsUrl::listeBooks());
 		}
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 942e6c624..bc69cf5cf 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -44,7 +44,7 @@ class wsUrl {
 		$res .= '<th>' . extranetUrl::orderby(__('Titre de la publication'), 'nom', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th>' . extranetUrl::orderby(__(''), 'lang', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th>' . extranetUrl::orderby(__('Proprietaire'), 'proprietaire_nom', $settings, 'sort' . $change) . '</th>';
-		$res .= '<th>' . extranetUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) . '</th>';
+		$res .= '<th>' . /*extranetUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) .*/ '</th>';
 		$res .= '<th>' . extranetUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';
 		$i = 0;
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 14edad776..793248692 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -477,8 +477,8 @@ class wsDAOBook extends extranetDAO {
 		$flex->addVariable('numerotation', $book->numerotation, false, true, 'String');
 		$flexLight->addVariable('theme', $theme->parametres->toStandardObject());
 		$flexLight->addVariable('pages', count($pages));
-		$flexLight->addVariable('fwidth', $size[0], false, true, 'Number');
-		$flexLight->addVariable('fheight', $size[1], false, true, 'Number');
+		$flexLight->addVariable('fwidth', round($size[0]), false, true, 'Number');
+		$flexLight->addVariable('fheight', round($size[1]), false, true, 'Number');
 		$flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');
 		$flex->addVariable('index', $index);
 		$flex->addVariable('textes', $textes);
@@ -498,7 +498,6 @@ class wsDAOBook extends extranetDAO {
 				$swffile = ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf';
 				if ($i == 1) {
 					$flexLight->addSWF($swffile, 'page' . $i);
-
 				} else {
 					$flex->addSWF($swffile, 'page' . $i);
 				}