Reintegrate branch 1.3

2012-12-19 15:39:09 +00:00 · 2012-12-19 15:39:09 +00:00 · 332d1826f8
commit 332d1826f8
parent 2301e706fb 27df43931e
68 changed files with 43829 additions and 915 deletions
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@ -1,7 +1,14 @@
 <?php
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 {
-	protected function _initViewSettings()
+    protected function _initConfig()
+    {
+        $config = new Zend_Config($this->getOptions());
+        Zend_Registry::set('config', $config);
+        return $config;
+    }
+    
+    protected function _initViewSettings()
 	{
 		$this->bootstrap('view');
 		$view 		= $this->getResource('view');
@ -9,7 +16,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		$pathScript = '/themes/default/scripts';

 		$view->setEncoding('UTF-8');
-		$view->doctype('XHTML1_STRICT');
+		$view->doctype('HTML5');

 		$view->headMeta()
 			->appendHttpEquiv('Content-Type', 'text/html; charset=UTF-8')
@ -25,7 +32,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 			->appendFile('/libs/jquery/jquery.js', 'text/javascript')
 			->appendFile('/libs/jquery/jquery.bgiframe.js', 'text/javascript')
 			->appendFile('/libs/jquery/jquery.cookie.js', 'text/javascript')
-			->appendFile('/libs/ui/jquery-ui.js', 'text/javascript')
+			->appendFile('/libs/ui/jquery-ui.min.js', 'text/javascript')
 			->appendFile('/libs/qtip/jquery.qtip.js', 'text/javascript')
 			->appendFile($pathScript.'/scripts.js', 'text/javascript');

@ -46,15 +53,15 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap

 	protected function _initDb()
 	{
-		$dbConfig = Zend_Registry::get('configuration')->databases;
-		try {
-			$db = Zend_Db::factory($dbConfig->db);
+	    $c = new Zend_Config($this->getOptions());
+	    try {
+			$db = Zend_Db::factory($c->profil->db->ciblage);
 			Zend_Db_Table::setDefaultAdapter ($db);
 		} catch ( Exception $e ) {
 			 if (APPLICATION_ENV == 'development') {
 		        print_r($e);
 		    } else {
-		        echo "Le service rencontre actuellement un problème technique.";
+		        echo "Le service est actuellement indisponible.";
 		    }
 		    exit;
 		}
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@ -1,18 +1,17 @@
 [production]
-;phpSettings.session.gc_maxlifetime = 86400
-;phpSettings.session.cookie_lifetime = 86400
 phpSettings.date.timezone = "Europe/Paris"
 phpSettings.display_startup_errors = 0
 phpSettings.display_errors = 0
 bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
 bootstrap.class = "Bootstrap"
 appnamespace = "Application"
-resources.session.save_path = APPLICATION_PATH "/../cache/sessions"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
 resources.session.gc_maxlifetime = 86400
 resources.session.cookie_lifetime = 86400
 resources.session.remember_me_seconds = 86400
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
 resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
 resources.frontController.params.displayExceptions = 0
 resources.layout.layout = "main"
@ -22,6 +21,32 @@ autoloaderNamespaces[] = "Application_"
 autoloaderNamespaces[] = "Scores_"
 autoloaderNamespaces[] = "Form_"

+; Scores configuration
+profil.server.name = development
+profil.webservice.location = sdsrvdev01
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "d:\www\dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=root
+profil.db.ciblage.params.password=bj10sx
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.78.230
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=192.168.78.252
+profil.sphinx.port=3312
+
 [staging : production]
 phpSettings.display_startup_errors = 1
 phpSettings.display_errors = 1
--- a/application/controllers/ComptageController.php
+++ b/application/controllers/ComptageController.php
@ -236,12 +236,16 @@ class ComptageController extends Zend_Controller_Action
 		$ciblage = new Ciblage($fields->getValues(), $user->globalRNCS);
 		$sirets = $ciblage->execute(true, 10);

-		$dbConfig = Zend_Registry::get('configuration')->databases;
+		$c = Zend_Registry::get('config');
 		try {
-			$dbMetier = Zend_Db::factory($dbConfig->jo);
+			$dbMetier = Zend_Db::factory($c->profil->db->jo);
 		} catch ( Exception $e ) {
-			//@todo : Changer le message d'erreur
-		    exit ( $e->getMessage() );
+			if ( $user->idClient ) {
+			    exit ( $e->getMessage() );
+			} else {
+    		    echo "Prévisualisation indisponible";
+    		    exit;
+			}
 		}

 		/**
--- a/application/controllers/EnrichissementController.php
+++ b/application/controllers/EnrichissementController.php
@ -24,8 +24,8 @@ class EnrichissementController extends Zend_Controller_Action
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);

-		$config = Zend_Registrey::get('configuration');
-		$path = realpath($config->path->data).'/clients';
+		$c = Zend_Registrey::get('config');
+		$path = realpath($c->profil->path->data).'/clients';
 		if(!file_exists($path)) mkdir($path);

 		if ( isset($_FILES) && count($_FILES)==1 ){
@ -258,16 +258,41 @@ class EnrichissementController extends Zend_Controller_Action
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);

+		$auth = Zend_Auth::getInstance();
+		$identity = $auth->getIdentity();
+		
 		$id = $this->getRequest()->getParam('id');
+		
+		/*
+		 * Do not download file that not own by the user
+		 * List profil
+		 */
+		$profilM = new Application_Model_EnrichissementProfils();
+		$sql = $profilM->select()
+		                ->from($profilM, array('id'))
+		                ->where('login=?',$identity->username);
+		
+		$profils = $profilM->fetchAll($sql);
+		if ( $profils->count()>0 ) {
+		    $profilList = array();
+		    foreach ( $profils->toArray() as $item ) {
+		        $profilList[] = $item['id'];
+		    }
+		}
+		
+		/*
+		 * List finish file
+		 */
 		$table = new Application_Model_EnrichissementIdentifiants();
 		$sql = $table->select()
+		    ->where('idProfil IN('.join(',', $profilList).')')
 			->where('id = ?', $id);
 		$result = $table->fetchRow($sql);
 		if(!empty($result)) {
 			$result = $result->toArray();
 			$date = substr($result['dateAdded'],0,4).substr($result['dateAdded'],5,2);
-			$config = Zend_Registry::get('configuration');
-			$path = $config->path->data.'/'.$date.'/';
+			$c = Zend_Registry::get('config');
+			$path = $c->profil->path->data.'/'.$date.'/';
 			$file = $result['fichier'];
 		}
 		$content_type = 'application/csv-tab-delimited-table';
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@ -31,7 +31,7 @@ class ErrorController extends Zend_Controller_Action
        $message.= "\n";
        $message.= 'Message : '.$errors->exception->getMessage();
        $message.= "\n";
-        $message.= 'Utilisateur : '.$identity->login;
+        $message.= 'Utilisateur : '.$identity->username;
        $message.= "\n";
        $message.= "File :".$errors->exception->getFile().", Ligne : ".$errors->exception->getLine();
        $message.= "\n";
@ -41,10 +41,10 @@ class ErrorController extends Zend_Controller_Action
        
        $message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n";
        
-        $configuration = Zend_Registry::get('configuration');
+        $c = Zend_Registry::get('config');
        require_once 'Scores/Mail.php';
        $mail = new Mail();
-        $mail->setSubject('[ERREUR APPLICATIVE] - '.$configuration->server->name.' -'.date('Ymd'));
+        $mail->setSubject('[ERREUR APPLICATIVE] - '.$c->profil->server->name.' -'.date('Ymd'));
        $mail->setBodyTexte($message);
        $mail->setFrom('supportdev');
        $mail->addToKey('supportdev');
--- a/application/controllers/FieldsController.php
+++ b/application/controllers/FieldsController.php
@ -141,7 +141,7 @@ class FieldsController extends Zend_Controller_Action
                    $result = $table->fetchAll($sql);
                    foreach ($result as $item) {
                        $output[] = array(
-                            'label' => $item->libdep . ' (Dépatement)',
+                            'label' => $item->libdep . ' (Département)',
                            'value' => 'D'.$item->numdep
                        );
                    }
--- a/application/controllers/GestionController.php
+++ b/application/controllers/GestionController.php
@ -77,6 +77,7 @@ class GestionController extends Zend_Controller_Action
 				'login' => $params['login'],
 				'reference' => $params['reference'],
 				'criteres' => json_encode($params['criteres']),
+			    'dataInsee' => 0,
 				'dateAjout' => date('Y-m-d H:i:s'),
 				'actif' => 1,
 			);
@ -259,10 +260,17 @@ class GestionController extends Zend_Controller_Action
 	 */
 	public function customerparamAction()
 	{
-		$request = $this->getRequest();
+	    //Fields
+	    require_once 'Scores/Enrichissement.php';
+	    $fieldsM = new Enrichissement();
+	    $allFields = $fieldsM->getFields();
+	    $this->view->assign('fields', $allFields);
+	    
+	    $request = $this->getRequest();

 		$idClient= $request->getParam('id', null);
-
+		$this->view->assign('idClient', $idClient);
+		
 		if ($idClient !== null) {
 			$paramsM = new Application_Model_CustomerParams();
 			$sql = $paramsM->select()->where('idClient = ?', $idClient);
@ -270,6 +278,7 @@ class GestionController extends Zend_Controller_Action
 			$infos = null;
 			if ($params!==null){
 				$infos = $params->toArray();
+				$infos['criteres'] = json_decode($infos['criteres'], true);
 			}
 			$this->view->assign('infos',$infos);
 			
@ -292,7 +301,7 @@ class GestionController extends Zend_Controller_Action
 		$request = $this->getRequest();
 		
 		//Sauvegarde du formulaire
-		if ( $request->isPost() && $request->getParam('submit')=='Enregistrer' ) {
+		if ( $request->isPost() && in_array($request->getParam('submit'), array('Enregistrer','Modifier')) ) {
 			$params = $request->getParams();
 		
 			//Vérifier le formulaire
@ -302,19 +311,7 @@ class GestionController extends Zend_Controller_Action
 					$errForm++;
 				}
 			}
-			if (!$errForm) {
-		
-				$dataInsee = 0;
-				// Est ce qu'il existe une donnée insee
-				require_once 'Scores/Enrichissement.php';
-				$fieldsM = new Enrichissement();
-				$fields = $fieldsM->getFields();
-				foreach ( $fields as $key => $val) {
-					if ( array_key_exists('insee', $val) && $val['insee']===true) {
-						$dateInsee = 1;
-						break;
-					}
-				}
+			if (!$errForm) {
 				
 				$checkValues = array(
 					'filterRNCS' => 0,
@ -341,18 +338,69 @@ class GestionController extends Zend_Controller_Action
 					'limitLines' => $params['limitLines'],
 					'limitFiles' => $params['limitFiles'],
 					'criteres' => json_encode($params['criteres']),
-					'dataInsee' => $dataInsee,
 					'dateAdded' => date('Y-m-d H:i:s'),
-				);
-				$customerParamsM = new Application_Model_CustomerParams();
-				if ( $customerParamsM->insert($data) ){
-					$this->view->assign('message', "Profil enregistré");
-				} else {
-					$this->view->assign('message', "Erreur lors de la sauvegarde");
-				}
+				);
+				
+				if ($request->getParam('submit')=='Modifier') {
+				    //Overwrite default profil for each login
+				    $profilM = new Application_Model_EnrichissementProfils();
+				    $profilM->update(
+				            array('criteres', json_encode($params['criteres'])),
+				            "reference='default' AND idClient=".$params['idClient']);
+				    
+				    //Set parameters
+				    $customerParamsM = new Application_Model_CustomerParams();
+				    if ( $customerParamsM->update($data, 'id='.$params['id']) ){
+				        $this->view->assign('message', "Profil enregistré");
+				    } else {
+				        $this->view->assign('message', "Erreur lors de la sauvegarde");
+				    }
+				    
+				} else {
+				    //Set parameters
+				    $customerParamsM = new Application_Model_CustomerParams();
+				    if ( $customerParamsM->insert($data) ){
+				        $this->view->assign('message', "Profil enregistré");
+				    } else {
+				        $this->view->assign('message', "Erreur lors de la sauvegarde");
+				    }
+				}
+								
 			} else {
 				$this->view->assign('message', "Erreur lors de la saisie");
 			}
+		} else {
+
+		    $idClient = $request->getParam('id', null);
+		    
+    		if ($idClient !== null) {
+    			$paramsM = new Application_Model_CustomerParams();
+    			$sql = $paramsM->select()->where('idClient = ?', $idClient);
+    			$params = $paramsM->fetchRow($sql);
+    			if ( $params!==null ) {
+    			    foreach ( $params as $key => $value ) {
+    			        switch ( $key ) {
+    			            case 'criteres':
+    			                $this->view->assign($key, json_decode($value,true));
+    			                break;
+    			            case 'dateContrat':
+    			                $this->view->assign($key, substr($value,0,10));
+    			                break;
+    			            default:
+    			                $this->view->assign($key, $value);
+    			                break;
+    			        }
+    			    }
+    			}
+    			
+		    } else {
+		        $this->view->assign('filterRNCS', 1);
+		        $this->view->assign('licenceINSEE', 0);
+		        $this->view->assign('immediatExtract', 0);
+		        $this->view->assign('limitLines', 50000);
+		        $this->view->assign('limitFiles', 0);
+		    }
+		    		    
 		}
 	}

--- a/application/controllers/UploadController.php
+++ b/application/controllers/UploadController.php
@ -3,23 +3,13 @@ Class UploadController extends Zend_Controller_Action
 {
 	protected $path;
 	protected $extensions;
-	
-	public function init()
-	{
-		/*$config 	= Zend_Registrey::get('configuration');	
-		$path 		= realpath($config->path->data).'/clients';
-		$this->path = $path;
-		$this->extensions = array('.csv');
 		
-		if(!file_exists($path)) mkdir($path);*/
-	}
-	
 	public function upload()
 	{
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);
 		
-		if(!empty($_FILES) and count($_FILES) == 1) 
+		if(!empty($_FILES) and count($_FILES) == 1)
 		{
 			$tmp_name  = $_FILES['fichier']['tmp_name'];
 			$extension = strrchr($_FILES['fichier']['name'], '.');
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@ -50,22 +50,22 @@ class UserController extends Zend_Controller_Action
    	$message = $request->getParam('message');
    	$this->view->assign('message', $message);

+    	$ajax = $request->getParam('ajax', 0);
+    	$this->view->assign('ajax', $ajax);
+    	
    	$refresh = 5;
    	
-    	$baseUrl = 'http://'.$_SERVER['SERVER_NAME'];
-    	if ($_SERVER['SERVER_PORT']!='80') {
-    	   $baseUrl.= ':'.$_SERVER['SERVER_PORT'];
-    	}
-    	
-		$url = $baseUrl.$this->view->url(array(
+		$url = 'http://'.$_SERVER['SERVER_NAME'].$this->view->url(array(
 			'controller' => 'user',
 			'action' => 'login',
-		));
+		), null, true);

    	$this->view->assign('url', $url);
-    	$this->view->assign('refresh', $refresh);
-    	$this->view->headMeta()->appendHttpEquiv('refresh', $refresh.'; url='.$url);
-    	$this->render('logout');
+    	
+    	if (!$ajax) {
+    	    $this->view->assign('refresh', $refresh);
+    	    $this->view->headMeta()->appendHttpEquiv('refresh', $refresh.'; url='.$url);
+    	}
    }

 }
--- a/application/models/JoSphinxIdx.php
+++ b/application/models/JoSphinxIdx.php
@ -0,0 +1,5 @@
+<?php
+class Application_Model_JoSpinxIdx extends Zend_Db_Table_Abstract
+{
+	protected $_name = 'sphinx_idx';
+}
--- a/application/views/default/helpers/Field.php
+++ b/application/views/default/helpers/Field.php
@ -25,7 +25,8 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 		$nbFields = count($params['fields']);

 		$display = true;
-
+		$out = '';
+		
 		//If more than one field exist we need to make a special display
 		if ( $nbFields > 1) {
 			$out.= '<div class="fieldgrp clearfix">';
@ -80,22 +81,22 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 					$html = $this->intervalDateHTML($name, $options);
 					break;
 				case 'interval':
-					$html = $this->intervalHTML($name, $field);
+					$html = $this->intervalHTML($name, $options);
 					break;
 				case 'date':
-					$html = $this->dateHTML($name, $field);
+					$html = $this->dateHTML($name, $options);
 					break;
 				case 'text':
 					$html = $this->textHTML($name, $options);
 					break;
 				case 'textarea':
-					$html = $this->textareaHTML($name, $field);
+					$html = $this->textareaHTML($name, $options);
 					break;
 				case 'radio':
-					$html = $this->radioHTML($name, $field);
+					$html = $this->radioHTML($name, $options);
 					break;
 				case 'file':
-					$html = $this->fileuploadHtml($name, $field);
+					$html = $this->fileuploadHtml($name, $options);
 					break;
 				case 'tree':
 					//Do nothing
@ -261,17 +262,17 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract

 		$return = '';

-		$return.= '<select name="'.$name.'1_j" style="width:40px;">';
+		$return.= '<select name="'.$name.'1_j" style="width:45px;">';
 		for ($i=1;$i<=31;$i++) {
 			$return.= '<option>'.str_pad($i,2,'0',STR_PAD_LEFT).'</option>';
 		}
 		$return.= '</select>';
-		$return.= '<select name="'.$name.'1_m" style="width:40px;">';
+		$return.= '<select name="'.$name.'1_m" style="width:45px;">';
 		for ($i=1;$i<=12;$i++) {
 			$return.= '<option>'.str_pad($i,2,'0',STR_PAD_LEFT).'</option>';
 		}
 		$return.= '</select>';
-		$return.= '<select name="'.$name.'1_a" style="width:55px;">';
+		$return.= '<select name="'.$name.'1_a" style="width:60px;">';
 		for ($i=1900;$i<=date('Y');$i++) {
 			$return.= '<option>'.$i.'</option>';
 		}
@ -279,7 +280,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract

 		$return.= ' au ';

-		$return.= '<select name="'.$name.'2_j" style="width:40px;">';
+		$return.= '<select name="'.$name.'2_j" style="width:45px;">';
 		for ($i=1;$i<=31;$i++) {
 			$select = '';
 			if ($i==date('d')) {
@ -288,7 +289,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			$return.= '<option'.$select.'>'.str_pad($i,2,'0',STR_PAD_LEFT).'</option>';
 		}
 		$return.= '</select>';
-		$return.= '<select name="'.$name.'2_m" style="width:40px;">';
+		$return.= '<select name="'.$name.'2_m" style="width:45px;">';
 		for ($i=1;$i<=12;$i++) {
 			$select = '';
 			if ($i==date('m')) {
@ -297,7 +298,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			$return.= '<option'.$select.'>'.str_pad($i,2,'0',STR_PAD_LEFT).'</option>';
 		}
 		$return.= '</select>';
-		$return.= '<select name="'.$name.'2_a" style="width:55px;">';
+		$return.= '<select name="'.$name.'2_a" style="width:60px;">';
 		$lastYear = date('Y');
 		for ($i=1900;$i<=$lastYear;$i++) {
 			$select = '';
--- a/application/views/default/scripts/comptage/savedialog.phtml
+++ b/application/views/default/scripts/comptage/savedialog.phtml
@ -25,11 +25,12 @@ $('#dialog').dialog({
 buttons: [ {
    text: "Enregistrer",
 	click: function() {
-    	    $('#result').html('Enregistrement...');
    		var options = {
    			target: '#result',
    			dataType: 'json',
-    			beforeSubmit: function(){},
+    			beforeSubmit: function(){
+    				$('#result').html('Enregistrement...');
+    			},
    			success: function(data){
    				if (data.error == 0) {
    					$('#result').html(data.msg);
--- a/application/views/default/scripts/enrichissement/commande.phtml
+++ b/application/views/default/scripts/enrichissement/commande.phtml
@ -1,8 +1,10 @@
 Votre commande a bien été prise en compte sous la référence <?=$this->ref?>

 <script>
-$('#dialog').dialog({ buttons: [ {
-    text: "Fermer",
-	click: function() { $(this).dialog('close'); }
-} ] });
+$('#dialog').dialog({
+buttons: [{ text: "Quitter",
+	click: function() {
+    	$(this).dialog("close");
+    	window.location.href= window.location.href;
+} }] });
 </script>
--- a/application/views/default/scripts/enrichissement/reference.phtml
+++ b/application/views/default/scripts/enrichissement/reference.phtml
@ -6,7 +6,7 @@ Erreur
 <p>Le nombre de lignes à enrichir est trop important.
 Vous pouvez prendre contact avec le service commercial en cliquant ici.
 Vos critères seront enregistrées et une référence vous sera fourni.</p>
-<?php } elseif ($this->forfaitRemain && $this->forfaitRemain<=0) { ?>
+<?php } elseif ($this->forfaitRemain<=0) { ?>
 <p>Le montant de votre forfait est insuffisant
 Vous pouvez prendre contact avec le service commercial en cliquant ici.
 Vos critères seront enregistrées et une référence vous sera fourni.</p>
@ -59,20 +59,15 @@ Vos critères seront enregistrées et une référence vous sera fourni.</p>
 $('#dialog').dialog({ buttons: [ {
    text: "Commander",
 	click: function() {
+		var action = $('form[name=commande]').attr('action');
+		var values = $('form[name=commande]').serialize();
 		$('div#update').html('Enregistrement...');
 		$('#dialog').dialog({ buttons: [{}] });
-		var url = '/dashboard/ciblage/id/<?=$this->id?>';
-		var ok = false;
-		$.post($('form[name=commande]').attr('action'),$('form[name=commande]').serialize(),
-			function(data){
-		    ok = true; $('div#update').html(data);
+		$.post(action, values, function(data){
+		    $('div#update').html(data);
+		}).error(function(){
+			$('div#update').html('Erreur');
 		});
-		$('#dialog').dialog({ buttons: [{ text: "Quitter", click: function() {
-			$(this).dialog("close");
-			if (ok==true) {
-				window.href= url;
-			}
-		} }] });
 	}
 },
 {
--- a/application/views/default/scripts/footer.phtml
+++ b/application/views/default/scripts/footer.phtml
@ -1 +1,3 @@
-<?php
+<p class="info">
+<a href="http://www.scores-decisions.com/">Scores & Décisions SAS</a>
+</p>
--- a/application/views/default/scripts/gestion/customerparam.phtml
+++ b/application/views/default/scripts/gestion/customerparam.phtml
@ -14,11 +14,17 @@
 <tr><td>forfait</td><td><?=$this->infos['forfait']?></td></tr>
 <tr><td>limitLines</td><td><?=$this->infos['limitLines']?></td></tr>
 <tr><td>limitFiles</td><td><?=$this->infos['limitFiles']?></td></tr>
-<tr><td>criteres</td><td><pre><?php print_r(json_decode($this->infos['criteres'],true))?></td></tr>
+<tr><td>criteres</td><td>
+<?php foreach ( $this->infos['criteres'] as $item ) {?>
+<?=$this->fields[$item]['label']?><br/>
+<?php }?>
+</td>
 <tr><td>dataInsee</td><td><?=$this->infos['dataInsee']?></td></tr>
 <tr><td>dateAdded</td><td><?=$this->infos['dateAdded']?></td></tr>
 </table>

+<a href="<?=$this->url(array('controller'=>'gestion','action'=>'customerparamadd','id'=>$this->idClient),null,true)?>">Modifier</a>
+
 <h2>Logins autorisés</h2>
 <div class="paragraph">
 <form method="post" action="<?=$this->url(array('controller'=>'gestion', 'action'=>'profiladd'), null, true)?>">
--- a/application/views/default/scripts/gestion/customerparamadd.phtml
+++ b/application/views/default/scripts/gestion/customerparamadd.phtml
@ -3,76 +3,100 @@
 <?=$this->message?>

 <form name="profil" method="post" action="<?=$this->url(array('controller'=>'gestion', 'action'=>'customerparamadd'))?>">
+
+<?php if ($this->id) {?>
+<input type="hidden" name="id" value="<?=$this->id?>"/>
+<?php }?>
+
+<div>
 <label>idClient</label>
-<input type="text" name="idClient" />
-<br/>
+<input type="text" name="idClient" value="<?=$this->idClient?>"/>
+</div>

+<div>
 <label>service</label>
-<input type="text" name="service" />
-<br/>
+<input type="text" name="service" value="<?=$this->service?>"/>
+</div>

+<div>
 <label>filterRNCS</label>
-<input type="checkbox" name="filterRNCS" value="1" />
+<?php $select = ''; if ($this->filterRNCS==1) $select = ' checked'?>
+<input type="checkbox" name="filterRNCS" value="1"<?=$select?>/>
 Filtrer au RNCS
-<br/>
+</div>

+<div>
 <label>licenceINSEE</label>
-<input type="checkbox" name="licenceINSEE" value="1" />
+<?php $select = ''; if ($this->licenceInsee==1) $select = ' checked'?>
+<input type="checkbox" name="licenceINSEE" value="1"<?=$select?>/>
 Le client possède la licence INSEE
-<br/>
+</div>

+<div>
 <label>immediatExtract</label>
-<input type="text" name="immediatExtract" value="0" />
+<input type="text" name="immediatExtract" value="<?=$this->immediatExtract?>" />
 Nombre de ligne maximum pour une extraction immédiate
-<br/>
+</div>

+<div>
 <label>dateContrat</label>
-<input type="text" name="dateContrat" />
+<input type="text" name="dateContrat" value="<?=$this->dateContrat?>"/>
 Date de début du contract (AAAA-MM-JJ)
-<br/>
+</div>

+<div>
 <label>periodContrat</label>
-<input type="text" name="periodContrat" />
+<input type="text" name="periodContrat" value="<?=$this->periodContrat?>"/>
 Durée du contrat (1,3,6,12 mois)
-<br/>
+</div>

+<div>
 <label>periodPaiement</label>
-<input type="text" name="periodPaiement" />
+<input type="text" name="periodPaiement" value="<?=$this->periodPaiement?>"/>
 Emission des factures (tous les 1,3,6,12 mois)
-<br/>
+</div>

+<div>
 <label>priceLine</label>
-<input type="text" name="priceLine" /> €
+<input type="text" name="priceLine" value="<?=$this->priceLine?>"/> €
 Prix à la ligne (obligatoire même en forfait pour pouvoir décompter)
-<br/>
+</div>

+<div>
 <label>forfait</label>
-<input type="text" name="forfait" value="0" />
+<input type="text" name="forfait" value="<?=$this->forfait?>"/>
 Montant du forfait pour l'extraction de fichier
-<br/>
+</div>

+<div>
 <label>limitLines</label>
-<input type="text" name="limitLines" value="50000" />
+<input type="text" name="limitLines" value="<?=$this->limitLines?>"/>
 Nombre maximal de lignes dans un fichier
-<br/>
+</div>

+<div>
 <label>limitFiles</label>
-<input type="text" name="limitFiles" value="0" />
+<input type="text" name="limitFiles" value="<?=$this->limitFiles?>"/>
 Nombre maximal de fichier pouvant être extrait
-<br/>
+</div>

 <div>
 <label>Enrichissement</label>
 <select style="padding:5px;" name="criteres[]" multiple size="20">
 <?php if ( count($this->fields)>0 ) {?>
 	<?php foreach ( $this->fields as $value => $item ) {?>
-	<option value="<?=$value?>"><?=$item['label']?></option>
+	<?php $select = ''; if (in_array($value, $this->criteres)) $select = ' selected'; ?>
+	<option value="<?=$value?>"<?=$select?>><?=$item['label']?></option>
 	<?php }?>
 <?php }?>
 </select>
 </div>

+<?php if ($this->idClient) {?>
+<input type="submit" name="submit" value="Modifier"/>
+<?php } else {?>
 <input type="submit" name="submit" value="Enregistrer"/>
+<?php }?>
 </form>

 </div>
--- a/application/views/default/scripts/header.phtml
+++ b/application/views/default/scripts/header.phtml
@ -1,37 +1,5 @@
-<div id="primaryNavigation" class="clearfix">
-	<ul>
-		<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>">Accueil</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'), null, true)?>">Tableau de bord</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'index'), null, true)?>">Aide</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'aproposde'), null, true)?>">A propos de</a></li>
-		<?php if ( $this->admin ) {?>
-		<li><a href="<?=$this->url(array('controller'=>'gestion', 'action'=>'index'), null, true)?>">Gestion</a></li>
-		<?php }?>
-		<li><a href="<?=$this->url(array('controller'=>'user', 'action'=>'logout'), null, true)?>">Déconnexion</a></li>
-	</ul>
-</div>
+<div id="header-logo">
 <div id="logo">
-	<h1>Odea</h1>
+    <h1><!-- <a href="./"><img alt="ODEA" src="#"></a> -->Outils D'Extraction Automatique</h1>
 </div>
-<div id="message">
-	<?php if ($this->msgComptage){?>
-		<div id="comptage" >
-		<?php if ( $this->total!==null ) {?>
-			Nombre sélectionnées :
-			<span class="valeur"><?=number_format($this->total, 0, '', ' ')?></span>
-			<?php if ( $this->insee!==null ) {?>
-			(dont <span class="valeur"><?=number_format($this->insee, 0, '', ' ')?></span> unité(s) insee)
-			<?php }?>
-		<?php } else {?>
-			Aucune sélection.
-		<?php }?>
-		</div>
-		<div id="attente" style="display:none;">
-			<img src="/themes/default/images/ajax.gif" />
-		</div>
-		<div id="control">
-			[<a href="<?=$this->url(array('controller'=>'comptage', 'action'=> 'reset'))?>">Initialiser les critères</a>],
-			[<a class="saveciblage" href="<?=$this->url(array('controller'=>'comptage', 'action'=>'savedialog'))?>">Sauvegarder le profil du ciblage</a>]
-		</div>
-	<?php }?>
 </div>
--- a/application/views/default/scripts/main.phtml
+++ b/application/views/default/scripts/main.phtml
@ -8,16 +8,26 @@
  <?php echo $this->headScript(); ?>
 </head>
 <body>
-<div id="global">
- <div id="header" class="clearfix">
- <?php echo $this->render('header.phtml') ?>
- </div>
- <div id="content" class="clearfix">
- 	<?php echo $this->layout()->content; ?>
- </div>
- <div id="footer">
- <?php echo $this->render('footer.phtml'); ?>
- </div>
+
+<div id="header">
+<?php echo $this->render('header.phtml') ?>
 </div>
+
+<div id="navigation">
+<?php echo $this->render('menu.phtml') ?>
+</div>
+
+<div id="global">
+
+<div id="content" class="clearfix">
+<?php echo $this->layout()->content; ?>
+</div>
+
+</div>
+
+<div id="footer">
+<?php echo $this->render('footer.phtml'); ?>
+</div>
+
 </body>
 </html>
--- a/application/views/default/scripts/menu.phtml
+++ b/application/views/default/scripts/menu.phtml
@ -0,0 +1,34 @@
+<div id="primaryNavigation">
+    <div id="message">
+    	<?php if ($this->msgComptage){?>
+    		<div id="comptage" >
+    		<?php if ( $this->total!==null ) {?>
+    			Sélection :
+    			<span class="valeur"><?=number_format($this->total, 0, '', ' ')?></span>
+    			<?php if ( $this->insee!==null ) {?>
+    			(dont <span class="valeur"><?=number_format($this->insee, 0, '', ' ')?></span> unité(s) insee)
+    			<?php }?>
+    		<?php } else {?>
+    			Aucune sélection.
+    		<?php }?>
+    		</div>
+    		<div id="attente" style="display:none;">
+    			<img src="/themes/default/images/ajax.gif" />
+    		</div>
+    		<div id="control">
+    			[<a href="<?=$this->url(array('controller'=>'comptage', 'action'=> 'reset'))?>">Initialiser les critères</a>],
+    			[<a class="saveciblage" href="<?=$this->url(array('controller'=>'comptage', 'action'=>'savedialog'))?>">Sauvegarder le profil du ciblage</a>]
+    		</div>
+    	<?php }?>
+    </div>
+	<ul>
+		<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='accueil') echo ' class="active"';?>>Accueil</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='dashboard') echo ' class="active"';?>>Tableau de bord</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='aide') echo ' active';?>>Aide</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'aproposde'), null, true)?>"<?php if ($this->menuActive=='aproposde') echo ' class="active"';?>>A propos de</a></li>
+		<?php if ( $this->admin ) {?>
+		<li><a href="<?=$this->url(array('controller'=>'gestion', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='gestion') echo ' class="active"';?>>Gestion</a></li>
+		<?php }?>
+		<li><a href="<?=$this->url(array('controller'=>'user', 'action'=>'logout'), null, true)?>">Déconnexion</a></li>
+	</ul>
+</div>
--- a/application/views/default/scripts/user/logout.phtml
+++ b/application/views/default/scripts/user/logout.phtml
@ -1,3 +1,11 @@
+<?php if ($this->ajax) {?>
+
+<h4 class="logout">Vous avez été déconnecté.</h4>
+<h5 class="logout">Veuillez cliquer <a href="<?=$this->url?>">ici</a>
+</h5>
+
+<?php } else {?>
+
 <?=$this->doctype();?>
 <html>
 <head>
@ -8,9 +16,10 @@
 <h4 class="logout">Vous avez été déconnecté.</h4>
 <p><?=$this->message?></p>
 <h5 class="logout">
-Si cette page ne disparait pas au bout de <?=$this->refresh?> seconde(s), 
+Si cette page ne disparait pas au bout de <?=$this->refresh?> seconde(s),
 veuillez cliquer <a href="<?=$this->url?>">ici</a>
 </h5>
-
 </body>
-</html>
+</html>
+
+<?php }?>
--- a/batch/extract.php
+++ b/batch/extract.php
@ -1,228 +0,0 @@
-<?php
-// Define path to application directory
-defined('APPLICATION_PATH')
-|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application'));
-
-// Define application environment
-define('APPLICATION_ENV', 'production');
-
-// Ensure library/ is on include_path
-set_include_path(implode(PATH_SEPARATOR, array(
-	realpath(APPLICATION_PATH . '/../library'),
-	get_include_path(),
-)));
-
-/** Zend_Application */
-require_once 'Zend/Application.php';
-
-// Create application, bootstrap, and run
-$application = new Zend_Application(
-	APPLICATION_ENV,
-	APPLICATION_PATH . '/configs/application.ini'
-);
-require_once APPLICATION_PATH . '/../library/Zend/Loader/Autoloader.php';
-
-Class extract
-{
-	protected $db;
-	protected $dbMetier;
-	protected $reference;
-
-	public function __construct($reference)
-	{
-		$this->reference = $reference;
-		$dbConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'databases');
-		try {
-			$this->db = Zend_Db::factory($dbConfig->db);
-		} catch ( Exception $e ) {
-			exit ( $e->getMessage() );
-		}
-	}
-
-	public function getHttp()
-	{
-		/* Depuis le navigateur */
-	}
-
-	protected function getCj($liste)
-	{
-		foreach($liste as $valeur)
-		{
-			if(strlen($valeur) < 5) {
-				$sql = $this->db->select('formejuridique', array('fjCode'))
-					->from('formejuridique')
-					->where('fjCode LIKE "'.$valeur.'%"');
-			} else  {
-				$sql = $this->db->select('formejuridique', array('fjCode'))
-					->from('formejuridique')
-					->where('fjCode = "'.$valeur.'"');
-			}
-			$result = $this->db->fetchAll($sql);
-			foreach ($result as $code) {
-				if(strlen($code['fjCode']) > 2) {
-					$return[] = $code['fjCode'];
-				}
-			}
-		}
-		return ($return);
-	}
-
-	protected function localisationArbo($name, $valeur)
-	{
-		if(strlen($valeur) == 2) {
-			switch($name) {
-				case 'adr_reg':
-					$return = array();
-					$sql = $this->db->select()
-						->from('departements')
-						->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
-						->where('codeRegionInsee ='.$valeur);
-					$result = $this->db->fetchAll($sql);
-					foreach ($result as $res) {
-						$return[] = trim($res['INSEE']);
-					}
-					break;
-				case 'adr_dept':
-					$return = array();
-					$sql = $this->db->select()
-						->from('departements')
-						->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
-						->where('numdep ='.$valeur);
-					$result = $this->db->fetchAll($sql);
-					foreach ($result as $res) {
-						$return[] = trim($res['INSEE']);
-					}
-					break;
-			}
-		}
-		return ($return);
-	}
-
-	public function getMinMax($name, $valeur)
-	{
-		$valeur = explode(',', $valeur);
-		if(count($valeur) > 1)
-		{
-			$sql = 'SELECT min, max FROM minmax WHERE cle ="'.$name.'"';
-			$result = $this->db->query($sql);
-			$result = $result->fetchAll();
-			if(empty($valeur[0])){
-				echo $name;
-				$valeur[0] = $result[0]['min'];
-			}
-			if(empty($valeur[1])){
-				$valeur[1] = $result[0]['max'];
-			}
-		}
-		return ($valeur);
-	}
-
-	protected function nafArbo($key, $valeur)
-	{
-		$value 			= array();
-		$valeur 		= trim($valeur);
-
-		if(strlen($valeur) == 1)
-		{
-			$sql = 'SELECT * FROM naf WHERE parent ='.$valeur;
-			$result		=$this->db->query($sql);
-			$result	= $result->fetchAll();
-			foreach($result as $code) $where .= " code LIKE '".trim($code['code'])."%' and niveau = 5 or ";
-			$where 		= substr($where, 0, (strlen($where)) - 3);
-			$sql 		= 'SELECT * FROM naf '.$where;
-			$result		= $this->db->query($sql);
-			$result = $result->fetchAll();
-			foreach($result as $code) $value[] = $code['code'];
-		} else if(strlen($valeur) < 5){
-			//$sql 		= $table->select()->where('code LIKE "'.trim($valeur).'%" and niveau = 5');
-			$sql = 'SELECT * FROM naf WHERE code LIKE "'.trim($valeur).'%" and niveau = 5';
-			$result 	= $this->db->query($sql);
-			$result = $result->fetchAll();
-			foreach($result as $code) $value[] = $code['code'];
-		} else if(strlen($valeur) == 5) {
-			$value[] = $valeur;
-		}
-		return ($value);
-	}
-
-	public function getCli()
-	{
-		require_once('Scores/Ciblage.php');
-		//require_once('Scores/Field.php');
-
-		$sql 		= 'SELECT id, idDefinition, uniteInsee FROM comptages WHERE id = '.$this->reference;
-		$fetch 		= $this->db->query($sql);
-		$result 	= $fetch->fetchAll();
-		$idComptage = $result[0]['id'];
-		$uniteInsee = $result[0]['uniteInsee'];
-
-		$sql 		= 'SELECT id, criteres.criteres FROM criteres WHERE id ='.$result[0]['idDefinition'];
-		$fetch 		= $this->db->query($sql);
-		$result 	= $fetch->fetchAll();
-		$idCriteres = $result[0]['id'];
-
-		$structure 	= json_decode($result[0]['criteres']);
-		$element 	= array();
-		foreach ($structure as $name => $valeur){
-			if($name == 'adr_com') {
-				$liste = explode(',', $valeur);
-				$codes = array();
-				foreach ($liste as $element) {
-					$val = explode(':', $element);
-					if(!empty($val[1]))
-						$codes = array_merge($this->localisationArbo($val[0], $val[1]), $codes);
-				}
-				$array['adr_com'] = $codes;
-			}
-			else if($name == 'cj') {
-				$array['cj'] = $this->getCj(explode(',', $valeur));
-			}
-			else if($name == 'ape_etab') {
-				$values = array();
-				$nafs = explode(',', $structure->ape_etab);
-				foreach($nafs as $naf) {
-					if($naf != ' ') {
-						$values = array_merge($values, $this->nafArbo('ape_etab', $naf));
-					}
-				}
-				$array['ape_etab'] 	= $values;
-			}else {
-				$valeur = $this->getMinMax($name, $valeur);
-				$array[$name] = $valeur;
-			}
-		}
-		unset($array['vil']);
-		unset($array['adr_com']);
-		unset($array['adr_dept']);
-		$array['bilTca'] = array(4, 5, 6);
-		$ciblage 			= new Ciblage($array, true);
-		$res 				= $ciblage->execute(true);
-
-		$data = array(
-			'idComptage' => $idComptage,
-			'idCriteres' => $idCriteres,
-			'idProfil' => 1,
-			'reference' => 'batch',
-			'identifiants' => json_encode($res),
-			'nbLigneTotales' => count($res),
-			'nbLigneTraites' => count($res),
-			'uniteInsee' => $uniteInsee,
-			'error' => 0
-		);
-		$this->db->insert('enrichissement_identifiants',$data);
-		$fd = fopen($idComptage.'_batch'.date('Y-m-d-hms').'.csv', 'x+');
-		try {
-			$array = array();
-			foreach($res as $field) {
-				fputcsv($fd, array($field), ';');
-			}
-		} catch(Exception $e) {
-			echo $e->getMessage();
-		}
-		fclose($fd);
-		echo count($res).' Success !';
-	}
-}
-
-$a = new extract('38');
-$a->getCli();
--- a/config/Odea/application.ini
+++ b/config/Odea/application.ini
@ -0,0 +1,57 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = Odea
+profil.webservice.location = celeste
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.celeste.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "/home/vhosts/data"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=ciblage
+profil.db.ciblage.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.3.30
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=127.0.0.1
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/config/local/application.ini
+++ b/config/local/application.ini
@ -0,0 +1,57 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = development
+profil.webservice.location = sdsrvdev01
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "d:\www\dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=user
+profil.db.ciblage.params.password=pass
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.78.230
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=192.168.78.252
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/config/sdsrvdev01/application.ini
+++ b/config/sdsrvdev01/application.ini
@ -0,0 +1,57 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = sdsrvdev01
+profil.webservice.location = sdsrvdev01
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "/sites/dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=root
+profil.db.ciblage.params.password=bj10sx
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.78.230
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=192.168.78.252
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/library/Application/Controller/Plugin/Auth.php
+++ b/library/Application/Controller/Plugin/Auth.php
@ -56,101 +56,123 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 			} else {

 			    $layout = Zend_Layout::getMVCInstance();
-			    
-				//Pas authentifié
-				if ( !$auth->hasIdentity() ) {
-				
-				    $request->setModuleName('default')
-    				    ->setControllerName('user')
-    				    ->setActionName('login');
-				
-				} elseif (time() > $auth->getIdentity()->time ) {
-				    	
-				    $auth->clearIdentity();
-				    $storage = $auth->getStorage();
-				    Zend_Session::namespaceUnset($storage->getNamespace());
-				
-				    if ( $request->getControllerName()=='index' && $request->getActionName()=='index' ) {
-				        $request->setModuleName('default')
-				            ->setControllerName('user')
-				            ->setActionName('login');
-				    } else {
-				        $request->setModuleName('default')
-				            ->setControllerName('user')
-				            ->setActionName('logout');
-				    }
-					
-		    	//Authentifié => on met à jour la session
-				} else {

-					$identity = $auth->getIdentity();
-					$identity->time = time() + $identity->timeout;
-
-					if ( !isset($identity->dateContrat) && $layout->isEnabled() )
-					{
-						//Get customer's params
-						$paramsM = new Application_Model_CustomerParams();
-						$sql = $paramsM->select()
-							->where('idClient = ?', $identity->idClient)
-							//@todo : add service from WebService
-							->order('dateContrat DESC')->limit(1);
+			    //Authentifié => on met à jour la session
+			    if ( $auth->hasIdentity() )
+			    {

-						Zend_Registry::get('firebug')->info($sql->__toString());
-						$params = $paramsM->fetchAll($sql)->toArray();
-						if (count($params)>0) {
-							$identity->filterRNCS = $params[0]['filterRNCS'];
-							$identity->licenceINSEE = $params[0]['licenceINSEE'];
-							$identity->limitLines = $params[0]['limitLines'];
-							$identity->limitFiles = $params[0]['limitFiles'];
-							$identity->immediatExtract = $params[0]['immediatExtract'];
-							$identity->dateContrat = $params[0]['dateContrat'];
-							$identity->periodContrat = $params[0]['periodContrat'];
-							$identity->priceLine = $params[0]['priceLine'];
-							$identity->forfait = $params[0]['forfait'];
-						}
-											
-						//Get user's preference
-						$prefsM = new Application_Model_Prefs();
-						$pref = $prefsM->find($identity->username)->current();
-						if ($pref) {
-							$identity->preferences = json_decode($pref->json, true);
-						}
-
-						//Add a global value to join filterRNCS and preferences RNCS
-						if ($identity->filterRNCS) {
-							$identity->globalRNCS = 1;
-						}
-
-						if (isset($identity->preferences['filter']['rncs']) && $identity->preferences['filter']['rncs']==1) {
-							$identity->globalRNCS = 1;
-						}
-					}
-					
-					Zend_Registry::get('firebug')->info($identity);
-					
-					//No contrat define
-					if ( $identity->dateContrat=='0000-00-00 00:00:00' ) {
-					    //If no params are detected, display a message to contact support
-					    $request->setModuleName('default')
-					        ->setControllerName('aide')
-					        ->setActionName('message')
-					        ->setParam('typeMsg', 'support');
-					}
-					
-					//@todo : Check dateContrat and calculate end of contrat
+			        $identity = $auth->getIdentity();
+			        $identity->time = time() + $identity->timeout;

-					$auth->getStorage()->write($identity);
+			        if ( !isset($identity->dateContrat) && $layout->isEnabled() )
+			        {
+			            //Get customer's params
+			            $paramsM = new Application_Model_CustomerParams();
+			            $sql = $paramsM->select()
+			            ->where('idClient = ?', $identity->idClient)
+			            //@todo : add service from WebService
+			            ->order('dateContrat DESC')->limit(1);

-					if ( $identity->profil=="SuperAdministrateur" ) {
-						$view = $layout->getView();
-						$view->admin = true;
-					}
+			            Zend_Registry::get('firebug')->info($sql->__toString());
+			            $params = $paramsM->fetchAll($sql)->toArray();
+			            if (count($params)>0) {
+			                $identity->filterRNCS = $params[0]['filterRNCS'];
+			                $identity->licenceINSEE = $params[0]['licenceINSEE'];
+			                $identity->limitLines = $params[0]['limitLines'];
+			                $identity->limitFiles = $params[0]['limitFiles'];
+			                $identity->immediatExtract = $params[0]['immediatExtract'];
+			                $identity->dateContrat = $params[0]['dateContrat'];
+			                $identity->periodContrat = $params[0]['periodContrat'];
+			                $identity->priceLine = $params[0]['priceLine'];
+			                $identity->forfait = $params[0]['forfait'];
+			            }

-					if (Zend_Session::namespaceIsset('login')){
-						Zend_Session::namespaceUnset('login');
-					}
+			            //Get user's preference
+			            $prefsM = new Application_Model_Prefs();
+			            $pref = $prefsM->find($identity->username)->current();
+			            if ($pref) {
+			                $identity->preferences = json_decode($pref->json, true);
+			            }

-				}
+			            //Add a global value to join filterRNCS and preferences RNCS
+			            if ($identity->filterRNCS) {
+			                $identity->globalRNCS = 1;
+			            }
+
+			            if (isset($identity->preferences['filter']['rncs'])
+			                    && $identity->preferences['filter']['rncs']==1) {
+			                $identity->globalRNCS = 1;
+			            }
+			        }
+
+			        //No contrat define
+			        if ( $identity->dateContrat=='0000-00-00 00:00:00' ) {
+			            //If no params are detected, display a message to contact support
+			            $request->setModuleName('default')
+    			            ->setControllerName('aide')
+    			            ->setActionName('message')
+    			            ->setParam('typeMsg', 'support');
+			        }
+			        //Check dateContrat and calculate end of contrat
+			        else {
+
+			            $hour = intval(substr($identity->dateContrat,11,2));
+			            $min = intval(substr($identity->dateContrat,14,2));
+			            $sec = intval(substr($identity->dateContrat,17,2));
+			            $month = intval(substr($identity->dateContrat,5,2)) + $identity->periodContrat;
+			            $day = intval(substr($identity->dateContrat,8,2));
+			            $year = intval(substr($identity->dateContrat,0,4));
+			            $dateFinContrat = mktime($hour,$min,$sec,$month,$day,$year);
+
+			            if ( $dateFinContrat > time() ) {
+			                $request->setModuleName('default')
+			                    ->setControllerName('user')
+			                    ->setActionName('logout')
+			                    ->setParam('message', "Votre Contrat est arrivé à expiration.");
+			            }
+
+			        }
+
+			        $auth->getStorage()->write($identity);
+
+			        if ( $identity->profil=="SuperAdministrateur" ) {
+			            $view = $layout->getView();
+			            $view->admin = true;
+			        }
+
+			        if (Zend_Session::namespaceIsset('login')){
+			            Zend_Session::namespaceUnset('login');
+			        }
+
+			    } elseif (time() > $auth->getIdentity()->time ) {
+
+			        if ( $request->getControllerName()=='index' && $request->getActionName()=='index' ) {
+			            $request->setModuleName('default')
+			                ->setControllerName('user')
+			                ->setActionName('login');
+			        } else {
+			            $request->setModuleName('default')
+			                ->setControllerName('user')
+			                ->setActionName('logout')
+			                ->setParam('ajax', $request->isXmlHttpRequest());
+			        }
+
+			    } else {
+
+			        if ( !$request->isXmlHttpRequest() ) {
+			            $session = new Zend_Session_Namespace('login');
+			            $session->url = $_SERVER['REQUEST_URI'];
+			            $request->setModuleName('default')
+			                ->setControllerName('user')
+			                ->setActionName('login');
+			        } else {
+			            $request->setModuleName('default')
+			                ->setControllerName('user')
+			                ->setActionName('logout')
+			                ->setParam('ajax', 1);
+			        }
+
+			    }
 			}
 		}
 	}
--- a/library/Application/Controller/Plugin/Menu.php
+++ b/library/Application/Controller/Plugin/Menu.php
@ -0,0 +1,45 @@
+<?php
+class Application_Controller_Plugin_Menu 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)
+	{
+	    $layout = Zend_Layout::getMVCInstance();
+        
+        if ( $layout->isEnabled() )
+        {
+            $view = $layout->getView();
+
+            $controller = $request->getControllerName();
+            $action = $request->getActionName();
+            
+            switch ( $controller ) {
+                case 'index':
+                    $view->menuActive = 'accueil';
+                    break;
+                case 'dashboard':
+                    $view->menuActive = 'dashboard';
+                    break;
+                case 'aide':
+                    switch ( $action ) {
+                        case 'index':
+                            $view->menuActive = 'aide';
+                            break;
+                        case 'aproposde':
+                            $view->menuActive = 'aproposde';
+                            break;
+                    }
+                    break;
+                case 'gestion':
+                    $view->menuActive = 'gestion';
+                    break;
+            }
+        }
+        
+	}
+}
--- a/library/Scores/Ciblage.php
+++ b/library/Scores/Ciblage.php
@ -48,14 +48,11 @@ class Ciblage
 		require_once 'sphinxapi/sphinxapi-2.0.4.php';

 		//Load configuration from registry
-		$configuration = Zend_Registry::get('configuration');
+		$c = Zend_Registry::get('config');

 		//Sphinx init
 		$this->sphinx = new SphinxClient();
-		$this->sphinx->SetServer(
-			$configuration->sphinx->host,
-			intval($configuration->sphinx->port)
-		);
+		$this->sphinx->SetServer ( $c->profil->sphinx->host, intval($c->profil->sphinx->port) );
 		$this->sphinx->SetMatchMode(SPH_MATCH_EXTENDED);
 		$this->sphinx->ResetFilters();

--- a/library/Scores/Mail.php
+++ b/library/Scores/Mail.php
@ -9,7 +9,9 @@ class Mail
 	 */
 	public function __construct()
 	{
-		$this->config = Zend_Registry::get('configuration')->mail;
+		$c = Zend_Registry::get('config');
+	    
+	    $this->config = $c->profil->mail;
 		$this->mail = new Zend_Mail();
 		if ($this->config->method == 'smtp') {
 			$tr = new Zend_Mail_Transport_Smtp($this->config->smtp_host);
@ -26,7 +28,7 @@ class Mail
 	 */
 	public function setFrom($configKey)
 	{
-		$email = $this->config->$configKey;
+		$email = $this->config->email->$configKey;
 		$this->mail->setFrom($email, ucfirst($configKey));
 	}

@ -36,7 +38,7 @@ class Mail
 	 */
 	public function addToKey($configKey)
 	{
-		$email = $this->config->$configKey;
+		$email = $this->config->email->$configKey;
 		$this->mail->addTo($email, ucfirst($configKey));
 	}

--- a/library/Scores/Ws.php
+++ b/library/Scores/Ws.php
@ -9,8 +9,8 @@ class Scores_Ws

 	public function __construct($login = '', $password = '')
 	{
-		$configuration = Zend_Registry::get('configuration');
-		$config = new Zend_Config_Ini(realpath(dirname(__FILE__)) . '/webservices.ini', $configuration->webservice->location);
+		$c = Zend_Registry::get('config');
+		$config = new Zend_Config_Ini(realpath(dirname(__FILE__)) . '/webservices.ini', $c->profil->webservice->location);
 		$this->webservices = $config->webservices->toArray();
 		if ( !empty($login) && !empty($password) ){
 			$this->login = $login;
@ -18,9 +18,9 @@ class Scores_Ws
 		} else {
 			$auth = Zend_Auth::getInstance();
 			$user = $auth->getIdentity();
-			$this->login = $user->getLogin();
-			$this->password = $user->getPassword();
-			$this->nbReponses = $user->getNbRep();
+			$this->login = $user->username;
+			$this->password = $user->password;
+			$this->nbReponses = $user->nbReponses;
 			if ( $user->checkModeEdition() ) {
 				$this->toNotCache = true;
 			}
@ -112,10 +112,10 @@ class Scores_Ws
 		$message.= "\n\n";
 		$message.= "Requete :\n ".$requete."\n";
 		$message.= "Reponse :\n ".$reponse."\n";
-		$configuration = Zend_Registry::get('configuration');
+		$c = Zend_Registry::get('config');
 		require_once 'Scores/Mail.php';
 		$mail = new Mail();
-		$mail->setSubject('[ERREUR SOAP] - '.$configuration->server->name.' -'.date('Ymd'));
+		$mail->setSubject('[ERREUR SOAP] - '.$c->profil->server->name.' -'.date('Ymd'));
 		$mail->setBodyTexte($message);
 		$mail->setFrom('supportdev');
 		$mail->addToKey('supportdev');
--- a/public/index.php
+++ b/public/index.php
@ -23,8 +23,4 @@ $application = new Zend_Application(
    APPLICATION_PATH . '/configs/application.ini'
 );

-$configuration = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini');
-Zend_Registry::set('configuration', $configuration);
-
-$application->bootstrap()
-            ->run();
+$application->bootstrap()->run();
--- a/public/libs/jquery/jquery.js
+++ b/public/libs/jquery/jquery.js
--- a/public/libs/qtip/jquery.qtip.css
+++ b/public/libs/qtip/jquery.qtip.css
--- a/public/libs/qtip/jquery.qtip.js
+++ b/public/libs/qtip/jquery.qtip.js
--- a/public/libs/ui/jquery-ui-i18n.js
+++ b/public/libs/ui/jquery-ui-i18n.js
--- a/public/libs/ui/jquery-ui-i18n.min.js
+++ b/public/libs/ui/jquery-ui-i18n.min.js
--- a/public/libs/ui/jquery-ui.js
+++ b/public/libs/ui/jquery-ui.js
--- a/public/libs/ui/jquery-ui.min.js
+++ b/public/libs/ui/jquery-ui.min.js
--- a/public/libs/ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+++ b/public/libs/ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
--- a/public/libs/ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/public/libs/ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
--- a/public/libs/ui/themes/smoothness/jquery-ui.css
+++ b/public/libs/ui/themes/smoothness/jquery-ui.css
@ -1,17 +1,12 @@
-/*!
- * jQuery UI CSS Framework 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
+/*! jQuery UI - v1.9.2 - 2012-11-23
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
+* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */

 /* Layout helpers
 ----------------------------------*/
 .ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
 .ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
 .ui-helper-clearfix:after { clear: both; }
@ -37,19 +32,211 @@
 /* Overlays */
 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }

+.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
+.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
+.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; }

-/*!
- * jQuery UI CSS Framework 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}

+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
+.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
+
+.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
+.ui-menu .ui-state-disabled a { cursor: default; }
+
+/* icon support */
+.ui-menu-icons { position: relative; }
+.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
+
+/* left-aligned */
+.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
+
+/* right-aligned */
+.ui-menu .ui-menu-icon { position: static; float: right; }
+
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
+.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
+.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
+.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
+.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
+.ui-spinner-up { top: 0; }
+.ui-spinner-down { bottom: 0; }
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position:-65px -16px;
+}
+
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+/* Fades and background-images don't work well together in IE6, drop the image */
+* html .ui-tooltip {
+	background-image: none;
+}
+body .ui-tooltip { border-width: 2px; }

 /* Component containers
 ----------------------------------*/
@ -66,10 +253,9 @@
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
 .ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
 .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-.ui-widget :active { outline: none; }

 /* Interaction Cues
 ----------------------------------*/
@ -81,6 +267,7 @@
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
 .ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */

 /* Icons
 ----------------------------------*/
@ -222,8 +409,8 @@
 .ui-icon-help { background-position: -48px -144px; }
 .ui-icon-check { background-position: -64px -144px; }
 .ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
 .ui-icon-pin-w { background-position: -128px -144px; }
 .ui-icon-pin-s { background-position: -144px -144px; }
 .ui-icon-play { background-position: 0 -160px; }
@ -283,281 +470,5 @@
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }

 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Resizable 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.23
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*!
- * jQuery UI Button 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
--- a/public/libs/ui/themes/smoothness/jquery.ui.theme.css
+++ b/public/libs/ui/themes/smoothness/jquery.ui.theme.css
@ -0,0 +1,248 @@
+/*!
+ * jQuery UI CSS Framework 1.9.2
+ * http://jqueryui.com
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
--- a/public/themes/default/scripts/fields.js
+++ b/public/themes/default/scripts/fields.js
@ -246,7 +246,7 @@ function set(key, value, ex)
 		//
 		if (data.error==0) {
 			//Count html result
-			var html = 'Nombre sélectionnées : <span class="valeur">'+data.count+'</span>'; 
+			var html = 'Sélection : <span class="valeur">'+data.count+'</span>'; 
 			if (data.insee>0) {
 				html = html + ' (dont <span class="valeur">'+data.insee +'</span> unité(s) insee)';
 			}
--- a/public/themes/default/scripts/scripts.js
+++ b/public/themes/default/scripts/scripts.js
@ -1,9 +1,20 @@
 $(document).ready(function(){
 	
-	$('#message').hover(
+	/*$('#message').hover(
 		function(){ $('#control').css('display', 'block'); },
 		function(){ $('#control').css('display', 'none'); }
-	);
+	);*/
+	
+	
+	$(window).scroll(function() {
+		var offset = $(window).scrollTop();
+		var headerHeight = $('div#header').height();
+		if (offset>headerHeight-15) {
+			$('div#navigation').addClass('navigationFix');
+		} else {
+			$('div#navigation').removeClass('navigationFix');			
+		}		
+	});
 	
 	$('body').delegate('.saveciblage', 'click', function(){
 		var title = 'Sauvegarde du profil de ciblage';
--- a/public/themes/default/styles/main.css
+++ b/public/themes/default/styles/main.css
@ -17,128 +17,199 @@ a img { border:none } /* Gets rid of IE's blue borders */
 /* Main
 ----------------------------------*/
 body {
-    background: url("/themes/default/images/bg-home-tile.jpg") repeat-x scroll 50% 0 #bebebe;
+	background: none repeat scroll 0 0 #DDDDDD;
+    border-bottom: 1px solid #F8F8F8;
+    margin: 2em auto 0;
+    min-height: 30em;
    color: #000000;
-    font: 0.8em Verdana,Helvetica,Arial,sans-serif;
+    font: 0.8em/1.6em Verdana,Arial,sans-serif;	
    margin: 0;
    padding: 0;
 }

+
+
 #global {
+	padding: 10px 0;
+	background: none repeat scroll 0 0 #EEEEEE;
 	position: relative;
-	width:1000px;
-	margin-right: auto;
-	margin-left: auto;
 }

 #header {
-	height: 157px;
-    padding: 0 40px;
-    position: relative;
+    padding: 0;
 }

-#header #message {
-    clear: right;
+#message {
+	color: #E1E5F2;
    float: right;
-    margin-top: 34px;
-    background-color: #ffffff;
-    color: #000000;
-    text-align:center;
-    line-height: 25px;
-    padding: 0 1em;
-    width:450px;  
+    margin-top: 3px;
+    padding-right: 95px;
+    position: relative;
+    z-index: 1;
 }

-#header #message #control {
+#message #comptage {
+	background-color:#4173c9;
+    background-image:-moz-linear-gradient(top,#5e8ee4,#4173c9);
+    background-image:-webkit-linear-gradient(top,#5e8ee4,#4173c9);
+    background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#5e8ee4),color-stop(1,#4173c9));
+    background-image:linear-gradient(top,#5e8ee4,#4173c9);
+    border:1px solid #fff;
+    -moz-border-radius:2px;
+    -webkit-border-radius:2px;
+    border-radius:2px;
+    color:#fff;
+    cursor:pointer;
+    display:inline-block;
+    font-family:arial,sans-serif;
+    font-weight:bold;
+    padding:5px 12px;
+    text-align:center;
+    text-shadow:0 -1px 0 rgba(0,0,0,.08);
+    margin:0;
+    overflow:visible;
+    white-space:normal;
+}
+#message #comptage:hover,#message #comptage:focus {
+	background-color:#396bbc;
+	background-image:-moz-linear-gradient(top,#5587d7,#396bbc);
+	background-image:-webkit-linear-gradient(top,#5587d7,#396bbc);
+	background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#5587d7),color-stop(1,#396bbc));
+	background-image:linear-gradient(top,#5587d7,#396bbc)
+}
+
+#message #control {
 	display:none;
 }

+#header-logo {	
+	background-color:#F5F5F5;
+    background: -moz-linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0 0 #F5F5F5;
+    border-bottom: 1px solid #EEEEEE;
+    color: #444444;
+    height: 44px;
+    padding: 14px 15px 13px;
+}
+
+#logo {
+	margin:auto;
+    max-width:978px;
+}
+
+#logo:after {
+    clear: both;
+    content: " ";
+    display: block;
+    height: 0;
+    visibility: hidden;
+}
+
+#logo h1 {
+	color: #91959C;
+    font-size: 27px;
+    float: left;
+    font-weight: 300;
+    line-height: 1.375;
+    margin: 0;
+}
+
 #control a {
-	color:#000000;
+	color:#000;
 	text-decoration:none;
 }

 #header h1 {
-    border: 0 none;
-    bottom: 15px;
-    color: #DDDDDD;
-    font-size: 2em;
-    font-weight: normal;
-    left: 60px;
-    line-height: 1;
-    padding: 0;
-    position: absolute;
-    text-transform: uppercase;
 }

-#header h1 {
-	font-size:18px; 
-	margin:10px 5px;
+#navigation {	
+	background:#325da7;
+	background-image:-moz-linear-gradient(top,#4e78c2,#325da7);
+	background-image:-webkit-linear-gradient(top,#4e78c2,#325da7);
+	background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4e78c2),color-stop(1,#325da7));
+	background-image:linear-gradient(top,#4e78c2,#325da7);
+	color:#fff;
 }

-#logo {
-	border: 0 none !important;
-    display: block;
-    position: absolute;
-    top: 80px;	
+.navigationFix {
+	width:100%;
+	z-index: 999;
+    position: fixed;
+    top: 0;	
 }

+
 #primaryNavigation {
-    background: url("/themes/default/images/menu/bg_primaryNav_left.gif") no-repeat scroll left bottom #192839;
-    float: right;
+	margin:0 auto;
+    max-width:978px;
+    height:40px;
 }

 #primaryNavigation ul {
-    background: url("/themes/default/images/menu/bg_primaryNav_right.gif") no-repeat scroll right bottom transparent;
-    float: left;
    margin: 0;
-    padding: 0 0.8em 2px;
+    list-style: none outside none;
+    height:40px;
+    padding:5px 0;
+}
+
+#primaryNavigation ul:after {
+    clear: both;
+    content: "";
+    display: block;
 }

 #primaryNavigation li {
-    background: none repeat scroll 0 0 transparent;
-    float: left;
-    list-style: none outside none;
-    margin: 0;
-    padding: 0;
+	float: left;
+    margin: 0 20px 0 0;
+    padding: 5px 0;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.08);
 }

 #primaryNavigation li a {
-    color: #D0D0D0;
-    float: left;
-    line-height: 25px;
-    margin-bottom: 2px;
-    padding: 0 1em;
+    display: block;
+    margin: -5px 0;
+    padding: 5px 0;    
+    color: #E1E5F2;
    text-decoration: none;
 }

