Integrate branch 2.5 - Ready to release

2014-04-24 10:46:36 +00:00 · 2014-04-24 10:46:36 +00:00 · 97f2d63ae7
commit 97f2d63ae7
parent ffd84c49f3
3646 changed files with 460192 additions and 87612 deletions
--- a/application/autoload_classmap.php
+++ b/application/autoload_classmap.php
@ -1,2 +1,37 @@
 <?php
-return array();
+// Generated by ZF's ./bin/classmap_generator.php
+return array(
+    'Bootstrap'                         => dirname(__FILE__) . '/Bootstrap.php',
+    'AideController'                    => dirname(__FILE__) . '/controllers/AideController.php',
+    'BdfController'                     => dirname(__FILE__) . '/controllers/BdfController.php',
+    'DashboardController'               => dirname(__FILE__) . '/controllers/DashboardController.php',
+    'DirigeantController'               => dirname(__FILE__) . '/controllers/DirigeantController.php',
+    'ErrorController'                   => dirname(__FILE__) . '/controllers/ErrorController.php',
+    'EvaluationController'              => dirname(__FILE__) . '/controllers/EvaluationController.php',
+    'FichierController'                 => dirname(__FILE__) . '/controllers/FichierController.php',
+    'FinanceController'                 => dirname(__FILE__) . '/controllers/FinanceController.php',
+    'GiantController'                   => dirname(__FILE__) . '/controllers/GiantController.php',
+    'IdentiteController'                => dirname(__FILE__) . '/controllers/IdentiteController.php',
+    'IndexController'                   => dirname(__FILE__) . '/controllers/IndexController.php',
+    'JuridiqueController'               => dirname(__FILE__) . '/controllers/JuridiqueController.php',
+    'LogoController'                    => dirname(__FILE__) . '/controllers/LogoController.php',
+    'MandataireController'              => dirname(__FILE__) . '/controllers/MandataireController.php',
+    'PiecesController'                  => dirname(__FILE__) . '/controllers/PiecesController.php',
+    'PrintController'                   => dirname(__FILE__) . '/controllers/PrintController.php',
+    'RechercheController'               => dirname(__FILE__) . '/controllers/RechercheController.php',
+    'SaisieController'                  => dirname(__FILE__) . '/controllers/SaisieController.php',
+    'SurveillanceController'            => dirname(__FILE__) . '/controllers/SurveillanceController.php',
+    'TelechargementController'          => dirname(__FILE__) . '/controllers/TelechargementController.php',
+    'UserController'                    => dirname(__FILE__) . '/controllers/UserController.php',
+    'WorldcheckController'              => dirname(__FILE__) . '/controllers/WorldcheckController.php',
+    'Zend_View_Helper_CssHelper'        => dirname(__FILE__) . '/views/default/helpers/CssHelper.php',
+    'Zend_View_Helper_Editable'         => dirname(__FILE__) . '/views/default/helpers/Editable.php',
+    'Zend_View_Helper_FormatPct'        => dirname(__FILE__) . '/views/default/helpers/FormatPct.php',
+    'Zend_View_Helper_JavascriptHelper' => dirname(__FILE__) . '/views/default/helpers/JavascriptHelper.php',
+    'Zend_View_Helper_MenuScript'       => dirname(__FILE__) . '/views/default/helpers/MenuScript.php',
+    'Zend_View_Helper_NewsDate'         => dirname(__FILE__) . '/views/mobile/helpers/NewsDate.php',
+    'Zend_View_Helper_RemplaceSiren'    => dirname(__FILE__) . '/views/default/helpers/RemplaceSiren.php',
+    'Zend_View_Helper_SirenTexte'       => dirname(__FILE__) . '/views/default/helpers/SirenTexte.php',
+    'Zend_View_Helper_SiretTexte'       => dirname(__FILE__) . '/views/default/helpers/SiretTexte.php',
+    'Zend_View_Helper_TrueLabel'        => dirname(__FILE__) . '/views/default/helpers/TrueLabel.php',
+);
--- a/application/controllers/DirigeantController.php
+++ b/application/controllers/DirigeantController.php
@ -117,6 +117,8 @@ class DirigeantController extends Zend_Controller_Action
 		$this->view->assign('AutrePage', $this->getRequest()->getParam('apage'));

 		$user = new Scores_Utilisateur();
+		$this->view->assign('accessWorldCheck', $user->checkPerm('WORLDCHECK'));
 		$this->view->assign('surveillance', $user->checkPerm('survdirigeants'));
+		$this->view->assign('edition', $user->checkModeEdition());
 	}
 }
--- a/application/controllers/EvaluationController.php
+++ b/application/controllers/EvaluationController.php
@ -56,6 +56,94 @@ class EvaluationController extends Zend_Controller_Action
        $this->view->assign('max', $bornes[$score]['max']);
    }

+    /**
+     * Historique des scores
+     */
+    public function indiscorehistoAction()
+    {
+        $sessionEntreprise = new Scores_Session_Entreprise($this->siret, $this->id);
+        $siren = substr($this->siret,0,9);
+
+        $user = new Scores_Utilisateur();
+
+    	$this->view->headTitle()->prepend('Historique indiScore');
+    	$this->view->headTitle()->prepend('Siret '.$this->siret);
+
+    	$ws = new WsScores();
+    	$histoScores = $ws->getScoresHisto($this->siret, 'indiscore');
+
+    	if ( $histoScores->nbReponses>1 ) {
+
+    	    $data = array();
+    	    $data['unite'] = '';
+    	    foreach ($histoScores->result->item as $item) {
+        	    $d = array(
+    				'date'	=> $item->date,
+    				'value'	=> $item->value,
+    			);
+        	    $data['data'][] = $d;
+    	    }
+
+    		//Make the graph - Ready to create a class for this char
+    	    require_once 'Vendors/ChartDirector/phpchartdir.php';
+    	    require_once 'Scores/Cache.php';
+    	    $c = Zend_Registry::get('config');
+    	    $path = $c->profil->path->pages . '/imgcache/';
+    	    $file = 'indiscorehisto-'.$this->siret.'-'.$this->id.'.png';
+    	    $cache = new Cache();
+    	    $return = null;
+    	    if( $cache->exist($path.$file) ){
+    	        $return = $file;
+    	    } else {
+    	        if( count($data)<=1 ){
+    	            $return = null;
+    	        } else {
+    	            $labelsX = array();
+    	            $labelsY = array();
+    	            $dataX1 = array();
+    	            $dataX2 = array();
+    	            foreach($data['data'] as $value){
+    	                $dataX1[] = $value['value'];
+    	                $labelsX[] = $value['date'];
+    	            }
+    	            $i=-100; while($i>100){
+    	                $labelsY[] = $i;
+    	            }
+    	            $c = new XYChart(500, 250);
+    	            $c->setPlotArea(70, 10, 450, 200);
+    	            $c->yAxis->setTitle($data['unite']);
+    	            $c->xAxis->setTitle("Date");
+    	            $c->xAxis->setWidth(2);
+    	            $c->yAxis->setTitle("Score");
+    	            $c->yAxis->setWidth(2);
+    	            $legendObj = $c->addLegend(50, 10, false, "times.ttf", 9);
+    	            $legendObj->setBackground(Transparent);
+    	            $c->addLineLayer($dataX1, 0x0000ff, "Evolution");
+    	            $c->yAxis->setLabels($labelsY);
+    	            $c->yAxis->setLabelStep(10);
+    	            $c->xAxis->setLabels($labelsX);
+    	            if( $c->makeChart($path.$file ) === true){
+    	                $return = $file;
+    	            } else {
+    	                $return = false;
+    	            }
+    	        }
+    	    }
+            $this->view->assign('graph', $return);
+
+            //Assign vars
+            $this->view->assign('scores', $histoScores->result->item);
+    		$this->view->assign('type', $histoScores->type);
+    	}
+
+    	$this->view->assign('siret', $this->siret);
+    	$this->view->assign('id', $this->id);
+    	$this->view->assign('siren', $siren);
+    	$this->view->assign('raisonSociale', $sessionEntreprise->getRaisonSociale());
+    	$this->view->assign('typeScore', $user->getTypeScore());
+    	$this->view->assign('exportObjet', $histoScores);
+    }
+
 	/**
 	 * IndiScore
 	 */
--- a/application/controllers/FinanceController.php
+++ b/application/controllers/FinanceController.php
@ -1389,14 +1389,17 @@ class FinanceController extends Zend_Controller_Action
        if ( $response === null ) {
        	$this->view->assign('msg','Aucun bilan déposé.');
        } else {
+
            $date = new Zend_Date($response->DateCloture, 'yyyy-MM-dd');
            $this->view->assign('DateCloture', $date->toString('dd/MM/yyyy'));
            $this->view->assign('DateClotureIso', $response->DateCloture);
+
            if ( $response->SaisieDate!='' || $response->SaisieDate!='0000-00-00' ) {
                $this->view->assign('SaisieDateIso', $response->SaisieDate);
                $date = new Zend_Date($response->SaisieDate, 'yyyy-MM-dd');
                $this->view->assign('SaisieDate', $date->toString('dd/MM/yyyy'));
            }
+
            $this->view->assign('SaisieLabel', $response->SaisieLabel);
        }
 	}
--- a/application/controllers/IdentiteController.php
+++ b/application/controllers/IdentiteController.php
@ -574,6 +574,7 @@ class IdentiteController extends Zend_Controller_Action
 	        $identite = $ws->getLienRef($lienRef);
 	        $this->view->assign('raisonSociale', $identite->raisonSociale);
 	        $this->view->assign('identification', $identite->identification);
+	        $this->view->assign('isin', $identite->isin);
 	        $this->view->assign('actif', $identite->actif);

 	        //Define SIREN if exist
@ -582,7 +583,8 @@ class IdentiteController extends Zend_Controller_Action
 	            $session = new Scores_Session_Entreprise($siren, null, true);
 	            $this->view->assign('siren', $siren);
 	            $this->view->assign('siret', $session->getSiret());
-	            $this->view->assign('isin', $session->getIsin());
+	            $this->view->assign('isin', $session->getIsin());
+	            $this->view->assign('surveillance', $user->checkPerm('survdirigeants'));
 	        }

 	        Zend_Registry::get('firebug')->info($identite);
@ -609,7 +611,8 @@ class IdentiteController extends Zend_Controller_Action
 	        $this->view->assign('isin', $session->getIsin());
 	        $this->view->assign('siren', $siren);
 	        $this->view->assign('siret', $this->siret);
-	        $this->view->assign('raisonSociale', $session->getRaisonSociale());
+	        $this->view->assign('raisonSociale', $session->getRaisonSociale());
+	        $this->view->assign('surveillance', $user->checkPerm('liens'));

 	        //Check access to display group link
 	        if ( $user->checkPerm('GROUPE') ) {
@ -967,6 +970,8 @@ class IdentiteController extends Zend_Controller_Action
 	    $result = $ws->getLienRef($id);
 	    Zend_Registry::get('firebug')->info($result);
 	    $this->view->assign('result', $result);
+
+	    $this->view->assign('idFiche', $id);
 	}

 	/**
@ -996,6 +1001,8 @@ class IdentiteController extends Zend_Controller_Action
 	    $request = $this->getRequest();

 	    $siren = substr($this->siret,0,9);
+	    $nic = $request->getParam('nic', null);
+
 		$this->view->headTitle()->prepend('Evènements - Siren '.$siren);

 		//Pagination
@ -1006,8 +1013,26 @@ class IdentiteController extends Zend_Controller_Action

 		$session = new Scores_Session_Entreprise($this->siret, $this->id);

+        /*
+        Par défaut, si on est sur un siège actif ou non, afficher tous les évènements de l'entreprise.
+        Si on est sur un NIC établissement actif ou radié, afficher juste les évènements de l'établissement.
+        */
+
+        if ( $nic === null ) {
+            $this->view->assign('Entreprise', 1);
+            if ( strlen($this->siret) == 9 ) {
+                $this->view->assign('Nic', substr($session->getSiretSiege(),10,5));
+            } else {
+                $this->view->assign('Nic', substr($this->siret,10,5));
+            }
+            $nic = 0;
+        } else {
+            $this->view->assign('Entreprise', 0);
+        	$this->view->assign('Nic', $nic);
+        }
+
 		$ws = new WsScores();
-		$infos = $ws->getListeEvenements($siren, 0, $position, $nbReponses);
+		$infos = $ws->getListeEvenements($siren, $nic, $position, $nbReponses);
 		$evens = $infos->result->item;

 		$this->view->assign('evens', $evens);
--- a/application/controllers/JuridiqueController.php
+++ b/application/controllers/JuridiqueController.php
@ -169,6 +169,14 @@ class JuridiqueController extends Zend_Controller_Action
 			//Affichage pour la liste des annonces
    	    } else {

+    	        //Titre de la page
+    	        if( empty($siren) ){
+    	            $titre = 'Identifiant '.$this->id;
+    	        } else {
+    	            $titre = 'Siret '.$siren;
+    	        }
+    	        $this->view->headTitle()->prepend('Annonces Légales - '.$titre);
+
    	        //Calcul pagination
    	        $nbReponses = count($infos->result->item);
    	        $nbReponsesTotal = $infos->nbReponses;
--- a/application/controllers/PiecesController.php
+++ b/application/controllers/PiecesController.php
@ -588,7 +588,6 @@ class PiecesController extends Zend_Controller_Action

    }

-
    /**
     * Commande de pièces, kbis, privileges, nantissements
     */
@ -633,6 +632,11 @@ class PiecesController extends Zend_Controller_Action

 		$message = '';

+		$emails = explode(';',$user->getEmail());
+		$email = $emails[0];
+		$validator = new Zend_Validate_EmailAddress();
+		$this->view->assign('emailValid', $validator->isValid($email));
+
 		//Validation du formulaire
 		if ($request->isPost() && $request->getParam('op')=='kbis') {

@ -642,55 +646,46 @@ class PiecesController extends Zend_Controller_Action
 			switch($method) {

 				case 'M':
-					$email = $request->getParam('emailKbisM', '');
-					//Vérification des champs
-					if (!empty($email)) {
-						//Envoi du mail
-						$mail = new Scores_Mail();
-						$mail->setFrom('contact');
-						$mail->addToKey('support');
-						$mail->setSubject('[COMMANDE PIECES] - KBIS par email');
-						$mail->setBodyTexte(
-							'COMMANDE DE PIECES - Demande de kbis par email <br/>'.EOL.
-							'Demande pour recevoir le KBIS de SIREN :'.
-							'<a href="'.$this->view->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=> $this->siret)).'">'.
-							$this->siret.'</a><br/>'.EOL.
-							'pour login '.$user->getLogin().'('.$email.')<br/>'.EOL.
-							'Référence : '.$ref
-						);
-						$mail->send();
+					//Envoi du mail
+					$mail = new Scores_Mail();
+					$mail->setFrom('contact');
+					$mail->addToKey('support');
+					$mail->setSubject('[COMMANDE PIECES] - KBIS par email');
+					$mail->setBodyTexte(
+						'COMMANDE DE PIECES - Demande de kbis par email <br/>'.EOL.
+						'Demande pour recevoir le KBIS de SIREN :'.
+						'<a href="'.$this->view->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=> $this->siret)).'">'.
+						$this->siret.'</a><br/>'.EOL.
+						'pour login '.$user->getLogin().'('.$email.')<br/>'.EOL.
+						'Référence : '.$ref
+					);
+					$mail->send();

-						//Enregistrement dans la bdd
-						$commandesKbis = new Application_Model_CommandesKbis();
-						$data = array(
-							'idUser' => $user->getId(),
-							'login' => $user->getLogin(),
-							'email' => $email,
-							'societe' => '',
-							'nom' => '',
-							'adresse' => '',
-							'cp' => '',
-							'ville' => '',
-							'siren' => substr($this->siret,0,9),
-							'raisonSociale' => $session->getRaisonSociale(),
-							'type' => 'M',
-							'dateCommande' => date('Y-m-d H:i:s'),
-						);
-						$commandesKbis->insert($data);
+					//Enregistrement dans la bdd
+					$commandesKbis = new Application_Model_CommandesKbis();
+					$data = array(
+						'idUser' => $user->getId(),
+						'login' => $user->getLogin(),
+						'email' => $email,
+						'societe' => '',
+						'nom' => '',
+						'adresse' => '',
+						'cp' => '',
+						'ville' => '',
+						'siren' => $siren,
+						'raisonSociale' => $session->getRaisonSociale(),
+						'type' => 'M',
+						'dateCommande' => date('Y-m-d H:i:s'),
+					);
+					$commandesKbis->insert($data);

-						$message = 'Votre demande de reception de Kbis par email a été prise en compte';
-						$ws = new WsScores();
-						$ws->setLog('kbis', $this->siret, 0, 'mail');
-					} else {
-						$message = '<font color="red">Erreur : adresse email non renseignée.</font>';
-						$this->view->assign('ref', $ref);
-						$this->view->assign('method', $method);
-						$this->view->assign('emailKbisM', $email);
-					}
+					$message = $this->view->translate('Votre demande de reception de Kbis par email a été prise en compte');
+					$ws = new WsScores();
+					$ws->setLog('kbis', $this->siret, 0, 'mail');
+					$ws->getKbis($siren, $method, $ref);
 				break;

 				case 'C':
-					$email = $ref = $request->getParam('emailKbisC', '');
 					//Vérification des champs
 					$fields = array('societe', 'nom', 'prenom', 'adresse', 'cp', 'ville');
 					$params = $request->getParams();
@ -731,21 +726,21 @@ class PiecesController extends Zend_Controller_Action
 							'adresse' => $params['adresse'],
 							'cp' => $params['cp'],
 							'ville' => $params['ville'],
-							'siren' => substr($this->siret,0,9),
+							'siren' => $siren,
 							'raisonSociale' => $session->getRaisonSociale(),
 							'type' => 'C',
 							'dateCommande' => date('Y-m-d H:i:s'),
 						);
 						$commandesKbis->insert($data);

-						$message = 'Votre commande à été prise en compte, vous recevrez ce document sous 3/5 jours';
+						$message = $this->view->translate('Votre commande à été prise en compte, vous recevrez ce document sous 3/5 jours');
 						$ws = new WsScores();
 						$ws->setLog('kbis', $this->siret, 0, 'courrier');
+						$ws->getKbis($siren, $method, $ref);
 					}
 					else
 					{
-						$message = '<font color="red">Erreur : Tous les champs doivent être renseigner.</font>';
-						$this->view->assign('emailKbisC', $email);
+						$message = '<font color="red">'.$this->view->translate('Erreur : Tous les champs doivent être renseigner.').'</font>';
 						$this->view->assign('method', $method);
 						$this->view->assign('societe', $params['societe']);
 						$this->view->assign('nom', $params['nom']);
@ -757,7 +752,6 @@ class PiecesController extends Zend_Controller_Action
 				break;
 			}
 			$this->view->assign('message', $message);
