| Line 157... |
Line 157... |
| 157 |
$p['navigation.depart'] = filter_var(@$params['navigation.depart'],
|
157 |
$p['navigation.depart'] = filter_var(@$params['navigation.depart'],
|
| 158 |
FILTER_VALIDATE_INT,
|
158 |
FILTER_VALIDATE_INT,
|
| 159 |
array('options' => array('default' => NULL,
|
159 |
array('options' => array('default' => NULL,
|
| 160 |
'min_range' => 0,
|
160 |
'min_range' => 0,
|
| 161 |
'max_range' => _LISTE_OBS_MAX_ID_OBS)));
|
161 |
'max_range' => _LISTE_OBS_MAX_ID_OBS)));
|
| 162 |
if(isset($params['masque.departement'])) {
|
- |
|
| 163 |
// STRING: 0 -> 95, 971 -> 976, 2A + 2B (./services/configurations/config_departements_bruts.ini)
|
162 |
// STRING: 0 -> 95, 971 -> 976, 2A + 2B (./services/configurations/config_departements_bruts.ini)
|
| 164 |
// accept leading 0 ?
|
163 |
// accept leading 0 ?
|
| 165 |
// TODO; filter patterns like 555.
|
164 |
// TODO; filter patterns like 555.
|
| 166 |
if(preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement'])) {
|
165 |
if (preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement']) != 0) {
|
| - |
|
166 |
if(is_numeric($params['masque.departement'])) {
|
| 167 |
$p['masque.departement'] = $params['masque.departement'];
|
167 |
$p['masque.departement'] = str_pad($params['masque.departement'], 5, '_');
|
| 168 |
}
|
168 |
} else {
|
| 169 |
// cf configurations/config_departements_bruts.ini
|
169 |
$p['masque.departement'] = $params['masque.departement'];
|
| - |
|
170 |
}
|
| 170 |
elseif( !is_null($c) && ( $x = $c->getParametre(
|
171 |
} else {
|
| 171 |
strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement'])))
|
172 |
$dpt_chaine = strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement'])));
|
| 172 |
))) {
|
173 |
$c->chargerConfiguration('config_departements_bruts.ini');
|
| 173 |
$p['masque.departement'] = sprintf("INSEE-C:%02d___", $x);
|
174 |
$p['masque.departement'] = str_pad($c->getParametre($dpt_chaine), 5, '_');
|
| 174 |
}
|
- |
|
| 175 |
}
|
175 |
}
|
| Line 176... |
Line 176... |
| 176 |
|
176 |
|
| 177 |
if(isset($params['masque.date'])) {
|
177 |
if(isset($params['masque.date'])) {
|
| 178 |
// une année, TODO: masque.annee
|
178 |
// une année, TODO: masque.annee
|