Merge depuis branche 1.5

This commit is contained in:
Michael RICOIS 2010-04-06 08:56:10 +00:00
commit eb9495fc42
5 changed files with 819 additions and 753 deletions

View File

@ -195,39 +195,33 @@ $children[] = array('data' => 'Actes & Statuts',
'href' => 'menu_href_greffesactes');
$menu[] = array( 'data'=>'PIECES OFFICIELLES', 'children'=>$children);
//Options
$children = array();
// Options
$children = array();
$children[] = array('data' => 'Mes options',
'href' => 'menu_href_mesoptions');
'href' => 'menu_href_mesoptions');
$children[] = array('data' => 'Mes surveillances',
'href' => 'menu_href_surveillances',
'perm' =>
array(
'list' => array( 'SURVLISTE' ),
'hidden' => true
)
);
'href' => 'menu_href_surveillances',
'perm' => array('list' => array('SURVLISTE'),
'hidden' => true));
$children[] = array('data' => 'Mon portefeuille',
'href' => 'menu_href_portefeuille',
'perm' =>
array(
'list' => array( 'PORTEFEUILLE' ),
'hidden' => true
)
);
'href' => 'menu_href_portefeuille',
'perm' => array('list' => array( 'PORTEFEUILLE' ),
'hidden' => true));
$children[] = array('data' => 'Administration',
'href' => 'menu_href_administration');
'href' => 'menu_href_administration');
$children[] = array('data' => 'Commandes Greffe',
'href' => 'menu_href_greffescmd');
'href' => 'menu_href_greffescmd');
$children[] = array('data' => 'Commandes Greffe Courrier',
'href' => 'menu_href_greffescmdcourrier');
'href' => 'menu_href_greffescmdcourrier');
$children[] = array('data' => 'Commandes International',
'href' => 'menu_href_internationalcmd');
$children[] = array('data' => 'Statistiques',
'href' => 'menu_href_stats');
'href' => 'menu_href_stats');
$children[] = array('data' => 'Surveillances',
'href' => 'menu_href_survliste');
'href' => 'menu_href_survliste');
$children[] = array('data' => 'Se déconnecter',
'href' => 'menu_href_logout');
$menu[] = array( 'data'=>'OPTIONS', 'children'=>$children);
'href' => 'menu_href_logout');
$menu[] = array('data' => 'OPTIONS', 'children' => $children);
function menu()
{
@ -819,6 +813,11 @@ function menu_href_greffescmdcourrier()
return $href;
}
function menu_href_internationalcmd()
{
return './?page=international_commandes';
}
function menu_href_stats()
{
global $siret, $idEntreprise;

File diff suppressed because it is too large Load Diff

View File

@ -62,96 +62,101 @@ if ($sortie == 'pdf') {
//Chargement du contenu
switch ($page)
{
case 'referer':
$O2 = $client->setLog('redirection_'.$_REQUEST['part'],
$_REQUEST['siret']);
header('Location: '.$_REQUEST['url']);
die();
break;
case 'international_recherche':
$title = 'Recherche International';
$page2 = 'international_recherche.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_identitec':
$title = 'Identité International approfondie';
$page2 ='international_identitec.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_identite':
$title = 'Identité - International';
$page2 = 'international_identite.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_enquete':
$title = 'Enquête - International';
$page2 = 'international_enquete.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_enquetet':
$title = 'Demande Enquête Terrain - International';
$page2 = 'international_enquetet.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'recherche':
if ($_REQUEST['vue'] == 'list' &&
($_POST['formR']['type'] == 'ent' ||
$_POST['formR']['type'] == 'dir')) {
$_SESSION['list_pre'] =
gzcompress(serialize($_POST['formR']), 9);
case 'referer':
$O2 = $client->setLog('redirection_'.$_REQUEST['part'],
$_REQUEST['siret']);
header('Location: '.$_REQUEST['url']);
die();
break;
case 'international_recherche':
$title = 'Recherche International';
$page2 = 'international_recherche.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_identitec':
$title = 'Identité International approfondie';
$page2 ='international_identitec.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_identite':
$title = 'Identité - International';
$page2 = 'international_identite.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_enquete':
$title = 'Enquête - International';
$page2 = 'international_enquete.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_enquetet':
$title = 'Demande Enquête Terrain - International';
$page2 = 'international_enquetet.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'recherche':
if ($_REQUEST['vue'] == 'list' &&
($_POST['formR']['type'] == 'ent' ||
$_POST['formR']['type'] == 'dir')) {
$_SESSION['list_pre'] =
gzcompress(serialize($_POST['formR']), 9);
}
$title = 'Recherche';
$page2 = 'recherche.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'moncompte':
if (isset($_REQUEST['frmOptions'])) {
$tabOptions = $_REQUEST['frmOptions'];
}
if (isset($tabOptions['rech_nbrep'])) {
$_SESSION['tabInfo']['nbReponses'] = $tabOptions['rech_nbrep'];
}
if (isset($tabOptions['mode_edition'])) {
$_SESSION['tabInfo']['mode_edition'] = 1;
}
if (isset($tabOptions['pref'])) {
$_SESSION['tabInfo']['pref'] = implode(' ', $tabOptions['pref']);
}
if (isset($tabOptions['droits'])) {
$_SESSION['tabInfo']['droits'] = implode(' ', $tabOptions['droits']);
}
$title = 'Recherche';
$page2 = 'recherche.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'moncompte':
if (isset($_REQUEST['frmOptions'])) {
$tabOptions = $_REQUEST['frmOptions'];
}
if (isset($tabOptions['rech_nbrep'])) {
$_SESSION['tabInfo']['nbReponses'] = $tabOptions['rech_nbrep'];
}
if (isset($tabOptions['mode_edition'])) {
$_SESSION['tabInfo']['mode_edition'] = 1;
}
if (isset($tabOptions['pref'])) {
$_SESSION['tabInfo']['pref'] = implode(' ', $tabOptions['pref']);
}
if (isset($tabOptions['droits'])) {
$_SESSION['tabInfo']['droits'] = implode(' ', $tabOptions['droits']);
}
if (isset($tabOptions['formatMail'])) {
$_SESSION['tabInfo']['formatMail'] = $tabOptions['formatMail'];
}
$title = 'Profil utilisateur';
$page2 = 'moncompte.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'administration':
$title = 'Administration des utilisateurs';
$page2 = 'administration.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'administration_client':
$title = 'Gestion des clients';
$page2 = 'administration_client.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'greffescmd':
$title = 'Gestion des commandes INFOGREFFE';
$page2 = 'greffescmd.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'greffescmd_courrier':
$title = 'Gestion des commandes Greffes par courrier';
$page2 = 'greffescmd_courrier.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'stats':
$title = 'Statistiques';
$page2 = 'stats.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
if (isset($tabOptions['formatMail'])) {
$_SESSION['tabInfo']['formatMail'] = $tabOptions['formatMail'];
}
$title = 'Profil utilisateur';
$page2 = 'moncompte.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'administration':
$title = 'Administration des utilisateurs';
$page2 = 'administration.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'administration_client':
$title = 'Gestion des clients';
$page2 = 'administration_client.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'greffescmd':
$title = 'Gestion des commandes INFOGREFFE';
$page2 = 'greffescmd.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'greffescmd_courrier':
$title = 'Gestion des commandes Greffes par courrier';
$page2 = 'greffescmd_courrier.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'international_commandes':
$title = 'Commandes - International';
$page2 = 'international_commandes.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'stats':
$title = 'Statistiques';
$page2 = 'stats.php';
require_once realpath(dirname(__FILE__)).'/pages/main.php';
break;
case 'identite':
require_once 'identite/header.php';
$title = titreAvecSiren('Identité');

View File

@ -20,14 +20,13 @@ else
if (($siret*1)==0 && $idan==0) die('Paramètres incorrects !');
$siren = substr($siret,0,9);
$idEntreprise = $_REQUEST['idEntreprise'];
isset($_REQUEST['vue'])? $vue = $_REQUEST['vue'] : $vue = '';
$action=$_REQUEST['action'];
$idEntreprise =
(isset($_GET['idEntreprise']) == true) ? $_GET['idEntreprise'] : '';
$vue = (isset($_GET['vue'])) ? $_GET['vue'] : '';
$raisonSociale = etabSession($siren, $idEntreprise);
$message='';
if ($action!='' && $action!='logon') die('Paramètres incorrects !');
//Récupération des infos du webservice
$annonces = scoresws_annonces($siret, $siren, $idEntreprise, $vue, $idan);
@ -122,7 +121,7 @@ if ($idan && ($vue=='bodacc' || $vue=='abod' || $vue=='balo' || $vue=='asso'))
$tabSource=explode('-', $ann['BodaccCode']);
$source=$tabSource[0];
$idSource=@$tabSource[1];
if ($source[0] == 'B'){
if ($source[0] == 'B') {
if ($ann['BodaccNum']==0)
echo '<img src="./img/logo_jo.png"/>&nbsp;&nbsp;Source BODACC '.substr($ann['BodaccCode'],-1).' du '.WDate::dateT('Y-m-d','d/m/Y',$ann['DateParution']);
else
@ -137,11 +136,14 @@ if ($idan && ($vue=='bodacc' || $vue=='abod' || $vue=='balo' || $vue=='asso'))
echo ' <b>Source TESSI</b> -';
}
echo '&nbsp;&nbsp;Source Journal Annonces L&eacute;gales';
}
if ($ann['dateInsertionSD']<>'') echo ' - Entr&eacute;e en base : '. WDate::dateT('Y-m-d','d/m/Y',$ann['dateInsertionSD']);
?>
</td>
}
if ($ann['dateInsertionSD'] <> '') {
print ' - Entr&eacute;e en base : ';
$date = new WDate;
print $date->dateT('Y-m-d', 'd/m/Y', $ann['dateInsertionSD']);
}
?>
</td>
</tr>
</table>
<?php
@ -177,7 +179,7 @@ if ($idan && ($vue=='bodacc' || $vue=='abod' || $vue=='balo' || $vue=='asso'))
<td width="30">&nbsp;</td>
<?php
/**Affichage du texte de l'annonce**/
$texte=preg_replace_callback("/((?:[0-9]{9,9})|(?:[0-9]{3,3} [0-9]{3,3} [0-9]{3,3})|(?:[0-9]{3,3}\.[0-9]{3,3}\.[0-9]{3,3})|(?:[0-9]{3,3}-[0-9]{3,3}-[0-9]{3,3}))/", replace_siren, $ann['texteAnnonce']);
$texte=preg_replace_callback("/((?:[0-9]{9,9})|(?:[0-9]{3,3} [0-9]{3,3} [0-9]{3,3})|(?:[0-9]{3,3}\.[0-9]{3,3}\.[0-9]{3,3})|(?:[0-9]{3,3}-[0-9]{3,3}-[0-9]{3,3}))/", 'replace_siren', $ann['texteAnnonce']);
?>
<td width="550" colspan="3"><code><?=$texte?></code></td>
</tr>
@ -187,99 +189,114 @@ if ($idan && ($vue=='bodacc' || $vue=='abod' || $vue=='balo' || $vue=='asso'))
</tr>
</table>
<?php
}
elseif (count($annonces)>0)
{
//Tri des annonces dans des tableaux différents
$annoncesBodacc = array();
$annoncesBalo = array();
$annoncesAsso = array();
foreach ($annonces as $i => $ann) {
if ($ann['BodaccCode']=='BODA' || $ann['BodaccCode']=='BODB' || $ann['BodaccCode']=='BODC') {
$annoncesBodacc[] = $ann;
}elseif ($ann['BodaccCode']=='BALO') {
$annoncesBalo[] = $ann;
}elseif ($ann['BodaccCode']=='ASSO') {
$annoncesAsso[] = $ann;
}else {
$annoncesBodacc[] = $ann;
}
}
/** Affichage de la liste des annonces **/
//Affiche annonces Bodacc
if (count($annoncesBodacc)>0)
{
?>
<h2>EV&Eacute;NEMENTS L&Eacute;GAUX</h2>
<table>
<?php
foreach($annoncesBodacc as $i => $ann)
{
?>
<tr>
<td width="30">&nbsp;</td>
<td width="140" class="StyleInfoLib">
<div id="annoncesDate"><p>Le <?=WDate::dateT('Y-m-d','d/m/Y',$ann['DateParution']);?></p></div>
<div id="annoncesImg">
<?php
$tabSource=explode('-', $ann['BodaccCode']);
$source=$tabSource[0];
$idSource=@$tabSource[1];
if ($source[0] == 'B'){
echo '<img src="./img/logo_jo.png" title="Source BODACC '.
$ann['BodaccNum'].' '.
substr($source,-1).' '.substr($ann['DateParution'],0,4).
'"/>';
}elseif ($source[0] == 'G' || $source[0] == 'T'){
echo '<img src="./img/logo_greffe.png" title="Source Collecte Greffe"/>';
}elseif ($source[0] == 'P'){
echo '<img src="./img/logo_inpi.png" title="Source Collecte RNCS"/>';
}else{
echo '<img src="./img/logo_jal.png" title="Source Collecte JAL';
if ($idSource>0) echo ' $idSource';
echo '"/>';
}
?>
</div>
</td>
<td width="450" colspan="2" class="StyleInfoData">
<a href="/?page=annonces&siret=<?=$siret?>&idan=<?=$ann['id']?>&vue=bodacc">
<?php
foreach ($ann['evenements'] as $i=>$even) {
echo $even['LibEven'];
if( hasModeEdition() && substr($source,0,2)=='JT' ){
echo ' <b>(Source TESSI)</b>';
}
$numEven=$even['CodeEven']*1;
if ($numEven>3000 && $numEven<3999)
echo ' (clôture au '.WDate::dateT('Y-m-d','d/m/Y',$ann['dateEffet']).')';
echo '<br/>';
}
?>
</a>
</td>
</tr>
<?php
}
?>
</table>
<?php
}
//Affiche annonces Balo
if (count($annoncesBalo)>0)
{
?>
<h2>BALO</h2>
<table>
<?php
foreach($annoncesBalo as $i => $ann){?>
<tr>
<td width="30">&nbsp;</td>
<td width="140" class="StyleInfoLib">
<span id="annoncesDate">Le <?=WDate::dateT('Y-m-d','d/m/Y',$ann['DateParution']);?></span>
<span id="annoncesImg">
<?php
} else if (count($annonces) > 0) {
// Tri des annonces dans des tableaux différents
$annoncesBodacc = array();
$annoncesBalo = array();
$annoncesAsso = array();
foreach ($annonces as $i => $ann) {
if ($ann['BodaccCode'] == 'BODA' ||
$ann['BodaccCode'] == 'BODB' ||
$ann['BodaccCode'] == 'BODC') {
$annoncesBodacc[] = $ann;
} else if ($ann['BodaccCode'] == 'BALO') {
$annoncesBalo[] = $ann;
} else if ($ann['BodaccCode'] == 'ASSO') {
$annoncesAsso[] = $ann;
} else {
$annoncesBodacc[] = $ann;
}
}
/** Affichage de la liste des annonces **/
// Affiche annonces Bodacc
if (count($annoncesBodacc) > 0) {
?>
<h2>EV&Eacute;NEMENTS L&Eacute;GAUX</h2>
<table>
<?php
foreach($annoncesBodacc as $i => $ann) {
?>
<tr>
<td width="30">&nbsp;</td>
<td width="140" class="StyleInfoLib">
<div id="annoncesDate"><p>Le
<?php
$date = new WDate;
print $date->dateT('Y-m-d', 'd/m/Y', $ann['DateParution']);
?>
</p></div>
<div id="annoncesImg">
<?php
$tabSource = explode('-', $ann['BodaccCode']);
$source = $tabSource[0];
$idSource = @$tabSource[1];
if ($source[0] == 'B') {
echo '<img src="./img/logo_jo.png" title="Source BODACC '.
$ann['BodaccNum'].' '.
substr($source,-1).' '.
substr($ann['DateParution'],0,4).'"/>';
} else if ($source[0] == 'G' ||
$source[0] == 'T') {
echo '<img src="./img/logo_greffe.png"'.
' title="Source Collecte Greffe"/>';
} else if ($source[0] == 'P') {
echo '<img src="./img/logo_inpi.png"'.
' title="Source Collecte RNCS"/>';
} else {
echo '<img src="./img/logo_jal.png"'.
' title="Source Collecte JAL';
if ($idSource>0) echo ' $idSource';
echo '"/>';
}
?>
</div>
</td>
<td width="450" colspan="2" class="StyleInfoData">
<a href="/?page=annonces&siret=<?=$siret?>&idan=<?=$ann['id']?>&vue=bodacc">
<?php
foreach ($ann['evenements'] as $i=>$even) {
echo $even['LibEven'];
if (hasModeEdition() && substr($source, 0, 2) == 'JT') {
echo ' <b>(Source TESSI)</b>';
}
$numEven = $even['CodeEven'] * 1;
if ($numEven > 3000 && $numEven < 3999) {
print ' (clôture au ';
$date = new WDate;
print $date->dateT('Y-m-d', 'd/m/Y', $ann['dateEffet']).
')';
}
echo '<br/>';
}
?>
</a>
</td>
</tr>
<?php
}
?>
</table>
<?php
}
// Affiche annonces Balo
if (count($annoncesBalo) > 0) {
?>
<h2>BALO</h2>
<table>
<?php
foreach ($annoncesBalo as $i => $ann) {
?>
<tr>
<td width="30">&nbsp;</td>
<td width="140" class="StyleInfoLib">
<span id="annoncesDate">Le
<?php
$date = new WDate;
print $date->dateT('Y-m-d', 'd/m/Y', $ann['DateParution']);
?>
</span>
<span id="annoncesImg">
<?php
if ($ann['BodaccCode'] == 'BALO'){
echo '<img src="./img/logo_jo.png" title="Source BALO n°'.$ann['BodaccNum'].'"/>';
}
@ -373,20 +390,18 @@ require_once 'export.php';
$parseTab = new tabExport();
$parseTab->tab = $annonces;
$parseTab->notdisplay = array('id');
$parseTab->title = array(
'BodaccCode'=>'Code Bodacc',
'BodaccNum'=>'Numéro Bodacc',
'NumAnnonce'=>'Numéro annonce',
'DateParution'=>'Date de parution',
'TribunalSiret'=>'Siret du tribunal',
'typeAnnonce'=>'Type annonce',
'texteRectificatif'=>'Texte rectificatif',
'texteAnnonce'=>'Texte annonce',
'dateEffet'=>'Date effet',
'dateJugement'=>'Date jugement',
'dateInsertionSD'=>'Date insertion',
'evenements'=>'Evenements',
);
$parseTab->title = array('BodaccCode' => 'Code Bodacc',
'BodaccNum' => 'Numéro Bodacc',
'NumAnnonce' => 'Numéro annonce',
'DateParution' => 'Date de parution',
'TribunalSiret' => 'Siret du tribunal',
'typeAnnonce' => 'Type annonce',
'texteRectificatif' => 'Texte rectificatif',
'texteAnnonce' => 'Texte annonce',
'dateEffet' => 'Date effet',
'dateJugement' => 'Date jugement',
'dateInsertionSD' => 'Date insertion',
'evenements' => 'Evenements');
$parseTab->type = array();
$tabForExport = $parseTab->convertTable();

View File

@ -23,7 +23,7 @@ function dRow($lib, $data, $title = '')
?>
<div id="center">
<h1 class="titre">IDENTIT&Eacute; DE L'ENTREPRISE</h1>
<h1 class="titre">IDENTIT&Eacute; DE L&apos;ENTREPRISE</h1>
<table>