-
 		}

   		if ($request->isPost() && $request->getParam('op')=='privileges') {
@ -816,7 +810,6 @@ class PiecesController extends Zend_Controller_Action
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
-
   	}

   	/**
@ -977,8 +970,8 @@ class PiecesController extends Zend_Controller_Action
   	}

   	/**
-   	* Enter description here ...
-   	*/
+   	 * Bilan association
+   	 */
   	public function associationbilanAction()
   	{
   		//Désactivation affichage
@ -1028,16 +1021,7 @@ class PiecesController extends Zend_Controller_Action
   	/**
   	 * Gestion téléchargement des kbis
   	 */
-   	public function kbisAction()
-   	{
-   		//On bascule soit vers kbispasserelle ou vers kbis infogreffe
-   		$this->_forward('kbispasserelle', 'pieces', null, $this->getRequest()->getParams());
-   	}
-
-   	/**
-   	 * Téléchargement de kbis par la passerelle SD
-   	 */
-	public function kbispasserelleAction()
+	public function kbisAction()
 	{
 		$request = $this->getRequest();
 		$params = $request->getParams();
@ -1096,7 +1080,7 @@ class PiecesController extends Zend_Controller_Action
 			{
 				require_once 'Scores/WsScores.php';
 				$ws = new WsScores();
-				$info = $ws->getKbis($siren);
+				$info = $ws->getKbis($siren, 'T');

 				if ( substr($info,0,7)=='http://' ) {
 					//Suppression du fichier si il existe
@ -1127,14 +1111,6 @@ class PiecesController extends Zend_Controller_Action
 		}
 	}

-	/**
-	 * Téléchargement de kbis par infogreffe
-	 */
-	public function kbisinfogreffeAction()
-	{
-
-	}
-
 	/**
 	 * Affiche les privilèges en surveillance
 	 */
--- a/application/controllers/SaisieController.php
+++ b/application/controllers/SaisieController.php
@ -47,7 +47,7 @@ class SaisieController extends Zend_Controller_Action
 		array( "triId"=>"1790", "triCode"=>"CAYENL", "triNom"=>"Chambre Détachée de la Cour d'Appel de Fort de France à Cayenne", "triCP"=>"97300" ),
 		array( "triId"=>"1798", "triCode"=>"AGENL", "triNom"=>"Cour d'Appel d'Agen", "triCP"=>"47916" ),
 	);
-	
+
 	protected $codVoie = array(
 		'ABE' => "Abbaye",
 		'AGL' => "Agglomération",
@ -324,7 +324,7 @@ class SaisieController extends Zend_Controller_Action
 	{
 		$this->view->headScript()
 			->appendFile('/themes/default/scripts/saisie.js', 'text/javascript')
-			->appendFile('/libs/form/jquery.form.js', 'text/javascript');
+			->appendFile('/libs/form/jquery.form.min.js', 'text/javascript');

 		$request = $this->getRequest();
 		$siret = $request->getParam('siret');
@ -526,8 +526,8 @@ class SaisieController extends Zend_Controller_Action
 			'1100', '1101' , '1200', '1201', '1300', '1301', '1302', '1303', '1304', '1305', '1306',
 		    '1307', '1308', '1309', '1310', '1311', '1312', '1408', '1411', '1412', '1413', '1414',
 			'1415', '1511', '1502', '1506', '1503', '1512', '1600', '1601', '1999', '2102', '2100',
-			'2202', '2206', '2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '5500',
-			'6700', '1010', '1050', '1055', '2203', '2204', '2210', '2212',
+			'2202', '2206', '2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '4500',
+		    '5500', '6700', '1010', '1050', '1055', '2203', '2204', '2210', '2212',
 		);
 		$eventM = new Application_Model_TabEvenements();
 		$sql = $eventM->select()
@ -1003,7 +1003,7 @@ class SaisieController extends Zend_Controller_Action
 		//Affichage formulaire
 		} else {

-			$this->view->inlineScript()->appendFile('/libs/form/jquery.form.js');
+			$this->view->inlineScript()->appendFile('/libs/form/jquery.form.min.js');
 			if ( intval($siren)==0 ) {
 				$session = new Scores_Session_Entreprise();
 				$siren = '';
@ -1653,11 +1653,13 @@ class SaisieController extends Zend_Controller_Action
 	            $this->view->assign('id1', $lienRef);
 	        } else {
    	        //Création de la première référence lien
+    	        $result = $ws->getIdentiteLight($siren);
+    	        //Compute informations
    	        $infos = array(
-    	            'siren' => $siren,
+    	            'siren' => $result->Siren,
    	            'actif' => 1,
    	            'PpPm' => 'PM',
-    	            'RS' => $rs,
+    	            'RS' => $result->Nom,
    	            'civilite' => '',
    	            'nom' => '',
    	            'prenom' => '',
@ -1666,17 +1668,17 @@ class SaisieController extends Zend_Controller_Action
    	            'naissance_dept_pays' => '',
    	            'naissance_lieu' => '',
    	            'nat' => '',
-    	            'adresse_num' => '',
-    	            'adresse_btq' => '',
-    	            'adresse_codvoie' => '',
-    	            'adresse_libvoie' => '',
+    	            'adresse_num' => $result->AdresseNum,
+    	            'adresse_btq' => $result->AdresseBtq,
+    	            'adresse_codvoie' => $result->AdresseVoie,
+    	            'adresse_libvoie' => $result->AdresseRue,
    	            'adresse_comp' => '',
-    	            'adresse_cp' => '',
-    	            'adresse_ville' => '',
-    	            'adresse_pays' => '',
+    	            'adresse_cp' => $result->CP,
+    	            'adresse_ville' => $result->Ville,
+    	            'adresse_pays' => 'FRA',
    	            'dateSaisie' => date('YmdHis'),
-    	            'capital' => '',
-    	            'deviseCapital' => 'EUR',
+    	            'capital' => $result->CapitalDev,
+    	            'deviseCapital' => $result->CapitalDev,
    	            'nbActions' => '',
    	            'idLoc1Type' => '',
    	            'idLoc1Num' => '',
@ -1687,7 +1689,7 @@ class SaisieController extends Zend_Controller_Action
    	        );
    	        $idNewLien = $ws->setLienRef(json_encode($infos));
    	        Zend_Registry::get('firebug')->info('idNewLien:'.$idNewLien);
-    	        if (is_int($idNewLien)) {
+    	        if ( is_int($idNewLien) ) {
    	            $this->view->assign('id1', $idNewLien);
    	        }
 	        }
@ -2242,7 +2244,7 @@ class SaisieController extends Zend_Controller_Action

 	    $ws = new WsScores();

-	    if ($id===null) {
+	    if ( $id===null ) {
 	        $siren = $request->getParam('siren');
 	        $result = $ws->searchLienRef($siren, 'siren');
 	        if (count($result->item)>0) {
@ -2253,44 +2255,57 @@ class SaisieController extends Zend_Controller_Action
    	    }
 	    }

-	    $this->view->assign('edit', $id);
+	    if ( $id!==null ) {

-	    $this->view->assign('currencies', $this->currencies);
-   	    $this->view->assign('countries', $this->countries);
+    	    $this->view->assign('edit', $id);

-	    $result = $ws->getSaisieLienRef($id);
-	    $items = json_decode($result, true);
+    	    $this->view->assign('currencies', $this->currencies);
+       	    $this->view->assign('countries', $this->countries);

-	    //Get country code
-	    if ($items->adresse_pays!='FRA') {
-	        $result = $ws->getCountryId($items['adresse_pays']);
-	        $this->view->assign('identifiant', $result->item);
-	    }
+    	    $result = $ws->getSaisieLienRef($id);

-	    Zend_Registry::get('firebug')->info($items);
+    	    if ( $result!==false ) {

-	    if (count($items)>0) {
-	        foreach( $items as $key => $val ) {
-	            switch ($key) {
-	                case 'dateCapital':
-	                case 'dateNbActions':
-	                case 'naissance_date':
-	                    if (!empty($val) && $val!='0000-00-00') {
-	                    	$date = new Zend_Date($val, 'yyyy-MM-dd');
-	                        $this->view->assign($key, $date->toString('dd/MM/yyyy'));
-	                    }
-	                    break;
-	                default:
-	                    $this->view->assign($key, $val);
-	                    break;
-	            }
-	        }
-	    }
+        	    $items = json_decode($result, true);
+        	    if ( $items!==null ) {
+            	    Zend_Registry::get('firebug')->info('getSaisieLienRef id='.$id);
+            	    Zend_Registry::get('firebug')->info($items);
+
+            	    //Get country code
+            	    if ($items->adresse_pays!='FRA') {
+            	        $result = $ws->getCountryId($items['adresse_pays']);
+            	        $this->view->assign('identifiant', $result->item);
+            	    }
+
+            	    Zend_Registry::get('firebug')->info($items);
+
+            	    if (count($items)>0) {
+            	        foreach( $items as $key => $val ) {
+            	            switch ($key) {
+            	                case 'dateCapital':
+            	                case 'dateNbActions':
+            	                case 'naissance_date':
+            	                    if (!empty($val) && $val!='0000-00-00') {
+            	                    	$date = new Zend_Date($val, 'yyyy-MM-dd');
+            	                        $this->view->assign($key, $date->toString('dd/MM/yyyy'));
+            	                    }
+            	                    break;
+            	                default:
+            	                    $this->view->assign($key, $val);
+            	                    break;
+            	            }
+            	        }
+            	    }
+
+            	    if ($items['PpPm']=='PM') {
+            	        $this->view->assign('nom', $items['RS']);
+            	    } else {
+            	        $this->view->assign('nom', $items['nom']);
+            	    }
+        	    }
+
+    	    }

-	    if ($items['PpPm']=='PM') {
-	        $this->view->assign('nom', $items['RS']);
-	    } else {
-	        $this->view->assign('nom', $items['nom']);
 	    }
 	}

@ -2337,20 +2352,20 @@ class SaisieController extends Zend_Controller_Action
 	    }

 	}
-	
+
 	public function liendeleteAction()
 	{
 	    $this->_helper->layout()->disableLayout();
-	    
+
 	    $request = $this->getRequest();
 	    $id = $request->getParam('idFiche', null);
 	    $infos = array ('delete' => '1');
-	    
+
 	    $ws = new WsScores();
-	    
+
 	    if ($id===null) {
    		$siren = $request->getParam('siren');
-    		
+
    		$result = $ws->searchLienRef($siren, 'siren');
    		if (count($result->item)>0) {
    			foreach ($result->item as $item) {
@ -2359,7 +2374,7 @@ class SaisieController extends Zend_Controller_Action
    			}
    		}
 	    }
- 		
+
 	    if ( $request->isPost() ) {
 	    	if ($id == null) {
 	    		$message = 'Fiche n\'est pas trouvée';
@ -2386,74 +2401,126 @@ class SaisieController extends Zend_Controller_Action

 	    $request = $this->getRequest();
 	    $siren = $request->getParam('siren');
-	    $refresh = 0;
 	    $message = '';
+	    $getcutoff = null;

 	    if ( $request->isXmlHttpRequest() ) {
 	        $this->_helper->layout()->disableLayout();
-	        if ( $request->isPost() ) {
-	            $params = $request->getParams();
-	            // check values one more time
-	            $paramlist = array(
-	            		'siren' => 'Siren',
-	            		'encours' => 'Encours',
-	            		'scoreSolv' => 'Indiscore',
-	            		'scoreDir' => 'Score dirigeance',
-	            		'scoreConf' => 'Score de conformité',
-	            		'remarque' => 'Remarque',
-	            );
-	            foreach ($paramlist as $item => $val) {
-	            	if (!isset($params[$item])) {
-	            		$message .= "Valeur $val vide !<br/>";
-	            	}
-	            	if ($params['encours']<0 || $params['encours']>500 ) {
-	            		$message = "Encours : Erreur borne";
-	            	}
-	            }
-	            // end checking values

-	            if ($message == '') {
-	    	        $message = $ws->setScoreCutoff($params['siren'], $params['encours']*1000, $params['scoreSolv'], $params['scoreDir'], $params['scoreConf'], $params['remarque'], $params['delete']);
-	    	        if (is_int($message)){
-	    	          	$message = "Cut-off mis à jour.";
-	    	          	$refresh = 1;
-	    	        }
+            $params = $request->getParams();
+            $mode = $request->getParam('mode');
+
+            //Confirm delete
+            if ( $mode == 'todelete' ) {
+
+                $this->view->assign('mode', 'todelete');
+
+                $this->view->assign('siren', $params['siren']);
+                $this->view->assign('encours', $params['encours']);
+                $this->view->assign('scoreSolv', $params['scoreSolv']);
+                $this->view->assign('scoreDir', $params['scoreDir']);
+                $this->view->assign('scoreConf', $params['scoreConf']);
+                $this->view->assign('remarque', $params['remarque']);
+
+            }
+
+            //Delete
+            elseif ($mode == 'delete') {
+
+                $this->view->assign('mode', 'delete');
+
+                $message = $ws->setScoreCutoff(
+                    $params['siren'],
+                    $params['encours']*1000,
+                    $params['scoreSolv'],
+                    $params['scoreDir'],
+                    $params['scoreConf'],
+                    $params['remarque'],
+                    1
+                );
+                if (is_int($message)){
+                    $message = "Cut-off est supprimé.";
+                } else {
+                    $message = "Erreur lors de la suppression du cut-off (".$message.").";
+                }
+
+            }
+
+            //Add or Edit cutoff
+            else {
+
+                if ( $request->isPost() ) {
+    	            // check values one more time
+    	            $paramlist = array(
+                		'siren' => 'Siren',
+                		'encours' => 'Encours',
+                		'scoreSolv' => 'Indiscore',
+                		'scoreDir' => 'Score dirigeance',
+                		'scoreConf' => 'Score de conformité',
+                		'remarque' => 'Remarque',
+    	            );
+    	            foreach ($paramlist as $item => $val) {
+    	            	if ( !isset($params[$item]) ) {
+    	            		$message .= "Valeur $val vide !<br/>";
+    	            	}
+    	            	if ( $params['encours']<0 || $params['encours']>500 ) {
+    	            		$message = "Encours : Erreur borne";
+    	            	}
+    	            }
+    	            // end checking values
+
+    	            if ( $message == '' ) {
+    	    	        $message = $ws->setScoreCutoff(
+    	    	            $params['siren'],
+    	    	            $params['encours']*1000,
+    	    	            $params['scoreSolv'],
+    	    	            $params['scoreDir'],
+    	    	            $params['scoreConf'],
+    	    	            $params['remarque'],
+    	    	            $params['delete']
+                        );
+    	    	        if (is_int($message)){
+    	    	          	$message = "Cut-off mis à jour.";
+    	    	          	$this->view->assign('mode', 'added');
+    	    	        } else {
+                            $message = "Erreur lors de la mise à jour (".$message.").";
+    	    	        }
+    	            }
 	            }

-	            if ($message == '' && $params['delete'] == 1) {
-	            	$message = "Cut-off est supprimé. Aucun Cut-off est défini, merci de remplir toutes les valeurs";
-	            	$refresh = 1;
+	            $getcutoff = json_decode($ws->getScoreCutoff($siren), true);
+	            if( !$getcutoff ) {
+	                if ( $message == '' ) {
+	                    $message = "Aucun Cut-off, merci de remplir toutes les valeurs";
+	                }
+
+	                $getcutoff = array(
+	                    'siren' => '',
+	                    'encours' => '',
+	                    'scoreSolv' => '',
+	                    'scoreDir' => '',
+	                    'scoreConf' => '',
+	                    'remarque' => '',
+	                    'dateInsert' => '',
+	                    'dateUpdate' => ''
+	                );
 	            }
-	        }
-	    } else {
+
+            }
+
+	    }
+	    //Display link
+	    else {
+
 	        $this->view->assign('name', "Définir un Cut-off");
 	        $this->view->assign('href', $this->view->url(array('controller'=>'saisie','action'=>'scorecutoff','siren'=>$siren)));
-	    }

-	    $getcutoff = json_decode($ws->getScoreCutoff($siren), true);
-	    if(!$getcutoff) {
-	    	if ($message == '') {
-	    		$message = "Aucun Cut-off est défini, merci de remplir toutes les valeurs";
-	    		$refresh = 0;
-	    	}
-
-	    	$getcutoff = array(
-	    			'siren' => '',
-	    			'encours' => '',
-	    			'scoreSolv' => '',
-	    			'scoreDir' => '',
-	    			'scoreConf' => '',
-	    			'remarque' => '',
-	    			'dateInsert' => '',
-	    			'dateUpdate' => ''
-	    	);
 	    }

 	    $this->view->assign('getcutoff', $getcutoff);
 	    $this->view->assign('siren', $siren);
 		$this->view->assign('typescore', $user->getTypeScore());
 	    $this->view->assign('message', $message);
-	    $this->view->assign('refresh', $refresh);
 	}

 	public function citysearchAction()
@ -2485,11 +2552,11 @@ class SaisieController extends Zend_Controller_Action

 		$this->view->assign('output', $output);
 	}
-	
+
 	public function codvoieAction()
 	{
 		$this->_helper->layout()->disableLayout();
-	
+
 		$codvoie = $this->getRequest()->getParam('codvoie', null);
 		$output = array();

@ -2507,26 +2574,131 @@ class SaisieController extends Zend_Controller_Action
 	}

 	/**
+	 * Ajouter, modifier ou supprimer des dirigeants oppérationnels
+	 */
+	public function diropcontrolAction()
+	{
+		$this->_helper->layout()->disableLayout();
+
+		$request = $this->getRequest();
+		$mode = $request->getParam('mode');
+		$id = $request->getParam('id', null);
+		$siret = $request->getParam('siret');
+		$siren = substr($siret, 0, 9);
+		$nic = substr($siret, 9, 5);
+
+		$ws = new WsScores();
+
+		switch ($mode) {
+			case 'add':
+				$fonction = $this->fctDir();
+
+				$this->view->assign('fonction', $fonction);
+				break;
+
+			case 'edit':
+				$fonction = $this->fctDir();
+				$infos = $ws->getDirigeantsOp($siren, $id);
+
+				$this->view->assign('fonction', $fonction);
+				$this->view->assign('infos', $infos->item[0]);
+				break;
+		}
+
+		$this->view->assign('mode', $mode);
+		$this->view->assign('id', $id);
+		$this->view->assign('siren', $siren);
+		$this->view->assign('nic', $nic);
+	}
+
+	/**
+	 * Sauvegarder les modifications des dirigeants oppérationnels
+	 */
+	public function diropsaveAction()
+	{
+		$this->_helper->layout()->disableLayout();
+
+		$params = $this->getRequest()->getParams();
+		$message = '';
+
+		$newDate = '0000-00-00';
+		if (trim($params['naiss_date']) != '') {
+			$date = new Zend_Date($params['naiss_date'], 'dd/MM/yyyy');
+			$newDate = $date->toString('yyyy-MM-dd');
+		}
+
+		$infos = array(
+				'siren'		=> $params['siren'],
+				'nic'		=> $params['nic'],
+				'civilite'	=> $params['civilite'],
+				'nom'		=> $params['nom'],
+				'prenom'	=> $params['prenom'],
+				'nom_usage'	=> $params['nom_usage'],
+				'dateNais'	=> $newDate,
+				'lieuNais'	=> $params['naiss_lieu'],
+				'codFct'	=> str_pad($params['codFct'], 4, 0, STR_PAD_LEFT),
+				'tel'		=> $params['tel'],
+				'fax'		=> $params['fax'],
+				'email'		=> $params['email']
+				);
+
+		$ws = new WsScores();
+
+		if($params['mode'] == 'add'){
+			$message = $this->view->translate('Ajout');
+		} else if ($params['mode'] == 'edit') {
+			$message = $this->view->translate('Edition');
+		} else if ($params['mode'] == 'del') {
+			$message = $this->view->translate('Suppression');
+		}
+
+		$result = $ws->setDirigeantsOp(json_encode($infos), $params['mode'], $params['id']);
+
+		if ($result>0) {
+				$message = $message.' '.$this->view->translate('a été réussi!');
+		} else if ($result===0) {
+				$message = $message.' '.$this->view->translate('n\'a  pas été réussi!');
+		} else {
+			$message = $result;
+		}
+
+		$this->view->assign('message', $message);
+	}
+
+/**
 	 * Edit contact information
 	 */
 	public function contactAction()
 	{
 		$request = $this->getRequest();
 		if ( $request->isXmlHttpRequest() ) {
-			$this->_helper->layout()->disableLayout();
+		    $this->_helper->layout()->disableLayout();
+
+		    $id = $request->getParam('id');
+		    $this->view->assign('id', $id);
+
 			if ( $request->isPost() ) {

 				$this->view->assign('post', true);
+				$params = $request->getParams();

 				$message = '';
 				$mode = $request->getParam('mode');
-				if( in_array($mode, array('create', 'edit')) ) {
-					$params = $request->getParams();
+				if( $mode == 'delete' ) {
+
+				    $ws = new WsScores();
+				    $result = $ws->setSaisieContactEt($params['siret'], '', '', '', $id, true);
+				    if ( is_string($result) ) {
+				        $this->view->assign('msg', $result);
+				    }
+
+				} else {
+
 					// check values
 					$paramlist = array(
-							'siret' => 'SIRET',
-							'type' => 'Type',
-							'value' => 'Valeur',
+						'siret' => 'SIRET',
+						'type' => 'Type',
+						'value' => 'Valeur',
 					);

 					foreach ($paramlist as $item => $val) {
@ -2539,7 +2711,7 @@ class SaisieController extends Zend_Controller_Action
 					if ($message == '') {
 						//setContactEt
 						$ws = new WsScores();
-						$result = $ws->setSaisieContactEt($siret, $type, $value, $info);
+						$result = $ws->setSaisieContactEt($params['siret'], $params['type'], $params['value'], $params['info']);

 						if ( is_string($result) ) {
 							$this->view->assign('msg', $result);
@ -2549,22 +2721,17 @@ class SaisieController extends Zend_Controller_Action
 						$this->view->assign('msg', $message);
 					}

-				} else {
-
-					$ws = new WsScores();
-					$result = $ws->delSaisieContactEt($id);
-					if ( is_string($result) ) {
-						$this->view->assign('msg', $result);
-					}
-
 				}

 			} else {

 				$mode = $request->getParam('mode');
-				$id = $request->getParam('id');
+				$this->view->assign('mode', $mode);

-				if ($mode=='delete') {
+				$siret = $request->getParam('siret');
+				$this->view->assign('siret', $siret);
+
+				if ( $mode=='delete' ) {

 					$this->view->assign('mode', 'delete');

@ -2573,21 +2740,44 @@ class SaisieController extends Zend_Controller_Action
 					if ( $id !== null ) {
 						$ws = new WsScores();
 						$result = $ws->getSaisieContactEt($id);
-						$data = json_decode($result);
+						$data = json_decode($result, true);
 						Zend_Registry::get('firebug')->info($data);
-						$this->view->assign('id', $data->id);
-						$this->view->assign('siret', str_pad($data->siren,9,'0',STR_PAD_LEFT).str_pad($data->nic,5,'0',STR_PAD_LEFT));
-						$this->view->assign('type',  $data->typeTel);
-						if ($data->typeTel=='tel' ||  $data->typeTel=='fax' ) {
-							$this->view->assign('value', str_pad($data->telephone,10,'0',STR_PAD_LEFT));
-							$this->view->assign('info', $data->infoTel);
+						$this->view->assign('id', $data['id']);
+						$this->view->assign('siret', str_pad($data['siren'],9,'0',STR_PAD_LEFT).str_pad($data['nic'],5,'0',STR_PAD_LEFT));
+						$this->view->assign('type',  $data['typeTel']);
+						if ($data['typeTel']=='tel' ||  $data['typeTel']=='fax' ) {
+							$this->view->assign('value', str_pad($data['telephone'],10,'0',STR_PAD_LEFT));
+							$this->view->assign('info', $data['infoTel']);
 						} else {
 							$this->view->assign('value', $data->infoTel);
 						}
+						$tabChange = array();
+						if ( $data->idUtilisateur != 0 ) {
+                            $change = new stdClass();
+                            $change->UserId = $data['idUtilisateur'];
+                            $change->UserName = $data['idUtilisateurName'];
+                            $change->Date = $data['dateInsert'];
+                            $change->Type = 'add';
+                            $tabChange[] = $change;
+						}
+						if ( $data->idUpdate != 0 ) {
+						    $change = new stdClass();
+						    $change->UserId = $data['idUpdate'];
+						    $change->UserName = $data['idUpdateName'];
+						    $change->Date = $data['dateUpdate'];
+						    $change->Type = 'edit';
+						    $tabChange[] = $change;
+						}
+						if ( $data->idSuppr != 0 ) {
+						    $change = new stdClass();
+						    $change->UserId = $data['idSuppr'];
+						    $change->UserName = $data['idSupprName'];
+						    $change->Date = $data['dateSuppr'];
+						    $change->Type = 'del';
+						    $tabChange[] = $change;
+						}
+                        $this->view->Modif = $tabChange;

-					} else {
-						$siret = $request->getParam('siret');
-						$this->view->assign('siret', $siret);
 					}

 					$this->view->telinfo = array(
--- a/application/controllers/SurveillanceController.php
+++ b/application/controllers/SurveillanceController.php
@ -52,13 +52,18 @@ class SurveillanceController extends Zend_Controller_Action
    	$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
 		$siret = $request->getParam('siret', '');
-		$email = $request->getParam('email', '');
-		$ref = $request->getParam('ref', '');
+        $ref = $request->getParam('ref', '');
 		$source = $request->getParam('source', '');
 		$encours = $request->getParam('encours', 0);

 		$user = new Scores_Utilisateur();
+		// Main email
 		$email = $user->getEmail();
+		$emails = explode(';', $email);
+
+		//Secondary email
+        //$ws = new WsScores();
+        //secondEmails = $ws->getEmail();

 		if( empty($source) ) {
 			$source = array();
@ -78,7 +83,8 @@ class SurveillanceController extends Zend_Controller_Action
 		}
 		$this->view->assign('source', $source);
 		$this->view->assign('siret', $siret);
-		$this->view->assign('email', $email);
+		$this->view->assign('emails', $emails);
+		$this->view->assign('email', join(';',$emails));
 		$this->view->assign('ref', $ref);
 		$this->view->assign('encours', $encours);
    }
@ -119,9 +125,9 @@ class SurveillanceController extends Zend_Controller_Action
 				echo "Erreur lors de la suppression";
 			}
 		} elseif (isset($page)) {
-			$this->_redirect('surveillance/liste/page/'.$page);
+			$this->redirect('surveillance/liste/page/'.$page);
 		} else {
-			$this->_redirect('surveillance/liste');
+			$this->redirect('surveillance/liste');
 		}
    }

@ -145,27 +151,41 @@ class SurveillanceController extends Zend_Controller_Action
 		//Vérification siret / email / ref
 		if (empty($siret) || empty($email) || empty($ref)){
 			$msg = 'Erreur email ou reférence non définie !';
-		}
-		elseif (!$validateur->isValid($email)) {
-		    $msg = "Email invalide.";
-		}
-		//Vérification de l'encours (chiffres)
-		elseif (!preg_match('/([0-9]+)/', $encours)){
-			$msg = 'Encours incorrect';
 		} else {
-			if (!empty($delete)){
-				$delete = true;
-			}
-			$ws = new WsScores();
-			$set = $ws->setSurveillance($siret, $email, $ref, $source, $delete, $encours);
-			if ($set) {
-			    if ($delete) { $msg = "Suppression surveillance $source"; }
-			    else { $msg = "Mise sous surveillance $source"; }
-			} else {
-			    if ($delete) { $msg = "Erreur lors de la suppression de la surveillance $source"; }
-			    else { $msg = "Erreur lors de la mise sous surveillance $source"; }
-			}
+
+            $emails = explode(';', $email);
+            $emailsValid = true;
+            foreach ( $emails as $email ) {
+                if ( !$validateur->isValid($email) ) {
+                    $emailsValid = false;
+                    break;
+                }
+            }
+
+            if ( $emailsValid ) {
+        		//Vérification de l'encours (chiffres)
+        		if (!preg_match('/([0-9]+)/', $encours)){
+        			$msg = 'Encours incorrect';
+        		} else {
+        			if (!empty($delete)){
+        				$delete = true;
+        			}
+        			$ws = new WsScores();
+        			$set = $ws->setSurveillance($siret, $email, $ref, $source, $delete, $encours);
+        			if ($set) {
+        			    if ($delete) { $msg = "Suppression surveillance $source"; }
+        			    else { $msg = "Mise sous surveillance $source"; }
+        			} else {
+        			    if ($delete) { $msg = "Erreur lors de la suppression de la surveillance $source"; }
+        			    else { $msg = "Erreur lors de la mise sous surveillance $source"; }
+        			}
+                }
+            } else {
+                $msg = "Email invalide.";
+            }
+
 		}
+
 		$this->view->assign('msg', $msg);
    }

--- a/application/controllers/TelechargementController.php
+++ b/application/controllers/TelechargementController.php
@ -25,7 +25,7 @@ class TelechargementController extends Zend_Controller_Action
 		if (!is_dir($this->path)) mkdir($this->path);

 	    // Recuperation du nom du fichier
-	    if ($filename===null) {
+	    if ( $filename === null ) {
 			$tableau = explode('/', $url);
 		    $file = $tableau[sizeof($tableau) - 1];
 	    } else {
@ -33,14 +33,16 @@ class TelechargementController extends Zend_Controller_Action
 	    }

 	    // Suppression du fichier si le temps de cache est depasse
-	    if (file_exists($this->path.'/'.$file)){
-	    	 $dateFile = filemtime($this->path.'/'.$file);
-	    	 $now = mktime(date('G'), date('i'), date('s'),
-	    	 	date('m') , date('d'), date('Y'));
-	    	 $maxTime = mktime(date('G',$dateFile)+$this->filetime, date('i',$dateFile),
-	    	 	date('s',$dateFile), date('m',$dateFile),
-	    	 	date('d',$dateFile), date('Y',$dateFile));
-	    	if ($maxTime-$now<0) {
+	    if ( $this->filetime == 0 && file_exists($this->path.'/'.$file) ){
+            unlink($this->path.'/'.$file);
+	    } elseif ( file_exists($this->path.'/'.$file) ) {
+            $dateFile = filemtime($this->path.'/'.$file);
+            $now = mktime(date('G'), date('i'), date('s'),
+                date('m') , date('d'), date('Y'));
+            $maxTime = mktime(date('G',$dateFile)+$this->filetime, date('i',$dateFile),
+	    	    date('s',$dateFile), date('m',$dateFile),
+                date('d',$dateFile), date('Y',$dateFile));
+	    	if ( $maxTime - $now < 0 ) {
 	    		unlink($this->path.'/'.$file);
 	    	}
 	    }
@ -82,7 +84,7 @@ class TelechargementController extends Zend_Controller_Action
 	 */
 	public function consommationAction()
 	{
-		$this->filetime = 1;
+		$this->filetime = 0;

 		$request = $this->getRequest();
 		$start = $request->getParam('start', false);
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@ -5,7 +5,6 @@ class UserController extends Zend_Controller_Action
 	public function init()
 	{
 		require_once 'Scores/WsScores.php';
-		$this->view->headLink()->appendStylesheet('/themes/default/styles/user.css', 'all');
 	}

 	/**
@ -13,7 +12,9 @@ class UserController extends Zend_Controller_Action
 	 */
 	public function indexAction()
 	{
-		$user = new Scores_Utilisateur();
+	    $this->view->headLink()->appendStylesheet('/themes/default/styles/user.css', 'all');
+
+	    $user = new Scores_Utilisateur();

 		if (!$user->checkPerm('MONPROFIL')){
 			$this->_forward('perms', 'error');
@ -189,49 +190,98 @@ class UserController extends Zend_Controller_Action
 	 * Email length 80 * 3 = 240
 	 * 255 chars is the length to store emails (email1;email2;email3)
 	 */
-	public function emailsAction()
-	{
-	    $this->_helper->layout()->disableLayout();
-
-	    $nbEmails = 3;
-
-	    $request = $this->getRequest();
-	    $emails = $request->getParam('q');
-
-	    if (null !== $emails) {
-	        $emailList = explode(';', $emails);
-	        if ( count($emailList)>0 ) {
-	            $i = 1;
-	            foreach ( $emailList as $email ) {
-	                $this->view->assign('email'.$i, $email);
-	                $i++;
-	            }
-	        }
-	    }
-	}
-
-	/**
-	 * Validate email
-	 */
-	public function emailvalidAction()
+	public function emailAction()
 	{
 	    $this->_helper->layout()->disableLayout();

 	    $request = $this->getRequest();
+
+	    $check = $request->getParam('check');
 	    $email = $request->getParam('q');

-	    $valid = false;
+	    if ( $check == 1) {
+
+	        $this->view->assign('checkemail', true);
+
+	        $valid = false;
+
+	        $this->view->assign('msg', 'Email invalide !');
+
+	        if (null !== $email) {
+	            $validateur = new Zend_Validate_EmailAddress();
+	            $valid = $validateur->isValid($email);
+
+	            if ( $valid ) {
+	                $this->view->assign('msg', 'Modification effectué.');
+	                $this->view->assign('email', $email);
+	            }
+
+	        }
+
+	    } else {
+
+	        $this->view->assign('email', $email);

-	    if (null !== $email) {
-	        $validateur = new Zend_Validate_EmailAddress();
-	        $valid = $validateur->isValid($email);
 	    }

-	    $result = array(
-	        'valid' => $valid,
-	    );
+	}
+
+	public function emailsecondaryAction()
+	{
+	    $this->_helper->layout()->disableLayout();
+
+	    $request = $this->getRequest();
+
+	    $user = new Scores_Utilisateur();
+
+	    $mode = $request->getParam('mode');
+        $this->view->assign('mode', $mode);
+	    $email = $request->getParam('email');
+	    $login = $request->getParam('login', $user->getLogin());
+	    $this->view->assign('login', $login);
+
+	    $idClient = $request->getParam('client', $user->getIdClient());
+
+	    if ( $mode === null ) {
+
+            $ws = new WsScores();
+            $result = $ws->getGestionEmail($login);
+            $emails = array();
+            if (count($result->item)>0) {
+            	$emails = $result->item;
+            }
+	        $this->view->assign('emails', $emails);
+
+	    } elseif ( $mode == 'set' ) {
+
+	        $this->view->assign('msg', 'Email invalide !');
+
+	        if (null !== $email) {
+	            $validateur = new Zend_Validate_EmailAddress();
+	            $valid = $validateur->isValid($email);
+
+	            if ( $valid ) {
+	                $ws = new WsScores();
+	                $result = $ws->setGestionEmail($email, $login);
+	                if ( $result ) {
+	                    $this->view->assign('msg', 'Modification effectué.');
+	                    $this->view->assign('email', $email);
+	                }
+	            }
+
+	        }
+	    } elseif ( $mode == 'del' ) {
+
+	        $this->view->assign('msg', 'Erreur lors de la suppression !');
+
+	        $ws = new WsScores();
+	        $result = $ws->setGestionEmail($email, $login, $id, $mode);
+            if ( $result ) {
+                $this->view->assign('msg', 'Adresse email supprimé.');
+            }
+
+	    }

-	    $this->view->assign('result', $result);
 	}

 	/**
@ -339,8 +389,7 @@ class UserController extends Zend_Controller_Action
 	 */
    public function loginAction()
    {
-    	$this->view->headScript()
-    		->appendFile('/libs/jquery/jquery.infieldlabel.min.js');
+        $this->_helper->layout()->disableLayout();

    	//@todo : gestion des affichages particuliers pour les clients
    	$this->view->headTitle()->append('Connexion');
@ -391,7 +440,6 @@ class UserController extends Zend_Controller_Action
      			}
    		}
    	}
-    	$this->_helper->layout()->disableLayout();
    }

   	/**
@ -420,7 +468,7 @@ class UserController extends Zend_Controller_Action

    	$this->view->assign('url', $url);

-    	if (!$ajax) {
+    	if ( $ajax == 0 ) {
    	    $this->view->assign('refresh', $refresh);
    	    $this->view->headMeta()->appendHttpEquiv('refresh', $refresh.'; url='.$url);
    	}
--- a/application/views/default/scripts/dashboard/newform.phtml
+++ b/application/views/default/scripts/dashboard/newform.phtml
@ -16,23 +16,22 @@ Fichier PDF : <input type="file" name="fichier" />
 <input type="submit" name="upload" value="Valider" />
 </form>
 <div id="uploadOutput"></div>
-<script type="text/javascript" src="/libs/form/jquery.form.js">
-</script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 var timer;

 function checkProgress() {
-	$.getJSON('<?=$this->url(array('controller'=>'dashboard', 'action'=>'newprogress'))?>', 
-		{key: $('#key').val()}, function(data) { 
+	$.getJSON('<?=$this->url(array('controller'=>'dashboard', 'action'=>'newprogress'))?>',
+		{key: $('#key').val()}, function(data) {
 			$('#uploadOutput').html(data.current+'/'+data.total);
 	});
 }

-$(document).ready(function() { 
+$(document).ready(function() {
 	$('#uploadForm').ajaxForm({
 	    beforeSubmit: function() {
 	    	$('#uploadOutput').html('Envoi en cours...');
-	    	timer = setInterval(checkProgress,500); 
+	    	timer = setInterval(checkProgress,500);
 	    },
 	    success: function(data) {
 	    	clearInterval(timer);
--- a/application/views/default/scripts/dirigeant/histo.phtml
+++ b/application/views/default/scripts/dirigeant/histo.phtml
@ -36,17 +36,10 @@
    <td class="StyleInfoData" width="270"><?=$dir->Titre?></td>
 	<td class="StyleInfoData" width="200"><?=$dir->Societe.' '.$dir->Nom.' '.$dir->Prenom?></td>
    <td class="StyleInfoData" width="200">
-    <?php if ($dir->DateFct != '') { ?>
-    <?=$this->translate("Modification le")?>
-	<?php
-    	if (strpos($dir->DateFct, '/') != false) {
-    		echo $dir->DateFct.' ';
-		} else {
-			$date = new Zend_Date($dir->DateFct,'yyyy-MM-dd');
-			echo $date->toString('dd/MM/yyyy');
-		}
-	}
-	?>
+    <?php $date = new Zend_Date($dir->DateFct,'yyyy-MM-dd'); ?>
+	<?php if ( Zend_Date::isDate($date) ) { ?>
+        <?=$this->translate("Modification le") . ' ' . $date->toString('dd/MM/yyyy');?>
+    <?php }?>
    </td>
    </tr>
 	<?php }?>
--- a/application/views/default/scripts/dirigeant/op.phtml
+++ b/application/views/default/scripts/dirigeant/op.phtml
@ -33,13 +33,16 @@

 <h2><?=$this->translate("Liste des dirigeants actifs")?></h2>
 <div class="paragraph">
-
+<?php if ($this->edition) {?>
+<a class="dialog" title="Ajouter un dirigeant" href="<?=$this->url(array('controller'=>'saisie','action'=>'diropcontrol','mode'=>'add','siret'=>$this->siret), null, true)?>">
+<img style="vertical-align:middle;" src="/themes/default/images/interfaces/ajouter.png" /><?=$this->translate("Ajouter un dirigeant")?></a>
+<?php }?>
 <?php if ( count($this->dirigeants)>0 ) {?>
 <table class="data">
 <?php foreach ($this->dirigeants as $dir) {?>
 <tr>
-	<td class="StyleInfoData" width="120"><?=$dir->Titre?></td>
-	<td class="StyleInfoData" width="200">
+	<td class="StyleInfoData" width="140"><?=$dir->Titre?></td>
+	<td class="StyleInfoData" id="<?=$dir->Id?>" width="200">
 	<?php if ($dir->Societe != '') { ?>
 	<a href="<?=$this->url(array(
 		'controller' => 'recherche',
@ -60,22 +63,63 @@
 		'dirNom' => $dir->Nom,
 		'dirPrenom' => $dir->Prenom,
 	), null, true)?>" title="<?=$this->translate("Recherche à partir du nom du dirigeant")?>">
-		<?=$dir->Nom.' '.$dir->Prenom?>
+		<?=$dir->Civilite.' '.$dir->Nom.' '.$dir->Prenom?>
 	</a>
 	<?php } ?>
 	</td>
-	<td class="StyleInfoData" width="230">
-	<?php if (trim($dir->NaissDate) != '' && trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
-		<?=$this->translate("né(e) le")?> <?=$dir->NaissDate?> à <?=$dir->NaissVille?>
-		<?php if (trim($dir->NaissDepPays) != '') { ?>
-			&nbsp;(<?=$dir->NaissDepPays?>)
-		<?php }?>
-	<?php } else if (trim($dir->NaissDate) != '') {?>
-		<?=$this->translate("né(e) le")?> <?=$dir->NaissDate?>
-	<?php } else if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
-		<?=$this->translate("né(e) à")?> <?=$dir->NaissVille?> &nbsp;(<?=$dir->NaissDepPays?>)
-	<?php } ?>
+	<td class="StyleInfoData" width="200">
+	<?php
+	$message = '';
+	if (trim($dir->NaissDate) != '' && trim($dir->NaissDate)!='0000-00-00') {
+		$date = new Zend_Date($dir->NaissDate, 'yyyy-MM-dd');
+		$message = $message.' '.$this->translate("le").' '.$date->toString('dd/MM/yyyy');
+	}
+	
+	if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') {
+		$message = $message.' '.$this->translate("à").' '.$dir->NaissVille;
+	} 
+	
+	if ($message!='') {
+		if ($dir->Civilite=='' || $dir->Civilite==null) {
+			$message = $this->translate("né(e)").' '.$message;
+		} else if ($dir->Civilite=='M') {
+			$message = $this->translate("né").' '.$message;
+		} else {
+			$message = $this->translate("née").' '.$message;
+		}
+		echo $message;
+	}
+	?>
 	</td>
+	<?php if ($this->edition) {?>
+	<td>
+		<a class="dialog" title="Modifier le dirigeant" href="<?=$this->url(array('controller'=>'saisie','action'=>'diropcontrol','mode'=>'edit','siret'=>$this->siret,'id'=>$dir->Id), null, true)?>">
+		<img src="/themes/default/images/interfaces/editer.png" /></a>
+		<a class="dialog" title="Supprimer le dirigeant" href="<?=$this->url(array('controller'=>'saisie','action'=>'diropcontrol','mode'=>'del','siret'=>$this->siret,'id'=>$dir->Id), null, true)?>">
+		<img src="/themes/default/images/interfaces/supprimer.png" /></a>
+	</td>
+<?php if (empty($this->AutrePage) && $this->accessWorldCheck) {?>
+		<td>
+    		<?php if ($dir->Societe != '') { ?>
+    		<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url(array(
+    				'controller'=>'worldcheck','action'=>'occurence','siren'=>$this->siren,
+    				'dirType'=>'ORGANISATION','dirSociete'=>$dir->Societe),null,true);?>" src="/themes/default/images/worldcheck/wc.png"/>
+    		<?php }?>
+    	   	<?php if ($dir->Nom != '') { 
+    	   	$param = array(
+					'controller'=>'worldcheck',
+					'action'=>'occurence',
+					'siren'=>$this->siren,
+					'dirType'=>'INDIVIDUAL',
+					'dirNom'=>$dir->Nom,
+					'dirPrenom'=>$dir->Prenom,
+				);
+    	   		?>
+			<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url($param,null,true);?>" src="/themes/default/images/worldcheck/wc.png"/>
+    		<?php }	?>
+    	</td>
+		<?php }?>
+	<?php }?>
 </tr>
 <?php } ?>
 </table>
@ -93,4 +137,42 @@
 <?php if (empty($this->AutrePage)){?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
 </div>
-<?php }?>
+<?php }?>
+<script>
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 1000 },
+		content: {
+			button: true,
+			title: 'WorlCheck',
+			text: "Chargement...",
+			ajax: { url: $(this).data('url') } },
+		position: { my: 'right center', at: 'left center' }
+	});
+});
+
+$('a.dialog').on('click', function(){
+	var href = $(this).attr('href');
+	if (href!='#') {
+		var title = $(this).attr('title');
+		var dialogOpts = {
+			bgiframe: true,
+			title: title,
+			width: 600,
+			height: 550,
+			modal: true,
+			open: function(event, ui) {
+				$(this).html('Chargement...');
+				$(this).load(href);
+			},
+			buttons: {
+				Quitter: function() { $(this).dialog('close'); }
+			},
+			close: function() { $('#dialog').remove(); }
+		};
+		$('<div id="dialog"></div>').dialog(dialogOpts);
+		return false;
+	}
+});
+</script>
--- a/application/views/default/scripts/evaluation/customindiscore3.phtml
+++ b/application/views/default/scripts/evaluation/customindiscore3.phtml
@ -49,7 +49,7 @@
 </table>
 </form>
 </div>
-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $('#uploadForm').ajaxForm({
 	beforeSubmit: function() {
--- a/application/views/default/scripts/evaluation/indiscore.phtml
+++ b/application/views/default/scripts/evaluation/indiscore.phtml
@ -1,8 +1,8 @@
-<?php if (empty($this->AutrePage)):?>
+<?php if ( empty($this->AutrePage) ) {?>
 <div id="center">
-<?php endif;?>
+<?php }?>

-<?php if (empty($this->AutrePage)):?>
+<?php if ( empty($this->AutrePage) ) {?>
 <h1>INDISCORE©</h1>
 <div class="paragraph">
 <table>
@ -24,7 +24,7 @@
 </tr>
 <?php }	?>
 <tr><td colspan="3">&nbsp;</td></tr>
-<?php if ($this->edition) {?>
+<?php if ( $this->edition && empty($this->AutrePage) ) {?>
 <tr>
 	<td width="30">&nbsp;</td>
 	<td width="200" class="StyleInfoLib"></td>
@ -33,94 +33,101 @@
    </td>
 </tr>
 <?php }?>
+<tr>
+	<td width="30">&nbsp;</td>
+	<td width="200" class="StyleInfoLib">&nbsp;</td>
+    <td width="350" class="StyleInfoData">
+    <a href=<?=$this->url(array('controller'=>'evaluation', 'action'=>'indiscorehisto', 'siret' => $this->siret)); ?>>
+    <?=$this->translate("Consulter l'historique des IndiScore");?></a>
+    </td>
+</tr>
 </table>
 </div>
-<?php endif;?>
-
+<?php }?>
 <h2>Dénomination sociale & coordonnées</h2>
 <div class="paragraph">
 <table>
-	<tr>
-		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
-		<td width="350" class="StyleInfoData">
-		<?php
-		echo $this->indiscore->Nom;
-        if (!empty($this->indiscore->Nom2)) {
-            echo '<br/>'.$this->indiscore->Nom2;
-        }
-        ?>
-	</tr>
+<tr>
+	<td width="30"></td>
+	<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+	<td width="350" class="StyleInfoData">
 	<?php
-	$titre='';
-  	if ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle!='') {
-  		$titre = 'Enseigne / Sigle';	$lib = $this->indiscore->Enseigne.' / '.$this->indiscore->Sigle;
-  	} elseif ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle=='') {
-  		$titre = 'Enseigne';			$lib = $this->indiscore->Enseigne;
-  	} elseif ($this->indiscore->Enseigne=='' && $this->indiscore->Sigle!='')	{
-  		$titre = 'Sigle';				$lib = $this->indiscore->Sigle;
-  	}
+	echo $this->indiscore->Nom;
+    if (!empty($this->indiscore->Nom2)) {
+        echo '<br/>'.$this->indiscore->Nom2;
+    }
+    ?>
+</tr>

-  	if (!empty($titre)) {
-	?>
-	<tr>
-		<td width="30">&nbsp;</td>
-		<td width="200" class="StyleInfoLib"><?=$titre?></td>
-		<td width="350" class="StyleInfoData"><?=$lib?></td>
-	</tr>
-	<?php } ?>
-	<tr>
-		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Forme juridique</td>
-		<td width="350" class="StyleInfoData">
-		<?=$this->indiscore->FJ_lib?>
-		</td>
-	</tr>
-	<tr>
-		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Date de création de l'entreprise</td>
-		<td width="350" class="StyleInfoData">
-		<?php $date = new Zend_Date($this->indiscore->DateCreaEn, 'yyyyMMdd');?>
-		<?=$date->toString('dd/MM/yyyy')?>
-		</td>
-	</tr>
-	<tr>
-		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Adresse</td>
-		<td width="350" class="StyleInfoData">
-		<?=$this->indiscore->Adresse?><br/>
-		<?php if ($this->indiscore->Adresse2<>'')	echo $this->indiscore->Adresse2.'<br/>';?>
-		<?=$this->indiscore->CP?>&nbsp;<?=$this->indiscore->Ville?>
-		</td>
-	</tr>
-	<tr>
-		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Téléphone</td>
-		<td width="350" class="StyleInfoData">
-		<?=$this->indiscore->Tel?>
-		</td>
-	</tr>
-	<?php if ($this->surveillance) {?>
-	<tr>
-		<td width="30"></td>
-		<td colspan="2">
-		<?=$this->action('infos','surveillance', null, array(
-			'source' => 'score',
-            'siret' => $this->siret
-		));?>
-		</td>
-	</tr>
-	<?php }?>
+<?php
+$titre='';
+if ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle!='') {
+	$titre = 'Enseigne / Sigle';	$lib = $this->indiscore->Enseigne.' / '.$this->indiscore->Sigle;
+} elseif ($this->indiscore->Enseigne!='' && $this->indiscore->Sigle=='') {
+	$titre = 'Enseigne';			$lib = $this->indiscore->Enseigne;
+} elseif ($this->indiscore->Enseigne=='' && $this->indiscore->Sigle!='')	{
+	$titre = 'Sigle';				$lib = $this->indiscore->Sigle;
+}?>

-	<?php if ($this->aviscredit) {?>
-	<tr>
-		<td width="30"></td>
-		<td colspan="2">
-		<a href="<?=$this->url(array('controller'=>'evaluation', 'action'=>'aviscredit', 'siret' => $this->siret))?>">
-		Saisir votre demande d'avis credit personnalisé</a>
-		</td>
-	</tr>
-	<?php }?>
+<?php if ( !empty($titre) ) {?>
+<tr>
+	<td width="30">&nbsp;</td>
+	<td width="200" class="StyleInfoLib"><?=$titre?></td>
+	<td width="350" class="StyleInfoData"><?=$lib?></td>
+</tr>
+<?php } ?>
+<tr>
+	<td width="30"></td>
+	<td width="200" class="StyleInfoLib">Forme juridique</td>
+	<td width="350" class="StyleInfoData">
+	<?=$this->indiscore->FJ_lib?>
+	</td>
+</tr>
+<tr>
+	<td width="30"></td>
+	<td width="200" class="StyleInfoLib">Date de création de l'entreprise</td>
+	<td width="350" class="StyleInfoData">
+	<?php $date = new Zend_Date($this->indiscore->DateCreaEn, 'yyyyMMdd');?>
+	<?=$date->toString('dd/MM/yyyy')?>
+	</td>
+</tr>
+<tr>
+	<td width="30"></td>
+	<td width="200" class="StyleInfoLib">Adresse</td>
+	<td width="350" class="StyleInfoData">
+	<?=$this->indiscore->Adresse?><br/>
+	<?php if ($this->indiscore->Adresse2<>'')	echo $this->indiscore->Adresse2.'<br/>';?>
+	<?=$this->indiscore->CP?>&nbsp;<?=$this->indiscore->Ville?>
+	</td>
+</tr>
+<tr>
+	<td width="30"></td>
+	<td width="200" class="StyleInfoLib">Téléphone</td>
+	<td width="350" class="StyleInfoData">
+	<?=$this->indiscore->Tel?>
+	</td>
+</tr>
+<?php if ( $this->surveillance && empty($this->AutrePage) ) {?>
+<tr>
+	<td width="30"></td>
+	<td colspan="2">
+	<?=$this->action('infos','surveillance', null, array(
+	    'source' => 'score',
+	    'siret' => $this->siret
+	));?>
+	</td>
+</tr>
+<?php }?>
+
+<?php if ( $this->aviscredit && empty($this->AutrePage) ) {?>
+<tr>
+	<td width="30"></td>
+	<td colspan="2">
+	<a href="<?=$this->url(array('controller'=>'evaluation', 'action'=>'aviscredit', 'siret' => $this->siret))?>">
+	Saisir votre demande d'avis credit personnalisé</a>
+	</td>
+</tr>
+<?php }?>
 </table>
 </div>

@ -131,7 +138,6 @@
 	<td width="30">&nbsp;</td>
 	<td width="550" colspan="2" class="StyleInfoData">
 	L'&eacute;valuation indiScore&copy; est en partie basée sur les points notables suivants :<br/>
-
 	<h3><u>Conformit&eacute; l&eacute;gale :</u></h3>
 	<div class="stats gradiant_pic">
 	<ul>
@ -178,7 +184,7 @@
 </tr>

 <?php $millesimeMax = date('Ymd', mktime(0, 0, 0, date('m'), date('d'), date('Y')-2));?>
-<?php if($this->indiscore->NbBilansScore > 0 && $this->indiscore->Bilans->item[0]->Millesime >= $millesimeMax):?>
+<?php if($this->indiscore->NbBilansScore > 0 && $this->indiscore->Bilans->item[0]->Millesime >= $millesimeMax) {?>

 <tr>
 	<td width="30">&nbsp;</td>
@ -201,7 +207,7 @@
    </td>
 </tr>

-<?php else:?>
+<?php } else {?>

 <tr>
 	<td width="30">&nbsp;</td>
@ -216,7 +222,7 @@
 	</td>
 </tr>

-<?php endif;?>
+<?php }?>
 </table>
 </div>

@ -280,7 +286,7 @@



-<?php if (empty($this->AutrePage)):?>
+<?php if ( empty($this->AutrePage) ) {?>
 <?=$this->render('cgu.phtml', $this->cgu);?>
 </div>
-<?php endif;?>
+<?php }?>
--- a/application/views/default/scripts/evaluation/indiscorehisto.phtml
+++ b/application/views/default/scripts/evaluation/indiscorehisto.phtml
@ -0,0 +1,64 @@
+<div id="center">
+
+<h1><?=$this->translate('HISTORIQUE INDISCORE')?></h1>
+<div class="paragraph">
+<table>
+<tr>
+	<td width="30">&nbsp;</td>
+	<td width="200" class="StyleInfoLib"><?=$this->translate('Numéro identifiant Siren')?></td>
+	<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
+	<td width="30">&nbsp;</td>
+	<td width="200" class="StyleInfoLib"><?=$this->translate('Dénomination sociale')?></td>
+	<td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
+</tr>
+</table>
+</div>
+
+<h2><?=$this->translate('Historique des scores')?></h2>
+
+<?php if ( count($this->scores)> 0 ) {?>
+
+<div class="paragraph">
+<table id="synthese">
+<thead>
+<tr class="head">
+	<th align="center"><?=$this->translate('Date')?></td>
+	<th align="center"><?=$this->translate('IndiScore')?></td>
+	<th><?=$this->translate('Motif du changement')?></td>
+</tr>
+</thead>
+<tbody>
+<?php foreach($this->scores as $score) {?>
+<tr>
+    <td align="center">
+	<?php $date = new Zend_Date($score->date, 'yyyy-MM-dd');?>
+	<?=$date->toString('dd/MM/yyyy')?>
+    </td>
+    <td align="center"><?=$score->value?> </td>
+    <td><?=$score->motif?></td>
+</tr>
+</tbody>
+<?php }?>
+</table>
+</div>
+
+<div class="paragraph">
+<?php if ( $this->graph ) {?>
+<img src="/fichier/imgcache/<?=$this->graph?>">
+<?php } else {?>
+<b><?=$this->translate('Impossible de générer le graphique')?></b>
+<?php }?>
+</div>
+
+<?php } else {?>
+
+<div class="paragraph">
+<?=$this->translate("Aucune information sur l'historique disponible.")?>
+</div>
+
+<?php }?>
+
+<?=$this->render('cgu.phtml', $this->cgu)?>
+</div>
--- a/application/views/default/scripts/finance/liasseinfos.phtml
+++ b/application/views/default/scripts/finance/liasseinfos.phtml
@ -2,7 +2,7 @@
 <?php if ( $this->DateClotureIso ) { ?>

 Le dernier millésime déposé au greffe est le <?=$this->DateCloture?>.
-<?php if ( $this->SaisieDateIso && $this->SaisieCode=='00' ) {?>
+<?php if ( $this->SaisieDateIso && $this->SaisieCode == 0 ) {?>
    Le bilan a été saisie le <?=$this->SaisieDate?>.
 <?php } else {?>
    Le bilan n'a pas été saisie par la source officielle (<i><?=$this->SaisieLabel?>)</i>.
--- a/application/views/default/scripts/finance/saisiebilan-upload.phtml
+++ b/application/views/default/scripts/finance/saisiebilan-upload.phtml
@ -41,7 +41,7 @@ Votre fichier : <input type="file" name="fichier" />
 </form>
 <div id="progressbar"></div>
 <div id="uploadOutput"></div>
-<script type="text/javascript" src="/libs/form/jquery.form.js" />
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $('#uploadForm').ajaxForm({
    beforeSubmit: function() {
--- a/application/views/default/scripts/footer.phtml
+++ b/application/views/default/scripts/footer.phtml
@ -13,6 +13,6 @@ pour en savoir plus cliquez-ici</a></span>
 <?=$this->translate("Tous droits r&eacute;serv&eacute;s")?> -
 <a href="http://www.scores-decisions.com/mentions.php" target="_blank">
 <?=$this->translate("Mentions l&eacute;gales")?></a> -
-<img class='flag' id='fr' src="/themes/default/images/drapeaux/fr.png"/>
-<img class='flag' id='en' src="/themes/default/images/drapeaux/en.png"/>
+<img class='flag' id="fr" src="/themes/default/images/drapeaux/fr.png"/>
+<img class='flag' id="en" src="/themes/default/images/drapeaux/en.png"/>
 </p>
--- a/application/views/default/scripts/identite/contacts.phtml
+++ b/application/views/default/scripts/identite/contacts.phtml
@ -114,8 +114,8 @@ if ($item->deleted) {

 	<?php if( $this->edition ) {?>
 	<div style="float:right;">
-	<a class="dialog" title="Modifier le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact','mode'=>'edit','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/editer.png" /></a>
-    <a class="dialog" title="Supprimer le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact','mode'=>'delete','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/supprimer.png" /></a>
+	<a class="dialog" title="Modifier le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact', 'siret'=>$this->siret, 'mode'=>'edit','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/editer.png" /></a>
+    <a class="dialog" title="Supprimer le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact', 'siret'=>$this->siret, 'mode'=>'delete','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/supprimer.png" /></a>
 	</div>
 	<?php }?>
 	</td>
--- a/application/views/default/scripts/identite/evenements.phtml
+++ b/application/views/default/scripts/identite/evenements.phtml
@ -1,4 +1,6 @@
+<?php if ( empty($this->AutrePage) ) {?>
 <div id="center">
+<?php }?>
 <h1>LISTE DES &Eacute;V&Eacute;NEMENTS</h1>
 <div class="paragraph">
 <table class="identite">
@ -23,17 +25,26 @@

 <h2>&Eacute;v&eacute;nements INSEE</h2>

-<?php if ( count($this->evens)==0 ) { ?>
+<?php if ( empty($this->AutrePage) ) {?>
 <div class="paragraph">
-<table class="data">
-<tr>
-    <td class="StyleInfoData" width="580">
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    Aucun &eacute;v&egrave;nement n'est pr&eacute;sent dans notre base
-    </td>
-</tr>
-</table>
+<?php if ( $this->Entreprise == 1 ) {?>
+Liste des événements de l'entreprise. <a href="<?=$this->url(array(
+    'controller'=>'identite',
+    'action'=>'evenements',
+    'siret'=>$this->siret,
+    'nic'=>$this->Nic), null, true)?>">Afficher uniquement les événements de l'établissement.</a>
+<?php } else {?>
+Liste des événements uniquement sur l'établissement <?=$this->Nic?>.
+<a href="<?=$this->url(array(
+    'controller'=>'identite',
+    'action'=>'evenements',
+    'siret'=>$this->siret), null, true)?>">Afficher tous les événements de l'entreprise.</a>
+<?php }?>
 </div>
+<?php }?>
+
+<?php if ( count($this->evens)==0 ) { ?>
+<div class="paragraph">Aucun &eacute;v&egrave;nement n'est pr&eacute;sent dans notre base</div>
 <?php } else { ?>
 <div class="paragraph">
 <table class="data">
@ -76,7 +87,7 @@
 </table>
 </div>

-<?php if ($this->PageTotal>1) {?>
+<?php if ( $this->PageTotal>1 ) {?>
 <div class="paragraph">
 <div class="pagination clearfix">
 <a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
@ -90,7 +101,7 @@

 <?php }?>

-<?php if (empty($this->AutrePage)) {?>
+<?php if ( empty($this->AutrePage) ) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
 </div>
 <?php }?>
--- a/application/views/default/scripts/identite/fiche.phtml
+++ b/application/views/default/scripts/identite/fiche.phtml
@ -142,8 +142,8 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['EffectifEtab']);
 <?=$this->action('news', 'identite');?>

 <div class="paragraph" style="clear:both;">
-<a href="#" title="Corporama me donne accès à toute la puissance des réseaux sociaux professionnels pour identifier rapidement un interlocuteur et accéder à ses coordonnées">
-Actualités de la société <?=$this->raisonSociale?> sur CORPORAMA</a>
+<a href="<?=$this->url(array('controller'=>'identite','action'=>'corporama', 'siret'=>$this->siret), null, true)?>" title="Toute la puissance des réseaux sociaux professionnels pour identifier rapidement un interlocuteur et accéder à ses coordonnées">
+Actualités de la société <?=$this->raisonSociale?> sur le Web</a>
 </div>

 <?php if ( !empty($this->surveillance) ) {?>
--- a/application/views/default/scripts/identite/lienfiche.phtml
+++ b/application/views/default/scripts/identite/lienfiche.phtml
@ -1,9 +1,9 @@
 <div>
 <?php if ($this->result->PpPm == 'PP') {?>
-    <?php if (!empty($this->result->civilite)) {?>
+<strong>
+<?php if (!empty($this->result->civilite)) {?>
    <?=$this->result->civilite?>&nbsp;
-    	<?php $sexe=($this->result->civilite=='M')?'':'e';?>
-    <?php }?>
+	<?php }?>
    <?php if (!empty($this->result->nom)) {?>
    <?=$this->result->nom?>&nbsp;
    <?php }?>
@ -13,16 +13,28 @@
    <?php if (!empty($this->result->nomUsage)) {?>
    (<?=$this->result->nomUsage?>)&nbsp;
    <?php }?>
-    <?php if (!empty($this->result->naissanceDate) && $this->result->naissanceDate!='0000-00-00') {?>
-    	<?php $date = new Zend_Date($this->result->naissanceDate, 'YYYY-MM-dd')?>
-    <br/>Né<?=$sexe;?> le <?=$date->toString('dd/MM/yyyy');?>&nbsp;
-    <?php }?>
-    <?php if (!empty($this->result->naissanceLieu)) {?>
-    à <?=$this->result->naissanceLieu?>&nbsp;
-    <?php }?>
-    <?php if (!empty($this->result->naissanceDeptPays)) {?>
-    (<?=$this->result->naissanceDeptPays?>)
-    <?php }?>
+    </strong><br/>
+    <?php
+	$message = '';
+	if (!empty($this->result->naissanceDate) && $this->result->naissanceDate!='0000-00-00') {
+		$date = new Zend_Date($this->result->naissanceDate, 'yyyy-MM-dd');
+		$message = $message.' '.$this->translate("le").' '.$date->toString('dd/MM/yyyy');
+	}
+
+	if (!empty($this->result->naissanceLieu) || !empty($this->result->naissanceDeptPays)) {
+		$message = $message.' '.$this->translate("à").' '.$this->result->naissanceLieu.' '.$this->result->naissanceDeptPays;
+	}
+
+	if ($message!='') {
+		if ($this->result->civilite=='' || $this->result->civilite==null) {
+			$message = $this->translate("Né(e)").' '.$message;
+		} else if ($this->result->civilite=='M') {
+			$message = $this->translate("Né").' '.$message;
+		} else {
+			$message = $this->translate("Née").' '.$message;
+		}?>
+		<?=$message;?>
+<?php }	?>

 <?php } else {?>

@ -63,6 +75,8 @@ $('a.dialogFiche').on('click', function(e){
 </script>
 <?php }?>

+<?php if ( $this->idFiche>=1000 ) {?>
+
 <div><b>Coordonnées : </b></div>
 <div><?=($this->result->adresseNum==0) ? '' : $this->result->adresseNum . ' ' .
        $this->result->adresseBtq. ' ' . $this->result->adresseCodeVoie. ' ' .
@ -83,22 +97,26 @@ else
 <?=$this->result->isin;?>
 </div>
 <?php }?>
+
 <?php if (count($this->result->identification->item)>0) {?>
 <div><b>Identifiants nationaux</b></div>
 <?php foreach ($this->result->identification->item as $id) {?>
 <div><?=$id->label?> - <?=$id->num?></div>
 <?php }?>
 <?php }?>
+
 <?php if ($this->result->PpPm == 'PP') {
 	 $param = array(
 			'controller'=>'recherche',
 			'action'=>'dirigeant',
 			'dirNom'=>$this->result->nom,
 			'dirPrenom'=>$this->result->prenom,
-			'dirDateNaissJJ' =>$date->get('dd'),
-			'dirDateNaissMM' =>$date->get('MM'),
-			'dirDateNaissAAAA' =>$date->get('YYYY')
+			'dirDateNaissJJ'=>$date?$date->get('dd'):'',
+			'dirDateNaissMM'=>$date?$date->get('MM'):'',
+			'dirDateNaissAAAA'=>$date?$date->get('YYYY'):''
 		);
    ?>
    <br/><a href="<?=$this->url($param,null,true);?>">Lancer une recherche dirigeant</a>
-<?php } ?>
+<?php } ?>
+
+<?php }?>
--- a/application/views/default/scripts/identite/liens.phtml
+++ b/application/views/default/scripts/identite/liens.phtml
@ -96,27 +96,38 @@
    <a class="confirm" title="Fiche suppression" href="<?=$hrefSuppr; ?>">Supprimer la fiche</a>
    </td>
 </tr>
+<?php if ($this->surveillance) {?>
+<tr>
+    <td width="30">&nbsp;</td>
+    <td colspan="2" width="550" class="StyleInfoData">
+     <?=$this->action('infos','surveillance', null, array(
+     	'source' => 'liens',
+     	'siret' => $this->siret
+     ))?>
+	</td>
+</tr>
+<?php }?>
+<?php  if ($this->PP) {?>
 <tr>
    <td width="30">&nbsp;</td>
    <td width="200" class="StyleInfoLib"></td>
    <td width="350" class="StyleInfoLib">
-    <?php
-    if ($this->PP) {
-		$date = new Zend_Date($this->naissanceDate, 'YYYY-MM-dd');
-		$param = array(
-			'controller'=>'recherche',
-			'action'=>'dirigeant',
-			'dirNom'=>$this->nom,
-			'dirPrenom'=>$this->prenom,
-			'dirDateNaissJJ' =>$date->get('dd'),
-			'dirDateNaissMM' =>$date->get('MM'),
-			'dirDateNaissAAAA' =>$date->get('YYYY')
-		);
-    ?>
-    <a href="<?=$this->url($param,null,true);?>">Lancer une recherche dirigeant</a><?php }?>
+    <?php 
+    $date = new Zend_Date($this->naissanceDate, 'YYYY-MM-dd');
+    $param = array(
+		'controller'=>'recherche',
+		'action'=>'dirigeant',
+		'dirNom'=>$this->nom,
+		'dirPrenom'=>$this->prenom,
+		'dirDateNaissJJ' =>$date?$date->get('dd'):'',
+		'dirDateNaissMM' =>$date?$date->get('MM'):'',
+		'dirDateNaissAAAA' =>$date?$date->get('YYYY'):''
+	); ?>
+    <a href="<?=$this->url($param,null,true);?>">Lancer une recherche dirigeant</a>
    </td>
 </tr>
 <?php }?>
+<?php }?>
 </table>
 </div>
 <?php }?>
--- a/application/views/default/scripts/logo/crop.phtml
+++ b/application/views/default/scripts/logo/crop.phtml
@ -9,8 +9,8 @@

 <?php else:?>

-<script src="/libs/jcrop/jquery.Jcrop.js"></script>
-<link rel="stylesheet" href="/libs/jcrop/jquery.Jcrop.css" type="text/css" />
+<script src="/libs/jcrop/js/jquery.Jcrop.min.js"></script>
+<link rel="stylesheet" href="/libs/jcrop/css/jquery.Jcrop.min.css" type="text/css" />
 <script>
 $(function(){
 	$('#cropbox').Jcrop({
@ -48,7 +48,7 @@ $('#crop').ajaxForm(options);
 </script>
 <img src="/fichier/logo/<?=$this->image?>" id="cropbox" />
 <br/>
-<form id="crop" name="crop" 
+<form id="crop" name="crop"
 	action="<?=$this->url(array('controller'=>'logo', 'action'=>'crop'),null, true);?>" method="post">
 	<input type="hidden" id="x" name="x" />
 	<input type="hidden" id="y" name="y" />
--- a/application/views/default/scripts/pieces/cmdcourrier-cmd1.phtml
+++ b/application/views/default/scripts/pieces/cmdcourrier-cmd1.phtml
@ -1,5 +0,0 @@
-<h2>Document déjà commandé</h2>
-<p>
-Vous avez déjà commandé ce document sous la référence
-<?=$this->typeCommande?><?=$this->idCommande?>.
-</p>
--- a/application/views/default/scripts/pieces/cmdcourrier-cmd2.phtml
+++ b/application/views/default/scripts/pieces/cmdcourrier-cmd2.phtml
@ -1,3 +0,0 @@
-<h2>Document déjà commandé</h2>
-<p>Une commande est déjà en cours, le document sera disponible
-sous peu. Merci de revenir sur cette page.</p>
--- a/application/views/default/scripts/pieces/cmdcourrier.phtml
+++ b/application/views/default/scripts/pieces/cmdcourrier.phtml
@ -1,35 +0,0 @@
-<div id="output">
-<h2>Saisir une adresse email</h2>
-<p>Recevoir le document directement par mail (sous 3/5 jours ouvrés)</p>
-<p>Merci de préciser votre adresse email pour recevoir le document
-et valider la commande.</p>
-Siren : <?=$this->SirenTexte($this->siren)?>
-<form name="commande" action="<?=$this->url(array(
-	'controller' => 'pieces',
-	'action' => 'sauvcmd',
-), null, true)?>" method="post">
-<input type="hidden" name="vue" value="<?=$this->vue?>"/>
-<input type="hidden" name="idCommande" value="<?=$this->idCommande?>"/>
-<input type="hidden" name="siret" value="<?=$this->siren?>"/>
-<input type="hidden" name="info" value="<?=$this->info?>"/>
-<input type="hidden" name="type" value="G"/>
-<input type="hidden" name="ref" value="<?=$this->ref?>"/>
-<label>Adresse email du destinataire</label>
-<input name="emailCommande" type="text" value="<?=$this->email?>" size="40"/><br/>
-<p><i>Votre commande ne sera pas validé si l'adresse email est vide.</i>
-<br/><i>Après validation, patientez pour avoir votre référence de commande.</i></p>
-</form>
-</div>
-<script type="text/javascript">
-$('input[name=emailCommande]').focus();
-
-$('form[name=commande]').submit(function(){
-	var email = $('input[name=emailCommande]').val();
-	if(!checkEmail(email)){
-		alert("Veuillez saisir une adresse email valide !");
-		return false;
-	} else {
-		return true;
-	}
-});
-</script>
--- a/application/views/default/scripts/pieces/commande-kbis.phtml
+++ b/application/views/default/scripts/pieces/commande-kbis.phtml
@ -1,98 +0,0 @@
-<form name="kbis" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'commande'))?>">
-<input type="hidden" name="siret" value="<?=$this->partial()->view->siret?>"/>
-<input type="hidden" name="op" value="kbis"/>
-
-<div class="fieldgrp">
-<div class="field">
-<?php if($this->partial()->view->KbisErreurCJ){ ?>
-	K-Bis inexistant pour cette forme juridique
-<?php } else {?>
-<?php
-$disable = '';
-if($this->partial()->view->KbisErreurDEP){ $disable = ' disabled'; }
-?>
-<input class="noborder" type="radio" name="method" value="<?=$this->url(array('controller'=>'pieces', 'action'=>'kbis', 'siret'=>$this->partial()->view->siret))?>"<?=$disable?>/>
-Visualiser/Télécharger le kbis
-<?php if($this->partial()->view->KbisErreurDEP){ ?><br/>K-Bis en ligne indisponible pour ce département. -
-Afin d'obtenir un extrait K-bis, vous pouvez contactez directement le greffe du tribunal à compétence commercial
-dont vous trouverez les coordonnées <a href="<?=$this->url(array(
-	'controller' => 'juridique',
-	'action' => 'competences',
-	'type' => 'tri',
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id
-))?>">ici</a> ou choisir de commander par nos services en sélectionnant les propositions ci-dessous.
-<?php }?>
-<br/>
-<input class="noborder" type="radio" name="method" value="M" <?=$this->partial()->view->method=='M' ? 'checked' : ''?>/>Recevoir le kbis par email<br/>
-<input class="noborder" type="radio" name="method" value="C" <?=$this->partial()->view->method=='C' ? 'checked' : ''?>/>Recevoir le kbis original par courrier<br/>
-<?php if($this->partial()->view->KbisErreurDEP) { ?>
-	<p><i>Les pièces demandées seront commandées par courrier auprès du greffe. Prévoir un délai de 2 à 3 semaines.</i></p>
-<?php } ?>
-<?php } ?>
-</div>
-</div>
-
-<div id="kbisM">
-
-<div class="fieldgrp">
-<label>E-mail</label>
-<div class="field">
-<?php
-$user = $this->partial()->view->user;
-?>
-<input type="text" class="longfield" name="emailKbisM" value="<?=$user->getEmail()?>">
-<span>Précisez votre e-mail pour recevoir le kbis.</span>
-</div>
-</div>
-
-<div class="fieldgrp">
-<label>Référence</label>
-<div class="field">
-<input type="text" class="longfield" name="ref" value="<?=$this->partial()->view->ref?>">
-<span>Votre référence.</span>
-</div>
-</div>
-<div class="fieldgrp">
-<label>&nbsp;</label>
-<div class="field"><input type="submit" class="button" name="kbis" value="Valider"></div>
-</div>
-
-</div>
-
-<div id="kbisC">
-<div class="fieldgrp">
-<label>Votre E-mail</label>
-<div class="field"><input class="longfield" type="text" name="emailKbisC" value="<?=$user->getEmail()?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Societe</label>
-<div class="field"><input class="longfield" type="text" name="societe" value="<?=$this->partial()->view->societe?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Nom</label>
-<div class="field"><input class="longfield" type="text" name="nom" value="<?=$user->getNom()?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Prenom</label>
-<div class="field"><input class="longfield" type="text" name="prenom" value="<?=$user->getPrenom()?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Adresse</label>
-<div class="field"><input class="longfield" type="text" name="adresse" value="<?=$this->partial()->view->adresse?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Code Postal</label>
-<div class="field"><input class="longfield" type="text" name="cp" value="<?=$this->partial()->view->cp?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>Votre Ville</label>
-<div class="field"><input class="longfield" type="text" name="ville" value="<?=$this->partial()->view->ville?>"/></div>
-</div>
-<div class="fieldgrp">
-<label>&nbsp;</label>
-<div class="field"><input type="submit" class="button" name="kbis" value="Valider"></div>
-</div>
-</div>
-
-</form>
--- a/application/views/default/scripts/pieces/commande-privileges.phtml
+++ b/application/views/default/scripts/pieces/commande-privileges.phtml
@ -1,57 +0,0 @@
-<form name="privileges" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'commande'))?>">
-<input type="hidden" name="siret" value="<?=$this->partial()->view->siret?>"/>
-<input type="hidden" name="op" value="privileges"/>
-
-<div class="fieldgrp">
-<?php
-$disponible = true;
-if($this->partial()->view->KbisErreurCJ || $this->partial()->view->KbisErreurDEP){
-	$disponible = false;
-}
-if ( $disponible ) { ?>
-	<?php if( $this->partial()->view->permSurvPriv ) { ?>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="SprivSurv" <?=is_array($this->partial()->view->privileges) && in_array('SprivSurv',$this->partial()->view->privileges) ? '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[]" value="privSecu" <?=is_array($this->partial()->view->privileges) && in_array('privSecu',$this->partial()->view->privileges) ? '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[]" value="privTres" <?=is_array($this->partial()->view->privileges) && in_array('privTres',$this->partial()->view->privileges) ? 'checked' : ''?>/>Privilèges du Trésor Public (mail sous 12h ouvrées)<br/>
-	<br/>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="nantFond" <?=is_array($this->partial()->view->privileges) && in_array('nantFond',$this->partial()->view->privileges) ? 'checked' : ''?>/>Nantissements du fonds de commerce ou du fonds artisanal (conventionnels et judiciaires)<br/>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="nantVend" <?=is_array($this->partial()->view->privileges) && in_array('nantVend',$this->partial()->view->privileges) ? 'checked' : ''?>/>Privilèges du vendeur de fonds de commerce et d'action résolutoire<br/>
-
-	<input class="noborder type" type="checkbox" name="privileges[]" value="declCrea" <?=is_array($this->partial()->view->privileges) && in_array('declCrea',$this->partial()->view->privileges) ? 'checked' : ''?>/>Déclarations de créances<br/>
-	<?php } else { ?>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="privSecu" <?=is_array($this->partial()->view->privileges) && in_array('privSecu',$this->partial()->view->privileges) ? 'checked' : ''?>/>Privilèges de la sécurité sociale et des régimes complémentaires<br/>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="privTres" <?=is_array($this->partial()->view->privileges) && in_array('privTres',$this->partial()->view->privileges) ? 'checked' : ''?>/>Privilèges du Trésor Public<br/>
-	<input class="noborder type" type="checkbox" name="privileges[]" value="nantCompl" <?=is_array($this->partial()->view->privileges) && in_array('nantCompl',$this->partial()->view->privileges) ? 'checked' : ''?>/>Etat complet des nantissements<br/>
-	<?php } ?>
-	<br/>
-<?php if ( !$disponible ) { ?>
-<p><i>Les pièces demandées seront commandées par courrier auprès du greffe. Prévoir un délai de 2 à 3 semaines.</i></p>
-<?php } ?>
-</div>
-
-<div id="privilegesM">
-
-<div class="fieldgrp">
-<label>E-mail</label>
-<div class="field">
-<input type="text" class="longfield" name="email" value="<?=$this->partial()->view->user->getEmail()?>">
-<span>Précisez votre e-mail pour recevoir la commande.</span>
-</div>
-</div>
-
-<div class="fieldgrp">
-<label>Référence</label>
-<div class="field">
-<input type="text" class="longfield" name="ref" value="<?=$this->partial()->view->ref?>">
-<span>Votre référence.</span>
-</div>
-</div>
-<div class="fieldgrp">
-<label>&nbsp;</label>
-<div class="field"><input type="submit" name="submit" value="Valider" class="button"></div>
-</div>
-</div>
-
-</form>
--- a/application/views/default/scripts/pieces/commande.phtml
+++ b/application/views/default/scripts/pieces/commande.phtml
@ -2,24 +2,20 @@
 <h1>COMMANDES DE PI&Egrave;CES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
    <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
    <td width="30">&nbsp;</td>
    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
+</tr>
 </table>
 </div>

-<?php if(!empty($this->message)) { ?>
+<?php if( !empty($this->message) ) { ?>
 <div id="message"><?=$this->message?></div>
 <?php } ?>

@ -29,23 +25,207 @@
 #privilegesM {display:none;}
 </style>

-
 <h2>EXTRAIT KBIS</h2>
 <div class="paragraph">
 <?php if ($this->permKbis) {?>
-<?=$this->partial('pieces/commande-kbis.phtml')?>
+
+<form name="kbis" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'commande'))?>">
+<input type="hidden" name="siret" value="<?=$this->siret?>"/>
+<input type="hidden" name="op" value="kbis"/>
+
+<div class="fieldgrp">
+<div class="field">
+<?php if( $this->KbisErreurCJ ){ ?>
+	<?=$this->translate("K-Bis inexistant pour cette forme juridique");?>
 <?php } else {?>
-<p class="marge">Vous n'avez pas les droits d'accès pour cette fonctionalité.</p>
+<?php
+$disable = '';
+if($this->KbisErreurDEP){ $disable = ' disabled'; }
+?>
+<input class="noborder" type="radio" name="method" value="<?=$this->url(array('controller'=>'pieces', 'action'=>'kbis', 'siret'=>$this->view->siret))?>"<?=$disable?>/>
+<?=$this->translate("Visualiser/Télécharger le kbis");?>
+<?php if($this->KbisErreurDEP){ ?>
+<br/>K-Bis en ligne indisponible pour ce département. -
+Afin d'obtenir un extrait K-bis, vous pouvez contactez directement le greffe du tribunal à compétence commercial
+dont vous trouverez les coordonnées <a href="<?=$this->url(array(
+	'controller' => 'juridique',
+	'action' => 'competences',
+	'type' => 'tri',
+	'siret' => $this->siret,
+	'id' => $this->id
+))?>">ici</a> ou choisir de commander par nos services en sélectionnant les propositions ci-dessous.
+<?php }?>
+<br/>
+<input class="noborder" type="radio" name="method" value="M" <?=$this->method=='M' ? 'checked' : ''?>/><?=$this->translate("Recevoir le kbis par email");?><br/>
+<input class="noborder" type="radio" name="method" value="C" <?=$this->method=='C' ? 'checked' : ''?>/><?=$this->translate("Recevoir le kbis original par courrier");?><br/>
+<?php if($this->KbisErreurDEP) { ?>
+	<p><i><?=$this->translate("Les pièces demandées seront commandées par courrier auprès du greffe. Prévoir un délai de 2 à 3 semaines.");?></i></p>
+<?php } ?>
+<?php } ?>
+</div>
+</div>
+
+<div id="kbisM">
+
+<?php if( $this->emailValid ) {?>
+<div class="fieldgrp"><p>
+<?=$this->translate("Commande de KBIS demandé pour la société");?> <strong><?=$this->raisonSociale?> (<?=$this->siren;?>)</strong><br/>
+<?=$this->translate("Vous recevrez un email (sous 3/5 jours ouvrés) lorsque le document sera disponible.");?>
+</p></div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Votre email");?></label>
+<div class="field">
+<?=$this->user->getEmail()?>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Votre référence");?></label>
+<div class="field">
+<input type="text" class="longfield" name="ref" value="<?=$this->ref?>">
+<?=$this->translate("(facultatif)");?>
+</div>
+</div>
+<div class="fieldgrp">
+<label>&nbsp;</label>
+<div class="field"><input type="submit" class="button" name="kbis" value="<?=$this->translate("Valider");?>"></div>
+</div>
+<?php } else {?>
+<div class="fieldgrp">
+<div class="field" style="color:red;"><?=$this->translate("Commande impossible. L'email de votre compte est invalide.");?></div>
+</div>
+<?php }?>
+</div>
+
+<div id="kbisC">
+<?php if( $this->emailValid ) {?>
+<div class="fieldgrp"><p>
+<?=$this->translate("Commande de KBIS demandé pour la société");?> <strong><?=$this->raisonSociale?> (<?=$this->siren;?>)</strong><br/>
+<?=$this->translate("Vous recevrez un email (sous 2 à 3 semaines) lorsque le document sera disponible.");?>
+</p></div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre email");?></label>
+<div class="field">
+<?=$this->user->getEmail()?>
+</div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre référence");?></label>
+<div class="field"><input class="longfield" type="text" name="ref" value="<?=$this->ref?>">
+<?=$this->translate("(facultatif)");?></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Societe");?></label>
+<div class="field"><input class="longfield" type="text" name="societe" value="<?=$this->societe?>"/></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Nom");?></label>
+<div class="field"><input class="longfield" type="text" name="nom" value="<?=$this->user->getNom()?>"/></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Prenom");?></label>
+<div class="field"><input class="longfield" type="text" name="prenom" value="<?=$this->user->getPrenom()?>"/></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Adresse");?></label>
+<div class="field"><input class="longfield" type="text" name="adresse" value="<?=$this->adresse?>"/></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Code Postal");?></label>
+<div class="field"><input class="longfield" type="text" name="cp" value="<?=$this->cp?>"/></div>
+</div>
+<div class="fieldgrp">
+<label><?=$this->translate("Votre Ville");?></label>
+<div class="field"><input class="longfield" type="text" name="ville" value="<?=$this->ville?>"/></div>
+</div>
+<div class="fieldgrp">
+<label>&nbsp;</label>
+<div class="field"><input type="submit" class="button" name="kbis" value="<?=$this->translate("Valider");?>"></div>
+</div>
+<?php } else {?>
+<div class="fieldgrp">
+<div class="field" style="color:red;"><?=$this->translate("Commande impossible. L'email de votre compte est invalide");?></div>
+</div>
+<?php }?>
+</div>
+
+</form>
+
+<?php } else {?>
+
+<p class="marge"><?=$this->translate("Vous n'avez pas les droits d'accès pour cette fonctionalité."); ?></p>
+
 <?php }?>
 </div>

 <h2>PRIVIL&Eacute;GES &amp; NANTISSEMENTS</h2>
 <div class="paragraph">
-<?php if ($this->permPriv) {?>
-<?=$this->partial('pieces/commande-privileges.phtml')?>
+<?php if ( $this->permPriv ) {?>
+
+<form name="privileges" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'commande'))?>">
+<input type="hidden" name="siret" value="<?=$this->siret?>"/>
+<input type="hidden" name="op" value="privileges"/>
+
+<div class="fieldgrp">
+<?php
+$disponible = true;
+if($this->KbisErreurCJ || $this->KbisErreurDEP){
+	$disponible = false;
+}
+if ( $disponible ) { ?>
+	<?php if( $this->permSurvPriv ) { ?>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="SprivSurv" <?=is_array($this->privileges) && in_array('SprivSurv',$this->privileges) ? '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[]" value="privSecu" <?=is_array($this->privileges) && in_array('privSecu',$this->privileges) ? '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[]" value="privTres" <?=is_array($this->privileges) && in_array('privTres',$this->privileges) ? 'checked' : ''?>/>Privilèges du Trésor Public (mail sous 12h ouvrées)<br/>
+	<br/>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="nantFond" <?=is_array($this->privileges) && in_array('nantFond',$this->privileges) ? 'checked' : ''?>/>Nantissements du fonds de commerce ou du fonds artisanal (conventionnels et judiciaires)<br/>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="nantVend" <?=is_array($this->privileges) && in_array('nantVend',$this->privileges) ? 'checked' : ''?>/>Privilèges du vendeur de fonds de commerce et d'action résolutoire<br/>
+
+	<input class="noborder type" type="checkbox" name="privileges[]" value="declCrea" <?=is_array($this->privileges) && in_array('declCrea',$this->privileges) ? 'checked' : ''?>/>Déclarations de créances<br/>
+	<?php } else { ?>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="privSecu" <?=is_array($this->privileges) && in_array('privSecu',$this->privileges) ? 'checked' : ''?>/>Privilèges de la sécurité sociale et des régimes complémentaires<br/>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="privTres" <?=is_array($this->privileges) && in_array('privTres',$this->privileges) ? 'checked' : ''?>/>Privilèges du Trésor Public<br/>
+	<input class="noborder type" type="checkbox" name="privileges[]" value="nantCompl" <?=is_array($this->privileges) && in_array('nantCompl',$this->privileges) ? 'checked' : ''?>/>Etat complet des nantissements<br/>
+	<?php } ?>
+	<br/>
+<?php if ( !$disponible ) { ?>
+<p><i>Les pièces demandées seront commandées par courrier auprès du greffe. Prévoir un délai de 2 à 3 semaines.</i></p>
+<?php } ?>
+</div>
+
+<div id="privilegesM">
+
+<div class="fieldgrp">
+<label>E-mail</label>
+<div class="field">
+<input type="text" class="longfield" name="email" value="<?=$this->user->getEmail()?>">
+<span>Précisez votre e-mail pour recevoir la commande.</span>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label>Référence</label>
+<div class="field">
+<input type="text" class="longfield" name="ref" value="<?=$this->ref?>">
+<span>Votre référence.</span>
+</div>
+</div>
+<div class="fieldgrp">
+<label>&nbsp;</label>
+<div class="field"><input type="submit" name="submit" value="Valider" class="button"></div>
+</div>
+</div>
+
+</form>
+
 <?php } else {?>
-<p class="marge">Vous n'avez pas les droits d'accès pour cette fonctionalité.</p>
+
+<p class="marge"><?=$this->translate("Vous n'avez pas les droits d'accès pour cette fonctionalité."); ?></p>
+
 <?php }?>
 </div>

-</div>
+</div>
--- a/application/views/default/scripts/pieces/kbis.phtml
+++ b/application/views/default/scripts/pieces/kbis.phtml
@ -0,0 +1,40 @@
+<div id="center">
+<h1>COMMANDES DE PI&Eacute;CES</h1>
+<div class="paragraph">
+<table class="identite">
+  <tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">
+      Num&eacute;ro identifiant Siren
+    </td>
+    <td width="350" class="StyleInfoData">
+      <?=$this->SirenTexte($this->siren)?>
+    </td>
+  </tr>
+  <tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
+  </tr>
+</table>
+</div>
+
+<h2>Extrait R.C.S</h2>
+<div class="paragraph">
+<?=$this->message?>
+</div>
+<div class="paragraph">
+<?php if($this->mail) { ?>
+</script>
+<div id="formMail" style="display:none">
+<form name="mailkbis" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'kbis', 'siret'=>$this->siren))?>">
+<input type="hidden" name="op" value="mailkbis"/>
+<label>Votre Email : </label>
+<input type="text" name="mail" value="<?=$this->email?>"/>
+<input type="submit" name="mailkbis" value="Ok"/>
+</form>
+</div>
+<?php } ?>
+</div>
+
+</div>
--- a/application/views/default/scripts/pieces/kbisinfogreffe.phtml
+++ b/application/views/default/scripts/pieces/kbisinfogreffe.phtml
@ -1 +0,0 @@
-<?php
--- a/application/views/default/scripts/pieces/kbispasserelle.phtml
+++ b/application/views/default/scripts/pieces/kbispasserelle.phtml
@ -1,40 +0,0 @@
-<div id="center">
-<h1>COMMANDES DE PI&Eacute;CES</h1>
-<div class="paragraph">
-<table class="identite">
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
-    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
-</table>
-</div>
-
-<h2>Extrait R.C.S</h2>
-<div class="paragraph">
-<?=$this->message?>	
-</div>
-<div class="paragraph">
-<?php if($this->mail) { ?>
-</script>
-<div id="formMail" style="display:none">
-<form name="mailkbis" method="post" action="<?=$this->url(array('controller'=>'pieces', 'action'=>'kbis', 'siret'=>$this->siren))?>">
-<input type="hidden" name="op" value="mailkbis"/>
-<label>Votre Email : </label>
-<input type="text" name="mail" value="<?=$this->email?>"/>
-<input type="submit" name="mailkbis" value="Ok"/>
-</form>
-</div>
-<?php } ?>
-</div>
-
-</div>
--- a/application/views/default/scripts/saisie/annoncedialog.phtml
+++ b/application/views/default/scripts/saisie/annoncedialog.phtml
@ -85,7 +85,7 @@ $('select[name="even[]"]').change(function(){

 <?php }?>

-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"></script>
 <script>
 $('form#saisie').bind('submit', function(){
 	var options = {
--- a/application/views/default/scripts/saisie/contact.phtml
+++ b/application/views/default/scripts/saisie/contact.phtml
@ -7,8 +7,9 @@
 	<?php }?>

 	<script>
+	var windowhref =  window.location.href;
 	$('#dialog').dialog({ buttons: [
-	{ text: "Fermer", click: function() { $(this).dialog("close"); } }
+	{ text: "Fermer", click: function() { $(this).dialog("close"); window.location.href=windowhref; } }
 	] });
 	</script>

@ -19,12 +20,45 @@
 <p>Supprimer l'élément id=<?=$this->id?> ?</p>

 <form name="contact" action="<?=$this->url(array('controller'=>'saisie','action'=>'contact'),null,true)?>" method="post">
+<input type="hidden" name="mode" value="delete" />
 <input type="hidden" name="id" value="<?=$this->id?>"/>
+<input type="hidden" name="siret" value="<?=$this->siret?>"/>
 </form>

 <?php } else {?>

+<?php if ( count($this->Modif)>0 ) {?>
+<?php foreach ( $this->Modif as $item ) {?>
+    <p>
+    <?php
+    switch ($item->type) {
+        case 'add':
+            $date = new Zend_Date($item->dateInsert, 'yyyy-MM-dd');
+            ?>
+            Création le <?=$date->toString('dd/MM/yyyy')?> par <?$item->idUtilisateurName?>.
+            <?php
+            break;
+        case 'edit':
+            $date = new Zend_Date($item->dateUpdate, 'yyyy-MM-dd');
+            ?>
+            Modification le <?=$date->toString('dd/MM/yyyy')?> par <?$item->idUpdateName?>.
+            <?php
+            break;
+        case 'del':
+            $date = new Zend_Date($item->dateSuppr, 'yyyy-MM-dd');
+            ?>
+            Suppression le <?=$date->toString('dd/MM/yyyy')?> par <?$item->idSupprName?>.
+            <?php
+            break;
+    }
+    ?>
+    </p>
+<?php }?>
+<?php }?>
+
 <form name="contact" action="<?=$this->url(array('controller'=>'saisie','action'=>'contact'),null,true)?>" method="post">
+<input type="hidden" name="mode" value="<?=$this->mode?>"/>
+
 <?php if ($this->id) {?>
 <input type="hidden" name="id" value="<?=$this->id?>"/>
 <?php }?>
@ -40,7 +74,7 @@
 </div>
 <div>
 <label>Valeur</label>
-<input type="text" name="" value="<?=$this->value?>">
+<input type="text" name="value" value="<?=$this->value?>">
 </div>
 <p>
 Téléphone france saisit sans séparateur, maximum 10 chiffres (format: XXXXXXXXXX)
--- a/application/views/default/scripts/saisie/diropcontrol-form.phtml
+++ b/application/views/default/scripts/saisie/diropcontrol-form.phtml
@ -0,0 +1,110 @@
+<style>
+.err {
+	border-style:solid;
+	border-width:1px;
+	border-color:red;
+}
+</style>
+<div class="fields">
+<div class="fieldgrp">
+<label><?=$this->translate("Civilité") ?></label>
+<div class="field">
+<?php 
+$civilites = array('M', 'MME', 'MLE');
+foreach ($civilites as $civilite) {
+	$checked=(strcmp($civilite, $this->infos->Civilite)==0)?"checked":"";
+?>
+	<?=$civilite ?><input type="radio" name="civilite" value="<?=$civilite?>" <?=$checked?>/>
+<?php }?>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Nom") ?></label>
+<div class="field">
+<input type="text" name="nom" value="<?=$this->infos->Nom?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Prenom") ?></label>
+<div class="field">
+<input type="text" name="prenom" value="<?=$this->infos->Prenom?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Nom d'usage") ?></label>
+<div class="field">
+<input type="text" name="nom_usage" value="<?=$this->infos->NomUsage?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Fonction") ?></label>
+<div class="field">
+<select name="codFct" style="width:380px;">
+<?php foreach ($this->fonction as $key=>$val) {
+	$selected=(intval($key)==intval($this->infos->Code))?"selected":""; ?>
+	<option value="<?=$key ?>" <?=$selected?>><?=$val?></option>
+<?php }?>
+</select>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Date de naissance") ?></label>
+<div class="field">
+<?php
+if (trim($this->infos->NaissDate) != '' && trim($this->infos->NaissDate)!='0000-00-00') {
+	$date = new Zend_Date($this->infos->NaissDate, 'yyyy-MM-dd');
+	$newDate = $date->toString('dd/MM/yyyy');
+}
+?>
+<input type="text" name="naiss_date" value="<?=$newDate?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Lieu de naissance") ?></label>
+<div class="field">
+<input type="text" name="naiss_lieu" value="<?=$this->infos->NaissVille?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Téléphone") ?></label>
+<div class="field">
+<input type="text" name="tel" value="<?=$this->infos->Tel?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Télécopie") ?></label>
+<div class="field">
+<input type="text" name="fax" value="<?=$this->infos->Fax?>"/>
+</div>
+</div>
+
+<div class="fieldgrp">
+<label><?=$this->translate("Email") ?></label>
+<div class="field">
+<input type="text" name="email" value="<?=$this->infos->Email?>"/>
+</div>
+</div>
+</div>
+
+<script>
+$('input[name=email]').on("focusout", function(){
+	var regex = /^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+	if (!regex.test($(this).val())) {
+		$(this).addClass('err');
+	}
+	else {
+		$(this).removeClass('err');
+	}
+});
+
+$.datepicker.setDefaults( $.datepicker.regional["fr"] );
+$('input[name=naiss_date]').datepicker({ changeMonth: true, changeYear: true, yearRange: "-100:+0", });
+</script>
--- a/application/views/default/scripts/saisie/diropcontrol.phtml
+++ b/application/views/default/scripts/saisie/diropcontrol.phtml
@ -0,0 +1,29 @@
+<form name="dirop" action="<?=$this->url(array('controller'=>'saisie', 'action'=>'diropsave'),null, true)?>" method="post">
+<input type="hidden" name="mode" value="<?=$this->mode?>" />
+<input type="hidden" name="siren" value="<?=$this->siren?>" />
+<input type="hidden" name="nic" value="<?=$this->nic?>" />
+<input type="hidden" name="id" value="<?=$this->id?>" />
+
+<?php 
+if ($this->mode=='add') {
+	echo $this->translate("Ajouter un dirigeant opérationnel");
+	echo $this->partial('/saisie/diropcontrol-form.phtml', array('fonction'=>$this->fonction));
+} else if ($this->mode=='edit') {
+	echo $this->translate("Modifier le dirigeant opérationnel");
+	echo $this->render('/saisie/diropcontrol-form.phtml');
+} else if ($this->mode=='del')
+	echo $this->translate("Supprimer le dirigeant opérationnel");
+?>
+</form>
+
+<script>
+$('#dialog').dialog({ buttons: [
+	{ text: "Valider", click: function() {
+		var form = $('form[name=dirop]');
+		$.post(form.attr('action'), form.serialize(), function(data){
+			$('#dialog').html(data);
+		}).fail(function(){ alert('Unknown error'); });
+	}},
+	{ text: "Annuler", click: function() { $(this).dialog('close'); } }
+] });
+</script>
--- a/application/views/default/scripts/saisie/diropsave.phtml
+++ b/application/views/default/scripts/saisie/diropsave.phtml
@ -0,0 +1,12 @@
+<?=$this->message ?>
+<script>
+$('#dialog').dialog({ 
+	buttons: [{
+		text: "Quitter", 
+		click: function() {
+			location.reload();
+			$(this).dialog('close'); 
+		} 
+	}] 
+});
+</script>
--- a/application/views/default/scripts/saisie/even/1506.phtml
+++ b/application/views/default/scripts/saisie/even/1506.phtml
@ -0,0 +1,2 @@
+<label>Compl&eacute;ment, huissier, opposition, etc...</label>
+<input type="text" name="jugement[comp]" size="70" maxlength="255" value="" />
--- a/application/views/default/scripts/saisie/even/4500.phtml
+++ b/application/views/default/scripts/saisie/even/4500.phtml
@ -0,0 +1,7 @@
+<label>Date de jouissance / effet :</label>
+<input type="text" maxlength="10" class="date" name="jugement[dateFinPeriode]" value="<?=$this->saisie['dateFinPeriode']?>" />
+<span class="left">(Format JJ/MM/AAAA)</span>
+<label>Nom de l'acheteur</label>
+<input type="text" name="jugement[AcheteurNom]" size="70" maxlength="100" value="" />
+<label>SIREN de l'acheteur</label>
+<input type="text" name="jugement[AcheteurSiren]" size="70" maxlength="11" value="" />
--- a/application/views/default/scripts/saisie/liasse.phtml
+++ b/application/views/default/scripts/saisie/liasse.phtml
@ -71,7 +71,7 @@ span.poste input { width:50px; }
    $('span.unit').editable(function(value, settings) {
        return value;
    }, {
-        data   : "{'U':'&euro;','K':'K&euro;','M':'M&euro;'}",
+        data   : {'U':'&euro;','K':'K&euro;','M':'M&euro;', 'selected':'<?=$this->unite?>'},
        type   : 'select',
        tooltip : 'Click to edit',
    });
--- a/application/views/default/scripts/saisie/liasse/2050.phtml
+++ b/application/views/default/scripts/saisie/liasse/2050.phtml
@ -2626,7 +2626,7 @@
    <td align="center">&nbsp;</td>
    <td align="right"><?=$this->Editable('VH1',$this->liasse['VH1'],'poste');?></td>
    <td align="center">&nbsp;</td>
-    <td align="right"><?=$this->Editable('VH3',$this->liasse['VH2'],'poste');?></td>
+    <td align="right"><?=$this->Editable('VH2',$this->liasse['VH2'],'poste');?></td>
    <td align="right"><?=$this->Editable('VH3',$this->liasse['VH3'],'poste');?></td>
 </tr>
 <tr>
--- a/application/views/default/scripts/saisie/liendoc.phtml
+++ b/application/views/default/scripts/saisie/liendoc.phtml
@ -97,7 +97,7 @@ Liste des documents Infogreffe
 </form>
 </div>

-<script type="text/javascript" src="/libs/form/jquery.form.js"></script>
+<script type="text/javascript" src="/libs/form/jquery.form.min.js"/>
 <script>
 $.datepicker.setDefaults( $.datepicker.regional["fr"] );
 $('input[name=fileDate]').datepicker({ changeMonth: true, changeYear: true });
--- a/application/views/default/scripts/saisie/lienetranger.phtml
+++ b/application/views/default/scripts/saisie/lienetranger.phtml
@ -121,7 +121,7 @@ Selectionner un pays pour afficher les identifiants locaux
 <div class="fieldgrp">
 <label>Téléphone</label>
 <div class="field">
-<div style="float-left;"></div><span id="indTel"></div><div></span><input type="text" name="tel" value="<?=$this->tel?>"/></div> 
+<div style="float-left;"></div><span id="indTel"></div><div></span><input type="text" name="tel" value="<?=$this->tel?>"/></div>
 </div>
 </div>

@ -249,7 +249,7 @@ $('input[name=dateNbActions]').datepicker({ changeMonth: true, changeYear: true

 $('input[name=isin]').change(function(e){
 	$.post('/saisie/checkisin', {isin: $(this).val() }, function success(data) {
-		 if (data){$('input[name=isin]').css("border-color", "red");} 
+		 if (data){$('input[name=isin]').css("border-color", "red");}
 		 else {$('input[name=isin]').css("border-color", "");}
 	});
 });
@ -301,12 +301,6 @@ function AddSelectCountry(code, n){
    }
 }

-$('input[name=tel], input[name=fax]').on('blur', function(){
-	var input = $(this).val();
-	var output = $.trim(input.replace(/[^0-9]+/g, ''));
-	$(this).val(output);
-});
-
 $('a#google').on('click', function(e){
 	var val = $('input[name=nom]').val();
 	window.open('https://www.google.fr/#q='+encodeURIComponent(val));
--- a/application/views/default/scripts/saisie/scorecutoff.phtml
+++ b/application/views/default/scripts/saisie/scorecutoff.phtml
@ -1,4 +1,4 @@
-<?php if ($this->href) {?>
+<?php if ( $this->href ) {?>

 <a class="dialog" title="<?=$this->name?>" href="<?=$this->href?>"><?=$this->name?></a>
 <script>
@ -16,52 +16,72 @@ $('a.dialog').on('click', function(e){
 			$(this).html('Chargement...');
 			$(this).load(href);
 		},
-		buttons: {'Fermer': function() { $(this).dialog('close'); }},
+		buttons: {"Fermer": function() { $(this).dialog('close'); }},
 		close: function() { $('#dialog').remove(); }};
 	$('<div id="dialog"></div>').dialog(dialogOpts);
 	return false;
 });
 </script>

-<?php } else {?>
-<style>
+<?php } elseif ( $this->mode == 'todelete' ) {?>

+<p>Etes vous sur de vouloir supprimer le cut-off sur le siren <?=$this->siren?> ? </p>
+
+<form action="<?=$this->url(array('controller'=>'saisie', 'action'=>'scorecutoff'), null, true)?>" method="post">
+<input type="hidden" name="siren" value="<?=$this->siren?>">
+<input type="hidden" name="mode" value="delete">
+<input type="hidden" name="encours" value="<?=$this->encours?>"/>
+<input type="hidden" name="scoreConf" value="<?=$this->scoreConf?>"/>
+<input type="hidden" name="scoreDir" value="<?=$this->scoreDir?>"/>
+<input type="hidden" name="scoreSolv" value="<?=$this->scoreSolv?>"/>
+<input type="hidden" name="remarque" value="<?=$this->remarque?>"/>
+</form>
+
+<script>
+$('#dialog').dialog({ buttons: [
+    {text: "Oui", click: function() {
+        var values = $(this).find('form').serialize();
+        var url = $(this).find('form').attr('action');
+        $('#dialog').html('Chargement...');
+        $.post(url, values, function(data) {
+            $('#dialog').html(data);
+        });
+    }},
+    {text: "Non", click: function() { $(this).dialog('close'); }}
+] });
+</script>
+
+<?php } elseif ( $this->mode == 'delete' || $this->mode == 'added' ) {?>
+
+<div class="ui-widget">
+	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
+		<p><?=$this->message?></p></p>
+	</div>
+</div>
+
+<script>
+var windowhref =  window.location.href;
+$('#dialog').dialog({ buttons: [
+    {text: "Fermer", click: function() { $(this).dialog('close'); window.location.href = windowhref; }}
+] });
+</script>
+
+<?php } else {?>
+
+<style>
 select, input {
 	width:5em;
 }
-
-.brsr {
-	border-style:solid;
-	border-width:1px;
-	border-color:red;
-}
-
-.loading
-{
-	background-color: silver;
-	height: 450px;
-	top: 0px;
-	left: 0px;
-	position: absolute;
-	width: 720px;
-	opacity: 0.3;
-	display:none;
-	z-index: 1;
-}
-
-.message {
-	font-size: 10px;
-	width: 98%;
-    background-color: #FFFFDD;
-	border: 1px solid #FCEFA1;
-	border-radius: 4px;
-    padding-left: 15px;
-}
 </style>

 <?php $getcutoff = $this->getcutoff; ?>
+
 <?php if ($this->message!='') {?>
-<div class='message'><p id='<?=$this->refresh ?>'><?=$this->message; ?></p></div>
+<div class="ui-widget">
+	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
+		<p><?=$this->message?></p></p>
+	</div>
+</div>
 <?php }?>

 <?php if ($getcutoff['dateInsert']!='') { ?>
@ -70,7 +90,7 @@ select, input {
 	<div>Date de mise à jour Cut-off</div>
 </div>
 <div class="StyleInfoData" style="float:left; margin-top:20px; ">
-	<div id='dateInsert'>
+	<div>
 	<?php $date = new Zend_Date($getcutoff['dateInsert'], 'yyyy-MM-dd')?>
 	<?=$date->toString('dd/MM/yyyy')?>
 	</div>
@ -82,9 +102,8 @@ select, input {
 <?php } ?>

 <div style="margin-top:5em">
-<form>
+<form action="<?=$this->url(array('controller'=>'saisie', 'action'=>'scorecutoff'), null, true)?>" method="post">
 <input type="hidden" name="siren" value="<?=$this->siren?>">
-<input type="hidden" name="delete" value="0">

 <div>
 <label>Encours</label>
@ -121,8 +140,28 @@ foreach($select as $item => $val) {
 </form>
 </div>

-<div class="loading"><center><img style="padding-top:25%" src="/themes/default/images/giant/19-1.gif" /></center></div>
-
-<script type="text/javascript" src="/themes/default/scripts/scorecutoff.js" />
+<script>
+$('#dialog').dialog({ buttons: [
+    <?php if ($getcutoff['dateInsert']!='') { ?>
+	{text: "Supprimer", click: function() {
+		var values = $(this).find('form').serialize();
+		var url = $(this).find('form').attr('action') + '/mode/todelete';
+		$('#dialog').html('Chargement...');
+	    $.post(url, values, function(data) {
+	    	  $('#dialog').html(data);
+	    });
+	}},
+    <?php }?>
+    {text: "Valider", click: function() {
+        var values = $(this).find('form').serialize();
+        var url = $(this).find('form').attr('action');
+        $('#dialog').html('Chargement...');
+    	$.post(url, values, function(data) {
+    		$('#dialog').html(data);
+    	});
+    }},
+    {text: "Fermer", click: function() { $(this).dialog('close'); }}
+] });
+</script>

 <?php }?>
--- a/application/views/default/scripts/saisie/scorecutoffdel.phtml
+++ b/application/views/default/scripts/saisie/scorecutoffdel.phtml
--- a/application/views/default/scripts/surveillance/ajouter.phtml
+++ b/application/views/default/scripts/surveillance/ajouter.phtml
@ -72,7 +72,10 @@ $('#dialogsurv').dialog({ buttons: [ {
 <div class="fieldgrp">
 <label class="StyleInfoLib">Adresse email du destinataire</label>
 <div class="field">
-<input class="longfield" name="email" type="text" value="<?=$this->email?>" size="20"/>
+<?php foreach($this->emails as $email) {?>
+<?=$email?><br/>
+<?php }?>
+<input class="longfield" name="email" type="hidden" value="<?=$this->email?>"/>
 </div>
 </div>

@ -102,13 +105,13 @@ function survSubmit(){
 		source.push($('input[name=source]').val());
 	}
 	$('#frmSurv').replaceWith('<div id="frmSurv">Mise sous surveillance en cours...</div>');
-
 	if (source.length>0) {
    	$.each( source, function( key, value ) {
    		$.post(action, {siret: siret, ref: ref, email: email, encours: encours, source: value} ,
    			    function(data) { $('#frmSurv').append('<br/>'+data);
    	    }, 'text');
    	});
+    	$('#frmSurv').append('<br/>Mise sous surveillance terminé.');
    	$('#dialogsurv').dialog({ buttons: [
 		{ text: "Fermer", click: function() { window.location.href = windowhref; } }
    	]});
@ -117,7 +120,7 @@ function survSubmit(){
 		$('#dialogsurv').dialog({ buttons: [
 		{ text: "Fermer", click: function() { window.location.href = windowhref; } }
 		]});
-	}	
+	}
 }
 </script>

--- a/application/views/default/scripts/user/email.phtml
+++ b/application/views/default/scripts/user/email.phtml
@ -0,0 +1,54 @@
+<?php if ( $this->checkemail ) {?>
+
+<strong><?=$this->msg?></strong>
+<input type="hidden" name="email" value="<?=$this->email?>"/>
+
+<?php if ($this->email!='') {?>
+<p><i>Enregistrer les modifications en cliquant sur "Sauver", en bas de la page, après avoir fermer la fenêtre.</i></p>
+<?php }?>
+
+<script>
+$('#dialog').dialog({ buttons: [
+    { text: "Fermer", click: function() {
+    	var email = $('#dialog input[name=email]').val();
+        if (email!='') {
+        	$('div#email').html('<span>'+email+'</span>');
+        	$('input[name="frmOptions[email]"]').val(email);
+        }
+        $(this).dialog('close');
+    } }
+]});
+</script>
+
+<?php } else {?>
+
+<style>
+#bloc-addemail { display:none; }
+</style>
+
+<p>Email principal associé au compte utilisateur</p>
+
+<form name="email" action="<?=$this->url(array('controller'=>'user', 'action'=>'email'), null, true)?>" method="post">
+
+<label>Adresse Email principal :</label><br/>
+<input type="text" size="50" maxlength="80" name="q" value="<?=$this->email?>"/>
+<input type="hidden" name="check" value="1"/>
+
+</form>
+
+<p><i>L'email principal est utilisé pour toutes communications avec Scores & Decisions. Il doit donc être valide.</i></p>
+
+<script>
+$('#dialog').dialog({ buttons: [
+    { text: "Valider", click: function() {
+    	$.post($('form[name=email]').attr('action'), $('form[name=email]').serialize(), function(data){
+    		$('#dialog').html(data);
+		}).fail(function() {
+			$('#dialog').html('<strong>Unknown error</strong>');
+		});
+    } },
+    { text: "Quitter", click: function() { $(this).dialog('close'); } }
+]});
+</script>
+
+<?php }?>
--- a/application/views/default/scripts/user/emailsecondary.phtml
+++ b/application/views/default/scripts/user/emailsecondary.phtml
@ -0,0 +1,65 @@
+<?php if ( $this->msg ) {?>
+
+<?=$this->msg?>
+<script>
+$('#dialog').dialog({ buttons: [
+    { text: "Fermer", click: function() { $(this).dialog('close'); } }
+]});
+</script>
+
+<?php } elseif( $this->mode == 'add' ) {?>
+
+<form name="email" action="<?=$this->url(array('controller'=>'user', 'action'=>'emailsecondary'), null, true)?>">
+<label>Saisisez l'email à ajouter : </label><br/>
+<input type="text" size="50" maxlength="80" name="email" value=""/>
+<input type="hidden" name="login" value="<?=$this->login?>">
+<input type="hidden" name="mode" value="set">
+</form>
+
+<script>
+$('#dialog').dialog({ buttons: [
+    { text: "Valider", click: function() {
+    	 $.post($('form[name=email]').attr('action'), $('form[name=email]').serialize(), function(data) {
+    		 $('#dialog').html(data);
+         });
+    } },
+    { text: "Fermer", click: function() { $(this).dialog('close'); } }
+]});
+</script>
+
+<?php } else {?>
+
+<p>Emails secondaires associés au compte <strong><?=$this->login?></strong></p>
+
+<?php if ( count($this->emails)>0 ) {?>
+<ul>
+<?php foreach ($this->emails as $email) {?>
+    <li><?=$email->value?> (<a class="email-delete" href="<?=$this->url(array(
+        'controller'=>'user', 'action'=>'emailsecondary', 'login'=>$this->login,
+        'id'=>$email->id, 'email'=>$email->value, 'mode'=>'del'), null, true)?>">supprimer</a>)
+    </li>
+<?php }?>
+</ul>
+<?php } else {?>
+<strong>Aucun email secondaire.</strong>
+<?php }?>
+
+<script>
+$('#dialog').dialog({ buttons: [
+    { text: "Associer une nouvelle adresse email", click: function() {
+        $.post('<?=$this->url(array('controller'=>'user', 'action'=>'emailsecondary', 'mode'=> 'add', 'login' => $this->login), null, true)?>', function(data) {
+        	$('#dialog').html(data);
+        });
+    } },
+    { text: "Fermer", click: function() { $(this).dialog('close'); } }
+]});
+
+$('a.email-delete').on('click', function(e) {
+    e.preventDefault();
+    $.post($(this).attr('href'), function(data) {
+        $('#dialog').html(data);
+    });
+});
+</script>
+
+<?php }?>
--- a/application/views/default/scripts/user/emailvalid.phtml
+++ b/application/views/default/scripts/user/emailvalid.phtml
@ -1 +1,3 @@
-<?=json_encode($this->result);?>
+
+<strong><?=$this->msg?></strong>
+<input type="hidden" name="email" value="<?=$this->email?>"/>
--- a/application/views/default/scripts/user/index.phtml
+++ b/application/views/default/scripts/user/index.phtml
@ -43,22 +43,51 @@ if ($this->action != 'new') {
 </div>

 <div class="infoTitle StyleInfoLib">Adresse e-mail</div>
-<div class="infoData">
+<div class="infoData" id="email">
 <?php $emails = explode(';', $this->options->email); ?>
 <?php foreach ( $emails as $email ) {?>
 <span><?=$email?></span><br/>
 <?php }?>
 </div>
 <div style="float:left;">
-<button id="user-emails">Editer les emails</button>
+<button id="user-emails" data-href="<?=$this->url(array(
+	'controller' => 'user', 'action' => 'email',
+    'q' => $this->options->email,
+))?>">Editer e-mail du compte</button>
+<button id="user-emailsecondary" data-href="<?=$this->url(array(
+	'controller' => 'user', 'action' => 'emailsecondary',
+    'idClient' => $this->options->idClient,
+    'login' => $this->loginVu,
+
+))?>">Voir ou associer des e-mails secondaires</button>
 <script>
-$('button#user-emails').button({
-	icons: { primary: "ui-icon-pencil" },
-	text: false
-}).click(function( event ) {
-    event.preventDefault();
+$('button#user-emails').button({ icons: { primary: "ui-icon-pencil" }, text: false}).click(function(e) {
+    e.preventDefault();
    var title = $(this).text();
-	var href = '/user/emails/q/'+$('input[name="frmOptions[email]"]').val();
+	var href = $(this).data('href');
+	var dialogOpts = {
+		bgiframe: true,
+		title: title,
+		width: 500,
+		height: 300,
+		modal: true,
+		open: function(event, ui) {
+			$(this).html('Chargement...');
+			$(this).load(href);
+		},
+		buttons: {
+			Quitter: function() { $(this).dialog('close'); }
+		},
+		close: function() { $('#dialog').remove(); }
+	};
+	$('<div id="dialog"></div>').dialog(dialogOpts);
+	return false;
+
+});
+$('button#user-emailsecondary').button({icons: { primary: "ui-icon-plusthick" }, text: false}).click(function(e) {
+    e.preventDefault();
+    var title = $(this).text();
+	var href = $(this).data('href');;
 	var dialogOpts = {
 		bgiframe: true,
 		title: title,
--- a/application/views/default/scripts/user/login.phtml
+++ b/application/views/default/scripts/user/login.phtml
@ -1,647 +1,68 @@
-<?php echo $this->doctype()?>
+<?php echo $this->doctype(); ?>
 <html>
 <head>
-<?php echo $this->headMeta()?>
-<?php echo $this->headTitle()?>
-<?php echo $this->headLink()?>
-<?php echo $this->headScript()?>
-<link rel="shortcut icon" type="image/x-icon" href="<?='http://'.$_SERVER['SERVER_NAME']?>/favicon.ico" />
-<style>
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
-    border: 0 none;
-    cursor: default;
-    font-family: inherit;
-    font-size: 100%;
-    font-weight: inherit;
-    margin: 0;
-    outline: 0 none;
-    padding: 0;
-    vertical-align: baseline;
-}
-html, body {
-    height: 100%;
-}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {
-    display: block;
-}
-body {
-    line-height: 1.5;
-}
-table {
-    border-collapse: separate;
-    border-spacing: 0;
-    white-space: nowrap;
-}
-caption, th, td {
-    font-weight: normal;
-    text-align: left;
-}
-table, td, th {
-    vertical-align: middle;
-}
-a {
-    border: 0 none;
-    color: #000000;
-    text-decoration: none;
-}
-a, a *, input, input *, select, .button span, li, label {
-    cursor: pointer;
-}
-ul {
-    list-style: none outside none;
-}
-body {
-    background: none repeat scroll 0 0 #FEFEFE;
-    color: #000000;
-    font: 0.8em/1.6em "Lucida Grande",Arial,Verdana,sans-serif;
-}
-#body-user #header, #body-settings #header {
-    background: none repeat scroll 0 0 #1D2D44;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5), 0 -2px 10px #222222 inset;
-    height: 2.5em;
-    padding: 0.5em;
-    position: fixed;
-    top: 0;
-    width: 100%;
-    z-index: 100;
-}
-#body-login #header {
-	margin: -2em auto 0;
-	text-align: center;
-	height: 10em;
-	padding: 1em 0 .5em;
-	-moz-box-shadow: 0 0 1em rgba(0, 0, 0, .5);
-	-webkit-box-shadow: 0 0 1em rgba(0, 0, 0, .5);
-	box-shadow: 0 0 1em rgba(0, 0, 0, .5);
-	background:  #1D2D44;
-	background: -moz-linear-gradient(top, #35537A 0%, #1D2D42 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #35537A), color-stop(100%, #1D2D42));
-	background: -webkit-linear-gradient(top, #35537A 0%, 1D2D42 100%);
-	background: -o-linear-gradient(top, #35537A 0%, #1D2D42 100%);
-	background: -ms-linear-gradient(top, #35537A 0%, #1D2D42 100%);
-	background: linear-gradient(top, #35537A 0%, #1D2D42 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 );
-}
-
-#body-login #header span {
-	color:#FFFFFF;
-	font-weight:bold;
-	font-size:1.6em;
-	line-height:5em;
-}
-input[type="text"], input[type="password"] {
-    cursor: text;
-}
-input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
-    background: none repeat scroll 0 0 #FFFFFF;
-    border: 1px solid #DDDDDD;
-    border-radius: 0.5em 0.5em 0.5em 0.5em;
-    box-shadow: 0 1px 1px #FFFFFF, 0 1px 0 #BBBBBB inset;
-    color: #333333;
-    font-size: 1em;
-    margin: 0.3em;
-    outline: medium none;
-    padding: 0.6em 0.5em 0.4em;
-    width: 10em;
-}
-input[type="text"], input[type="password"], input[type="search"] {
-    background: none repeat scroll 0 0 #F8F8F8;
-    color: #555555;
-    cursor: text;
-}
-input[type="text"], input[type="password"], input[type="search"] {
-    -moz-appearance: textfield;
-    -moz-box-sizing: content-box;
-}
-input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active {
-    background-color: #FFFFFF;
-    color: #333333;
-    opacity: 1;
-}
-input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
-    background: none repeat scroll 0 0 #F8F8F8;
-    border: 1px solid #DDDDDD;
-    border-radius: 0.5em 0.5em 0.5em 0.5em;
-    color: #555555;
-    cursor: pointer;
-    font-weight: bold;
-    padding: 0.4em;
-    text-shadow: 0 1px 0 #FFFFFF;
-    width: auto;
-}
-input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover {
-    background: none repeat scroll 0 0 #FFFFFF;
-    color: #333333;
-}
-input[type="checkbox"] {
-    width: auto;
-}
-#quota {
-    cursor: default;
-}
-#body-login input {
-    font-size: 1.5em;
-}
-#body-login input[type="text"], #body-login input[type="password"] {
-    width: 13em;
-}
-#body-login input.login {
-    float: right;
-    width: auto;
-}
-#remember_login {
-    margin: 0.8em 0.2em 0 1em;
-}
-.searchbox input[type="search"] {
-    -moz-transition: opacity 300ms ease 0s;
-    background: url("../img/actions/search.svg") no-repeat scroll 0.5em center #FFFFFF;
-    border: 0 none;
-    border-radius: 1em 1em 1em 1em;
-    font-size: 1.2em;
-    opacity: 0.7;
-    padding: 0.2em 0.5em 0.2em 1.5em;
-    position: fixed;
-    right: 3em;
-    top: 0.4em;
-}
-input.enabled[type="submit"] {
-    background: none repeat scroll 0 0 #66F866;
-    border: 1px solid #55EE55;
-    box-shadow: 0 1px 1px #F8F8F8, 0 1px 1px #CCFFCC inset;
-}
-input.highlight[type="submit"] {
-    background: none repeat scroll 0 0 #FFC100;
-    border: 1px solid #DDBB00;
-    box-shadow: 0 1px 1px #F8F8F8, 0 1px 1px #FFEEDD inset;
-    text-shadow: 0 1px 0 #FFEEDD;
-}
-#select_all {
-    margin-top: 0.4em !important;
-}
-#controls {
-    background: none repeat scroll 0 0 #F7F7F7;
-    border-bottom: 1px solid #EEEEEE;
-    box-shadow: 0 -3px 7px #000000;
-    height: 2.8em;
-    margin: 0;
-    padding: 0 0.5em;
-    position: fixed;
-    top: 3.5em;
-    width: 100%;
-    z-index: 50;
-}
-#controls .button {
-    display: inline-block;
-}
-#content {
-    left: 12.5em;
-    position: absolute;
-    top: 3.5em;
-}
-#leftcontent, .leftcontent {
-    background: none repeat scroll 0 0 #F8F8F8;
-    border-right: 1px solid #DDDDDD;
-    overflow: auto;
-    position: fixed;
-    top: 6.4em;
-    width: 20em;
-}
-#leftcontent li, .leftcontent li {
-    -moz-transition: background-color 200ms ease 0s;
-    background: none repeat scroll 0 0 #F8F8F8;
-    overflow: hidden;
-    padding: 0.5em 0.8em;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active {
-    background: none repeat scroll 0 0 #EEEEEE;
-}
-#leftcontent li.active, .leftcontent li.active {
-    font-weight: bold;
-}
-#leftcontent li:hover, .leftcontent li:hover {
-    background: none repeat scroll 0 0 #DDDDDD;
-    color: #333333;
-}
-#leftcontent a {
-    display: block;
-    float: left;
-    height: 100%;
-    margin: 0;
-    padding: 0 1em 0 0;
-}
-#rightcontent, .rightcontent {
-    left: 32.5em;
-    overflow: auto;
-    position: fixed;
-    top: 6.4em;
-}
-#body-login {
-    background: none repeat scroll 0 0 #DDDDDD;
-}
-#body-login div.buttons {
-    text-align: center;
-}
-#body-login p.info {
-    color: #777777;
-    margin: 2em auto;
-    text-align: center;
-    text-shadow: 0 1px 0 #FFFFFF;
-    width: 22em;
-}
-#body-login p.info a {
-    color: #777777;
-    font-weight: bold;
-}
-#login {
-    background: none repeat scroll 0 0 #EEEEEE;
-    border-bottom: 1px solid #F8F8F8;
-    margin: 2em auto 0;
-    min-height: 30em;
-}
-#login form {
-    margin: 2em auto;
-    padding: 0;
-    width: 22em;
-}
-#login form fieldset {
-    background: none repeat scroll 0 center transparent;
-    border: 0 none;
-    margin-bottom: 2em;
-    padding: 0;
-}
-#login form fieldset legend {
-    font-weight: bold;
-}
-#login form label {
-    color: #666666;
-    margin: 0.95em 0 0 0.85em;
-}
-p.infield {
-    position: relative;
-}
-label.infield {
-    cursor: text !important;
-}
-#login form label.infield {
-    color: #AAAAAA;
-    font-size: 1.5em;
-    position: absolute;
-}
-#login #dbhostlabel, #login #directorylabel {
-    display: block;
-    margin: 0.95em 0 0.8em -8em;
-}
-#login form input[type="checkbox"] + label {
-    font-size: 1em;
-    margin: 0;
-    position: relative;
-    text-shadow: 0 1px 0 #FFFFFF;
-}
-#login form .errors {
-    background: none repeat scroll 0 0 #FED7D7;
-    border: 1px solid #FF0000;
-    margin: 0 0 2em;
-    padding: 1em;
-}
-#login form #selectDbType {
-    text-align: center;
-}
-#login form #selectDbType label {
-    background: none repeat scroll 0 0 #F8F8F8;
-    border: 1px solid #DDDDDD;
-    color: #555555;
-    cursor: pointer;
-    font-size: 1em;
-    font-weight: bold;
-    margin: 0 -0.3em 1em;
-    padding: 0.4em;
-    position: static;
-    text-shadow: 0 1px 0 #EEEEEE;
-}
-#login form #selectDbType label span {
-    cursor: pointer;
-    font-size: 0.9em;
-}
-#login form #selectDbType label.ui-state-hover span, #login form #selectDbType label.ui-state-active span {
-    color: #000000;
-}
-#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active {
-    background-color: #CCCCCC;
-    color: #333333;
-}
-#navigation {
-    background: none repeat scroll 0 0 #EEEEEE;
-    border-right: 1px solid #CCCCCC;
-    box-shadow: -3px 0 7px #000000;
-    float: left;
-    height: 100%;
-    overflow: hidden;
-    padding: 0;
-    position: fixed;
-    top: 3.5em;
-    width: 12.5em;
-    z-index: 75;
-}
-#navigation a {
-    -moz-transition: background 300ms ease 0s;
-    background: none no-repeat scroll 1em center #EEEEEE;
-    border-bottom: 1px solid #DDDDDD;
-    border-top: 1px solid #FFFFFF;
-    color: #666666;
-    display: block;
-    font-size: 1.2em;
-    padding: 0.6em 0.5em 0.4em 2.5em;
-    text-decoration: none;
-    text-shadow: 0 1px 0 #F8F8F8;
-}
-#navigation a.active, #navigation a:hover, #navigation a:focus {
-    background-color: #DBDBDB;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #D4D4D4;
-    color: #333333;
-}
-#navigation a.active {
-    background-color: #DDDDDD;
-}
-#navigation #settings {
-    bottom: 3.5em;
-    position: absolute;
-    width: 100%;
-}
-#expand {
-    cursor: pointer;
-    margin-bottom: -0.5em;
-    padding: 0.5em 10.1em 0.7em 1.2em;
-    position: relative;
-    z-index: 100;
-}
-#expand + span {
-    -moz-transition: opacity 300ms ease 0s;
-    color: #666666;
-    font-size: 1.2em;
-    margin: -1.7em 0 0 2.5em;
-    opacity: 0;
-    position: absolute;
-    text-shadow: 0 1px 0 #F8F8F8;
-    z-index: 99;
-}
-#expand:hover + span, #expand + span:hover {
-    cursor: pointer;
-    opacity: 1;
-}
-#logout {
-    padding: 1.2em 2em 0.55em 1.2em;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-.hidden {
-    display: none;
-}
-.bold {
-    font-weight: bold;
-}
-#notification {
-    background-color: #FFCC44;
-    border: 0 none;
-    border-bottom-left-radius: 1em;
-    border-bottom-right-radius: 1em;
-    cursor: pointer;
-    display: none;
-    left: 50%;
-    padding: 0 0.7em 0.3em;
-    position: fixed;
-    top: 0;
-    z-index: 101;
-}
-.action, .selectedActions a {
-    -moz-transition: opacity 200ms ease 0s;
-    opacity: 0.5;
-}
-.action {
-    height: 16px;
-    width: 16px;
-}
-#logout {
-    opacity: 0.8;
-}
-.action:hover, .selectedActions a:hover, #logout:hover {
-    opacity: 1;
-}
-table:not(.nostyle) tr {
-    -moz-transition: background-color 200ms ease 0s;
-}
-tbody tr:hover, tr:active {
-    background-color: #F8F8F8;
-}
-#body-settings .personalblock, #body-settings .helpblock {
-    background: none repeat scroll 0 0 #F8F8F8;
-    border-radius: 0.5em 0.5em 0.5em 0.5em;
-    color: #555555;
-    margin: 1em;
-    padding: 0.5em 1em;
-    text-shadow: 0 1px 0 #FFFFFF;
-}
-#body-settings #quota.personalblock {
-    padding: 0;
-    position: relative;
-}
-#body-settings #controls + .helpblock {
-    margin-top: 3em;
-    position: relative;
-}
-.personalblock > legend {
-    margin-top: 2em;
-}
-.personalblock > legend, th, dt, label {
-    font-weight: bold;
-}
-code {
-    font-family: "Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono",monospace;
-}
-#quota div, div.jp-play-bar, div.jp-seek-bar {
-    background: none repeat scroll 0 0 #E6E6E6;
-    border-bottom-left-radius: 0.4em;
-    border-top-left-radius: 0.4em;
-    font-weight: normal;
-    padding: 0;
-    white-space: nowrap;
-}
-#quotatext {
-    padding: 0.6em 1em;
-}
-div.jp-play-bar, div.jp-seek-bar {
-    padding: 0;
-}
-.pager {
-    display: inline;
-    float: right;
-    list-style: none outside none;
-    margin: 0.7em 13em 0 0;
-}
-.pager li {
-    display: inline-block;
-}
-li.error {
-    background: none no-repeat scroll 0.8em 0.8em #FFFFEE;
-    border: 1px solid #CCCCCC;
-    border-radius: 10px 10px 10px 10px;
-    color: #FF3B3B;
-    margin: 4em auto;
-    padding: 1em 1em 1em 4em;
-    width: 640px;
-}
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.hint {
-    background-image: url("/core/img/actions/info.png");
-    background-position: 0 0.3em;
-    background-repeat: no-repeat;
-    color: #777777;
-    padding-left: 25px;
-}
-.separator {
-    border-left: 1px solid #D3D3D3;
-    border-right: 1px solid #FFFFFF;
-    display: inline;
-    height: 10px;
-    margin: 4px;
-    width: 0;
-}
-a.bookmarklet {
-    background-color: #DDDDDD;
-    border: 1px solid #CCCCCC;
-    margin-top: 5px;
-    padding: 0 5px 2px;
-    text-decoration: none;
-}
-#dirtree {
-    width: 100%;
-}
-#filelist {
-    background-color: white;
-    height: 270px;
-    overflow: scroll;
-    width: 100%;
-}
-.filepicker_element_selected {
-    background-color: lightblue;
-}
-.filepicker_loader {
-    background-color: #333333;
-    height: 120px;
-    left: 0;
-    opacity: 0.3;
-    padding-top: 150px;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    visibility: visible;
-    width: 100%;
-}
-#categoryform .scrollarea {
-    background: none repeat scroll 0 0 #F8F8F8;
-    border: 1px solid #DDDDDD;
-    bottom: 50px;
-    left: 10px;
-    overflow: auto;
-    position: absolute;
-    right: 10px;
-    top: 10px;
-}
-#categoryform .bottombuttons {
-    bottom: 10px;
-    position: absolute;
-}
-#categoryform .bottombuttons * {
-    float: left;
-}
-#categorylist li {
-    -moz-transition: background-color 500ms ease 0s;
-    background: none repeat scroll 0 0 #F8F8F8;
-    overflow: hidden;
-    padding: 0.3em 0.8em;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-#categorylist li:hover, li:active {
-    background: none repeat scroll 0 0 #EEEEEE;
-}
-#category_addinput {
-    width: 10em;
-}
-
-</style>
-<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
-<script>
-$(document).ready(function(){
-	$("label").inFieldLabels();
-});
-</script>
+	<?php echo $this->headMeta(); ?>
+	<?php echo $this->headTitle(); ?>
+	<?php echo $this->headStyle(); ?>
+	<?php echo $this->headLink(); ?>
+	<?php echo $this->headScript(); ?>
 </head>

-<body id="body-login">
-<div id="login">
-<header>
-	<div id="header">
-	<span>EXTRANET SCORES & DECISIONS</span>
-	</div>
-</header>
+<body>

-<form method="post" action="<?=$this->url(array('controller'=>'user', 'action'=>'login'),null, true)?>">
-<p style="text-align:center; color:red;"><span><?=$this->message?></span></p>
-<fieldset>
-	<p class="infield">
-		<label for="user" class="infield">Identifiant</label>
-		<input type="text" name="login" id="user" value="" autofocus autocomplete="off" required />
-	</p>
-	<p class="infield">
-		<label for="password" class="infield">Mot de passe</label>
-		<input type="password" name="pass" id="password" value="" required />
-	</p>
-	<!-- <input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login">Remember</label> -->
-	<script>document.write('<input name="screenSize" type="hidden" value="'+ screen.width +'x'+screen.height + '">');</script>
-	<input type="submit" id="submit" class="login" value="Connexion" />
-</fieldset>
-</form>
+    <div id="wrap">

-<div>
-<a class="dlg" title="<?=$this->translate("Identifiants oubliés ?")?>" href="<?=$this->url(array('controller'=>'user', 'action'=>'motpasse'))?>">
-<?=$this->translate("Identifiants oubliés ?")?></a>
-<script>
-$('a.dlg').on('click', function(e){
-   	e.preventDefault();
-   	var title = $(this).attr('title');
-   	var href = $(this).attr('href');
-   	var dlgOpts = {
-   		bgiframe: true,
-   		title: title,
-   		width: 710,
-   		height: 530,
-   		modal: true,
-   		resizable: false,
-   		open: function(event, ui) {
-   			$(this).html('Chargement...');
-   			$(this).load(href);
-   		},
-   		buttons: {'Fermer': function() { $(this).dialog('close'); }},
-   		close: function() { $('#dlg').remove(); }};
-   	$('<div id="dlg"></div>').dialog(dlgOpts);
-   	return false;
-   });
-</script>
-</div>
+	<div class="container">

-</div>
+    <form class="form-signin" method="post" action="<?=$this->url(array('controller'=>'user', 'action'=>'login'),null, true)?>">

-<footer>
-<p class="info">
-<a href="http://www.scores-decisions.com/">Scores & Décisions SAS</a>
-</p>
-</footer>
+    <h2 class="form-signin-heading">Extranet <small>Scores & Décisions</small></h2>
+    <div style="text-align:center;"><p class="text-danger"><span><?=$this->message?></span></p></div>
+    <input name="login" value="" type="text" class="form-control" placeholder="Identifiant" autofocus autocomplete="off" required />
+    <input name="pass" value="" type="password" class="form-control" placeholder="Mot de passe" required/>
+    <script>document.write('<input name="screenSize" type="hidden" value="'+ screen.width +'x'+screen.height + '">');</script>
+
+    <button class="btn btn-lg btn-primary btn-block clearfix"" type="submit">Connexion</button>
+
+    </form>
+
+    <div class="form-signin">
+    <a class="dlg pull-right" title="<?=$this->translate("Identifiants oubliés ?")?>" href="<?=$this->url(array('controller'=>'user', 'action'=>'motpasse'))?>">
+    <?=$this->translate("Identifiants oubliés ?")?></a>
+    <script>
+    $('a.dlg').on('click', function(e){
+       	e.preventDefault();
+       	var title = $(this).attr('title');
+       	var href = $(this).attr('href');
+       	var dlgOpts = {
+       		bgiframe: true,
+       		title: title,
+       		width: 710,
+       		height: 530,
+       		modal: true,
+       		resizable: false,
+       		open: function(event, ui) {
+       			$(this).html('Chargement...');
+       			$(this).load(href);
+       		},
+       		buttons: {'Fermer': function() { $(this).dialog('close'); }},
+       		close: function() { $('#dlg').remove(); }};
+       	$('<div id="dlg"></div>').dialog(dlgOpts);
+       	return false;
+       });
+    </script>
+    </div>
+
+    </div>
+
+    </div>
+
+    <div id="footer">
+ 	<div class="container">
+        <p class="text-muted credit"> &copy; <?=date('Y')?> <a href="http://www.scores-decisions.com">Scores & Décisions SAS</a>.</p>
+    </div>
+ 	</div>
+
+	<?php echo $this->inlineScript(); ?>
 </body>
 </html>
--- a/application/views/default/scripts/user/logout.phtml
+++ b/application/views/default/scripts/user/logout.phtml
@ -6,19 +6,34 @@

 <?php } else {?>

-<?php echo $this->doctype()?>
+<?php echo $this->doctype(); ?>
 <html>
 <head>
-  <?=$this->headMeta();?>
-  <?=$this->headTitle();?>
+	<?php echo $this->headMeta(); ?>
+	<?php echo $this->headTitle(); ?>
+	<?php echo $this->headStyle(); ?>
+	<?php echo $this->headLink(); ?>
 </head>
 <body>
-<h4 class="logout"><?=$this->translate("Vous avez été déconnecté.")?></h4>
-<p><?=$this->message?></p>
-<h5 class="logout">
-<?=$this->translate("Si cette page ne disparait pas au bout de %1$s seconde(s)", $this->refresh)?>,
-<?=$this->translate("veuillez cliquer ")?><a href="<?=$this->url?>"><?=$this->translate("ici")?></a>
-</h5>
+	<div id="wrap">
+
+	<div class="container">
+        <h4><?=$this->translate("Vous avez été déconnecté.")?></h4>
+        <p><?=$this->message?></p>
+        <h5 class="logout">
+        <?=$this->translate("Si cette page ne disparait pas au bout de %1\$s seconde(s)", $this->refresh)?>,
+        <?=$this->translate("veuillez cliquer ")?><a href="<?=$this->url?>"><?=$this->translate("ici")?></a>
+        </h5>
+    </div>
+
+    </div>
+
+   <div id="footer">
+ 	<div class="container">
+        <p class="text-muted credit"> &copy; <?=date('Y')?> <a href="http://www.scores-decisions.com">Scores & Décisions SAS</a>.</p>
+    </div>
+ 	</div>
+
 </body>
 </html>

--- a/application/views/mobile/scripts/layout.phtml
+++ b/application/views/mobile/scripts/layout.phtml
@ -8,20 +8,21 @@
  <?=$this->headScript()?>
 </head>
 <body>
-<div data-role="page" data-theme="b">
-	<div data-role="header">
-		<a href="<?=$this->url(array('controller'=>'index'), null, true)?>" data-role="button" 
-			data-icon="home" data-iconpos="notext">Menu</a>
-		<h1><?=$this->headTitle()?></h1>
-		<a href="<?=$this->url(array('controller'=>'index'), null, true)?>" data-role="button" 
-			data-icon="search" data-iconpos="notext">Recherche</a>		
-	</div>
-	<div data-role="content">
+<div data-role="page">
+	<div data-role="header" role="banner">
+		<h2 class="ui-title" role="heading" aria-level="1">Extranet</h2>
+		<a href="#" data-role="button" role="button">Menu</a>
+		<a href="#" data-role="button" role="button">Search</a>
+	</div><!-- /header -->
+
+	<div role="main" class="ui-content">
 		<?=$this->layout()->content?>
-	</div>
+	</div><!-- /content -->
+
 	<div data-role="footer" data-position="fixed">
-		<h4>Menu</h4>
-	</div>
-</div>
+		<h4>Scores & Decisions</h4>
+	</div><!-- /footer -->
+
+</div><!-- /page -->
 </body>
 </html>
--- a/application/views/mobile/scripts/main.phtml
+++ b/application/views/mobile/scripts/main.phtml
@ -1,27 +0,0 @@
-<?=$this->doctype()?>
-<html>
-<head>
-  <?=$this->headMeta()?>
-  <?=$this->headTitle()?>
-  <?=$this->headStyle()?>
-  <?=$this->headLink()?>
-  <?=$this->headScript()?>
-</head>
-<body>
-<div data-role="page" data-theme="b">
-	<div data-role="header">
-		<a href="<?=$this->url(array('controller'=>'index'), null, true)?>" data-role="button" 
-			data-icon="home" data-iconpos="notext">Menu</a>
-		<h1><?=$this->headTitle()?></h1>
-		<a href="<?=$this->url(array('controller'=>'index'), null, true)?>" data-role="button" 
-			data-icon="search" data-iconpos="notext">Recherche</a>		
-	</div>
-	<div data-role="content">
-		<?=$this->layout()->content?>
-	</div>
-	<div data-role="footer" data-position="fixed">
-		<h4>Menu</h4>
-	</div>
-</div>
-</body>
-</html>
--- a/application/views/mobile/scripts/user/login.phtml
+++ b/application/views/mobile/scripts/user/login.phtml
@ -0,0 +1,36 @@
+<?=$this->doctype()?>
+<html>
+<head>
+  <?=$this->headMeta()?>
+  <?=$this->headTitle()?>
+  <?=$this->headStyle()?>
+  <?=$this->headLink()?>
+  <?=$this->headScript()?>
+</head>
+<body>
+<div data-role="page">
+	<div data-role="header" role="banner">
+		<h2 class="ui-title" role="heading" aria-level="1">Extranet</h2>
+	</div><!-- /header -->
+
+	<div role="main" class="ui-content">
+        <form method="post" action="<?=$this->url(array('controller'=>'user', 'action'=>'login'),null, true)?>">
+
+            <label for="user" class="ui-hidden-accessible">Identifiant</label>
+            <input name="login" id="user" placeholder="Identifiant" value="" type="text" required>
+
+            <label for="password" class="ui-hidden-accessible">Mot de passe</label>
+            <input name="pass" id="password" placeholder="Mot de passe" value="" type="password" required>
+
+            <input value="Connexion" data-icon="user" type="button">
+
+        </form>
+	</div><!-- /content -->
+
+	<div data-role="footer" data-position="fixed">
+		<h4>Scores & Décisions SAS</h4>
+	</div><!-- /footer -->
+
+</div><!-- /page -->
+</body>
+</html>
--- a/bin/classmap_generator.php
+++ b/bin/classmap_generator.php
@ -15,7 +15,7 @@
 * @category   Zend
 * @package    Zend_Loader
 * @subpackage Exception
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */

@ -28,8 +28,10 @@
 *                              current directory
 * --output|-o [ <string> ]     Where to write autoload file; if not provided,
 *                              assumes "autoload_classmap.php" in library directory
+ * --append|-a                  Append to autoload file if it exists
 * --overwrite|-w               Whether or not to overwrite existing autoload
 *                              file
+ * --ignore|-i [ <string> ]     Comma-separated namespaces to ignore
 */

 $libPath = dirname(__FILE__) . '/../library';
@ -49,12 +51,14 @@ if (!is_dir($libPath)) {

 // Ensure library/ is on include_path
 set_include_path(implode(PATH_SEPARATOR, array(
-    realpath($libPath),
-    get_include_path(),
+	realpath($libPath),
+	get_include_path(),
 )));

+$libraryPath = getcwd();
+
 // Setup autoloading
-$loader = new Zend_Loader_StandardAutoloader();
+$loader = new Zend_Loader_StandardAutoloader(array('autoregister_zf' => true));
 $loader->setFallbackAutoloader(true);
 $loader->register();

@ -62,7 +66,9 @@ $rules = array(
    'help|h'        => 'Get usage message',
    'library|l-s'   => 'Library to parse; if none provided, assumes current directory',
    'output|o-s'    => 'Where to write autoload file; if not provided, assumes "autoload_classmap.php" in library directory',
+    'append|a'    => 'Append to autoload file if it exists',
    'overwrite|w'   => 'Whether or not to overwrite existing autoload file',
+    'ignore|i-s'  => 'Comma-separated namespaces to ignore',
 );

 try {
@ -75,83 +81,164 @@ try {

 if ($opts->getOption('h')) {
    echo $opts->getUsageMessage();
-    exit();
+    exit(0);
 }

-$path = $libPath;
-if (array_key_exists('PWD', $_SERVER)) {
-    $path = $_SERVER['PWD'];
+$ignoreNamespaces = array();
+if (isset($opts->i)) {
+    $ignoreNamespaces = explode(',', $opts->i);
 }
+
+$relativePathForClassmap = '';
 if (isset($opts->l)) {
-    $path = $opts->l;
-    if (!is_dir($path)) {
-        echo "Invalid library directory provided" . PHP_EOL . PHP_EOL;
+    if (!is_dir($opts->l)) {
+        echo 'Invalid library directory provided' . PHP_EOL
+            . PHP_EOL;
        echo $opts->getUsageMessage();
        exit(2);
    }
-    $path = realpath($path);
+    $libraryPath = $opts->l;
 }
+$libraryPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath($libraryPath));

 $usingStdout = false;
-$output = $path . DIRECTORY_SEPARATOR . 'autoload_classmap.php';
+$appending = $opts->getOption('a');
+$output = $libraryPath . '/autoload_classmap.php';
 if (isset($opts->o)) {
    $output = $opts->o;
    if ('-' == $output) {
        $output = STDOUT;
        $usingStdout = true;
+    } elseif (is_dir($output)) {
+        echo 'Invalid output file provided' . PHP_EOL
+            . PHP_EOL;
+        echo $opts->getUsageMessage();
+        exit(2);
    } elseif (!is_writeable(dirname($output))) {
        echo "Cannot write to '$output'; aborting." . PHP_EOL
            . PHP_EOL
            . $opts->getUsageMessage();
        exit(2);
-    } elseif (file_exists($output)) {
-        if (!$opts->getOption('w')) {
-            echo "Autoload file already exists at '$output'," . PHP_EOL
-                . "but 'overwrite' flag was not specified; aborting." . PHP_EOL
-                . PHP_EOL
-                . $opts->getUsageMessage();
-            exit(2);
+    } elseif (file_exists($output) && !$opts->getOption('w') && !$appending) {
+        echo "Autoload file already exists at '$output'," . PHP_EOL
+            . "but 'overwrite' or 'appending' flag was not specified; aborting." . PHP_EOL
+            . PHP_EOL
+            . $opts->getUsageMessage();
+        exit(2);
+    } else {
+        // We need to add the $libraryPath into the relative path that is created in the classmap file.
+        $classmapPath = str_replace(DIRECTORY_SEPARATOR, '/', realpath(dirname($output)));
+
+        // Simple case: $libraryPathCompare is in $classmapPathCompare
+        if (strpos($libraryPath, $classmapPath) === 0) {
+            $relativePathForClassmap = substr($libraryPath, strlen($classmapPath) + 1) . '/';
+        } else {
+            $libraryPathParts  = explode('/', $libraryPath);
+            $classmapPathParts = explode('/', $classmapPath);
+
+            // Find the common part
+            $count = count($classmapPathParts);
+            for ($i = 0; $i < $count; $i++) {
+                if (!isset($libraryPathParts[$i]) || $libraryPathParts[$i] != $classmapPathParts[$i]) {
+                    // Common part end
+                    break;
+                }
+            }
+
+            // Add parent dirs for the subdirs of classmap
+            $relativePathForClassmap = str_repeat('../', $count - $i);
+
+            // Add library subdirs
+            $count = count($libraryPathParts);
+            for (; $i < $count; $i++) {
+                $relativePathForClassmap .= $libraryPathParts[$i] . '/';
+            }
        }
    }
 }

-$strip     = $path;
-
 if (!$usingStdout) {
-    echo "Creating class file map for library in '$path'..." . PHP_EOL;
+    if ($appending) {
+        echo "Appending to class file map '$output' for library in '$libraryPath'..." . PHP_EOL;
+    } else {
+        echo "Creating class file map for library in '$libraryPath'..." . PHP_EOL;
+    }
 }

 // Get the ClassFileLocator, and pass it the library path
-$l = new Zend_File_ClassFileLocator($path);
+$l = new Zend_File_ClassFileLocator($libraryPath);

 // Iterate over each element in the path, and create a map of
 // classname => filename, where the filename is relative to the library path
-$map    = new stdClass;
-$strip .= DIRECTORY_SEPARATOR;
-function createMap(Iterator $i, $map, $strip) {
-    $file      = $i->current();
-    $namespace = empty($file->namespace) ? '' : $file->namespace . '\\';
-    $filename  = str_replace($strip, '', $file->getRealpath());
+$map = new stdClass;
+foreach ($l as $file) {
+    $filename  = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $file->getFilename());

-    // Windows portability
-    $filename  = str_replace(array('/', '\\'), "' . DIRECTORY_SEPARATOR . '", $filename);
+    // Add in relative path to library
+    $filename  = $relativePathForClassmap . $filename;

-    $map->{$namespace . $file->classname} = $filename;
+    foreach ($file->getClasses() as $class) {
+        foreach ($ignoreNamespaces as $ignoreNs) {
+            if ($ignoreNs == substr($class, 0, strlen($ignoreNs))) {
+                continue 2;
+            }
+        }

-    return true;
+        $map->{$class} = $filename;
+    }
 }
-iterator_apply($l, 'createMap', array($l, $map, $strip));

-// Create a file with the class/file map.
-// Stupid syntax highlighters make separating < from PHP declaration necessary
-$dirStore = 'dirname_' . uniqid();
-$content = '<' . "?php\n"
-         . '$' . $dirStore . " = dirname(__FILE__);\n"
-         . 'return ' . var_export((array) $map, true) . ';';
+if ($appending) {
+    $content = var_export((array) $map, true) . ';';

-// Prefix with dirname(__FILE__); modify the generated content
-$content = preg_replace('#(=> )#', '$1$' . $dirStore . ' . DIRECTORY_SEPARATOR . ', $content);
-$content = str_replace("\\'", "'", $content);
+    // Prefix with dirname(__FILE__); modify the generated content
+    $content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
+
+    // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
+    $content = str_replace("\\'", "'", $content);
+
+    // Convert to an array and remove the first "array("
+    $content = explode("\n", $content);
+    array_shift($content);
+
+    // Load existing class map file and remove the closing "bracket ");" from it
+    $existing = file($output, FILE_IGNORE_NEW_LINES);
+    array_pop($existing);
+
+    // Merge
+    $content = implode("\n", array_merge($existing, $content));
+} else {
+    // Create a file with the class/file map.
+    // Stupid syntax highlighters make separating < from PHP declaration necessary
+    $content = '<' . "?php\n"
+        . "// Generated by ZF's ./bin/classmap_generator.php\n"
+        . 'return ' . var_export((array) $map, true) . ';';
+
+    // Prefix with dirname(__FILE__); modify the generated content
+    $content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
+
+    // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
+    $content = str_replace("\\'", "'", $content);
+}
+
+// Remove unnecessary double-backslashes
+$content = str_replace('\\\\', '\\', $content);
+
+// Exchange "array (" width "array("
+$content = str_replace('array (', 'array(', $content);
+
+// Align "=>" operators to match coding standard
+preg_match_all('(\n\s+([^=]+)=>)', $content, $matches, PREG_SET_ORDER);
+$maxWidth = 0;
+
+foreach ($matches as $match) {
+    $maxWidth = max($maxWidth, strlen($match[1]));
+}
+
+$content = preg_replace('(\n\s+([^=]+)=>)e', "'\n    \\1' . str_repeat(' ', " . $maxWidth . " - strlen('\\1')) . '=>'", $content);
+
+// Make the file end by EOL
+$content = rtrim($content, "\n") . "\n";

 // Write the contents to disk
 file_put_contents($output, $content);
--- a/bin/zf.bat
+++ b/bin/zf.bat
@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
 REM to license@zend.com so we can send you a copy immediately.
 REM
 REM Zend
-REM Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+REM Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 REM http://framework.zend.com/license/new-bsd     New BSD License


--- a/bin/zf.php
+++ b/bin/zf.php
@ -15,7 +15,7 @@
 * @category   Zend
 * @package    Zend_Tool
 * @subpackage Framework
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 * @version    $Id$
 */
@ -26,7 +26,7 @@
 * @category   Zend
 * @package    Zend_Tool
 * @subpackage Framework
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class ZF
--- a/bin/zf.sh
+++ b/bin/zf.sh
@ -14,7 +14,7 @@
 # to license@zend.com so we can send you a copy immediately.
 #
 # Zend
-# Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+# Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 # http://framework.zend.com/license/new-bsd     New BSD License
 #############################################################################

--- a/data/pages/themes/default/styles/main.css
+++ b/data/pages/themes/default/styles/main.css
@ -453,6 +453,37 @@ div.ui-state-highlight p {margin: 10px;}
 div.ui-state-highlight a {text-decoration: underline;}
 .noborder {border:0;}
 img {vertical-align:middle;}
+.pagination {border:1px solid #CDCDCD;border-radius:3px;width:224px;margin:0 auto;}
+.pagination span {
+    border: medium none;
+    float: left;
+    height: 26px;
+    font-size: 14px;
+	line-height: 24px;
+    outline: medium none;
+    padding: 0;
+    text-align: center;
+    vertical-align: middle;
+    width: 120px;
+}
+.pagination a:first-child {border: medium none;border-radius: 2px 0 0 2px;}
+.pagination a:last-child {border:medium none;border-radius:0 2px 2px 0;}
+.pagination a {border-left: 1px solid #CDCDCD; border-right: 1px solid #CDCDCD;}
+.pagination a {
+    background: -moz-linear-gradient(center top , #F3F3F3 0%, #D3D3D3 100%) repeat scroll 0 0 rgba(0, 0, 0, 0);
+    color: #555555;
+    display: block;
+    float: left;
+    font-family: Times,'Times New Roman',Georgia,Palatino;
+    font-size: 18px;
+    font-weight: bold;
+    height: 26px;
+    outline: medium none;
+    text-align: center;
+    text-decoration: none;
+    vertical-align: middle;
+    width: 25px;
+}

 /* Menu
 ----------------------------------*/
@ -544,10 +575,10 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF
 #liasseForm th {color:#606060;font-weight:bold;}
 #liasseForm {margin-left:30px;}
 #liasseForm td {color:#606060;}
+#synthese {border-collapse: collapse;clear: both;font-size: 12px;padding: 2px;text-align: left;width: 100%;font-family: arial,sans-serif;font-size: 11px;}
 #synthese .head  {font-weight: bold;}
 #synthese th  {background: none repeat scroll 0 0 #B9C9FE;border: 1px solid #FFFFFF;color: #003399;font-size: 13px;font-weight: normal;padding: 4px;}
 #synthese td.right {text-align: right;}
-#synthese {border-collapse: collapse;clear: both;font-size: 12px;margin: 10px 0px 0;padding: 2px;text-align: left;width: 100%;font-family: arial,sans-serif;font-size: 11px;}
 #synthese td  {background: none repeat scroll 0 0 #E8EDFF;border: 1px solid #FFFFFF;color: #666699;padding: 4px;}
 #synthese tr:hover td {background: none repeat scroll 0 0 #D0DAFD;}
 #tabbed_box {margin: 0px auto 0px auto;width:300px;}
@ -601,13 +632,6 @@ div.blocdegrade .echelleleft{float:left;}
 div.blocdegrade .echelleright{float:right;}
 .textdegrademin { position:absolute;overflow:hidden; margin-left:10px;line-height: 20px;color: #000;font-size:11px;font-weight: bold;font-family: monospace;}
 .regle {clear:both; }
-.clearfix:after {clear: both;content: ".";display: block;height: 0;visibility: hidden;}
-#synthese .head {font-weight: bold;}
-#synthese th {background: none repeat scroll 0 0 #B9C9FE;border: 1px solid #FFFFFF;color: #003399;font-size: 13px;font-weight: normal;padding: 4px;}
-#synthese td.right {text-align: right;}
-#synthese{border-collapse: collapse;clear: both;font-size: 12px;margin: 10px 0px 0;padding: 2px;text-align: left;width: 100%;font-family: arial,sans-serif;font-size: 11px;}
-#synthese td {background: none repeat scroll 0 0 #E8EDFF;border: 1px solid #FFFFFF;color: #666699;padding: 4px;}
-#synthese tr:hover td {background: none repeat scroll 0 0 #D0DAFD;}

 /* Comment
 ----------------------------------*/
@ -659,8 +683,6 @@ div.blocdegrade .echelleright{float:right;}
 #formSurveillance input.search {border:1px solid; padding:3px 5px;width:200px;}
 #formSurveillance input.search:focus {border:1px solid #4D90FE;}
 #formSurveillance input.submit {font-weight:bold;padding:2px 5px; background-color:#4D90FE; border:1px solid #3079ED;color:#ffffff; }
-.pagination {background: none repeat scroll 0 0 transparent; border: 0 none; font-weight: bold; margin: 0; min-width: 1.5em; padding: 0.3em 0.5em;}
-.pagination:hover {background: black repeat scroll 0 0;color:white;}

 /* Pieces
 ----------------------------------*/
--- a/library/Application/Controller/Plugin/Auth.php
+++ b/library/Application/Controller/Plugin/Auth.php
@ -1,12 +1,6 @@
 <?php
 class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 {
-    /**
-     * Vérifie les autorisations
-     * Utilise _request et _response hérités et injectés par le FC
-     *
-     * @param Zend_Controller_Request_Abstract $request : non utilisé, mais demandé par l'héritage
-     */
 	public function preDispatch(Zend_Controller_Request_Abstract $request)
 	{
 		$checkAuth = true;
@ -125,17 +119,22 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 		    	//Pas Authentifié
 				} else {

-					if ($request->isXmlHttpRequest()) {
+					if ( $request->isXmlHttpRequest() ) {
+
 					    $request->setModuleName('default')
    					    ->setControllerName('user')
    					    ->setActionName('logout')
    					    ->setParam('ajax', 1);
+
 					} else {
+
 					    $session = new Zend_Session_Namespace('login');
 					    $session->url = $_SERVER['REQUEST_URI'];
+
 					    $request->setModuleName('default')
-    					    ->setControllerName('user')
+                            ->setControllerName('user')
    					    ->setActionName('login');
+
 					}

 				}
--- a/library/Application/Controller/Plugin/Theme.php
+++ b/library/Application/Controller/Plugin/Theme.php
@ -1,10 +1,10 @@
 <?php
 class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstract
 {
-	public function routeShutdown(Zend_Controller_Request_Abstract $request)
+	public function preDispatch(Zend_Controller_Request_Abstract $request)
 	{
 		$auth = Zend_Auth::getInstance();
-		$theme = 'default';
+		$theme = 'default'; //$theme = 'mobile';
 		if ( $auth->hasIdentity() ) {
 			$theme = !empty($auth->getIdentity()->theme) ? $auth->getIdentity()->theme : 'default';
 		}
@ -67,6 +67,11 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				    'href' => '/favicon.ico')
 				);

+                $UserLogin = false;
+                if ( $controller == 'user' && ( $action == 'login' || $action == 'logout' ) ) {
+                    $UserLogin = true;
+                }
+
 				/**
 				 * Detect IE
 				 */
@ -79,24 +84,41 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				/**
 				 * ===> Standard Styles
 				 */
-				$view->headLink()->appendStylesheet($paramsTheme->pathStyle.'/main.css', 'all');
-				if ($isIE6) {
-				    //Old CSS for IE6
+				if ( $UserLogin ) {
 				    $view->headLink()
-				        ->appendStylesheet($paramsTheme->pathStyle.'/ie6.css', 'all')
-				        ->appendStylesheet('/libs/ui-1.9.2/themes/smoothness/jquery-ui.css', 'all');
+				        ->appendStylesheet('/libs/bootstrap-3.1.1/css/bootstrap.min.css', 'all')
+				        ->appendStylesheet('/themes/default/styles/user-login.css', 'all');
 				} else {
-				   $view->headLink()
-				       ->appendStylesheet('/libs/ui-1.10.4/themes/smoothness/jquery-ui.min.css', 'all');
+				    $view->headLink()
+				        ->appendStylesheet('/libs/pace/themes/pace-theme-flash.css', 'all')
+				        ->appendStylesheet($paramsTheme->pathStyle.'/main.css', 'all');
 				}
-				$view->headLink()->appendStylesheet('/libs/qtip/jquery.qtip.css', 'all');

+			    if ($isIE6) {
+			        //Old CSS for IE6
+			        $view->headLink()
+			        ->appendStylesheet($paramsTheme->pathStyle.'/ie6.css', 'all')
+			        ->appendStylesheet('/libs/ui-1.9.2/themes/smoothness/jquery-ui.css', 'all');
+			    } else {
+			        $view->headLink()
+			        ->appendStylesheet('/libs/ui-1.10.4/themes/smoothness/jquery-ui.min.css', 'all');
+			    }
+			    $view->headLink()->appendStylesheet('/libs/qtip/jquery.qtip.css', 'all');

 				/**
 				 * ===> Standard Javascript
 				 */
-				$view->headScript()
-				    ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript');
+				if ( $UserLogin ) {
+				    $view->headScript()
+				        ->appendFile('/libs/html5shiv.js', 'text/javascript', array('conditional' => 'lt IE 9'))
+				        ->appendFile('/libs/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
+				        ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript')
+				        ->appendFile('/libs/bootstrap-3.1.1/js/bootstrap.min.js', 'text/javascript');
+				} else {
+				    $view->headScript()
+				        ->appendFile('/libs/pace/pace.min.js', 'text/javascript')
+				        ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript');
+				}

 				if ($isIE6) {
 				    //Old JQuery version for IE6
@ -109,9 +131,12 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				        ->appendFile('/libs/ui-1.10.4/jquery-ui.min.js', 'text/javascript')
 				        ->appendFile('/libs/ui-1.10.4/jquery-ui-i18n.min.js', 'text/javascript');
 				}
-				$view->headScript()
-					->appendFile('/libs/qtip/jquery.qtip.js', 'text/javascript')
-					->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');
+
+				if ( ! $UserLogin ) {
+				    $view->headScript()
+                        ->appendFile('/libs/qtip/jquery.qtip.js', 'text/javascript')
+				        ->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');
+				}

 				/**
 				 * ===> Specific Style and Script by Controller/Action
@ -187,20 +212,38 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac

 			case 'mobile': //@todo

-				$view->doctype('HTML5');
+			    $view->doctype('HTML5');

-				$view->headMeta()
-					->appendName('charset', 'utf-8')
-					->appendName('viewport', 'width=device-width, initial-scale=1');
+			    $view->headMeta()
+                    ->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8')
+                    ->appendHttpEquiv('Content-Language', 'fr-FR')
+                    ->appendName('viewport', 'width=device-width, initial-scale=1');
+
+			    //Favicon - Touch icon for iOS 2.0+ and Android 2.1+
+			    $view->headLink()->headLink(array(
+			        'rel' => 'apple-touch-icon-precomposed',
+			        'href' => '/favicon-152.png'
+			    ));
+			    //Favicon - targeted to any additional png size
+			    $view->headLink()->headLink(array(
+			        'rel' => 'icon',
+			        'type' => 'image/png',
+			        'href' => '/favicon-32.png'
+			    ));
+			    $view->headLink()->headLink(array(
+			        'rel' => 'shortcut icon',
+			        'type' => 'image/x-icon',
+			        'href' => '/favicon.ico')
+			    );

 				//Style
 				$view->headLink()
-					->appendStylesheet('/libs/mobile/1.4.0/jquery.mobile-1.4.0.min.css', 'all');
+					->appendStylesheet('/libs/mobile/1.4.2/jquery.mobile-1.4.2.min.css', 'all');

 				//JavaScript
 				$view->headScript()
-				    ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript')
-				    ->appendFile('/libs/mobile/1.4.0/jquery.mobile-1.4.0.min.js', 'text/javascript')
+				    ->appendFile('/libs/jquery/jquery-2.1.0.min.js', 'text/javascript')
+				    ->appendFile('/libs/mobile/1.4.2/jquery.mobile-1.4.2.min.js', 'text/javascript')
 					->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');

 				break;
--- a/library/Application/autoload_classmap.php
+++ b/library/Application/autoload_classmap.php
@ -1,38 +1,38 @@
 <?php
-$dirname_531986e1115c5 = dirname(__FILE__);
-return array (
-  'Application_Controller_Plugin_Auth' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Auth.php',
-  'Application_Controller_Plugin_Cgu' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Cgu.php',
-  'Application_Controller_Plugin_Lang' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Lang.php',
-  'Application_Controller_Plugin_Menu' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Menu.php',
-  'Application_Controller_Plugin_Pdf' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Pdf.php',
-  'Application_Controller_Plugin_Theme' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Theme.php',
-  'Application_Controller_Plugin_Xml' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . 'Plugin' . DIRECTORY_SEPARATOR . 'Xml.php',
-  'Application_Form_Login' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'Login.php',
-  'Application_Form_RechercheActionnaire' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'RechercheActionnaire.php',
-  'Application_Form_RechercheDirigeant' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'RechercheDirigeant.php',
-  'Application_Form_RechercheEnquete' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'RechercheEnquete.php',
-  'Application_Form_RechercheEntreprise' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'RechercheEntreprise.php',
-  'Application_Form_RechercheWorldcheck' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Form' . DIRECTORY_SEPARATOR . 'RechercheWorldcheck.php',
-  'Application_Model_ActesFiles' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'ActesFiles.php',
-  'Application_Model_Aide' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'Aide.php',
-  'Application_Model_BilanSaisie' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'BilanSaisie.php',
-  'Application_Model_City' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'City.php',
-  'Application_Model_ClientStat' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'ClientStat.php',
-  'Application_Model_Commandes' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'Commandes.php',
-  'Application_Model_CommandesErreur' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesErreur.php',
-  'Application_Model_CommandesGiants' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesGiants.php',
-  'Application_Model_CommandesKbis' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesKbis.php',
-  'Application_Model_CommandesPieces' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesPieces.php',
-  'Application_Model_CommandesStatut' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesStatut.php',
-  'Application_Model_CommandesTarifs' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'CommandesTarifs.php',
-  'Application_Model_FctDir' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'FctDir.php',
-  'Application_Model_MonitoringGiants' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'MonitoringGiants.php',
-  'Application_Model_Naf5' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'Naf5.php',
-  'Application_Model_Nouveautes' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'Nouveautes.php',
-  'Application_Model_RapportsGiants' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'RapportsGiants.php',
-  'Application_Model_RetriveGiants' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'RetriveGiants.php',
-  'Application_Model_TabEvenements' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'TabEvenements.php',
-  'Application_Model_TabFJur' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'TabFJur.php',
-  'Application_Model_Worldcheck' => $dirname_531986e1115c5 . DIRECTORY_SEPARATOR . 'Model' . DIRECTORY_SEPARATOR . 'Worldcheck.php',
-);
+// Generated by ZF's ./bin/classmap_generator.php
+return array(
+    'Application_Controller_Plugin_Auth'    => dirname(__FILE__) . '/Controller/Plugin/Auth.php',
+    'Application_Controller_Plugin_Cgu'     => dirname(__FILE__) . '/Controller/Plugin/Cgu.php',
+    'Application_Controller_Plugin_Lang'    => dirname(__FILE__) . '/Controller/Plugin/Lang.php',
+    'Application_Controller_Plugin_Menu'    => dirname(__FILE__) . '/Controller/Plugin/Menu.php',
+    'Application_Controller_Plugin_Pdf'     => dirname(__FILE__) . '/Controller/Plugin/Pdf.php',
+    'Application_Controller_Plugin_Theme'   => dirname(__FILE__) . '/Controller/Plugin/Theme.php',
+    'Application_Controller_Plugin_Xml'     => dirname(__FILE__) . '/Controller/Plugin/Xml.php',
+    'Application_Form_Login'                => dirname(__FILE__) . '/Form/Login.php',
+    'Application_Form_RechercheActionnaire' => dirname(__FILE__) . '/Form/RechercheActionnaire.php',
+    'Application_Form_RechercheDirigeant'   => dirname(__FILE__) . '/Form/RechercheDirigeant.php',
+    'Application_Form_RechercheEnquete'     => dirname(__FILE__) . '/Form/RechercheEnquete.php',
+    'Application_Form_RechercheEntreprise'  => dirname(__FILE__) . '/Form/RechercheEntreprise.php',
+    'Application_Form_RechercheWorldcheck'  => dirname(__FILE__) . '/Form/RechercheWorldcheck.php',
+    'Application_Model_ActesFiles'          => dirname(__FILE__) . '/Model/ActesFiles.php',
+    'Application_Model_Aide'                => dirname(__FILE__) . '/Model/Aide.php',
+    'Application_Model_BilanSaisie'         => dirname(__FILE__) . '/Model/BilanSaisie.php',
+    'Application_Model_City'                => dirname(__FILE__) . '/Model/City.php',
+    'Application_Model_ClientStat'          => dirname(__FILE__) . '/Model/ClientStat.php',
+    'Application_Model_Commandes'           => dirname(__FILE__) . '/Model/Commandes.php',
+    'Application_Model_CommandesErreur'     => dirname(__FILE__) . '/Model/CommandesErreur.php',
+    'Application_Model_CommandesGiants'     => dirname(__FILE__) . '/Model/CommandesGiants.php',
+    'Application_Model_CommandesKbis'       => dirname(__FILE__) . '/Model/CommandesKbis.php',
+    'Application_Model_CommandesPieces'     => dirname(__FILE__) . '/Model/CommandesPieces.php',
+    'Application_Model_CommandesStatut'     => dirname(__FILE__) . '/Model/CommandesStatut.php',
+    'Application_Model_CommandesTarifs'     => dirname(__FILE__) . '/Model/CommandesTarifs.php',
+    'Application_Model_FctDir'              => dirname(__FILE__) . '/Model/FctDir.php',
+    'Application_Model_MonitoringGiants'    => dirname(__FILE__) . '/Model/MonitoringGiants.php',
+    'Application_Model_Naf5'                => dirname(__FILE__) . '/Model/Naf5.php',
+    'Application_Model_Nouveautes'          => dirname(__FILE__) . '/Model/Nouveautes.php',
+    'Application_Model_RapportsGiants'      => dirname(__FILE__) . '/Model/RapportsGiants.php',
+    'Application_Model_RetriveGiants'       => dirname(__FILE__) . '/Model/RetriveGiants.php',
+    'Application_Model_TabEvenements'       => dirname(__FILE__) . '/Model/TabEvenements.php',
+    'Application_Model_TabFJur'             => dirname(__FILE__) . '/Model/TabFJur.php',
+    'Application_Model_Worldcheck'          => dirname(__FILE__) . '/Model/Worldcheck.php',
+);
--- a/library/Scores/Export/Print.php
+++ b/library/Scores/Export/Print.php
@ -25,6 +25,7 @@ class Scores_Export_Print
 		'juridique-competences' => 'siret,id,type',
 		'juridique-marques' => 'siret,id,idObject',
 		'evaluation-indiscore' => 'siret,id',
+		'evaluation-indiscorehisto' => 'siret,id',
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-scoring' => 'siret,id',
@ -59,6 +60,7 @@ class Scores_Export_Print
 		'juridique-competences' => 'siret,id,type',
 		'juridique-marques' => 'siret,id,idObject',
 		'evaluation-indiscore' => 'siret,id',
+		'evaluation-indiscorehisto' => 'siret,id',
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-scoring' => 'siret,id',
@ -91,6 +93,7 @@ class Scores_Export_Print
 		'juridique-competences' => 'siret,id,type',
 		'juridique-marques' => 'siret,id,idObject',
 		'evaluation-indiscore' => 'siret,id',
+		'evaluation-indiscorehisto' => 'siret,id',
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-valorisation' => 'siret,id',
--- a/library/Scores/Finance/Liasse.php
+++ b/library/Scores/Finance/Liasse.php
@ -157,52 +157,52 @@ class Scores_Finance_Liasse
    	    'DA1' => 'N16',

    		'DC'  => '124',
-    	    'DC1'  => 'N17',
+    	    'DC1' => 'N17',

    		'DD'  => '126',
-    	    'DD1'  => 'N18',
+    	    'DD1' => 'N18',

    		'DF'  => '130',
-    	    'DF1'  => 'N19',
+    	    'DF1' => 'N19',

    		'DG'  => '132',
-    	    'DG1'  => 'N20',
+    	    'DG1' => 'N20',

    	    'DH'  => '134',
-    	    'DH1'  => 'N21',
+    	    'DH1' => 'N21',

    	    'DI'  => '136',
-    	    'DI1'  => 'N22',
+    	    'DI1' => 'N22',

    	    'DK'  => '140',
-    	    'DK1'  => 'N23',
+    	    'DK1' => 'N23',

    	    'DL'  => '142',
-    	    'DL1'  => 'N24',
+    	    'DL1' => 'N24',

    	    'DR'  => '154',
-    	    'DR1'  => 'N25',
+    	    'DR1' => 'N25',

    	    'DU'  => '156',
-    	    'DU1'  => 'N26',
+    	    'DU1' => 'N26',

    	    'DW'  => '164',
-    	    'DW1'  => 'N27',
+    	    'DW1' => 'N27',

    	    'DX'  => '166',
-    	    'DX1'  => 'N28',
+    	    'DX1' => 'N28',

    	    'EA'  => '172',
-    	    'EA1'  => 'N29',
+    	    'EA1' => 'N29',

    	    'EB'  => '174',
-    	    'EB1'  => 'N30',
+    	    'EB1' => 'N30',

    	    'EC'  => '176',
-    	    'EC1'  => 'N31',
+    	    'EC1' => 'N31',

    	    'EE'  => '180',
-    	    'EE1'  => 'N32',
+    	    'EE1' => 'N32',

    	    'EH'  => '156-195',

@ -210,101 +210,106 @@ class Scores_Finance_Liasse
    		'FA'  => '210-209',
    		'FB'  => '209',
    		'FC'  => '210',
-    	    'FC1'  => 'N33',
+    	    'FC1' => 'N33',

    		'FD'  => '214-215',
    		'FE'  => '215',
    		'FF'  => '214',
-    	    'FF1'  => 'N34',
+    	    'FF1' => 'N34',

+            'FG'  => '218-217',
    		'FH'  => '217',
    		'FI'  => '218',
-    	    'FI1'  => 'N35',
+    	    'FI1' => 'N35',

+		    'FJ'  => '210+214+218-209-215-217',
    		'FK'  => '209+215+217',
    		'FL'  => '210+214+218',
    	    'FL1' => 'N33+N34+N35',

    		'FM'  => '222',
-    	    'FM1'  => 'N36',
+    	    'FM1' => 'N36',

    		'FN'  => '224',
-    	    'FN'  => 'N37',
+    	    'FN1'  => 'N37',

    		'FO'  => '226',
-    	    'FO'  => 'N38',
+    	    'FO1'  => 'N38',

    		'FQ'  => '230',
-    	    'FQ'  => 'N39',
+    	    'FQ1'  => 'N39',

    		'FR'  => '232',
-    	    'FR1'  => 'N40',
+    	    'FR1' => 'N40',

    		'FS'  => '234',
-    	    'FS1'  => 'N41',
+    	    'FS1' => 'N41',

    		'FT'  => '236',
-    	    'FT1'  => 'N42',
+    	    'FT1' => 'N42',

    		'FU'  => '238',
-    	    'FU1'  => 'N43',
+    	    'FU1' => 'N43',

    		'FV'  => '240',
-    	    'FV1'  => 'N44',
+    	    'FV1' => 'N44',

    		'FW'  => '242',
-    	    'FW1'  => 'N45',
+    	    'FW1' => 'N45',

    		'FX'  => '244',
-    	    'FX1'  => 'N46',
+    	    'FX1' => 'N46',

    		'FY'  => '250',
-    	    'FY1'  => 'N47',
+    	    'FY1' => 'N47',

    		'FZ'  => '252',
-    	    'FZ1'  => 'N48',
+    	    'FZ1' => 'N48',

    		'GA'  => '254',
-    	    'GA1'  => 'N49',
+    	    'GA1' => 'N49',

    	    'GE'  => '262',
-    	    'GE1'  => 'N50',
+    	    'GE1' => 'N51',

    	    'GF'  => '264',
-    	    'GF1'  => 'N52',
+    	    'GF1' => 'N52',

    	    'GG'  => '270',
-    	    'GG1'  => 'N53',
+    	    'GG1' => 'N53',

    	    'GP'  => '280',
-    	    'GP1'  => 'N54',
+    	    'GP1' => 'N54',

    	    'GU'  => '294',
-    	    'GU1'  => 'N56',
+    	    'GU1' => 'N56',

-    	    'GW' => '270+280+294',
+		    'GV'  => '280-294', //GP-GU
+		    'GV1' => 'N54-N56', //GP1-GU1
+
+    	    'GW'  => '270+280+294', //GG+GH-GI+GV ???
    	    'GW1' => 'N53+N54+N56',

    		'HD'  => '290',
-    	    'HD1'  => 'N55',
+    	    'HD1' => 'N55',

    		'HH'  => '300',
-    	    'HH1'  => 'N57',
+    	    'HH1' => 'N57',

    	    'HI'  => '290-300',
-    	    'HI1'  => 'N55-N57',
+    	    'HI1' => 'N55-N57',

    	    'HK'  => '306',
-    	    'HK1'  => 'N58',
+    	    'HK1' => 'N58',

    	    'HL'  => '232+280+290',
-    	    'HL1'  => 'N40+N54+N55',
+    	    'HL1' => 'N40+N54+N55',

    	    'HM'  => '264+294+300+306',
-    	    'HM1'  => 'N52+N56+N57+N58',
+    	    'HM1' => 'N52+N56+N57+N58',

    	    'HN'  => '310',
-    	    'HN1'  => 'N59',
+    	    'HN1' => 'N59',

    	    'YY'  => '374',

@ -350,6 +355,12 @@ class Scores_Finance_Liasse
            $bilanRN['GD']=$bilanRS['256'];
 		}

+		if ( $bilanRS['071']<>0 || $bilanRS['075']<>0 || $bilanRS['053']<>0 || $bilanRS['063']<>0 ) {
+		    $bilanRN['GC1']=$bilanRS['N50'];
+		} elseif ($bilanRS['071']==0 || $bilanRS['075']==0 || $bilanRS['053']==0 || $bilanRS['063']==0 && $bilanRS['N49']<>0 ) {
+		    $bilanRN['GD1']=$bilanRS['N50'];
+		}
+
 		if ( $bilanRS['584']<>0 ) {
 			$bilanRN['HB']=$bilanRS['584'];
 			$bilanRN['HA']=$bilanRS['290']-$bilanRS['584'];
--- a/library/Scores/Ws/Pieces.php
+++ b/library/Scores/Ws/Pieces.php
@ -4,10 +4,12 @@ class Scores_Ws_Pieces  extends Scores_Ws_Abstract
 	/**
 	 * Récupération des kbis
 	 */
-	public function getKbis($siren)
+	public function getKbis($siren, $diffusion, $reference='')
 	{
 		$params = new StdClass;
 		$params->siren = $siren;
+		$params->diffusion = $diffusion;
+		$params->reference = $reference;
 		$client = $this->loadClient('pieces');
 		try {
 			$reponse = $client->getKbis($params);
--- a/library/Scores/Ws/Saisie.php
+++ b/library/Scores/Ws/Saisie.php
@ -452,5 +452,60 @@ class Scores_Ws_Saisie  extends Scores_Ws_Abstract
 		}
 	}
 	
-	
+	/**
+	 * getDirigeantsOp
+	 * @param string $siren
+	 */
+	public function getDirigeantsOp($siren, $id = null)
+	{
+		$filename = 'dirigeantsop-'.$siren.'-'.intval($id);
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new StdClass();
+		$params->siren = $siren;
+		$params->id = $id;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getDirigeantsOp($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getDirigeantsOpResult);
+			}
+			return $reponse->getDirigeantsOpResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * setDirigeantsOp
+	 * @param array $infos
+	 */
+	public function setDirigeantsOp($infos, $mode, $id)
+	{
+		$params = new stdClass();
+		$params->infos = $infos;
+		$params->mode = $mode;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setDirigeantsOp($params);
+			return $reponse->setDirigeantsOpResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
 }
--- a/library/Scores/WsScores.php
+++ b/library/Scores/WsScores.php
@ -120,28 +120,19 @@ class WsScores
 	    }
 	}

-	public function delSaisieContactEt($id)
+	public function setSaisieContactEt($siret, $type, $value, $info, $id=null, $delete=false)
 	{
 		$params = new stdClass();
 		$params->id = $id;
+		$params->siret = $siret;
+		$params->type = $type;
+		$params->value = $value;
+		$params->info = $info;
+		$params->delete = $delete;
 		$client = $this->loadClient('saisie');
 		try {
-			$reponse = $client->delContactEt($params);
-			return $reponse->delContactEtResult;
-		} catch (SoapFault $fault) {
-			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
-			return $fault->faultstring;
-		}
-	}
-
-	public function setSaisieContactEt($siret, $type, $value, $info, $id=null)
-	{
-		$params = new stdClass();
-		$params->id = $id;
-		$client = $this->loadClient('saisie');
-		try {
-			$reponse = $client->getContactEt($params);
-			return $reponse->getContactEtResult;
+			$reponse = $client->setContactEt($params);
+			return $reponse->setContactEtResult;
 		} catch (SoapFault $fault) {
 			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
 			return $fault->faultstring;
@ -1081,6 +1072,54 @@ class WsScores
 		}
 	}

+	/**
+	 * Get secondary email
+	 * @param string $login
+	 * @param int $id
+	 * @return boolean
+	 */
+	public function getGestionEmail($login, $id=null)
+	{
+	    $params = new stdClass();
+	    $params->login = $login;
+	    $params->id = $id;
+	    $client = $this->loadClient('gestion');
+	    try {
+	        $reponse = $client->getEmail($params);
+	        Zend_Registry::get('firebug')->info($reponse);
+	        return $reponse->getEmailResult;
+	    } catch (SoapFault $fault) {
+	        $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+	        return false;
+	    }
+	}
+
+	/**
+	 * Set secondary email
+	 * @param string $email
+	 * @param login $login
+	 * @param int $id
+     * @param string $action
+	 * @return boolean
+	 */
+    public function setGestionEmail($email, $login, $id=null, $action = 'set')
+	{
+	    $params = new stdClass();
+        $params->email = $email;
+        $params->login = $login;
+        $params->idClient = $idClient;
+        $params->id = $id;
+        $params->action = $action;
+	    $client = $this->loadClient('gestion');
+	    try {
+	        $reponse = $client->setEmail($params);
+	        return $reponse->setEmailResult;
+	    } catch (SoapFault $fault) {
+	        $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+	        return false;
+	    }
+	}
+
 	/**
 	 * Retourne les infos du groupe
 	 * @param string $siren
@ -1146,10 +1185,12 @@ class WsScores
 	/**
 	 * Récupération des kbis
 	 */
-	public function getKbis($siren)
+	public function getKbis($siren, $diffusion, $reference='')
 	{
 		$params = new StdClass;
 		$params->siren = $siren;
+		$params->diffusion = $diffusion;
+		$params->reference = $reference;
 		$client = $this->loadClient('pieces');
 		try {
 			$reponse = $client->getKbis($params);
@ -2551,9 +2592,9 @@ class WsScores
 	* getDirigeantsOp
 	* @param string $siren
 	*/
-	public function getDirigeantsOp($siren)
+	public function getDirigeantsOp($siren, $id = null)
 	{
-		$filename = 'dirigeantsop-'.$siren;
+		$filename = 'dirigeantsop-'.$siren.'-'.intval($id);

 		if ($this->cacheWrite) {
 		    $cache = new Cache($filename);
@ -2564,6 +2605,7 @@ class WsScores

 		$params = new StdClass();
 		$params->siren = $siren;
+		$params->id = $id;
 		$client = $this->loadClient('interne');
 		try {
 			$reponse = $client->getDirigeantsOp($params);
@ -2578,6 +2620,31 @@ class WsScores
 		}
 	}

+	/**
+	 * setDirigeantsOp
+	 * @param array $infos
+	 */
+	public function setDirigeantsOp($infos, $mode, $id)
+	{
+		$params = new stdClass();
+		$params->infos = $infos;
+		$params->mode = $mode;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setDirigeantsOp($params);
+			return $reponse->setDirigeantsOpResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+
 	/**
 	 * getIdentiteLight
 	 * @param string $siret
@ -2970,6 +3037,26 @@ class WsScores
 			}
 		}
 	}
+	
+	/**
+	 * getScoreHistorique pour les derniers 5 ans
+	 * @param string $siret
+	 * @param string $type
+	 */
+	public function getScoresHisto($siret, $type = 'indiscore')
+	{
+		$params = new stdClass();
+		$params->siret = $siret;
+		$params->type = $type;
+		try {
+			$client = $this->loadClient('interne');
+			$reponse = $client->getScoresHisto($params);
+			return $reponse->getScoresHistoResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}

 	/**
 	 * getNextLogin
@ -3114,12 +3201,15 @@ class WsScores

 		$message.= "Requete :\n ".$requete."\n";
 		$message.= "Reponse :\n ".$reponse."\n";
-		$c = Zend_Registry::get('config');
-		$mail = new Scores_Mail();
-		$mail->setSubject('[ERREUR SOAP] - '.$c->profil->server->name.' -'.date('Ymd'));
-		$mail->setBodyTexte($message);
-		$mail->setFrom('supportdev');
-		$mail->addToKey('supportdev');
-		$mail->send();
+
+		if (APPLICATION_ENV == 'production' || APPLICATION_ENV == 'staging') {
+    		$c = Zend_Registry::get('config');
+    		$mail = new Scores_Mail();
+    		$mail->setSubject('[ERREUR SOAP] - '.$c->profil->server->name.' -'.date('Ymd'));
+    		$mail->setBodyTexte($message);
+    		$mail->setFrom('supportdev');
+    		$mail->addToKey('supportdev');
+    		$mail->send();
+		}
 	}
 }
--- a/library/Scores/autoload_classmap.php
+++ b/library/Scores/autoload_classmap.php
@ -1,45 +1,45 @@
 <?php
-$dirname_530d9a41d779e = dirname(__FILE__);
-return array (
-  'Annonces' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Annonces.php',
-  'Scores_Auth_Adapter_Db' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Auth' . DIRECTORY_SEPARATOR . 'Adapter' . DIRECTORY_SEPARATOR . 'Db.php',
-  'Scores_Auth_Adapter_Ws' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Auth' . DIRECTORY_SEPARATOR . 'Adapter' . DIRECTORY_SEPARATOR . 'Ws.php',
-  'BDF' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Bdf.php',
-  'Cache' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Cache.php',
-  'Scores_Export_ArrayCsv' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Export' . DIRECTORY_SEPARATOR . 'ArrayCsv.php',
-  'Scores_Export_Print' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Export' . DIRECTORY_SEPARATOR . 'Print.php',
-  'Scores_Finance_Liasse_XLS' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Finance' . DIRECTORY_SEPARATOR . 'Liasse' . DIRECTORY_SEPARATOR . 'XLS.php',
-  'Scores_Finance_Liasse' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Finance' . DIRECTORY_SEPARATOR . 'Liasse.php',
-  'Scores_Finance_Ratios_Data' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Finance' . DIRECTORY_SEPARATOR . 'Ratios' . DIRECTORY_SEPARATOR . 'Data.php',
-  'Scores_Finance_Ratios_Graph' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Finance' . DIRECTORY_SEPARATOR . 'Ratios' . DIRECTORY_SEPARATOR . 'Graph.php',
-  'GestionCommande' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'GestionCommandes.php',
-  'Scores_Google_Maps' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Google' . DIRECTORY_SEPARATOR . 'Maps.php',
-  'Scores_Google_Streetview' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Google' . DIRECTORY_SEPARATOR . 'Streetview.php',
-  'IdentiteEntreprise' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'IdentiteEntreprise.php',
-  'IdentiteProcol' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'IdentiteProcol.php',
-  'Scores_Insee_AvisSituation' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Insee' . DIRECTORY_SEPARATOR . 'AvisSituation.php',
-  'Scores_Insee_Iris' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Insee' . DIRECTORY_SEPARATOR . 'Iris.php',
-  'Logo' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Logo.php',
-  'Scores_Mail' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Mail.php',
-  'Mappy' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Mappy.php',
-  'Scores_Menu' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Menu.php',
-  'Scores_Mobile_Detect' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Mobile' . DIRECTORY_SEPARATOR . 'Detect.php',
-  'RapportComment' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'RapportComment.php',
-  'Scores_Serializer_Adapter_Xml' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Serializer' . DIRECTORY_SEPARATOR . 'Adapter' . DIRECTORY_SEPARATOR . 'Xml.php',
-  'Scores_Session_Entreprise' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Session' . DIRECTORY_SEPARATOR . 'Entreprise.php',
-  'Scores_Session_Recherche' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Session' . DIRECTORY_SEPARATOR . 'Recherche.php',
-  'Siren' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Siren.php',
-  'Scores_Utilisateur' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Utilisateur.php',
-  'Scores_Wkhtml_Pdf' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Wkhtml' . DIRECTORY_SEPARATOR . 'Pdf.php',
-  'Scores_Ws_Abstract' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Abstract.php',
-  'Scores_Ws_Catalog' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Catalog.php',
-  'Scores_Ws_Config' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Config.php',
-  'Scores_Ws_Entreprise' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Entreprise.php',
-  'Scores_Ws_Gestion' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Gestion.php',
-  'Scores_Ws_Interface' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Interface.php',
-  'Scores_Ws_Interne' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Interne.php',
-  'Scores_Ws_Pieces' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Pieces.php',
-  'Scores_Ws_Saisie' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws' . DIRECTORY_SEPARATOR . 'Saisie.php',
-  'Scores_Ws' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'Ws.php',
-  'WsScores' => $dirname_530d9a41d779e . DIRECTORY_SEPARATOR . 'WsScores.php',
-);
+// Generated by ZF's ./bin/classmap_generator.php
+return array(
+    'Annonces'                      => dirname(__FILE__) . '/Annonces.php',
+    'Scores_Auth_Adapter_Db'        => dirname(__FILE__) . '/Auth/Adapter/Db.php',
+    'Scores_Auth_Adapter_Ws'        => dirname(__FILE__) . '/Auth/Adapter/Ws.php',
+    'BDF'                           => dirname(__FILE__) . '/Bdf.php',
+    'Cache'                         => dirname(__FILE__) . '/Cache.php',
+    'Scores_Export_ArrayCsv'        => dirname(__FILE__) . '/Export/ArrayCsv.php',
+    'Scores_Export_Print'           => dirname(__FILE__) . '/Export/Print.php',
+    'Scores_Finance_Liasse_XLS'     => dirname(__FILE__) . '/Finance/Liasse/XLS.php',
+    'Scores_Finance_Liasse'         => dirname(__FILE__) . '/Finance/Liasse.php',
+    'Scores_Finance_Ratios_Data'    => dirname(__FILE__) . '/Finance/Ratios/Data.php',
+    'Scores_Finance_Ratios_Graph'   => dirname(__FILE__) . '/Finance/Ratios/Graph.php',
+    'GestionCommande'               => dirname(__FILE__) . '/GestionCommandes.php',
+    'Scores_Google_Maps'            => dirname(__FILE__) . '/Google/Maps.php',
+    'Scores_Google_Streetview'      => dirname(__FILE__) . '/Google/Streetview.php',
+    'IdentiteEntreprise'            => dirname(__FILE__) . '/IdentiteEntreprise.php',
+    'IdentiteProcol'                => dirname(__FILE__) . '/IdentiteProcol.php',
+    'Scores_Insee_AvisSituation'    => dirname(__FILE__) . '/Insee/AvisSituation.php',
+    'Scores_Insee_Iris'             => dirname(__FILE__) . '/Insee/Iris.php',
+    'Logo'                          => dirname(__FILE__) . '/Logo.php',
+    'Scores_Mail'                   => dirname(__FILE__) . '/Mail.php',
+    'Mappy'                         => dirname(__FILE__) . '/Mappy.php',
+    'Scores_Menu'                   => dirname(__FILE__) . '/Menu.php',
+    'Scores_Mobile_Detect'          => dirname(__FILE__) . '/Mobile/Detect.php',
+    'RapportComment'                => dirname(__FILE__) . '/RapportComment.php',
+    'Scores_Serializer_Adapter_Xml' => dirname(__FILE__) . '/Serializer/Adapter/Xml.php',
+    'Scores_Session_Entreprise'     => dirname(__FILE__) . '/Session/Entreprise.php',
+    'Scores_Session_Recherche'      => dirname(__FILE__) . '/Session/Recherche.php',
+    'Siren'                         => dirname(__FILE__) . '/Siren.php',
+    'Scores_Utilisateur'            => dirname(__FILE__) . '/Utilisateur.php',
+    'Scores_Wkhtml_Pdf'             => dirname(__FILE__) . '/Wkhtml/Pdf.php',
+    'Scores_Ws_Abstract'            => dirname(__FILE__) . '/Ws/Abstract.php',
+    'Scores_Ws_Catalog'             => dirname(__FILE__) . '/Ws/Catalog.php',
+    'Scores_Ws_Config'              => dirname(__FILE__) . '/Ws/Config.php',
+    'Scores_Ws_Entreprise'          => dirname(__FILE__) . '/Ws/Entreprise.php',
+    'Scores_Ws_Gestion'             => dirname(__FILE__) . '/Ws/Gestion.php',
+    'Scores_Ws_Interface'           => dirname(__FILE__) . '/Ws/Interface.php',
+    'Scores_Ws_Interne'             => dirname(__FILE__) . '/Ws/Interne.php',
+    'Scores_Ws_Pieces'              => dirname(__FILE__) . '/Ws/Pieces.php',
+    'Scores_Ws_Saisie'              => dirname(__FILE__) . '/Ws/Saisie.php',
+    'Scores_Ws'                     => dirname(__FILE__) . '/Ws.php',
+    'WsScores'                      => dirname(__FILE__) . '/WsScores.php',
+);
--- a/library/Zend/Acl.php
+++ b/library/Zend/Acl.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Acl.php 24771 2012-05-07 01:13:06Z adamlundrigan $
+ * @version    $Id$
 */


@ -53,7 +53,7 @@ require_once 'Zend/Acl/Resource.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl
--- a/library/Zend/Acl/Assert/Interface.php
+++ b/library/Zend/Acl/Assert/Interface.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -41,7 +41,7 @@ require_once 'Zend/Acl/Resource/Interface.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 interface Zend_Acl_Assert_Interface
--- a/library/Zend/Acl/Exception.php
+++ b/library/Zend/Acl/Exception.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -29,7 +29,7 @@ require_once 'Zend/Exception.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl_Exception extends Zend_Exception
--- a/library/Zend/Acl/Resource.php
+++ b/library/Zend/Acl/Resource.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -29,7 +29,7 @@ require_once 'Zend/Acl/Resource/Interface.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
--- a/library/Zend/Acl/Resource/Interface.php
+++ b/library/Zend/Acl/Resource/Interface.php
@ -14,16 +14,16 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 interface Zend_Acl_Resource_Interface
--- a/library/Zend/Acl/Role.php
+++ b/library/Zend/Acl/Role.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Role.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl_Role implements Zend_Acl_Role_Interface
--- a/library/Zend/Acl/Role/Interface.php
+++ b/library/Zend/Acl/Role/Interface.php
@ -14,16 +14,16 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 interface Zend_Acl_Role_Interface
--- a/library/Zend/Acl/Role/Registry.php
+++ b/library/Zend/Acl/Role/Registry.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl_Role_Registry
--- a/library/Zend/Acl/Role/Registry/Exception.php
+++ b/library/Zend/Acl/Role/Registry/Exception.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */


@ -29,7 +29,7 @@ require_once 'Zend/Acl/Exception.php';
 /**
 * @category   Zend
 * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception
--- a/library/Zend/Amf/Adobe/Auth.php
+++ b/library/Zend/Amf/Adobe/Auth.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** @see Zend_Amf_Auth_Abstract */
@ -28,12 +28,15 @@ require_once 'Zend/Acl.php';
 /** @see Zend_Auth_Result */
 require_once 'Zend/Auth/Result.php';

+/** @see Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /**
 * This class implements authentication against XML file with roles for Flex Builder.
 *
 * @package    Zend_Amf
 * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
@ -61,7 +64,7 @@ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
    public function __construct($rolefile)
    {
        $this->_acl = new Zend_Acl();
-        $xml = simplexml_load_file($rolefile);
+        $xml = Zend_Xml_Security::scanFile($rolefile);
 /*
 Roles file format:
 <roles>
--- a/library/Zend/Amf/Adobe/DbInspector.php
+++ b/library/Zend/Amf/Adobe/DbInspector.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbInspector.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -24,7 +24,7 @@
 *
 * @package    Zend_Amf
 * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Adobe_DbInspector
--- a/library/Zend/Amf/Adobe/Introspector.php
+++ b/library/Zend/Amf/Adobe/Introspector.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Introspector.php 25024 2012-07-30 15:08:15Z rob $
+ * @version    $Id$
 */

 /** @see Zend_Amf_Parse_TypeLoader */
@ -33,7 +33,7 @@ require_once 'Zend/Server/Reflection.php';
 *
 * @package    Zend_Amf
 * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Adobe_Introspector
--- a/library/Zend/Amf/Auth/Abstract.php
+++ b/library/Zend/Amf/Auth/Abstract.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** @see Zend_Auth_Adapter_Interface */
@ -27,7 +27,7 @@ require_once 'Zend/Auth/Adapter/Interface.php';
 *
 * @package    Zend_Amf
 * @subpackage Auth
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface
--- a/library/Zend/Amf/Constants.php
+++ b/library/Zend/Amf/Constants.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Constants.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -24,7 +24,7 @@
 * deserialization to detect the AMF marker and encoding types.
 *
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 final class Zend_Amf_Constants
--- a/library/Zend/Amf/Exception.php
+++ b/library/Zend/Amf/Exception.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -26,7 +26,7 @@ require_once 'Zend/Exception.php';

 /**
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Exception extends Zend_Exception
--- a/library/Zend/Amf/Parse/Amf0/Deserializer.php
+++ b/library/Zend/Amf/Parse/Amf0/Deserializer.php
@ -15,14 +15,17 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** Zend_Amf_Constants */
 require_once 'Zend/Amf/Constants.php';

+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /** @see Zend_Amf_Parse_Deserializer */
 require_once 'Zend/Amf/Parse/Deserializer.php';

@ -33,7 +36,7 @@ require_once 'Zend/Amf/Parse/Deserializer.php';
 * @todo       Class could be implemented as Factory Class with each data type it's own class
 * @package    Zend_Amf
 * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
@ -248,7 +251,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
    public function readXmlString()
    {
        $string = $this->_stream->readLongUTF();
-        return simplexml_load_string($string);
+        return Zend_Xml_Security::scan($string); //simplexml_load_string($string);
    }

    /**
--- a/library/Zend/Amf/Parse/Amf0/Serializer.php
+++ b/library/Zend/Amf/Parse/Amf0/Serializer.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $
+ * @version    $Id$
 */

 /** Zend_Amf_Constants */
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Serializer.php';
 * @uses       Zend_Amf_Parse_Serializer
 * @package    Zend_Amf
 * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
--- a/library/Zend/Amf/Parse/Amf3/Deserializer.php
+++ b/library/Zend/Amf/Parse/Amf3/Deserializer.php
@ -15,14 +15,17 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** Zend_Amf_Parse_Deserializer */
 require_once 'Zend/Amf/Parse/Deserializer.php';

+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
+
 /** Zend_Amf_Parse_TypeLoader */
 require_once 'Zend/Amf/Parse/TypeLoader.php';

@ -34,7 +37,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
 * @todo       Class could be implemented as Factory Class with each data type it's own class.
 * @package    Zend_Amf
 * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
@ -417,6 +420,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
        $xmlReference = $this->readInteger();
        $length = $xmlReference >> 1;
        $string = $this->_stream->readBytes($length);
-        return simplexml_load_string($string);
+        return Zend_Xml_Security::scan($string); 
    }
 }
--- a/library/Zend/Amf/Parse/Amf3/Serializer.php
+++ b/library/Zend/Amf/Parse/Amf3/Serializer.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $
+ * @version    $Id$
 */

 /** Zend_Amf_Constants */
@ -35,7 +35,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
 *
 * @package    Zend_Amf
 * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
--- a/library/Zend/Amf/Parse/Deserializer.php
+++ b/library/Zend/Amf/Parse/Deserializer.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -30,7 +30,7 @@
 * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Amf_Parse_Deserializer
--- a/library/Zend/Amf/Parse/InputStream.php
+++ b/library/Zend/Amf/Parse/InputStream.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputStream.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** Zend_Amf_Util_BinaryStream */
@ -31,7 +31,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
 *
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream
--- a/library/Zend/Amf/Parse/OutputStream.php
+++ b/library/Zend/Amf/Parse/OutputStream.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OutputStream.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** Zend_Amf_Util_BinaryStream */
@ -32,7 +32,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php';
 * @uses       Zend_Amf_Util_BinaryStream
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream
--- a/library/Zend/Amf/Parse/Resource/MysqlResult.php
+++ b/library/Zend/Amf/Parse/Resource/MysqlResult.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MysqlResult.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -26,7 +26,7 @@
 *
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Resource_MysqlResult
--- a/library/Zend/Amf/Parse/Resource/MysqliResult.php
+++ b/library/Zend/Amf/Parse/Resource/MysqliResult.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MysqliResult.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -26,7 +26,7 @@
 *
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Resource_MysqliResult
--- a/library/Zend/Amf/Parse/Resource/Stream.php
+++ b/library/Zend/Amf/Parse/Resource/Stream.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -25,7 +25,7 @@
 *
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Parse_Resource_Stream
--- a/library/Zend/Amf/Parse/Serializer.php
+++ b/library/Zend/Amf/Parse/Serializer.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $
+ * @version    $Id$
 */

 /**
@ -25,7 +25,7 @@
 *
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Amf_Parse_Serializer
--- a/library/Zend/Amf/Parse/TypeLoader.php
+++ b/library/Zend/Amf/Parse/TypeLoader.php
@ -15,9 +15,9 @@
 * @category   Zend
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TypeLoader.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /**
@ -47,7 +47,7 @@ require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
 * @todo       PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
 * @package    Zend_Amf
 * @subpackage Parse
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 final class Zend_Amf_Parse_TypeLoader
--- a/library/Zend/Amf/Request.php
+++ b/library/Zend/Amf/Request.php
@ -14,9 +14,9 @@
 *
 * @category   Zend
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $
+ * @version    $Id$
 */

 /** @see Zend_Amf_Parse_InputStream */
@ -40,7 +40,7 @@ require_once 'Zend/Amf/Value/MessageBody.php';
 *
 * @todo       Currently not checking if the object needs to be Type Mapped to a server object.
 * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Amf_Request
--- a/Show More
+++ b/Show More