From e82fa0c22f8af48ad870fbf117c57c54375fb4a7 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 21 Feb 2011 17:52:54 +0000
Subject: [PATCH]

---
 .../Metier/class.common.utilisateur.php       |  2 +-
 inc/ws/Controlleur/class.ws.ajax.php          | 10 ++++-----
 inc/ws/Controlleur/class.ws.url.php           |  4 ++--
 inc/ws/DAO/class.ws.dao.document.php          | 21 ++++++++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index 793ade3a6..af7ba03bf 100644
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -41,7 +41,7 @@ class commonUtilisateur extends cubeMetier {
 
 	public function getSettings($liste)
 	{
-		$cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id');
+		$cles = array('clients' => 'entreprise_id', 'clients_ws' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id');
 		if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {
 			$this->settings['search'][$liste] = array();
 		}
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index b839ae9f2..172c7fb1a 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -99,30 +99,30 @@ class wsAjax extends cubeAjax {
 
 	public static function sortClient($args, &$x)
 	{
-		commonAjax::sort('clients', $args[1]);
+		commonAjax::sort('clients_ws', $args[1]);
 		$x->addContent('listeClients', wsUrl::listeClients());
 	}
 
 	public static function pageClient($args, &$x)
 	{
-		commonAjax::page('clients', $args[1]);
+		commonAjax::page('clients_ws', $args[1]);
 		$x->addContent('listeClients', wsUrl::listeClients());
 	}
 
 	public static function parPageClient($args, &$x)
 	{
-		commonAjax::parPage('clients', $_POST['par_page']);
+		commonAjax::parPage('clients_ws', $_POST['par_page']);
 		$x->addContent('listeClients', wsUrl::listeClients());
 	}
 
 	public static function filtreClients($args, &$x)
 	{
 		if (isset($args[1]) && $args[1] == 'efface') {
-			commonAjax::filtre('clients');
+			commonAjax::filtre('clients_ws');
 			$x->addReload();
 			return;
 		} else {
-			commonAjax::filtre('clients', $_POST);
+			commonAjax::filtre('clients_ws', $_POST);
 			$x->addContent('listeClients', wsUrl::listeClients());
 		}
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 114f3351b..f61a4f159 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -676,7 +676,7 @@ html{height:100%}' . "\n";
 		cubePage::autoComplete();
 		cubePage::emptyfield();
 		commonDroits::min(3);
-		$settings = $core->user->getSettings('clients');
+		$settings = $core->user->getSettings('clients_ws');
 
 		$shortcuts = array();
 		$shortcuts[] = '<a href="#" class="popup" rel="formClient/new">' . $core->typo->Ajouter('Créer un nouveau client') . '</a>';
@@ -702,7 +702,7 @@ html{height:100%}' . "\n";
 	{
 		global $core;
 		commonDroits::min(3);
-		$settings = is_null($settings)?$core->user->getSettings('clients'):$settings;
+		$settings = is_null($settings)?$core->user->getSettings('clients_ws'):$settings;
 		$change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;
 		$dao = new commonDAOEntreprise($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index d9dd18f8f..2284f7e09 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -31,7 +31,7 @@ class wsDAODocument extends commonDAO {
 
 		for($page = 1;$page <= $document->generalInfos['pages'];$page++) {
 			$csv = WS_DOCS . '/' . $document->document_id . '/p' . $page . '.csv';
-			if(!file_exists($csv)){
+			if (!file_exists($csv)) {
 				continue;
 			}
 			$c->update = filemtime($csv);
@@ -155,18 +155,29 @@ class wsDAODocument extends commonDAO {
 				continue;
 			}
 
+			$left = floatval((string)$l->startX);
+			$right = floatval((string)$l->endX);
+			$top = floatval((string)$l->startY);
+			$bottom = floatval((string)$l->endY);
+
+			$lwidth = abs($right - $left);
+			$lheight = abs($bottom - $top);
+
+			$left = min($left, $right);
+			$top = min($top, $bottom);
+
 			$link = array();
 			$link['page'] = (string)$l->page;
 			$link['numerotation'] = false;
-			$link['left'] = intval((string)$l->startX);
-			$link['width'] = intval((string)$l->endX) - $link['left'];
+			$link['left'] = $left;
+			$link['width'] = $lwidth;
 			if ($link['left'] > $width) {
 				$link['page']++;
 				$link['left'] -= $width;
 			}
 			$page = $link['page'];
-			$link['top'] = intval((string)$l->startY);
-			$link['height'] = intval((string)$l->endY) - $link['top'];
+			$link['top'] = $top;
+			$link['height'] = $lheight;
 			$link['infobulle'] = '';
 			$link['target'] = '_blank';
 			$link['to'] = (string)$l->linkTo;
-- 
2.39.5