-#primaryNavigation li.jq-ui, #primaryNavigation li.jq-blog {
-    border-right: 1px solid #0F1924;
-}
-
-#primaryNavigation li.jq-current a, #primaryNavigation li.jq-current a:hover {
-    background: none repeat scroll 0 0 #192839;
-    border-bottom: 2px solid #176092;
-    color: #D0D0D0;
-    cursor: default;
-    margin-bottom: 0;
-}
-
 #primaryNavigation li a:hover {
-    border-bottom: 2px solid #4082AE;
+    border-bottom: 2px solid #FFFFFF;
    color: #FFFFFF;
-    margin-bottom: 0;
 }

+#primaryNavigation li a.active {
+	border-bottom: 2px solid #ECB12E;
+    color: #FFFFFF;
+    font-weight:bold;
+}
+	
 #content {
-    margin:0;
+	width:1000px;
+	margin:10px auto;
 }

 #content h1 {font-size:16px; text-decoration:underline;}
 #content h2 {font-size:14px;}
 #content h3 {font-size:12px;}

-#footer {}
+#footer {
+	display: block;
+	background: none repeat scroll 0 0 #DDDDDD;	
+}
+
+#footer p.info {
+	color: #777777;
+    margin: 2em auto;
+    text-align: center;
+    text-shadow: 0 1px 0 #FFFFFF;
+    width: 22em;	
+}
+
+#footer p.info a {
+	color: #777777;
+	font-weight: bold;
+	text-decoration:none;
+}

 .qtip {
 	font-size:0.9em;
--- a/scripts/build/Odea/application.ini
+++ b/scripts/build/Odea/application.ini
@ -0,0 +1,58 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = Odea
+profil.webservice.location = celeste
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "d:\www\dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=ciblage
+profil.db.ciblage.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.3.30
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=127.0.0.1
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/scripts/build/Odea/configuration.ini
+++ b/scripts/build/Odea/configuration.ini
@ -0,0 +1,37 @@
+[server]
+name = Odea
+
+[webservice]
+location = celeste
+
+[databases]
+db.adapter=mysqli
+db.params.host=127.0.0.1
+db.params.username=ciblage
+db.params.password=z7jq8AhvrwqQJ4Yb
+db.params.dbname=ciblage
+db.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+
+jo.adapter=mysqli
+jo.params.host=192.168.3.30
+jo.params.username=ciblage
+jo.params.password=z7jq8AhvrwqQJ4Yb
+jo.params.dbname=jo
+jo.params.persistent = true
+jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+
+[sphinx]
+host = 127.0.0.1
+port = 3312
+
+[mail]
+method = smtp
+smpt_port =
+smtp_host = smtp.celeste.fr
+support = supportdev@scores-decisions.com
+supportdev = supportdev@scores-decisions.com
+contact = supportdev@scores-decisions.com
+production = supportdev@scores-decisions.com
+
+[path]
+data = "/home/vhosts/data"
--- a/scripts/build/_sql/CiblageComptages.sql
+++ b/scripts/build/_sql/CiblageComptages.sql
@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS `ciblage_comptages` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idDefinition` int(11) NOT NULL,
+  `resultat` int(11) NOT NULL,
+  `uniteInsee` int(11) NOT NULL,
+  `dateAjout` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Résultat des comptages';
--- a/scripts/build/_sql/CiblageCriteres.sql
+++ b/scripts/build/_sql/CiblageCriteres.sql
@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS `ciblage_criteres` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idClient` int(11) NOT NULL,
+  `login` varchar(20) NOT NULL,
+  `reference` varchar(50) NOT NULL,
+  `criteres` longtext NOT NULL,
+  `parent` int(11) NOT NULL,
+  `dateAjout` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `reference` (`reference`),
+  KEY `login` (`login`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Sauvegarde des critères pour les comptages' ;
--- a/scripts/build/_sql/CustomerParams.sql
+++ b/scripts/build/_sql/CustomerParams.sql
@ -0,0 +1,18 @@
+CREATE TABLE `customer_params` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idClient` int(11) NOT NULL,
+  `service` varchar(100) NOT NULL,
+  `filterRNCS` tinyint(1) NOT NULL COMMENT 'Filtrer sur le perimetre RNCS ',
+  `licenceINSEE` tinyint(1) NOT NULL COMMENT 'Le client possède une licence INSEE',
+  `immediatExtract` int(11) NOT NULL DEFAULT '0' COMMENT 'Nombre de ligne maximum pour une extraction immédiate',
+  `dateContrat` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Date de debut du contrat',
+  `periodContrat` int(2) NOT NULL COMMENT 'Durée du contrat en mois',
+  `periodPaiement` int(2) NOT NULL COMMENT 'Durée en mois pour l''emission de la facture (1,3,6,12)',
+  `priceLine` float NOT NULL DEFAULT '0',
+  `forfait` int(11) NOT NULL DEFAULT '0' COMMENT 'Montant du forfait pour décompte',
+  `limitLines` int(11) NOT NULL DEFAULT '0' COMMENT 'Limiter à un nombre de ligne sur la période du contrat',
+  `limitFiles` int(11) NOT NULL DEFAULT '0' COMMENT 'Limiter à un nombre de fichier sur la durée du contrat',
+  `criteres` text NOT NULL,
+  `dateAdded` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Paramètres de facturation';
--- a/scripts/build/_sql/CustomerPrefs.sql
+++ b/scripts/build/_sql/CustomerPrefs.sql
@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS `customer_prefs` (
+  `login` varchar(255) NOT NULL,
+  `json` text NOT NULL,
+  PRIMARY KEY (`login`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- a/scripts/build/_sql/EnrichissementFichiers.sql
+++ b/scripts/build/_sql/EnrichissementFichiers.sql
@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS `enrichissement_fichiers` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idProfil` int(11) NOT NULL,
+  `reference` varchar(50) NOT NULL, 
+  `identifiants` longtext NOT NULL,
+  `nbLigneTotales` int(11) NOT NULL,
+  `nbLigneTraites` int(11) NOT NULL,
+  `uniteInsee` int(11) NOT NULL DEFAULT '0',
+  `error` varchar(100) NOT NULL,
+  `dateAdded` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dateStart` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dateStop` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `fichierIn` varchar(100) NOT NULL,
+  `fichierOut` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- a/scripts/build/_sql/EnrichissementIdentifiants.sql
+++ b/scripts/build/_sql/EnrichissementIdentifiants.sql
@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS `enrichissement_identifiants` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idComptage` int(11) NOT NULL,
+  `idCriteres` int(11) NOT NULL DEFAULT '0',
+  `idProfil` int(11) NOT NULL,
+  `reference` varchar(50) NOT NULL, 
+  `identifiants` longtext NOT NULL,
+  `nbLigneTotales` int(11) NOT NULL,
+  `nbLigneTraites` int(11) NOT NULL,
+  `uniteInsee` int(11) NOT NULL DEFAULT '0',
+  `error` varchar(100) NOT NULL,
+  `dateAdded` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dateStart` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dateStop` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `fichier` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- a/scripts/build/_sql/EnrichissementProfils.sql
+++ b/scripts/build/_sql/EnrichissementProfils.sql
@ -0,0 +1,14 @@
+CREATE TABLE `enrichissement_profils` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idClient` int(11) NOT NULL,
+  `service` varchar(25) NOT NULL,
+  `login` varchar(50) NOT NULL,
+  `reference` varchar(50) NOT NULL,
+  `criteres` text NOT NULL,
+  `dataInsee` tinyint(4) NOT NULL,
+  `dateAjout` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dateSuppr` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `actif` tinyint(4) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idClient` (`idClient`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Profil d''extraction';
--- a/scripts/build/_sql/FieldsCodepostaux.sql
+++ b/scripts/build/_sql/FieldsCodepostaux.sql
--- a/scripts/build/_sql/FieldsDepartements.sql
+++ b/scripts/build/_sql/FieldsDepartements.sql
@ -0,0 +1,126 @@
+--
+-- Structure de la table `departements`
+--
+
+CREATE TABLE IF NOT EXISTS `fields_departements` (
+  `numdep` char(3) NOT NULL DEFAULT '0',
+  `libdep` varchar(30) NOT NULL DEFAULT '',
+  `numreg` tinyint(4) NOT NULL DEFAULT '0',
+  `codeRegionInsee` tinyint(2) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`numdep`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Contenu de la table `departements`
+--
+
+INSERT INTO `fields_departements` (`numdep`, `libdep`, `numreg`, `codeRegionInsee`) VALUES
+('03', 'Allier', 3, 83),
+('04', 'Alpes-de-Haute-Provence', 21, 93),
+('02', 'Aisne', 19, 26),
+('01', 'Ain', 22, 82),
+('05', 'Hautes-Alpes', 21, 93),
+('06', 'Alpes-Maritimes', 21, 93),
+('07', 'Ardèche', 22, 82),
+('08', 'Ardennes', 7, 21),
+('09', 'Ariège', 15, 73),
+('10', 'Aube', 7, 21),
+('11', 'Aude', 11, 91),
+('12', 'Aveyron', 15, 73),
+('13', 'Bouches-du-Rhône', 21, 93),
+('14', 'Calvados', 18, 25),
+('15', 'Cantal', 3, 83),
+('16', 'Charente', 20, 54),
+('17', 'Charente-Maritime', 20, 54),
+('18', 'Cher', 6, 24),
+('19', 'Corrèze', 12, 74),
+('2A', 'Corse-du-Sud', 8, 94),
+('20', 'Corse', 8, 94),
+('21', 'Côte-d''Or', 4, 26),
+('22', 'Côtes-d''Armor', 5, 53),
+('23', 'Creuse', 12, 74),
+('24', 'Dordogne', 2, 72),
+('25', 'Doubs', 9, 43),
+('26', 'Drôme', 22, 82),
+('27', 'Eure', 17, 23),
+('28', 'Eure-et-Loir', 6, 24),
+('29', 'Finistère', 5, 53),
+('30', 'Gard', 11, 91),
+('33', 'Gironde', 2, 72),
+('32', 'Gers', 15, 73),
+('34', 'Hérault', 11, 91),
+('31', 'Haute-Garonne', 15, 73),
+('36', 'Indre', 6, 24),
+('37', 'Indre-et-Loire', 6, 24),
+('35', 'Ille-et-Vilaine', 5, 53),
+('39', 'Jura', 9, 43),
+('38', 'Isère', 22, 82),
+('40', 'Landes', 2, 72),
+('41', 'Loir-et-Cher', 6, 24),
+('42', 'Loire', 22, 82),
+('43', 'Haute-Loire', 3, 83),
+('44', 'Loire-Atlantique', 13, 52),
+('45', 'Loiret', 6, 24),
+('46', 'Lot', 15, 73),
+('47', 'Lot-et-Garonne', 2, 72),
+('48', 'Lozère', 11, 91),
+('49', 'Maine-et-Loire', 13, 52),
+('53', 'Mayenne', 13, 52),
+('51', 'Marne', 7, 21),
+('50', 'Manche', 18, 25),
+('52', 'Haute-Marne', 7, 21),
+('54', 'Meurthe-et-Moselle', 14, 41),
+('56', 'Morbihan', 5, 53),
+('55', 'Meuse', 14, 41),
+('57', 'Moselle', 14, 41),
+('58', 'Nièvre', 4, 26),
+('59', 'Nord', 16, 31),
+('60', 'Oise', 19, 26),
+('62', 'Pas-de-Calais', 16, 31),
+('61', 'Orne', 18, 25),
+('63', 'Puy-de-Dôme', 3, 83),
+('67', 'Bas-Rhin', 1, 42),
+('68', 'Haut-Rhin', 1, 42),
+('69', 'Rhône', 22, 82),
+('64', 'Pyrénées-Atlantiques', 2, 72),
+('65', 'Hautes-Pyrénées', 15, 73),
+('66', 'Pyrénées-Orientales', 11, 91),
+('70', 'Haute-Saône', 9, 43),
+('71', 'Saône-et-Loire', 4, 26),
+('72', 'Sarthe', 13, 52),
+('73', 'Savoie', 22, 82),
+('74', 'Haute-Savoie', 22, 82),
+('75', 'Paris', 10, 11),
+('76', 'Seine-Maritime', 17, 23),
+('77', 'Seine-et-Marne', 10, 11),
+('78', 'Yvelines', 10, 11),
+('79', 'Deux-Sèvres', 20, 54),
+('80', 'Somme', 19, 26),
+('81', 'Tarn', 15, 73),
+('82', 'Tarn-et-Garonne', 15, 73),
+('83', 'Var', 21, 93),
+('84', 'Vaucluse', 21, 93),
+('85', 'Vendée', 13, 52),
+('86', 'Vienne', 20, 54),
+('87', 'Haute-Vienne', 12, 74),
+('88', 'Vosges', 14, 41),
+('89', 'Yonne', 4, 26),
+('90', 'Territoire de Belfort', 9, 43),
+('91', 'Essonne', 10, 11),
+('92', 'Hauts-de-Seine', 10, 11),
+('93', 'Seine-Saint-Denis', 10, 11),
+('94', 'Val-de-Marne', 10, 11),
+('95', 'Val-d''Oise', 10, 11),
+('971', 'Guadeloupe', 23, 1),
+('972', 'Martinique', 23, 2),
+('973', 'Guyane', 23, 3),
+('974', 'Réunion', 24, 4),
+('200', 'Corse-du-Sud', 8, 94),
+('201', 'Corse-du-Sud', 8, 94),
+('202', 'Haute-Corse', 8, 94),
+('976', 'Mayotte', 0, 0),
+('988', 'Nouvelle-Calédonie', 0, 0),
+('987', 'Polynésie-Française', 0, 0),
+('975', 'Saint-Pierre-et-Miquelon', 0, 0),
+('986', 'Wallis-et-Futuna', 0, 0),
+('2B', 'Haute-Corse', 8, 94);
--- a/scripts/build/_sql/FieldsFormejuridique.sql
+++ b/scripts/build/_sql/FieldsFormejuridique.sql
@ -0,0 +1,338 @@
+--
+-- Structure de la table `fields_formejuridique`
+--
+
+CREATE TABLE IF NOT EXISTS `fields_formejuridique` (
+  `fjCode` int(4) NOT NULL,
+  `fjLibelle` varchar(100) NOT NULL,
+  `fjInsee` tinyint(1) NOT NULL,
+  KEY `fjCode` (`fjCode`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Contenu de la table `formejuridique`
+--
+
+INSERT INTO `fields_formejuridique` (`fjCode`, `fjLibelle`, `fjInsee`) VALUES
+(0, 'Indéterminée', 0),
+(1, 'Personne physique', 1),
+(2, 'Groupement de droit privé non doté de la personnalité morale', 1),
+(3, 'Personne morale de droit étranger', 1),
+(4, 'Personne morale de droit public soumise au droit commercial', 1),
+(5, 'Société commerciale', 1),
+(6, 'Autre personne morale immatriculée au RCS', 1),
+(7, 'Personne morale et organisme soumis au droit administratif', 1),
+(8, 'Organisme privé spécialisé', 1),
+(9, 'Groupement de droit privé', 1),
+(11, 'Artisan Commerçant', 1),
+(12, 'Commerçant', 1),
+(13, 'Artisan', 1),
+(14, 'Officier public ou ministériel', 1),
+(15, 'Profession libérale', 1),
+(16, 'Exploitant agricole', 1),
+(17, 'Agent commercial', 1),
+(18, 'Associé Gérant de société', 1),
+(19, '(Autre) personne physique', 1),
+(21, 'Indivision', 1),
+(22, 'Société créée de fait', 1),
+(23, 'Société en participation', 1),
+(27, 'Paroisse hors zone concordataire', 1),
+(29, 'Autre groupement de droit privé non doté de la   personnalité morale', 1),
+(31, 'Personne morale de droit étranger,  immatriculée au RCS (registre du  commerce et des sociétés)', 1),
+(32, 'Personne morale de droit étranger, non immatriculée au RCS', 1),
+(41, 'Établissement public ou régie à caractère industriel ou commercial', 1),
+(51, 'Société coopérative commerciale particulière', 1),
+(52, 'Société en nom collectif', 1),
+(53, 'Société en commandite', 1),
+(54, 'Société à responsabilité limité', 1),
+(55, 'Société anonyme à conseil d''administration', 1),
+(56, 'Société anonyme à directoire', 1),
+(57, 'Société par actions simplifiée', 1),
+(61, 'Caisse d''épargne et de prévoyance', 1),
+(62, 'Groupement d''intérêt économique', 1),
+(63, 'Société coopérative agricole', 1),
+(64, 'Société d''assurance mutuelle', 1),
+(65, 'Société civile', 1),
+(69, 'Autre personne morale de droit privé inscrite au registre du commerce et des sociétés', 1),
+(71, 'Administration de l''état', 1),
+(72, 'Collectivité territoriale', 1),
+(73, 'Établissement public administratif', 1),
+(74, 'Autre personne morale de droit public administratif', 1),
+(81, 'Organisme gérant un régime de protection sociale à adhésion obligatoire', 1),
+(82, 'Organisme mutualiste', 1),
+(83, 'Comité d''entreprise', 1),
+(84, 'Organisme professionnel', 1),
+(91, 'Syndicat de propriétaires', 1),
+(92, 'Association loi 1901 ou assimilé', 1),
+(93, 'Fondation', 1),
+(99, 'Autre personne morale de droit privé', 1),
+(1000, 'Entrepreneur Individuel à Responsabilité Limité', 0),
+(1100, 'Artisan Commerçant', 1),
+(1200, 'Commerçant', 1),
+(1300, 'Artisan', 1),
+(1400, 'Officier public ou ministériel', 1),
+(1500, 'Profession libérale', 1),
+(1600, 'Exploitant agricole', 1),
+(1700, 'Agent commercial', 1),
+(1800, 'Associé Gérant de société', 1),
+(1900, '(Autre) personne physique', 1),
+(2100, 'Indivision', 0),
+(2110, 'Indivision entre personnes physiques', 1),
+(2120, 'Indivision avec personne morale', 1),
+(2200, 'Société créée de fait', 0),
+(2210, 'Société créée de fait entre personnes physiques', 1),
+(2220, 'Société créée de fait avec personne morale', 1),
+(2300, 'Société en participation', 0),
+(2310, 'Société en participation entre personnes physiques', 1),
+(2320, 'Société en participation avec personne morale', 1),
+(2385, 'Société en participation de professions libérales', 1),
+(2400, 'Fiducie', 1),
+(2700, 'Paroisse hors zone concordataire', 1),
+(2900, 'Autre groupement de droit privé non doté de la personnalité morale', 1),
+(3110, 'Représentation ou agence commerciale d''état ou organisme public étranger immatriculé au RCS', 1),
+(3120, 'Société étrangère immatriculée au RCS', 1),
+(3205, 'Organisation internationale', 1),
+(3210, 'État collectivité ou établissement public étranger', 1),
+(3220, 'Société étrangère non immatriculée au RCS', 1),
+(3290, '(Autre) personne morale de droit étranger', 1),
+(4110, 'Établissement public national à caractère industriel ou commercial doté d''un comptable public', 1),
+(4120, 'Établissement public national à caractère industriel ou commercial non doté d''un comptable public', 1),
+(4130, 'Exploitant public', 1),
+(4140, 'Établissement public local à caractère industriel ou commercial', 1),
+(4150, 'Régie d''une collectivité locale à caractère industriel ou commercial', 1),
+(4160, 'Institution Banque de France', 1),
+(5191, 'Société de caution mutuelle', 1),
+(5192, 'Société coopérative de banque populaire', 1),
+(5193, 'Caisse de crédit maritime mutuel', 1),
+(5194, 'Caisse (fédérale) de crédit mutuel', 1),
+(5195, 'Association coopérative inscrite ( droit local Alsace Moselle )', 1),
+(5196, 'Caisse d''épargne et de prévoyance à forme coopérative', 1),
+(5202, 'Société en nom collectif', 1),
+(5203, 'Société en nom collectif coopérative', 1),
+(5306, 'Société en commandite simple', 1),
+(5307, 'Société en commandite simple coopérative', 1),
+(5308, 'Société en commandite par actions', 1),
+(5309, 'Société en commandite par actions coopérative', 1),
+(5385, 'Société d''exercice libéral en commandite par action', 1),
+(5410, 'SARL nationale', 1),
+(5415, 'SARL d''économie mixte', 1),
+(5422, 'SARL immobilière pour le commerce et l''industrie (SICOMI)', 1),
+(5426, 'Société immobilière de gestion', 1),
+(5430, 'Safer en SARL', 1),
+(5431, 'SARL mixte d''intérêt agricole', 1),
+(5432, 'SARL d''intérêt collectif agricole', 1),
+(5442, 'SARL d''attribution', 1),
+(5443, 'SARL coopérative de construction', 1),
+(5451, 'SARL coopérative de consommation', 1),
+(5453, 'SARL coopérative artisanale', 1),
+(5454, 'SARL coopérative d''intérêt maritime', 1),
+(5455, 'SARL coopérative de transports', 1),
+(5458, 'SARL coopérative ouvrière de production et de crédit', 1),
+(5459, 'SARL union de sociétés coopératives', 1),
+(5460, 'Autre SARL coopérative', 1),
+(5485, 'Société d''exercice libéral à responsabilité limitée', 1),
+(5488, 'Entreprise Unipersonnelle à Responsabilité Limitée', 1),
+(5498, 'SARL unipersonnelle', 1),
+(5499, 'Autre société à responsabilité limitée', 1),
+(5505, 'SA à participation ouvrière à conseil d''administration', 1),
+(5510, 'SA nationale à conseil d''administration', 1),
+(5515, 'SA d''économie mixte à conseil d''administration', 1),
+(5520, 'Société d''investissement à capital variable (SICAV) à conseil d''administration', 1),
+(5522, 'Société anonyme immobilière pour le commerce et l''industrie (SICOMI) à conseil d''administration', 1),
+(5525, 'Société anonyme immobilière d''investissement à conseil d''administration', 1),
+(5530, 'Safer anonyme à conseil d''administration', 1),
+(5531, 'Société anonyme mixte d''intérêt agricole (SMIA) à conseil d''administration', 1),
+(5532, 'Société anonyme mixte d''intérêt collectif agricole (SICA) à conseil d''administration', 1),
+(5542, 'Société anonyme d''attribution à conseil d''administration', 1),
+(5543, 'Société anonyme coopérative de construction à conseil d''administration', 1),
+(5546, 'SA de HLM à conseil d''administration', 1),
+(5547, 'SA coopérative de production de HLM à conseil d''administration', 1),
+(5548, 'SA de crédit immobilier à conseil d''administration', 1),
+(5551, 'SA coopérative de consommation à conseil d''administration', 1),
+(5552, 'SA coopérative de commerçants détaillants à conseil d''administration', 1),
+(5553, 'SA coopérative artisanale à conseil d''administration', 1),
+(5554, 'SA coopérative (d''intérêt) maritime à conseil d''administration', 1),
+(5555, 'SA coopérative de transports à conseil d''administration', 1),
+(5558, 'SA coopérative ouvrière de production et de crédit (SCOP) à conseil d''administration', 1),
+(5559, 'SA union de sociétés coopératives à conseil d''administration', 1),
+(5560, 'Autre SA coopérative à conseil d''administration', 1),
+(5585, 'Société d''exercice libéral à forme anonyme à conseil d''administration', 1),
+(5599, 'Autre SA à conseil d''administration', 1),
+(5605, 'SA à participation ouvrière à directoire', 1),
+(5610, 'SA nationale à directoire', 1),
+(5615, 'SA d''économie mixte à directoire', 1),
+(5620, 'Société d''investissement à capital variable (SICAV) à directoire', 1),
+(5622, 'Société immobilière pour le commerce et l''industrie (SICOMI) anonyme à directoire', 1),
+(5625, 'Société immobilière d''investissement anonyme à directoire', 1),
+(5630, 'Safer anonyme à directoire', 1),
+(5631, 'Société anonyme mixte d''intérêt agricole', 1),
+(5632, 'Société anonyme d''intérêt collectif agricole', 1),
+(5642, 'Société anonyme d''attribution à directoire', 1),
+(5643, 'Société anonyme coopérative de construction à directoire', 1),
+(5646, 'Société anonyme de HLM à directoire', 1),
+(5647, 'Société coopérative de production de HLM anonyme à directoire', 1),
+(5648, 'SA de crédit immobilier à directoire', 1),
+(5651, 'SA coopérative de consommation à directoire', 1),
+(5652, 'SA coopérative de commerçants détaillants à directoire', 1),
+(5653, 'SA coopérative artisanale à directoire', 1),
+(5654, 'SA coopérative (d''intérêt) maritime à directoire', 1),
+(5655, 'SA coopérative de transport à directoire', 1),
+(5658, 'SA coopérative ouvrière de production et de crédit (SCOP) à directoire', 1),
+(5659, 'SA union de sociétés coopératives à directoire', 1),
+(5660, '(Autre) SA coopérative à directoire', 1),
+(5685, 'Société d''exercice libéral à forme anonyme à directoire', 1),
+(5699, 'Autre SA à directoire', 1),
+(5710, 'Société par actions simplifiée', 1),
+(5720, 'Société par actions simplifiée à associé unique ou société par actions simplifiée unipersonnelle', 1),
+(5785, 'Société d’exercice libéral par action simplifiée', 1),
+(5800, 'Société européenne', 1),
+(6100, 'Caisse d’épargne et de prévoyance', 1),
+(6200, 'Groupement d''intérêt économique', 0),
+(6210, 'Groupement européen d’intérêt économique', 1),
+(6220, 'Groupement d’intérêt économique', 1),
+(6316, 'Coopérative d’utilisation de matériel agricole en commun', 1),
+(6317, 'Société coopérative agricole', 1),
+(6318, 'Union de sociétés coopératives agricoles', 1),
+(6411, 'Société d’assurance mutuelle', 1),
+(6412, 'Société mutuelle d''assurance', 1),
+(6413, 'Union de sociétés mutuelles d''assurances', 1),
+(6414, 'Autre société non commerciale d''assurance', 1),
+(6521, 'Société civile de placement collectif immobilier', 1),
+(6532, 'Société civile d’intérêt collectif agricole', 1),
+(6533, 'Groupement agricole d’exploitation en commun', 1),
+(6534, 'Groupement foncier agricole', 1),
+(6535, 'Groupement agricole foncier', 1),
+(6536, 'Groupement forestier', 1),
+(6537, 'Groupement pastoral', 1),
+(6538, 'Groupement foncier rural', 1),
+(6539, 'Société civile foncière', 1),
+(6540, 'Société civile immobilière', 1),
+(6541, 'Société civile immobilière de construction vente', 1),
+(6542, 'Société civile d’attribution', 1),
+(6543, 'Société civile coopérative de construction', 1),
+(6544, 'Société immobilière d''accession progressive à la propriété', 1),
+(6551, 'Société civile coopérative de consommation', 1),
+(6554, 'Société civile coopérative (d’intérêt) maritime', 1),
+(6558, 'Société civile coopérative entre médecins', 1),
+(6560, 'Autre société civile coopérative', 1),
+(6561, 'SCP d’avocats', 1),
+(6562, 'SCP d’avocats aux conseil', 1),
+(6563, 'SCP d’avoués d’appel', 1),
+(6564, 'SCP d’huissiers', 1),
+(6565, 'SCP de notaires', 1),
+(6566, 'SCP de commissaires-priseurs', 1),
+(6567, 'SCP de greffiers de tribunal de commerce', 1),
+(6568, 'SCP de conseils juridiques', 1),
+(6569, 'SCP de commissaires aux comptes', 1),
+(6571, 'SCP de médecins', 1),
+(6572, 'SCP de dentistes', 1),
+(6573, 'SCP d’infirmiers', 1),
+(6574, 'SCP de masseurs kinésithérapeutes', 1),
+(6575, 'SCP de directeurs de laboratoire d’analyse médicale', 1),
+(6576, 'SCP de vétérinaires', 1),
+(6577, 'SCP de géomètres-experts', 1),
+(6578, 'SCP d’architectes', 1),
+(6585, '(Autres) Société Civile professionnelle', 1),
+(6588, 'Société civile laitière', 0),
+(6589, 'Société civile de moyens', 1),
+(6595, 'Caisse (locale) de crédit mutuel', 1),
+(6596, 'Caisse de crédit agricole mutuel', 1),
+(6597, 'Société civile d’exploitation agricole', 1),
+(6598, 'Exploitation agricole à responsabilité limitée', 1),
+(6599, 'Autre société civile', 1),
+(6901, 'Autres personnes de droit privé inscrites au registre du commerce et des sociétés', 1),
+(7111, 'Autorité constitutionnelle', 1),
+(7112, 'Autorité administrative indépendante', 1),
+(7113, 'Ministère', 1),
+(7120, 'Service central d’un ministère', 1),
+(7130, 'Service du ministère des Postes et Télécommunications', 1),
+(7150, 'Service du ministère de la Défense', 1),
+(7160, 'Service déconcentré à compétence nation. D’un ministère (hors Défense)', 1),
+(7171, 'Service déconcentré de l’État à compétence (inter) régionale', 1),
+(7172, 'Service déconcentré de l’État à compétence (inter) départementale', 1),
+(7179, '(Autre) Service déconcentré de l’État à compétence territoriale', 1),
+(7190, 'Ecole nationale non dotée de la personnalité morale', 1),
+(7210, 'Commune', 1),
+(7220, 'Département', 1),
+(7225, 'Territoire d’Outre-mer', 1),
+(7229, '(Autre) Collectivité territoriale', 1),
+(7230, 'Région', 1),
+(7312, 'Commune associée', 1),
+(7313, 'Section de commune', 1),
+(7314, 'Ensemble urbain', 1),
+(7321, 'Association syndicale autorisée', 1),
+(7322, 'Association foncière urbaine', 1),
+(7323, 'Association foncière de remembrement', 1),
+(7331, 'Établissement public local d’enseignement', 1),
+(7341, 'Secteur de commune', 1),
+(7342, 'District urbain', 1),
+(7343, 'Communauté urbaine', 1),
+(7345, 'Syndicat intercommunal à vocation multiple', 1),
+(7346, 'Communauté de communes', 1),
+(7347, 'Communauté de villes', 1),
+(7348, 'Communauté d''agglomération', 1),
+(7349, 'Autre établissement public local de coopération non spécialisé ou entente', 1),
+(7351, 'Institution interdépartemental ou entente', 1),
+(7352, 'Institution interrégionale ou entente', 1),
+(7353, 'Syndicat intercommunal à vocation unique', 1),
+(7354, 'Syndicat mixte communal', 1),
+(7355, 'Autre syndicat mixte', 1),
+(7356, 'Commission syndicale pour la gestion des biens indivis des communes', 1),
+(7361, 'Centre communal d''action sociale', 1),
+(7362, 'Caisse des écoles', 1),
+(7363, 'Caisse de crédit municipal', 1),
+(7364, 'Établissement d''hospitalisation', 1),
+(7365, 'Syndicat inter hospitalier', 1),
+(7366, 'Établissement public local social et médico-social', 1),
+(7371, 'Office public d''habitation à loyer modéré', 1),
+(7372, 'Service départemental d''incendie', 1),
+(7373, 'Établissement public local culturel', 1),
+(7378, 'Régie d''une collectivité locale à caractère administratif', 1),
+(7379, '(Autre) Établissement public administratif local', 1),
+(7381, 'Organisme consulaire', 1),
+(7382, 'Établissement public national ayant fonction d''administration centrale', 1),
+(7383, 'Établissement public national à caractère scientifique culturel et professionnel', 1),
+(7384, 'Autre établissement public national d''enseignement', 1),
+(7385, 'Autre établissement public national administratif à compétence territoriale limitée', 1),
+(7389, 'Établissement public national à caractère administratif', 1),
+(7410, 'Groupement d''intérêt public', 1),
+(7430, 'Établissement public des cultes d''Alsace-Lorraine', 1),
+(7450, 'Etablissement public administratif, cercle et foyer dans les armées', 1),
+(7470, 'Groupement de coopération sanitaire à gestion publique', 1),
+(7490, 'Autre personne morale de droit administratif', 1),
+(7510, 'Service d''une collectivité locale à comptabilité distincte', 1),
+(7520, 'Régie d''une collectivité locale non dotée de la personnalité morale', 1),
+(8110, 'Régime général de la sécurité sociale', 1),
+(8120, 'Régime spécial de sécurité sociale', 1),
+(8130, 'Institution de retraite complémentaire', 1),
+(8140, 'Mutualité sociale agricole', 1),
+(8150, 'Régime maladie des non-salariés non agricoles', 1),
+(8160, 'Régime vieillesse ne dépendant pas du régime général de la sécurité sociale', 1),
+(8170, 'Régime d''assurance chômage', 1),
+(8190, 'Autre régime de prévoyance sociale', 1),
+(8210, 'Mutuelle', 1),
+(8250, 'Assurance mutuelle agricole', 1),
+(8290, 'Autre organisme mutualiste', 1),
+(8310, 'Comité central d''entreprise', 1),
+(8311, 'Comité d''établissement', 1),
+(8410, 'Syndicat de salariés', 1),
+(8420, 'Syndicat patronal', 1),
+(8450, 'Ordre professionnel ou assimilé', 1),
+(8470, 'Centre technique industriel ou comité professionnel du développement économique', 1),
+(8490, 'Autre organisme professionnel', 1),
+(8510, 'Institution de prévoyance', 1),
+(8520, 'Institution de retraite supplémentaire ', 1),
+(9110, 'Syndicat de copropriété', 1),
+(9150, 'Association syndicale libre', 1),
+(9210, 'Association non déclarée', 1),
+(9220, 'Association déclarée', 1),
+(9221, 'Association déclarée "entreprises d''insertion par l''économique"', 1),
+(9222, 'Association intermédiaire', 1),
+(9223, 'Groupement d''employeurs', 1),
+(9224, 'Association d''avocats à responsabilité professionnelle individuelle', 1),
+(9230, 'Association déclarée reconnue d''utilité publique', 1),
+(9240, 'Congrégation', 1),
+(9260, 'Association de droit local', 1),
+(9300, 'Fondation', 1),
+(9900, 'Autre personne morale de droit privé', 1),
+(9970, 'Groupement de coopération sanitaire à gestion privée', 1);
--- a/scripts/build/_sql/FieldsMinmax.sql
+++ b/scripts/build/_sql/FieldsMinmax.sql
@ -0,0 +1,5 @@
+CREATE TABLE `fields_minmax` (
+	`cle` VARCHAR(20) PRIMARY KEY NOT NULL,
+	`min` INTEGER NOT NULL,
+	`max` BIGINT NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;;
--- a/scripts/build/_sql/FieldsNaf.sql
+++ b/scripts/build/_sql/FieldsNaf.sql
--- a/scripts/build/_sql/FieldsRegions.sql
+++ b/scripts/build/_sql/FieldsRegions.sql
@ -0,0 +1,46 @@
+--
+-- Structure de la table `regions`
+--
+
+CREATE TABLE IF NOT EXISTS `fields_regions` (
+  `REGION` tinyint(2) unsigned zerofill NOT NULL,
+  `CHEFLIEU` char(5) NOT NULL,
+  `TNCC` char(1) NOT NULL,
+  `NC` char(30) NOT NULL,
+  `NCCENR` char(30) NOT NULL,
+  PRIMARY KEY (`REGION`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Contenu de la table `regions`
+--
+
+INSERT INTO `fields_regions` (`REGION`, `CHEFLIEU`, `TNCC`, `NC`, `NCCENR`) VALUES
+(01, '97105', '3', 'GUADELOUPE', 'Guadeloupe'),
+(02, '97209', '3', 'MARTINIQUE', 'Martinique'),
+(03, '97302', '3', 'GUYANE', 'Guyane'),
+(04, '97411', '0', 'LA REUNION', 'La Réunion'),
+(11, '75056', '1', 'ILE-DE-FRANCE', 'Île-de-France'),
+(21, '51108', '0', 'CHAMPAGNE-ARDENNE', 'Champagne-Ardenne'),
+(22, '80021', '0', 'PICARDIE', 'Picardie'),
+(23, '76540', '0', 'HAUTE-NORMANDIE', 'Haute-Normandie'),
+(24, '45234', '2', 'CENTRE', 'Centre'),
+(25, '14118', '0', 'BASSE-NORMANDIE', 'Basse-Normandie'),
+(26, '21231', '0', 'BOURGOGNE', 'Bourgogne'),
+(31, '59350', '2', 'NORD-PAS-DE-CALAIS', 'Nord-Pas-de-Calais'),
+(41, '57463', '0', 'LORRAINE', 'Lorraine'),
+(42, '67482', '1', 'ALSACE', 'Alsace'),
+(43, '25056', '0', 'FRANCHE-COMTE', 'Franche-Comté'),
+(52, '44109', '4', 'PAYS DE LA LOIRE', 'Pays de la Loire'),
+(53, '35238', '0', 'BRETAGNE', 'Bretagne'),
+(54, '86194', '2', 'POITOU-CHARENTES', 'Poitou-Charentes'),
+(72, '33063', '1', 'AQUITAINE', 'Aquitaine'),
+(73, '31555', '0', 'MIDI-PYRENEES', 'Midi-Pyrénées'),
+(74, '87085', '2', 'LIMOUSIN', 'Limousin'),
+(82, '69123', '2', 'RHONE-ALPES', 'Rhône-Alpes'),
+(83, '63113', '1', 'AUVERGNE', 'Auvergne'),
+(91, '34172', '2', 'LANGUEDOC-ROUSSILLON', 'Languedoc-Roussillon'),
+(93, '13055', '0', 'PROVENCE-ALPES-COTE D''AZUR', 'Provence-Alpes-Côte d''Azur'),
+(94, '2A004', '0', 'CORSE', 'Corse'),
+(98, '', '', 'TERRITOIRES D''OUTRE-MER', 'Territoires d''outre-mer'),
+(99, '', '', 'ETRANGER', 'Etranger');
--- a/scripts/build/configure.php
+++ b/scripts/build/configure.php
@ -0,0 +1,64 @@
+#!/usr/bin/php
+<?php
+//error_reporting(E_ALL & ~E_NOTICE);
+
+// Define path to application directory
+defined('APPLICATION_PATH')
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));
+
+// Define application environment
+defined('APPLICATION_ENV')
+    || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+    realpath(APPLICATION_PATH . '/../library'),
+    get_include_path(),
+)));
+
+//Copy configuration
+$hostname = exec('echo $(hostname)');
+passthru('cp -fv ./'.$hostname.'/application.ini '.APPLICATION_PATH.'/configs/application.ini');
+
+/** Zend_Application */
+require_once 'Zend/Application.php';
+
+// Create application, bootstrap, and run
+$application = new Zend_Application(
+    APPLICATION_ENV,
+    APPLICATION_PATH . '/configs/application.ini'
+);
+
+try {
+    $opts = new Zend_Console_Getopt(
+        //Options
+    	array(
+            'help|?'	=> "Affiche les informations d'utilisation",
+    		'install'	=> "Installe et configure",
+        )
+    );
+	$opts->parse();
+} catch (Zend_Console_Getopt_Exception $e) {
+    echo $e->getUsageMessage();
+    exit;
+}
+
+//Usage
+if(isset($opts->help))
+{
+    echo $opts->getUsageMessage();
+    exit;
+}
+
+//Install
+if(isset($opts->install))
+{
+	//Création des répertoires
+	mkdir(APPLICATION_PATH . '/../data');
+	mkdir(APPLICATION_PATH . '/../data/sessions');
+    
+    //Modification des permissions
+	passthru('chown -R www-data: '.APPLICATION_PATH.'/../');
+	passthru('chmod +x '.APPLICATION_PATH.'/../scripts/cron.php');
+	passthru('chmod +x '.APPLICATION_PATH.'/../scripts/jobs/*.php');
+}
--- a/scripts/build/local/application.ini
+++ b/scripts/build/local/application.ini
@ -0,0 +1,58 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = development
+profil.webservice.location = sdsrvdev01
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "d:\www\dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=root
+profil.db.ciblage.params.password=bj10sx
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.78.230
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=192.168.78.252
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/scripts/build/sdsrvdev01/application.ini
+++ b/scripts/build/sdsrvdev01/application.ini
@ -0,0 +1,58 @@
+[production]
+phpSettings.date.timezone = "Europe/Paris"
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.session.save_path = APPLICATION_PATH "/../data/sessions"
+resources.session.gc_maxlifetime = 86400
+resources.session.cookie_lifetime = 86400
+resources.session.remember_me_seconds = 86400
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.plugins.Auth = "Application_Controller_Plugin_Auth"
+resources.frontController.plugins.Menu = "Application_Controller_Plugin_Menu"
+resources.frontController.plugins.Comptage = "Application_Controller_Plugin_Comptage"
+resources.frontController.params.displayExceptions = 0
+resources.layout.layout = "main"
+resources.layout.layoutPath = APPLICATION_PATH "/views/default"
+resources.view.basePath = APPLICATION_PATH "/views/default"
+autoloaderNamespaces[] = "Application_"
+autoloaderNamespaces[] = "Scores_"
+autoloaderNamespaces[] = "Form_"
+
+; Scores configuration
+profil.server.name = development
+profil.webservice.location = sdsrvdev01
+profil.mail.method = smtp
+profil.mail.smtp_host = smtp.free.fr
+profil.mail.email.support = supportdev@scores-decisions.com
+profil.mail.email.supportdev = supportdev@scores-decisions.com
+profil.mail.email.contact = supportdev@scores-decisions.com
+profil.mail.email.production = supportdev@scores-decisions.com
+profil.path.data = "d:\www\dataciblage"
+profil.db.ciblage.adapter=mysqli
+profil.db.ciblage.params.host=127.0.0.1
+profil.db.ciblage.params.username=root
+profil.db.ciblage.params.password=bj10sx
+profil.db.ciblage.params.dbname=ciblage
+profil.db.ciblage.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.db.jo.adapter=mysqli
+profil.db.jo.params.host=192.168.78.230
+profil.db.jo.params.username=ciblage
+profil.db.jo.params.password=z7jq8AhvrwqQJ4Yb
+profil.db.jo.params.dbname=jo
+profil.db.jo.params.persistent = true
+profil.db.jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+profil.sphinx.host=192.168.78.252
+profil.sphinx.port=3312
+
+[staging : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
--- a/scripts/build/sdsrvdev01/configuration.ini
+++ b/scripts/build/sdsrvdev01/configuration.ini
@ -0,0 +1,37 @@
+[server]
+name = sdsrvdev01
+
+[webservice]
+location = sdsrvdev01
+
+[databases]
+db.adapter=mysqli
+db.params.host=127.0.0.1
+db.params.username=ciblage
+db.params.password=z7jq8AhvrwqQJ4Yb
+db.params.dbname=ciblage
+db.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+
+jo.adapter=mysqli
+jo.params.host=192.168.78.230
+jo.params.username=ciblage
+jo.params.password=z7jq8AhvrwqQJ4Yb
+jo.params.dbname=jo
+jo.params.persistent = true
+jo.params.driver_options.MYSQLI_INIT_COMMAND = "SET NAMES utf8"
+
+[sphinx]
+host = 192.168.78.252
+port = 3312
+
+[mail]
+method = smtp
+smpt_port =
+smtp_host = smtp.free.fr
+support = supportdev@scores-decisions.com
+supportdev = supportdev@scores-decisions.com
+contact = supportdev@scores-decisions.com
+production = supportdev@scores-decisions.com
+
+[path]
+data = "/sites/dataciblage"
--- a/scripts/cron.php
+++ b/scripts/cron.php
@ -42,8 +42,8 @@ if(isset($opts->help))
 	exit;
 }

-$dbConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'databases');
-$db = Zend_Db::factory($dbConfig->db);
+$c = Zend_Registry::get('config');
+$db = Zend_Db::factory($c->profil->db->ciblage);

 $commandesM = new Application_Model_EnrichissementIdentifiants($db);

--- a/scripts/jobs/createIndex.php
+++ b/scripts/jobs/createIndex.php
@ -0,0 +1,58 @@
+<?php
+// Define path to application directory
+defined('APPLICATION_PATH')
+	|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));
+
+// Define application environment
+define('APPLICATION_ENV', 'production');
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+	realpath(APPLICATION_PATH . '/../library'),
+	get_include_path(),
+)));
+
+/** Zend_Application */
+require_once 'Zend/Application.php';
+
+// Create application, bootstrap, and run
+$application = new Zend_Application(
+	APPLICATION_ENV,
+	APPLICATION_PATH . '/configs/application.ini'
+);
+
+try {
+	$opts = new Zend_Console_Getopt(
+		//Options
+		array(
+	    	'help|?'	=> "Aide.",
+		    'cron'      => "",
+		)
+	);
+	$opts->parse();
+} catch (Zend_Console_Getopt_Exception $e) {
+	echo $e->getUsageMessage();
+	exit;
+}
+
+//Usage
+if(isset($opts->help))
+{
+    echo $opts->getUsageMessage();
+    exit;
+}
+
+//Cron indexing
+if(isset($opts->cron))
+{
+    $dbConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'databases');
+    $db = Zend_Db::factory($dbConfig->jo);
+    //Début de l'indexation
+    
+    //Execution de l'indexation
+    
+    //Fin de l'indexation
+    
+    //Minimum - Maximum
+    
+}
--- a/scripts/jobs/enrichissement.php
+++ b/scripts/jobs/enrichissement.php
@ -4,7 +4,7 @@ error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING);

 // Define path to application directory
 defined('APPLICATION_PATH')
