From 65dec1a0900f6052c647eb30e9be5311d5570f54 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 27 Apr 2009 08:29:26 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20conflit=20variable=20pays=20et=20c?=
 =?UTF-8?q?onflit=20m=C3=A9thode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 www/pages/annonces.php                    |  3 ++-
 www/pages/graydon/methodfield.php         | 15 ++++++++-------
 www/pages/identite.php                    |  4 +++-
 www/pages/international_recherche.php     |  2 +-
 www/pages/international_rechercheform.php |  8 +++++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/www/pages/annonces.php b/www/pages/annonces.php
index aa7418696..a9b0c0507 100644
--- a/www/pages/annonces.php
+++ b/www/pages/annonces.php
@@ -61,9 +61,10 @@ try {
 	}
 	$O = $client->getAnnonces($siren, $filtre, $idan);
 	$annonces=$O['result'];
+	$firephp->log($annonces, 'annonces');
 	if (count($annonces)==0) {
 		$idan=0;
-		$O = $client->getAnnonces($siren, $filtre,$idan);
+		$O = $client->getAnnonces($siren, $filtre, $idan);
 		$annonces=$O['result'];
 	}
 } catch (SoapFault $fault) {
diff --git a/www/pages/graydon/methodfield.php b/www/pages/graydon/methodfield.php
index 681ea37a1..aca5aa54f 100644
--- a/www/pages/graydon/methodfield.php
+++ b/www/pages/graydon/methodfield.php
@@ -5,13 +5,14 @@ if(!isset($method)){
 
 require_once 'graydon/graydonws.php';
 require_once 'graydon/log.php';
-
 // Create the request parameters
 $request = new StdClass();
 // Initialise the request object
 $request->Authentication_Parameters = $authentication;
 $request->Country = $pays;
 
+$firephp->log($pays,'PAYS');
+
 $path = PATH_DATA.'/graydon/method';
 $fileName = strtolower('CompanyMatchMethods-'.$pays);
 
@@ -37,7 +38,7 @@ if(!file_exists($path.'/'.$fileName)){
 
 	}catch( SoapFault $fault ){
 		require_once 'soaperror.php';
-		processSoapFault($client,$fault,$tabInfo);
+		processSoapFault($graydon,$fault,$tabInfo);
 	} 
 }else{
 	$methods = unserialize(file_get_contents($path.'/'.$fileName));	
@@ -70,12 +71,12 @@ if (isset($methods)){
 		$countMethods++;
 		
 		//Affichage des propostions des méthodes de recherche
-		if($item->MatchingMethod=='Keyword'){	$lien .= '<a href="./?page=international_recherche&mode=normal&method=keyword&pays='.$pays.'">Par mots clés</a>'; }
-		if($item->MatchingMethod=='Identifier'){ $lien .= '<a href="./?page=international_recherche&mode=normal&method=identifier&pays='.$pays.'">Par identifiant</a>'; }
-		if($item->MatchingMethod=='Name'){ $lien .= '<a href="./?page=international_recherche&mode=normal&method=name&pays='.$pays.'">Par nom</a>'; }
-		if($item->MatchingMethod=='PostCode'){ $lien .= '<a href="./?page=international_recherche&mode=normal&method=postcode&pays='.$pays.'">Par Post Code</a>'; }
+		if($item->MatchingMethod=='Keyword'){ $lien .= '<a href="?page=international_recherche&mode=normal&method=keyword&pays='.$pays.'">Par mots clés</a>'; }
+		if($item->MatchingMethod=='Identifier'){ $lien .= '<a href="?page=international_recherche&mode=normal&method=identifier&pays='.$pays.'">Par identifiant</a>'; }
+		if($item->MatchingMethod=='Name'){ $lien .= '<a href="?page=international_recherche&mode=normal&method=name&pays='.$pays.'">Par nom</a>'; }
+		if($item->MatchingMethod=='PostCode'){ $lien .= '<a href="?page=international_recherche&mode=normal&method=postcode&pays='.$pays.'">Par Post Code</a>'; }
 		
-		if($countMethods>=count($methods)){$separator=''; break;}else{$separator=' - ';}
+		if($countMethods>=count($methods)){ $separator=''; break; }else{ $separator=' - '; }
 		
 		$lien = $lien.$separator;
 	}
diff --git a/www/pages/identite.php b/www/pages/identite.php
index eeaff3969..4fd0dd4fa 100644
--- a/www/pages/identite.php
+++ b/www/pages/identite.php
@@ -99,7 +99,9 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
 		elseif (file_exists($locImg.'.png'))	{	$urlImg='./img/logos/'.$etab['Siren'].'.png';	$ext='.png';	}
 		elseif (file_exists($locImg.'.jpg'))	{	$urlImg='./img/logos/'.$etab['Siren'].'.jpg';	$ext='.jpg';	}
 		elseif (file_exists($locImg.'.jpeg'))	{	$urlImg='./img/logos/'.$etab['Siren'].'.jpeg';	$ext='.jpeg';	}
-			
+		
+		print '<!-- '.$locImg.'  '.$urlImg.'-->';
+		
 		if ($urlImg=='' && $etab['Isin']<>'') {
 			$locImg=PATH_LOGOS.$etab['Isin'];
 			if     (file_exists($locImg.'.gif'))	{	$urlImg='./img/logos/'.$etab['Isin'].'.gif';	$ext='.gif';	}
diff --git a/www/pages/international_recherche.php b/www/pages/international_recherche.php
index a12d68e2b..340e28847 100644
--- a/www/pages/international_recherche.php
+++ b/www/pages/international_recherche.php
@@ -14,7 +14,7 @@ if($vue=='recherche'){
 $(document).ready(function(){
 	$('#mode').change(function(){
 		var mode = $('#mode :selected').val();
-		document.location.href='<?php print EXTRANET_URL; ?>/?page=international_recherche&mode='+mode;
+		document.location.href='<?php print EXTRANET_URL; ?>?page=international_recherche&mode='+mode;
 	});	
 
 	$('#pays').change(function(){
diff --git a/www/pages/international_rechercheform.php b/www/pages/international_rechercheform.php
index 5a46733dc..0c78b8def 100644
--- a/www/pages/international_rechercheform.php
+++ b/www/pages/international_rechercheform.php
@@ -4,6 +4,8 @@ if(!isset($mode)){
 }
 
 if($mode=='normal'){
+	$pays = $_REQUEST['pays'];
+	$firephp->log($pays,'PAYS');
 ?>
 <div class="fieldgrp">
 <label class="StyleInfoLib">Pays : </label>
@@ -11,10 +13,10 @@ if($mode=='normal'){
 <select id="pays" name="frmRecherche[Country]" size="10">
 <?php 
 require_once 'graydon/pays.php';
-foreach($tabPays as $kpays => $pays ){
+foreach($tabPays as $kPays => $iPays ){
 	$selected = '';
-	if( isset($pays) && $pays=='Austria' ){ $selected = ' selected'; }
-	print '<option value="'.$kpays.'"'.$selected.'>'.$pays['display'].'</option>';
+	if( isset($pays) && $pays==$kPays ){ $selected = ' selected'; }
+	print '<option value="'.$kPays.'"'.$selected.'>'.$iPays['display'].'</option>';
 }
 ?>
 </select>