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

Merge depuis la branche 1.2

Browse Source
This commit is contained in:
Michael RICOIS 2009-08-27 09:35:58 +00:00
parent 98707cd069
commit 3386d4c56c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/pages/marques.php
View File

@ -28,13 +28,14 @@ cache_filename($fileName);
if( cache_exist() && !( preg_match('/saisie/i', $_SESSION['tabInfo']['droits']) || $_SESSION['tabInfo']['mode_edition']==1 ) ){
$marques = cache_get('marques');
$firephp->log($marques,'marques');
}else{
try {
$O = $client->getMarques($siren, $id);
$marques=$O['result'];
$firephp->log($marques,'marque');
$marques = $O['result'];
$firephp->log($marques,'marques');
cache_delete();
cache_add($marques, 'marques');
cache_add('marques', $marques);
} catch (SoapFault $fault) {
require_once 'soaperror.php';
processSoapFault($client,$fault,$tabInfo);

10
www/pages/menu.php
View File

@ -3,7 +3,6 @@
<div style="float:left" id="my_menu" class="sdmenu">
<img src="./img/logo_menu.gif" width="200" height="65">
<div class="collapsed">
<span>RECHERCHES</span>
<a href="/?page=recherche&vue=ent">Rechercher une entreprise</a>
<a href="/?page=recherche&vue=dir">Rechercher par dirigeant</a>
@ -21,6 +20,11 @@ if ($_SESSION['tabInfo']['login']=='mricois'
if (isset($_SESSION['list_pre']) || $_SESSION['list_pre']!=''){ ?>
<a href="/?page=recherche&vue=list_pre">Derni&egrave;re recherche</a>
<?php
if( count($_SESSION['recherche']['list'])>1 && ( $_SESSION['tabInfo']['idClient']==1 || $_SESSION['tabInfo']['idClient']==2 ) ){
?>
<a href="/?page=recherche&vue=histo">Liste des dernières recherches</a>
<?php
}
}else{?>
<a href="#"><font color="Gray">Derni&egrave;re recherche</font></a>
<?php
@ -257,8 +261,8 @@ if ($page=='recherche'){
<a href="/?<?=$printUrl;?>&sortie=prt" title="Impression" target="_blank">
<img src="./img/exporticones/printer.png"" alt="Impression"/></a>&nbsp;
<?php
//Affichage des impressions seulement pour certaines pages
if ($page=='identite' || $page=='etablissements' || $page=='liens' || $page=='evenements' || $page=='dirigeants' || $page=='synthese' || $page=='bilans' || $page=='liasse' || $page=='bourse' || $page=='annonces'){
if($page!='recherche')
{
?>
<a href="./?<?=$_SERVER['QUERY_STRING'];?>&sortie=pdf" target="_blank" title="PDF"><img src="./img/exporticones/pdf.png" alt="PDF"></a>&nbsp;
<?php