scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction problème merge

Browse Source
This commit is contained in:
Michael RICOIS 2010-11-16 16:57:00 +00:00
parent 18fdc66f7b
commit 1b2d5986a8
4 changed files with 4 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
includes/menu/menu_liens.php
View File

@ -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 = '#';
}

12
www/html2pdf.php
View File

@ -15,7 +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,
@ -25,17 +24,6 @@ if($nomFic == ''){
'password' => $_SESSION['tabInfo']['password']
));
=======
$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']
));
>>>>>>> .merge-right.r3171
require_once 'surveillance/survliste.php';
$file = PATH_SITE.'/cache/survliste/'.$nomFic;
$file2 = $file.'.bz2';

46
www/pages/bdf.php
View File

@ -1,50 +1,5 @@
<?php
<<<<<<< .working
function displayModule($req, $module, $service, $listModules)
{
global $denom, $type, $code, $rechet, $ape;
//Vérifier que le module existe
if(array_key_exists($module, $listModules))
{
$rech = array();
$rech = array(
'denom' => $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
?>
<script>
$(document).ready(function(){

11
www/servefile.php
View File

@ -42,16 +42,6 @@ switch ( $type ) {
$path = PATH_SITE.'/cache/kbis/'.$type.'/';
$content_type = 'application/pdf';
break;
<<<<<<< .working
case 'commentaires':
$content_type = 'application/pdf';
$path = PATH_DATA.'/'.$type.'/';
break;
case 'liasse':
$content_type = 'application/vnd.ms-excel';
$path = PATH_SITE.'/cache/liasse/';
break;
=======
case 'commentaires':
$content_type = 'application/pdf';
$path = PATH_SITE.'/cache/'.$type.'/';
@ -60,7 +50,6 @@ switch ( $type ) {
$content_type = 'application/vnd.ms-excel';
$path = PATH_SITE.'/cache/liasse/';
break;
>>>>>>> .merge-right.r3171
default:
exit;
break;