Merge pour correction

application/controllers/GestionController.php

@@ -136,9 +136,9 @@ class GestionController extends Zend_Controller_Action
 				'e.uniteInsee',
 				"DATE_FORMAT(e.dateAdded, '%Y/%m/%d %H:%i:%s') AS dateAdded"
 			))
-			->join('criteres', 'idCriteres = criteres.id', array(
-					'criteres.reference AS critereReference',
-					'criteres.login',
+			->join('ciblage_criteres', 'idCriteres = ciblage_criteres.id', array(
+					'ciblage_criteres.reference AS critereReference',
+					'ciblage_criteres.login',
 			))
 			->where('e.dateStart = ?', "0000-00-00 00:00:00")
 			->where('fichier = ""')
@@ -163,9 +163,9 @@ class GestionController extends Zend_Controller_Action
 				"DATE_FORMAT(e.dateAdded, '%Y/%m/%d %H:%i:%s') AS dateAdded",
 				'e.fichier'
 		))
-		->join('criteres', 'idCriteres = criteres.id', array(
-				'criteres.reference AS critereReference',
-				'criteres.login',
+		->join('ciblage_criteres', 'idCriteres = ciblage_criteres.id', array(
+				'ciblage_criteres.reference AS critereReference',
+				'ciblage_criteres.login',
 		))
 		->where('fichier != ""')
 		->order('e.dateAdded DESC');
@@ -216,15 +216,15 @@ class GestionController extends Zend_Controller_Action
 		$comptagesM = new Application_Model_Comptages();
 
 		$sql = $comptagesM->select()->setIntegrityCheck(false)
-			->from('comptages', array(
-					'comptages.idDefinition',
-					'comptages.resultat',
-					'comptages.uniteInsee',
-					"DATE_FORMAT(comptages.dateAjout, '%Y/%m/%d %H:%i:%s') as dateAjout"
+			->from('ciblage_comptages', array(
+					'ciblage_comptages.idDefinition',
+					'ciblage_comptages.resultat',
+					'ciblage_comptages.uniteInsee',
+					"DATE_FORMAT(ciblage_comptages.dateAjout, '%Y/%m/%d %H:%i:%s') as dateAjout"
 					))
-			->join('criteres', 'comptages.idDefinition = criteres.id', array('criteres.reference'))
-			->order('comptages.dateAjout DESC')
-			->group('criteres.id');
+			->join('ciblage_criteres', 'ciblage_comptages.idDefinition = ciblage_criteres.id', array('ciblage_criteres.reference'))
+			->order('ciblage_comptages.dateAjout DESC')
+			->group('ciblage_criteres.id');
 
 		$comptages = $comptagesM->fetchAll($sql)->toArray();
 		Zend_Registry::get('firebug')->info($comptages);

application/controllers/UserController.php

@@ -52,7 +52,12 @@ class UserController extends Zend_Controller_Action
 
     	$refresh = 5;
     	
-		$url = 'http://'.$_SERVER['SERVER_NAME'].$this->view->url(array(
+    	$baseUrl = 'http://'.$_SERVER['SERVER_NAME'];
+    	if ($_SERVER['SERVER_PORT']!='80') {
+    	   $baseUrl.= ':'.$_SERVER['SERVER_PORT'];
+    	}
+    	
+		$url = $baseUrl.$this->view->url(array(
 			'controller' => 'user',
 			'action' => 'login',
 		));

application/views/default/scripts/arborescence/geographique.phtml

@@ -3,7 +3,7 @@
 $("div#<?=$this->key?>").jstree({
 	"themes" : {
 		"theme" : "default",
-		"url" : "/themes/jstree/classic/style.css",
+		"url" : "/libs/tree/themes/classic/style.css",
 		"dots" : true,
 		"icons" : false,
 	},

application/views/default/scripts/arborescence/juridique.phtml

@@ -3,7 +3,7 @@
 $("div#<?=$this->key?>").jstree({
 	"themes" : {
 		"theme" : "default",
-		"url" : "/themes/jstree/classic/style.css",
+		"url" : "/libs/tree/themes/classic/style.css",
 		"dots" : true,
 		"icons" : false,
 	},

application/views/default/scripts/arborescence/naf.phtml

@@ -3,7 +3,7 @@
 $("div#<?=$this->key?>").jstree({
 	"themes" : {
 		"theme" : "default",
-		"url" : "/themes/jstree/classic/style.css",
+		"url" : "/libs/tree/themes/classic/style.css",
 		"dots" : true,
 		"icons" : false,
 	},

library/Application/Controller/Plugin/Auth.php

@@ -58,16 +58,28 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 			    $layout = Zend_Layout::getMVCInstance();
 			    
 				//Pas authentifié
-				if ( !$auth->hasIdentity() || time() > $auth->getIdentity()->time ) {
-
-					$auth->clearIdentity();
-					$storage = $auth->getStorage();
-					Zend_Session::namespaceUnset($storage->getNamespace());
+				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');
+				    }
 					
-					$request->setModuleName('default')
-					    ->setControllerName('user')
-					    ->setActionName('logout');
-
 		    	//Authentifié => on met à jour la session
 				} else {
 

public/themes/default/scripts/fields.js

@@ -110,7 +110,7 @@ $(document).ready(function()
 	
 	$('#tabs').delegate('a.autocompleteEx', 'click', function(e){
 		e.stopPropagation();
-		var name = $(this).parent().find('input.criteres');
+		var name = $(this).parent().find('input.criteres').attr('name');
 		var ul = $(this).parent().find('ul#selectqueries');
 		var values = new Array();
 		if ($('li', ul).length>0) {