| 166,10 → 166,16 |
|---|
| // STRING: 0 -> 95, 971 -> 976, 2A + 2B (./services/configurations/config_departements_bruts.ini) |
| // accept leading 0 ? |
| // TODO; filter patterns like 555. |
| if (preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement'])) { |
| $p['masque.departement'] = $params['masque.departement']; |
| } elseif( !is_null($c) && ( $x = $c->getParametre(strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement'])))))) {// cf configurations/config_departements_bruts.ini |
| $p['masque.departement'] = sprintf("INSEE-C:%02d___", $x); |
| if (preg_match(';^(\d{2}|\d{3}|2a|2b)$;i', $params['masque.departement']) != 0) { |
| if(is_numeric($params['masque.departement'])) { |
| $p['masque.departement'] = str_pad($params['masque.departement'], 5, '_'); |
| } else { |
| $p['masque.departement'] = $params['masque.departement']; |
| } |
| } else { |
| $dpt_chaine = strtolower(str_replace(' ','-',iconv("UTF-8", "ASCII//TRANSLIT", $params['masque.departement']))); |
| $c->chargerConfiguration('config_departements_bruts.ini'); |
| $p['masque.departement'] = str_pad($c->getParametre($dpt_chaine), 5, '_'); |
| } |
| } |
| |
| 365,7 → 371,7 |
|---|
| // $req['join'][] = 'LEFT JOIN del_utilisateur AS dui ON dui.id_utilisateur = vdi.i_ce_utilisateur'; |
| |
| if (is_numeric($p['masque.auteur'])) { |
| $req['where'][] = sprintf('(du.id_utilisateur = %1$d OR vdi.id_utilisateur = %1$d)', $p['masque.auteur']); |
| $req['where'][] = sprintf('(du.id_utilisateur = %1$d OR vdi.ce_utilisateur = %1$d)', $p['masque.auteur']); |
| } elseif(preg_match(';^.{5,}@[a-z0-9-.]{5,}$;i', $p['masque.auteur'])) { |
| $req['where'][] = sprintf('(du.courriel LIKE %1$s OR vdi.courriel LIKE %1$s )', |
| $db->proteger($p['masque.auteur'] . '%')); |
| 385,7 → 391,7 |
|---|
| |
| // TODO: avoir des champs d'entrée distinct |
| if (!empty($p['masque.departement'])) { |
| $req['where'][] = sprintf("vdi.ce_zone_geo = %s", $db->proteger('INSEE-C:'.$p['masque.departement'])); |
| $req['where'][] = sprintf("vdi.ce_zone_geo LIKE %s", $db->proteger('INSEE-C:'.$p['masque.departement'])); |
| } |
| if (!empty($p['masque.id_zone_geo'])) { |
| $req['where'][] = sprintf("vdi.ce_zone_geo = %s", $db->proteger($p['masque.id_zone_geo'])); |