-    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application'));
+    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));

 // Define application environment
 define('APPLICATION_ENV', 'production');
@ -41,16 +41,15 @@ try {
 //Usage
 if(isset($opts->help) || !isset($opts->id) && !isset($opts->file) )
 {
-    echo $opts->getUsageMessage();
-    exit;
+    echo $opts->getUsageMessage(); exit;
 }

-$config = new Zend_Config_Ini(APPLICATION_PATH.'/configs/configuration.ini');
+$config = new Zend_Config($application->getOptions());

 //MetadataCache pour la base de données
 $frontendOptions = array(
-		'lifetime' => 14400,
-		'automatic_serialization' => true
+    'lifetime' => 14400,
+    'automatic_serialization' => true
 );
 $backendOptions  = array();
 $cache = Zend_Cache::factory('Core','Apc', $frontendOptions, $backendOptions);
@ -58,13 +57,13 @@ Zend_Db_Table_Abstract::setDefaultMetadataCache($cache);

 //Définition bdd
 try {
-	$db = Zend_Db::factory($config->databases->db);
+	$db = Zend_Db::factory($config->profil->db->ciblage);
 } catch ( Exception $e ) {
 	exit ( $e->getMessage() );
 }
 //Définition bdd metier
 try {
-	$dbMetier = Zend_Db::factory($config->databases->jo);
+	$dbMetier = Zend_Db::factory($config->profil->db->jo);
 } catch ( Exception $e ) {
 	exit ( $e->getMessage() );
 }
@ -90,7 +89,7 @@ else if ($opts->file)

 //Something is needed
 if ( count($identifiants)==0 || count($dataProfil)==0 ) {
-
+    echo "Identifiants:".count($identifiants).", profil:".$count($profil)."\n";
 	exit;
 }

@ -101,7 +100,7 @@ if(!file_exists($config->path->data.'/'.$mois))
 	mkdir($config->path->data.'/'.$mois);

 $path = $config->path->data.'/'.$mois;
-$outFile = $profil['login'].'_'.$opts->id.'_'.date('YmdHis').'.csv';
+$outFile = $profil->login.'_'.$opts->id.'_'.date('YmdHis').'.csv';

 require_once 'Scores/Enrichissement.php';
 $dico 	= new Enrichissement();
@ -126,7 +125,7 @@ foreach ( $dataProfil as $item ) {
 //Ajouter le champ presentRcs
 $tabEntete[] 		= 'presentRcs';
 $tabEnteteLabel[] 	= 'RCS';
-$sql				.= ' presentRcs';
+$sql			    .= ' presentRcs';

 //Pour chaque identifiant traiter les données
 $row = 0;
--- a/scripts/jobs/setMinMax.php
+++ b/scripts/jobs/setMinMax.php
@ -1,8 +1,7 @@
-#!/usr/bin/php
 <?php
 // Define path to application directory
 defined('APPLICATION_PATH')
-	|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application'));
+	|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));

 // Define application environment
 define('APPLICATION_ENV', 'production');
@ -44,15 +43,15 @@ if(isset($opts->help))
 	exit;
 }

-$dbConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'databases');
+$config = new Zend_Config($application->getOptions());
 try {
-	$db = Zend_Db::factory($dbConfig->db);
+	$db = Zend_Db::factory($config->profil->db->ciblage);
 } catch ( Exception $e ) {
 	exit ( $e->getMessage() );
 }
 //Définition bdd metier
 try {
-	$dbMetier = Zend_Db::factory($dbConfig->jo);
+	$dbMetier = Zend_Db::factory($config->profil->db->jo);
 } catch ( Exception $e ) {
 	exit ( $e->getMessage() );
 }