Subversion Repositories eFlore/Applications.del

Rev

Rev 1852 | Rev 1871 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1852 Rev 1853
Line 71... Line 71...
71
 
71
 
Line 72... Line 72...
72
		$this->filtrerUrlParamsGeneraux();
72
		$this->filtrerUrlParamsGeneraux();
73
 
73
 
74
		$trisPossibles = $this->conteneur->getParametreTableau('appli_obs.tris_possibles');
74
		$trisPossibles = $this->conteneur->getParametreTableau('appli_obs.tris_possibles');
75
		$this->detruireParametreInvalide('tri', $trisPossibles);
75
		$this->detruireParametreInvalide('tri', $trisPossibles);
76
		
76
 
77
		$this->supprimerParametresFiltresInvalides();
77
		$this->supprimerParametresFiltresInvalides();
Line 78... Line 78...
78
		return $this->parametresFiltres;
78
		return $this->parametresFiltres;
Line 422... Line 422...
422
	// masque.type: ['adeterminer', 'aconfirmer', 'endiscussion', 'validees']
422
	// masque.type: ['adeterminer', 'aconfirmer', 'endiscussion', 'validees']
423
	private function filtrerType() {
423
	private function filtrerType() {
424
		if (isset($this->parametres['masque.type'])) {
424
		if (isset($this->parametres['masque.type'])) {
425
			$typesArray = explode(';', $this->parametres['masque.type']);
425
			$typesArray = explode(';', $this->parametres['masque.type']);
426
			$typesFiltres = array_filter($typesArray);
426
			$typesFiltres = array_filter($typesArray);
427
			$typesAutorises = $this->conteneur->getParametreTableau('appli_obs.valeurs_type');
427
			$typesAutorises = $this->conteneur->getParametreTableau('valeurs_type');
428
			$typesValides = array_intersect($typesFiltres, $typesAutorises);
428
			$typesValides = array_intersect($typesFiltres, $typesAutorises);
429
			$paramFiltre = array_flip($typesValides);
429
			$paramFiltre = array_flip($typesValides);
430
			$this->parametresFiltres['masque.type'] = $paramFiltre;
430
			$this->parametresFiltres['masque.type'] = $paramFiltre;
431
		}
431
		}
432
	}
432
	}