From 1e993cfbe25bede836979c20881218331b847a59 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Fri, 2 Apr 2010 16:02:20 +0000
Subject: [PATCH] =?UTF-8?q?gestion=20de=20la=20surveillance=20privil=C3=A8?=
 =?UTF-8?q?ge,=20fixed=20issue=20#0000222?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/surveillance/surveillance.php |  2 ++
 www/pages/options_surv.php             | 26 ++++++++++++++------------
 www/pages/piecescmd.php                | 23 ++++++++++++++++++++---
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/includes/surveillance/surveillance.php b/includes/surveillance/surveillance.php
index 75a751f31..cc21e7d05 100644
--- a/includes/surveillance/surveillance.php
+++ b/includes/surveillance/surveillance.php
@@ -10,6 +10,7 @@ function assocSourceDroit()
 		'score' 		=> 'survscore',
 		'actes'  		=> 'survactes',
 		'dirigeants' 	=> 'survdirigeants',
+		'privileges'	=> 'survpriv',
 	);
 
 }
@@ -23,6 +24,7 @@ function assocSourceTxt()
 		'score'			=> 'IndiScore',
 		'actes'			=> 'les actes &amp; status',
 		'dirigeants'	=> 'les dirigeants',
+		'privileges'	=> 'les privilèges',
 	);
 }
 
diff --git a/www/pages/options_surv.php b/www/pages/options_surv.php
index 43291188c..c161e9708 100644
--- a/www/pages/options_surv.php
+++ b/www/pages/options_surv.php
@@ -47,7 +47,9 @@ $tabSource = array(
 	'bilans'=>'bilan',
 	'score'=>'score',
 	'actes'=>'actes',
-	'dirigeants'=>'dirigeants');
+	'dirigeants'=>'dirigeants',
+	'privileges'=>'priv',
+);
 $nbAffichage = 100;
 
 //Enregistrement pour liste dernière recherche
