Correction après mise en prod

This commit is contained in:
Michael RICOIS 2009-08-24 07:15:38 +00:00
commit fea841d4ec
4 changed files with 61 additions and 51 deletions

View File

@ -16,7 +16,7 @@ Configuration vhost
</Directory>
<Directory /home/www/extranet/www/>
Options Indexes FollowSymLinks MultiViews
Options Indexes FollowSymLinks
AllowOverride none
Order allow,deny
Allow from all

View File

@ -70,7 +70,10 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
<tr>
<td colspan="3">&nbsp;</td>
</tr>
<? if ($histo) { ?>
<?php
if ($histo)
{
?>
<tr>
<td colspan="3"><img src="./img/srub_dirhisto.png" width="576" height="27"></td>
</tr>
@ -78,8 +81,9 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
<td width="30">&nbsp;</td>
<td colspan="2" width="550" class="StyleInfoData"><table>
<?php
foreach ($dirs as $i=>$dir) {
$nom=$dir['Societe'].' '.$dir['Nom'].' '.$dir['Prenom'];
foreach ($dirs as $i=>$dir)
{
$nom = $dir['Societe'].' '.$dir['Nom'].' '.$dir['Prenom'];
?>
<tr><td class="StyleInfoData" width="100"><?=$dir['Titre']?></td>
<td class="StyleInfoData" width="200"><?=$nom?></td>
@ -97,7 +101,11 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
echo '<tr><td class="StyleInfoData" width="550">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Aucune donn&eacute;e n\'est pr&eacute;sente dans notre base</td></tr>';
?></table></td>
</tr>
<? } else { ?>
<?php
}
else
{
?>
<tr>
<td colspan="3"><img src="./img/srub_dirliste.png" width="576" height="27"></td>
</tr>
@ -106,17 +114,35 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
<td colspan="2" width="550" class="StyleInfoData">
<table>
<?
foreach ($dirs as $i=>$dir) {
$nom = str_replace('&amp;#160;',' ', $dir['Societe'].' '.$dir['Nom'].' '.$dir['Prenom']);
foreach ($dirs as $i=>$dir)
{
$societe = str_replace('&amp;#160;',' ', $dir['Societe']);
$nom = str_replace('&amp;#160;',' ', $dir['Nom'].' '.$dir['Prenom']);
if(isset($dir['Civilite']) && $dir['Civilite']!=''){$nom = $dir['Civilite'].'. '.$nom;}
?>
<tr>
<td class="StyleInfoData" width="120"><?php print $dir['Titre'];?></td>
<td class="StyleInfoData" width="200">
<p>
<?php
if($societe != ''){
?>
<a href="/?page=recherche&vue=list&formR[type]=ent&formR[raisonSociale]=<?php print $societe;?>" title="Recherche à partir de la raison sociale">
<?php print $societe;?>
</a>
<?php
}
?>
&nbsp;
<?php
if($nom != ''){
?>
<a href="/?page=recherche&vue=list&formR[type]=dir&formR[dirNom]=<?php print $dir['Nom'];?>&formR[dirPrenom]=<?php print $dir['Prenom'];?>&formR[dirDateNaissJJ]=<?php print substr($dir['NaissDate'],0,2);?>&formR[dirDateNaissMM]=<?php print substr($dir['NaissDate'],3,2);?>&formR[dirDateNaissAAAA]=<?php print substr($dir['NaissDate'],6,4);?>" title="Recherche à partir du nom du dirigeant">
<?php print $nom;?>
</a>
<?php
}
?>
</p>
</td>
<td class="StyleInfoData" width="230"><?

View File

@ -229,65 +229,49 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
if(isset($etab['DateRadiation']) && $etab['DateRadiation']!='' && $etab['DateRadiation']!='0000-00-00'){
$dateRadiation = WDate::dateT('Ymd', 'd/m/Y', str_replace('-','',$etab['DateRadiation']));
}
$firephp->log($etab['SituationJuridique'], 'SituationJuridique');
if ($etab['SituationJuridique']=='P')
if ( $etab['SituationJuridique']=='P' || $etab['SituationJuridique'][0]=='R' || $_SESSION['tabInfo']['mode_edition']==1)
{
?>
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Situation juridique</td>
<td width="350" class="StyleInfoData">
<?php
if ($etab['SituationJuridique']=='P'){
?>
<?php
}
//Procédure collective
if ($etab['SituationJuridique']=='P')
{
?>
<a href="./?page=annonces&siret=<?=$etab['Siret']?>&idEntreprise=<?=$idEntreprise?>">
<font color="red"><b>En proc&eacute;dure collective</b></font>
</a>
<?php if($dateRadiation!=''){ ?><br/>Radié du RCS le <?php print $dateRadiation; } ?>
<?php
}else{
if($dateRadiation!=''){ ?>Radié du RCS le <?php print $dateRadiation; }
}
?>
<?php
if ($_SESSION['tabInfo']['mode_edition']==1)
{
?>
}/*else{
if($dateRadiation!=''){ ?>Radié du RCS le <?php print $dateRadiation; }
}*/
//Radiation
if($etab['SituationJuridique']=='RR')
{
?> Radié du RCS <?php if($dateRadiation!=''){ ?> le <?php print $dateRadiation; }
}elseif($etab['SituationJuridique']=='RP'){
?> Radiation publiée <?php if($dateRadiation!=''){ ?> le <?php print $dateRadiation; }
}
if ($_SESSION['tabInfo']['mode_edition']==1)
{
?>
<a href="./?page=saisie&siret=<?=$etab['Siret']?>&idEntreprise=<?=$idEntreprise?>">(Edition)</a>
<?php
}
?>
<?php
}
if ( $etab['SituationJuridique']=='P' || $etab['SituationJuridique'][0]!='R' || $_SESSION['tabInfo']['mode_edition']==1)
{
?>
</td>
</tr>
<?php
}
elseif( ($etab['SituationJuridique']!='P' && $etab['SituationJuridique']!='') || $_SESSION['tabInfo']['mode_edition']==1 )
{
?>
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Situation juridique</td>
<td width="350" class="StyleInfoData">
<?php
if($etab['SituationJuridique']=='RR')
{
?> Radié du RCS <?php if($dateRadiation!=''){ ?> le <?php print $dateRadiation; }
}elseif($etab['SituationJuridique']=='RP'){
?> Radiation publiée <?php if($dateRadiation!=''){ ?> le <?php print $dateRadiation; }
}
?>
<?php
if ($_SESSION['tabInfo']['mode_edition']==1)
{
?>
<a href="./?page=saisie&siret=<?=$etab['Siret']?>&idEntreprise=<?=$idEntreprise?>">(Edition)</a>
<?php
}
?>
</td>
</tr>
<?
}
} // Fin Situation juridique
?>
<tr><td colspan="3">&nbsp;</td></tr>

View File

@ -147,7 +147,7 @@ if ( $cache->startCapture($fileName.'.html') == FALSE){
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Raison Sociale</td>
<td width="340" class="StyleInfoData"><?=$tabInfo['entrep']['raisonSociale'];?></td>
<td width="340" class="StyleInfoData"><?=$_SESSION['tabInfo']['entrep']['raisonSociale'];?></td>
</tr>
</table>