From 1b2d5986a85bb6971e2ccd1c916bab480930a079 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 16 Nov 2010 16:57:00 +0000 Subject: [PATCH] =?UTF-8?q?Correction=20probl=C3=A8me=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/menu/menu_liens.php | 53 +++--------------------------------- www/html2pdf.php | 12 -------- www/pages/bdf.php | 46 ------------------------------- www/servefile.php | 11 -------- 4 files changed, 4 insertions(+), 118 deletions(-) diff --git a/includes/menu/menu_liens.php b/includes/menu/menu_liens.php index 655fb68ff..046448e9a 100644 --- a/includes/menu/menu_liens.php +++ b/includes/menu/menu_liens.php @@ -271,20 +271,11 @@ function menu_href_marques() function menu_href_indiscore() { -<<<<<<< .working -<<<<<<< .working - global $siret, $siren, $idEntreprise; -======= global $idEntreprise; $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3168 -======= - global $idEntreprise; - $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3171 if ($siret*1!=0 && ($_SESSION['tabInfo']['idClient']!=34 || $_SESSION['nowAuthorized'])) { - return './?page=indiscore&siret='.$siren.'&idEntreprise='.$idEntreprise; + return './?page=indiscore&siret='.$siret.'&idEntreprise='.$idEntreprise; } else { return '#'; } @@ -292,17 +283,8 @@ function menu_href_indiscore() function menu_href_indiscoreplus() { -<<<<<<< .working -<<<<<<< .working - global $siret, $siren, $idEntreprise; -======= global $idEntreprise; $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3168 -======= - global $idEntreprise; - $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3171 $href = false; $usersAuthorized = array('ylenaour','jmartory','mricois','mheitz','testreunica','reunicacsf'); if ($siret*1!=0 && ($_SESSION['tabInfo']['idClient']!=34 || $_SESSION['nowAuthorized'])) @@ -330,20 +312,11 @@ function menu_href_creditsafe() function menu_href_rsynthese() { -<<<<<<< .working -<<<<<<< .working - global $siret, $siren, $idEntreprise; -======= global $idEntreprise; $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3168 -======= - global $idEntreprise; - $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3171 $href = false; if ( $siret*1!=0 ) { - $href = './?page=rsynthese&siret='.$siren.'&idEntreprise='.$idEntreprise; + $href = './?page=rsynthese&siret='.$siret.'&idEntreprise='.$idEntreprise; }else{ $href = '#'; } @@ -352,20 +325,11 @@ function menu_href_rsynthese() function menu_href_indiscore3() { -<<<<<<< .working -<<<<<<< .working - global $siret, $siren, $idEntreprise; -======= global $idEntreprise; $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3168 -======= - global $idEntreprise; - $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3171 $href = false; if ( $siret*1!=0 ) { - $href = './?page=indiscore3&siret='.$siren.'&idEntreprise='.$idEntreprise.'&niveau=2'; + $href = './?page=indiscore3&siret='.$siret.'&idEntreprise='.$idEntreprise.'&niveau=2'; }else{ $href = '#'; } @@ -374,20 +338,11 @@ function menu_href_indiscore3() function menu_href_indiscore2() { -<<<<<<< .working -<<<<<<< .working - global $siret, $siren, $idEntreprise; -======= global $idEntreprise; $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3168 -======= - global $idEntreprise; - $siret = $_SESSION['tabInfo']['entrep']['siretSiege']; ->>>>>>> .merge-right.r3171 $href = false; if ( $siret*1!=0 ) { - $href = './?page=indiscore2&siret='.$siren.'&idEntreprise='.$idEntreprise; + $href = './?page=indiscore2&siret='.$siret.'&idEntreprise='.$idEntreprise; }else{ $href = '#'; } diff --git a/www/html2pdf.php b/www/html2pdf.php index 36801e52d..122d18e73 100644 --- a/www/html2pdf.php +++ b/www/html2pdf.php @@ -15,17 +15,6 @@ if($nomFic == ''){ }else{ /** Déclation du client Soap auprès du webservice **/ -<<<<<<< .working - $client = new SoapClient(null, array( - 'trace' => 1, - 'soap_version' => SOAP_1_1, - 'location' => 'http://78.31.45.206/ws/', - 'uri' => 'http://78.31.45.206/', - 'login' => $_SESSION['tabInfo']['login'], - 'password' => $_SESSION['tabInfo']['password'] - )); - -======= $client = new SoapClient(null, array( 'trace' => 1, 'soap_version' => SOAP_1_1, @@ -35,7 +24,6 @@ if($nomFic == ''){ 'password' => $_SESSION['tabInfo']['password'] )); ->>>>>>> .merge-right.r3171 require_once 'surveillance/survliste.php'; $file = PATH_SITE.'/cache/survliste/'.$nomFic; $file2 = $file.'.bz2'; diff --git a/www/pages/bdf.php b/www/pages/bdf.php index 47d4ed81d..6566257c5 100644 --- a/www/pages/bdf.php +++ b/www/pages/bdf.php @@ -1,50 +1,5 @@ $denom, - 'type' => $type, - 'code' => $code, - 'rechet' => $rechet, - 'ape' => $ape, - ); - - $url = bdf_lien_module($module, $service, $req, $rech); - - if($module=='07'){ - $filename = false; - } - else - { - $filename = PATH_DATA.'/bdf/bdf_'.$service.'_'.$req.'_'.$module.'.html'; - } - //@todo : Ajouter timeover - if($filename!==false && file_exists($filename)) - { - $content = file_get_contents($filename); - } - else - { - $content = trim(bdf_loadpage($url)); - if( !empty($content) && $filename!==false ) - { - if(!file_exists(PATH_DATA.'/bdf')) mkdir(PATH_DATA.'/bdf'); - file_put_contents($filename, $content); - } - } - } - return $content; -} - - -======= function displayModule($req, $module, $service, $listModules) { global $denom, $type, $code, $rechet, $ape; @@ -88,7 +43,6 @@ function displayModule($req, $module, $service, $listModules) } ->>>>>>> .merge-right.r3171 ?>