| 30,10 → 30,11 |
|---|
| $this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
| $this->conteneur->chargerConfiguration('config_departements.ini'); |
| $this->conteneur->chargerConfiguration('config_votes.ini'); |
| $this->conteneur->chargerConfiguration('config_images.ini'); |
| $this->navigation = $conteneur->getNavigation(); |
| $this->masque = $conteneur->getMasque(); |
| $this->gestionBdd = $conteneur->getGestionBdd(); |
| $this->bdd = $this->gestionBdd->getBdd(); |
| $this->bdd = $this->gestionBdd->getBdd(); |
| } |
| |
| /** |
| 193,6 → 194,9 |
|---|
| case 'tag' : |
| $where[] = " di.mots_cles_texte LIKE ".$this->proteger($valeurMasque); |
| break; |
| case 'ns' : |
| $where[] = " nom_sel LIKE ".$this->proteger($valeurMasque.'%'); |
| break; |
| default: |
| $where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->proteger($valeurMasque); |
| break; |
| 265,7 → 269,7 |
|---|
| $this->gestionBdd->formaterTable('del_image_vote', 'v'). |
| ' INNER JOIN del_image_protocole p '. |
| 'ON v.ce_protocole = p.id_protocole '. |
| 'WHERE '.$this->chargerClauseWhereVotes(); |
| $this->chargerClauseWhereVotes(); |
| $resultatsVotes = $this->bdd->recupererTous($requeteVotes); |
| |
| |
| 289,7 → 293,9 |
|---|
| if (isset($this->parametres['protocole'])) { |
| $where[] = 'v.ce_protocole = '.$this->proteger($this->parametres['protocole']); |
| } |
| return implode(' AND ', $where); |
| |
| $where = (!empty($where)) ? 'WHERE '.implode(' AND ', $where) : ''; |
| return $where; |
| } |
| |
| /*------------------------------------------------------------------------------- |