@@ -66,7 +68,6 @@ try{
 	$nbSurveillances = $result['results']['nbReponsesTotal'];
 	$totPage = ceil($nbSurveillances/$nbAffichage);
 	$curPage = ceil($position/$nbAffichage);
-
 } catch (SoapFault $fault) {
 	require_once 'soaperror.php';
 	processSoapFault($client,$fault,$tabInfo);
@@ -147,7 +148,7 @@ if($vue=='default'){
 <?php
 foreach($tabSource as $s => $perm)
 {
-	if(preg_match('/\bsurv'.$perm.'\b/i', $_SESSION['tabInfo']['droits']))
+	if(hasPerm('surv'.$perm))
 	{
 		?>
 		<option value="<?=$s?>" <?php if(isset($source) && $source==$s){print 'selected';}?>><?=$s?></option>
@@ -169,7 +170,7 @@ Afficher uniquement les suveillances de type
 <?php
 foreach($tabSource as $s => $perm)
 {
-	if(preg_match('/\bsurv'.$perm.'\b/i', $_SESSION['tabInfo']['droits']))
+	if(hasPerm('surv'.$perm))
 	{
 		?>
 		<option value="<?=$s?>"
@@ -291,16 +292,16 @@ foreach($listTrier as $item)
 	<?php
 	foreach($tabSource as $source => $perm)
 	{
-		if(preg_match('/\bsurv'.$perm.'\b/i', $_SESSION['tabInfo']['droits']))
+		if(hasPerm('surv'.$perm))
 		{
 			if(isset($item['sources'][$source]))
 			{
 				foreach($item['sources'][$source] as $surveillance)
 				{
-				if($surveillance['ref']!=''){
-						print '<p>'.$surveillance['ref'].'</p>';
-				}else{?> <p>-</p> <?php }
-			}
+					if($surveillance['ref']!=''){
+							print '<p>'.$surveillance['ref'].'</p>';
+					}else{?> <p>-</p> <?php }
+				}
 			}else{?> <p>-</p> <?php }
 		}
 	}
@@ -310,7 +311,8 @@ foreach($listTrier as $item)
 	<?php
 	foreach($tabSource as $source => $perm)
 	{
-		if(preg_match('/\bsurv'.$perm.'\b/i', $_SESSION['tabInfo']['droits']))
+		FB::log($source, $perm);
+		if(hasPerm('surv'.$perm))
 		{
 			if(array_key_exists($source, $item['sources']))
 			{
@@ -354,7 +356,7 @@ foreach($listTrier as $item)
 	<td>
 	<?php
 	foreach($tabSource as $source => $perm){
-		if(preg_match('/surv'.$perm.'/i', $_SESSION['tabInfo']['droits']))
+		if(hasPerm('surv'.$perm))
 		{
 			if(array_key_exists($source, $item['sources'])){
 				foreach($item['sources'][$source] as $surveillance){
@@ -368,7 +370,7 @@ foreach($listTrier as $item)
 	<td>
 	<?php
 	foreach($tabSource as $source => $perm){
-		if(preg_match('/\bsurv'.$perm.'\b/i', $_SESSION['tabInfo']['droits']))
+		if(hasPerm('surv'.$perm))
 		{
 			if(array_key_exists($source, $item['sources'])){
 				foreach($item['sources'][$source] as $surveillance){
diff --git a/www/pages/piecescmd.php b/www/pages/piecescmd.php
index 26dd62fbf..72c722a7a 100644
--- a/www/pages/piecescmd.php
+++ b/www/pages/piecescmd.php
@@ -14,7 +14,7 @@ require_once 'user/user.php';
 $siret = trim(preg_replace('/[^0-9]/', '', $_REQUEST['siret']));
 if (strlen($siret)<>0 && strlen($siret)<>9 && strlen($siret)<>14)
 	die('Paramètres incorrects !');
-$siren=substr($siret,0,9);
+$siren = substr($siret,0,9);
 $raisonSociale = etabSession($siren, $idEntreprise);
 
 function sendCmdMail($sujet, $message)
@@ -107,6 +107,17 @@ if(isset($_REQUEST['action']))
 					$privileges = join(', ', $_REQUEST['privileges']['type']);
 					$privilegesLog = join('-', $_REQUEST['privileges']['type']);
 					$firephp->log($privileges, 'privileges');
+
+					if (in_array('privSurv',$_REQUEST['privileges']['type'])){
+						try {
+							$O = $client->setSurveillance(
+								$_REQUEST['siret'],$_REQUEST['email'],
+								$_REQUEST['ref'], 'Privileges');
+						} catch (SoapFault $fault) {
+							require_once 'soaperror.php';
+							processSoapFault($client,$fault,$_SESSION['tabInfo']);
+						}
+					}
 					sendCmdMail("[COMMANDE PIECES] - PRIVILEGES par email",
 						'COMMANDE DE PRIVILEGES - par email<br/>'.EOL.
 						'Demande pour recevoir ('.$privileges.') pour SIREN : '.
@@ -392,11 +403,17 @@ if(hasPerm('privileges'))
 <?php
 if($disponible)
 {
+	if( hasPerm('survpriv') ){
 ?>
-<input class="noborder type" type="checkbox" name="privileges[type][]" value="privSecu" <?=is_array($_REQUEST['privileges']['type']) && in_array('privSecu',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Privilèges de la sécurité sociale et des régimes complémentaires<br/>
-<input class="noborder type" type="checkbox" name="privileges[type][]" value="privTres" <?=is_array($_REQUEST['privileges']['type']) && in_array('privTres',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Privilèges du Trésor Public<br/>
+<input class="noborder type" type="checkbox" name="privileges[type][]" value="privSurv" <?=is_array($_REQUEST['privileges']['type']) && in_array('SprivSecu',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/><b>Privilèges de la sécurité sociale et des régimes complémentaires et Trésor Public <br/>(avec surveillance, retour sous 48 à 72h)</b><br/>
+<br/>
+<?php } ?>
+<input class="noborder type" type="checkbox" name="privileges[type][]" value="privSecu" <?=is_array($_REQUEST['privileges']['type']) && in_array('privSecu',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Privilèges de la sécurité sociale et des régimes complémentaires (mail sous 12h ouvrées)<br/>
+<input class="noborder type" type="checkbox" name="privileges[type][]" value="privTres" <?=is_array($_REQUEST['privileges']['type']) && in_array('privTres',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Privilèges du Trésor Public (mail sous 12h ouvrées)<br/>
+<br/>
 <input class="noborder type" type="checkbox" name="privileges[type][]" value="nantFond" <?=is_array($_REQUEST['privileges']['type']) && in_array('nantFond',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Nantissements du fonds de commerce ou du fonds artisanal (conventionnels et judiciaires)<br/>
 <input class="noborder type" type="checkbox" name="privileges[type][]" value="nantVend" <?=is_array($_REQUEST['privileges']['type']) && in_array('nantVend',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Privilèges du vendeur de fonds de commerce et d'action résolutoire<br/>
+
 <input class="noborder type" type="checkbox" name="privileges[type][]" value="declCrea" <?=is_array($_REQUEST['privileges']['type']) && in_array('declCrea',$_REQUEST['privileges']['type']) ? 'checked' : ''?>/>Déclarations de créances<br/>
 <?php
 }else{