/trunk/services/bibliotheque/GestionBdd.php |
---|
File deleted |
\ No newline at end of file |
/trunk/services/bibliotheque/Masque.php |
---|
76,5 → 76,4 |
return $this->masque; |
} |
} |
} |
?> |
} |
/trunk/services/bibliotheque/ReponseHttp.php |
---|
3,16 → 3,17 |
* Classe créant la réponse HTTP pour les services de DEL. |
* |
* Vérifie qu'aucune erreur n'a été générée. Si une erreur existe, retourne le contenu de l'erreur. |
* Encodage en entrée : utf8 |
* Encodage en sortie : utf8 |
* |
* @category DEL |
* @package Commun |
* @package Services |
* @subpackage Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica (accueil@tela-botanica.org) |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class ReponseHttp { |
75,5 → 76,4 |
} |
} |
} |
?> |
} |
/trunk/services/bibliotheque/Navigation.php |
---|
1,14 → 1,17 |
<?php |
/** |
* Navigation gère les url de navigation en fonction d'un départ et d'une limite |
* @category php 5.2 |
* @package del |
* @author Grégoire Duché <gregoire@tela-botanica.org> |
* @copyright Copyright (c) 2012, Tela Botanica (accueil@tela-botanica.org) |
* @license http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL |
* @license http://www.gnu.org/licenses/gpl.html Licence GNU-GPL |
* @version $Id: Bdd.php 403 2012-02-22 14:35:20Z gduche $ |
* |
* @category DEL |
* @package Services |
* @subpackage Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class Navigation { |
71,7 → 74,6 |
* @param $parametresAdditionnels le tableau contenant les parametres => valeurs additionnels |
* */ |
private function obtenirUrlNavigation($depart, $limite) { |
$parametres = $this->parametres; |
$parametres['navigation.depart'] = $depart; |
$parametres['navigation.limite'] = $limite; |
101,7 → 103,6 |
* Récupérer le lien pour afficher les images suivantes en fonction des paramètres |
* */ |
public function recupererHrefSuivant() { |
$departActuel = $this->getDepart(); |
$limite = $this->getLimite(); |
$departSuivant = $departActuel + $limite; |
126,6 → 127,4 |
public function setTotal($total) { |
$this->total = $total; |
} |
} |
?> |
} |
/trunk/services/bibliotheque/Outils.php |
---|
1,4 → 1,22 |
<?php |
/** |
* Classe contenant des méthodes utilitaires. |
* |
* Mettre les méthodes utilitaires dans cette classe, de temps en temps, si plusieurs méthodes ont une |
* intéraction entre elles ou peuvent être regroupées. Les rassembler dans une nouvelle classe et mettre à |
* jour le code. |
* |
* @category DEL |
* @package Services |
* @subpackage Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class Outils { |
public static function recupererTableauConfig($parametres) { |
17,5 → 35,4 |
} |
return $tableau; |
} |
} |
?> |
} |
/trunk/services/bibliotheque/Conteneur.php |
---|
1,15 → 1,17 |
<?php |
/** |
* Le conteneur encapsule les classe Masque, Navigation et GestionBdd |
* Il gère leur instanciation, ainsi que la récupération des paramètres depuis l'url ou |
* Le conteneur encapsule l'instanciation des classes ainsi que la récupération des paramètres depuis l'url ou |
* les fichiers de configuration |
* |
* @category DEL |
* @package Commun |
* @author Grégoire Duché <gregoire@tela-botanica.org> |
* @copyright Copyright (c) 2012, Tela Botanica (accueil@tela-botanica.org) |
* @license http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL |
* @license http://www.gnu.org/licenses/gpl.html Licence GNU-GPL |
* @package Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
//TODO : initialiser tous les objets dans le conteneur |
//TODO : créer un tableau de partage |
20,6 → 22,7 |
protected $masque; |
protected $gestionBdd; |
protected $sansLimite = false; |
protected $partages = array(); |
/** |
* Constructeur de la classe |
69,6 → 72,8 |
$this->parametres[$cle] = $valeur; |
} |
//-------------------------------------------------------------------------------------------------------- |
// Ci-dessous méthode à revoir ! |
/** |
* Charger la configuration depuis le fichier |
* @param String $chemin le chemin relatif depuis le dossier configurations du fichier |
82,7 → 87,7 |
} |
Config::charger($cheminConfigurations.DS.$chemin); |
if ($this->masque = $this->creerMasque()) { |
if ($this->masque = new Masque(Config::get('masques_possibles'), $this->parametres)) { |
$this->masque->chargerMasque(); |
} else { |
$message = 'Erreur lors de la création du Masque'; |
90,7 → 95,7 |
throw new Exception($message, $code); |
} |
if ($this->navigation = $this->creerNavigation()) { |
if ($this->navigation = new Navigation($this->parametres)) { |
$this->navigation->chargerUrl(); |
} else { |
$message = 'Erreur lors de la création de la Navigation'; |
98,34 → 103,10 |
throw new Exception($message, $code); |
} |
$this->creerGestionBdd($this->navigation, Config::get('schemaBdd')); |
$this->gestionBdd = new GestionBdd($this->navigation, Config::get('schemaBdd')); |
} |
/** |
* Créer l'objet Masque en fonction des configurations |
* */ |
private function creerMasque() { |
$this->masque = new Masque(Config::get('masques_possibles'), $this->parametres); |
return $this->masque; |
} |
/** |
* Créer l'objet navigation avec les paramètres |
* */ |
private function creerNavigation() { |
return ($this->navigation = new Navigation($this->parametres)); |
} |
/** |
* Créer l'objet Gestion BDD |
* */ |
private function creerGestionBdd($navigation, $schemaBdd) { |
$this->gestionBdd = new GestionBdd($navigation, $schemaBdd); |
} |
/** |
* Changer la valeur de sans limite pour ne pas l'afficher dans l'entete |
* */ |
public function setSansLimite() { |
133,13 → 114,6 |
} |
/** |
* Récupérer l'objet GestionBdd |
* */ |
public function getGestionBdd() { |
return $this->gestionBdd; |
} |
/** |
* Récupérer l'objet Navigation |
* */ |
public function getNavigation() { |
179,19 → 153,28 |
return $entete; |
} |
//-------------------------------------------------------------------------------------------------------- |
// Ci-dessous méthode ok ! |
public function getBdd() { |
if (!isset($this->partages['Bdd'])){ |
$this->partages['Bdd'] = new Bdd(); |
} |
return $this->partages['Bdd']; |
} |
public function getRestClient() { |
if (!isset($this->restClient)) { |
$this->restClient = new RestClient(); |
if (!isset($this->partages['restClient'])){ |
$this->partages['restClient'] = new RestClient(); |
} |
return $this->restClient; |
return $this->partages['restClient']; |
} |
public function getControleAcces() { |
if (!isset($this->controleAcces)) { |
$this->controleAcces = new ControleAcces($this); |
if (!isset($this->partages['controleAcces'])) { |
$this->partages['controleAcces'] = new ControleAcces($this); |
} |
return $this->controleAcces; |
return $this->partages['controleAcces']; |
} |
} |
?> |
/trunk/services/bibliotheque/GestionUtilisateur.php |
---|
2,14 → 2,12 |
class GestionUtilisateur { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->conteneur->chargerConfiguration('config_utilisateurs.ini'); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
$this->demarrerSession(); |
} |
87,5 → 85,4 |
unset($_COOKIE['del_courriel']); |
unset($_COOKIE['del_mot_de_passe']); |
} |
} |
?> |
} |
/trunk/services/bibliotheque/ControleAcces.php |
---|
17,13 → 17,11 |
class ControleAcces { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
public function __construct($conteneur) { |
$this->conteneur = $conteneur; |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
public function controlerIpAutorisees() { |
/trunk/services/bibliotheque/EnteteHttp.php |
---|
1,7 → 1,20 |
<?php |
/** |
* Classe contenant le contenu par défaut de l'entête d'une réponse http par défaut. |
* |
* @category DEL |
* @package Services |
* @subpackage Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class EnteteHttp { |
public $code = RestServeur::HTTP_CODE_OK; |
public $encodage = 'utf-8'; |
public $mime = 'application/json'; |
} |
?> |
} |
/trunk/services/bibliotheque/ResultatService.php |
---|
1,7 → 1,20 |
<?php |
/** |
* Classe contenant seulement le résultat d'un service. |
* |
* @category DEL |
* @package Services |
* @subpackage Bibliotheque |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class ResultatService { |
public $mime = 'application/json'; |
public $encodage = 'utf-8'; |
public $corps = ''; |
} |
?> |
} |
/trunk/services/modules/0.1/Images.php |
---|
235,5 → 235,4 |
$classeNom = str_replace(' ', '', ucwords(strtolower(str_replace('-', ' ', $mot)))); |
return $classeNom; |
} |
} |
?> |
} |
/trunk/services/modules/0.1/utilisateurs/Preferences.php |
---|
17,7 → 17,6 |
class Preferences { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
public function __construct(Conteneur $conteneur = null) { |
24,8 → 23,7 |
session_start(); |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->conteneur->chargerConfiguration('config_utilisateurs.ini'); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/images/VotesImage.php |
---|
21,7 → 21,6 |
private $conteneur; |
private $navigation; |
private $masque; |
protected $gestionBdd; |
protected $bdd; |
private $ressources; |
private $parametres; |
32,8 → 31,7 |
$this->conteneur->chargerConfiguration('config_mapping_votes.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/images/ListeImages.php |
---|
125,7 → 125,7 |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->conteneur->chargerConfiguration('config_images.ini'); |
$this->bdd = $conteneur->getGestionBdd()->getBdd(); |
$this->bdd = $conteneur->conteneur->getBdd(); |
} |
public function consulter($ressources, $parametres) { |
/trunk/services/modules/0.1/nomstaxons/ListeTaxons.php |
---|
20,7 → 20,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
31,8 → 30,7 |
$this->conteneur->chargerConfiguration('config_nomstaxons.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/Determinations.php |
---|
4,14 → 4,17 |
* |
* Encodage en entrée : utf8 |
* Encodage en sortie : utf8 |
* @package eflore-projets |
* |
* @category DEL |
* @package Services |
* @subpackage Determinations |
* @version 0.1 |
* @author Jennifer DHÉ <jennifer.dhe@tela-botanica.org> |
* @author Delphine CAUQUIL <delphine@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @version 0.1 |
* @copyright 1999-2011 Tela Botanica (accueil@tela-botanica.org) |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class Determinations extends RestService { |
/trunk/services/modules/0.1/Commentaires.php |
---|
1,27 → 1,40 |
<?php |
/** |
* Description : |
* Classe principale de chargement des services d'eFlore. |
* Classe principale de chargement des services concernant les commentaires. |
* |
* Encodage en entrée : utf8 |
* Encodage en sortie : utf8 |
* @package eflore-projets |
* @author Jennifer DHÉ <jennifer.dhe@tela-botanica.org> |
* @author Delphine CAUQUIL <delphine@tela-botanica.org> |
* |
* URLs possibles : |
* |
* GET : |
* http://localhost/del/services/0.1/commentaires => liste tous les commentaires |
* http://localhost/del/services/0.1/commentaires/#id => retourne le contenu d'un commentaire d'id #id |
* |
* PUT : |
* http://localhost/del/services/0.1/commentaires => Ajoute un nouveau commentaire |
* |
* DELETE : |
* http://localhost/del/services/0.1/commentaires/#id => supprime le commentaire d'id #id |
* |
* @category DEL |
* @package Services |
* @subpackage Commentaires |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @version 0.1 |
* @copyright 1999-2011 Tela Botanica (accueil@tela-botanica.org) |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class Commentaires extends RestService { |
private $parametres = array(); |
private $ressources = array(); |
private $methode = null; |
private $projetNom = array(); |
private $serviceNom = array(); |
private $serviceNom = 'commentaires'; |
private $sousServiceNom = null; |
private $cheminCourant = null; |
private $conteneur; |
35,29 → 48,31 |
public function consulter($ressources, $parametres) { |
$this->methode = 'consulter'; |
$resultat = ''; |
$reponseHttp = new ReponseHttp(); |
try { |
$this->initialiserRessourcesEtParametres($ressources, $parametres); |
$this->conteneur = new Conteneur($this->parametres); |
$resultat = $this->traiterRessources(); |
$reponseHttp->setResultatService($resultat); |
} catch (Exception $e) { |
$reponseHttp->ajouterErreur($e); |
return $this->executerService(); |
} |
$reponseHttp->emettreLesEntetes(); |
$corps = $reponseHttp->getCorps(); |
return $corps; |
public function ajouter($ressources, $requeteDonnees) { |
$this->methode = 'ajouter'; |
$this->initialiserRessourcesEtParametres($ressources, $requeteDonnees); |
return $this->executerService(); |
} |
public function supprimer($ressources) { |
$this->methode = 'supprimer'; |
$this->initialiserRessourcesEtParametres($ressources); |
return $this->executerService(); |
} |
public function ajouter($ressources, $parametres) { |
$this->methode = 'ajouter'; |
private function initialiserRessourcesEtParametres($ressources, $parametres = array()) { |
$this->ressources = $ressources; |
$this->parametres = $parametres; |
} |
private function executerService() { |
$resultat = ''; |
$reponseHttp = new ReponseHttp(); |
try { |
$this->initialiserRessourcesEtParametres($ressources, $parametres); |
$this->conteneur = new Conteneur($this->parametres); |
$resultat = $this->traiterRessources(); |
$reponseHttp->setResultatService($resultat); |
64,69 → 79,68 |
} catch (Exception $e) { |
$reponseHttp->ajouterErreur($e); |
} |
$reponseHttp->emettreLesEntetes(); |
$corps = $reponseHttp->getCorps(); |
return $corps; |
} |
public function supprimer($ressources) { |
$this->methode = 'supprimer'; |
$resultat = ''; |
$reponseHttp = new ReponseHttp(); |
try { |
$this->ressources = $ressources; |
$this->conteneur = new Conteneur(); |
$resultat = $this->traiterRessources(); |
$reponseHttp->setResultatService($resultat); |
} catch (Exception $e) { |
$reponseHttp->ajouterErreur($e); |
$reponseHttp->emettreLesEntetes(); |
echo $reponseHttp->getCorps(); |
} |
} |
private function initialiserRessourcesEtParametres($ressources, $parametres) { |
$this->ressources = $ressources; |
$this->parametres = $parametres; |
} |
private function traiterRessources() { |
$retour = ''; |
$this->initialiserProjet(); |
$this->chargerConfigService(); |
$this->analyserRessources(); |
$retour = $this->initialiserService(); |
return $retour; |
} |
private function chargerConfigService() { |
$chemin = Config::get('chemin_configurations')."config_{$this->serviceNom}.ini"; |
Config::charger($chemin); |
} |
/*------------------------------------------------------------------------------------------------------------------ |
CONFIGURATION DU PROJET |
------------------------------------------------------------------------------------------------------------------*/ |
private function initialiserProjet() { |
$this->projetNom = 'commentaires'; |
$this->chargerConfigProjet(); |
private function analyserRessources() { |
if ($this->methode == 'consulter') { |
if (!isset($this->ressources) || empty($this->ressources)) { |
$this->sousServiceNom = 'liste-commentaires'; |
} else if (isset($this->ressources[0]) && count($this->ressources) == 1 && is_numeric($this->ressources[0])) { |
$this->sousServiceNom = 'consulter-commentaire'; |
} |
} else if ($this->methode == 'ajouter') { |
$this->sousServiceNom = 'ajouter-commentaire'; |
} else if ($this->methode == 'supprimer') { |
if (isset($this->ressources[0]) && count($this->ressources) == 1 && is_numeric($this->ressources[0])) { |
$this->sousServiceNom = 'supprimer-commentaire'; |
} |
} |
private function chargerConfigProjet() { |
$projet = $this->projetNom; |
$chemin = Config::get('chemin_configurations')."config_$projet.ini"; |
Config::charger($chemin); |
if ($this->sousServiceNom == null) { |
$this->lancerMessageErreurRessource(); |
} |
} |
/*------------------------------------------------------------------------------------------------------------------ |
CONFIGURATION DU SERVICE |
------------------------------------------------------------------------------------------------------------------*/ |
private function lancerMessageErreurRessource() { |
$ressource = $this->sousServiceNom.'/'.implode('/', $this->ressources); |
$message = "La ressource demandée '$ressource' ". |
"n'est pas disponible pour le service ".$this->serviceNom." !\n". |
"Les URLs disponibles sont : \n". |
" - en GET : commentaires, commentaires/#id \n". |
" - en PUT : commentaires". |
" - en DELETE : commentaires/#id"; |
$code = RestServeur::HTTP_CODE_RESSOURCE_INTROUVABLE; |
throw new Exception($message, $code); |
} |
private function initialiserService() { |
$this->chargerNomService(); |
$classe = $this->obtenirNomClasseService($this->serviceNom); |
$classe = $this->obtenirNomClasseService($this->sousServiceNom); |
//echo $this->sousServiceNom.':'.$classe."\n"; |
//echo 'Ressources :'.print_r($this->ressources, true); |
//echo 'Parametres :'.print_r($this->parametres, true); |
$chemins = array(); |
$chemins[] = $this->cheminCourant.$this->projetNom.DS.$classe.'.php'; |
$chemins[] = $this->cheminCourant.$this->serviceNom.DS.$classe.'.php'; |
$chemins[] = $this->cheminCourant.'commun'.DS.$classe.'.php'; |
$retour = ''; |
$service = null; |
foreach ($chemins as $chemin) { |
if (file_exists($chemin)) { |
$this->conteneur->chargerConfiguration('config_'.$this->projetNom.'.ini'); |
$this->conteneur->chargerConfiguration('config_'.$this->serviceNom.'.ini'); |
require_once $chemin; |
$service = new $classe($this->conteneur); |
if ($this->methode == 'consulter') { |
134,13 → 148,15 |
} elseif ($this->methode == 'ajouter') { |
$retour = $service->ajouter($this->ressources, $this->parametres); |
} elseif ($this->methode == 'supprimer') { |
$retour = $service->supprimer($this->ressources, $this->parametres); |
$retour = $service->supprimer($this->ressources); |
} |
} |
} |
if (is_null($service)) { |
$message = "Le service demandé '{$this->serviceNom}' n'existe pas dans le projet {$this->projetNom} !"; |
$ressource = $this->sousServiceNom.'/'.implode('/', $this->ressources); |
$message = "Le classe '$classe' correspondant à la ressource '$ressource' ". |
"n'existe pas dans le service '{$this->serviceNom}' !"; |
$code = RestServeur::HTTP_CODE_RESSOURCE_INTROUVABLE; |
throw new Exception($message, $code); |
} |
147,32 → 163,8 |
return $retour; |
} |
private function chargerNomService() { |
// si la méthode est POST, on ajouter un commentaire |
if ($this->methode == 'ajouter') { |
$this->serviceNom = 'ajouter-commentaire'; |
} else if ($this->methode == 'supprimer') { |
$this->serviceNom = 'supprimer-commentaire'; |
} |
else { |
//S'il n'y a pas de ressources => tous les commentaires |
if (!isset($this->ressources) || empty($this->ressources)) { |
$this->serviceNom = 'liste-commentaires'; |
} else { |
if (!is_numeric($this->ressources[0])) { |
$message = "La première ressource doit être un identifiant"; |
$code = RestServeur::HTTP_CODE_ERREUR; |
throw new Exception($message, $code); |
} else { |
$this->serviceNom = 'consulter-commentaire'; |
} |
} |
} |
} |
private function obtenirNomClasseService($mot) { |
$classeNom = str_replace(' ', '', ucwords(strtolower(str_replace('-', ' ', $mot)))); |
return $classeNom; |
} |
} |
?> |
} |
/trunk/services/modules/0.1/observations/Observation.php |
---|
23,7 → 23,6 |
class Observation { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
/* Map les champs MySQL vers les champs utilisés dans le JSON pour les clients pour |
chacune des différentes tables utilisées pour le chargement de résultats ci-dessous. |
117,8 → 116,7 |
$this->conteneur->chargerConfiguration('config_votes.ini'); |
$this->conteneur->chargerConfiguration('config_mapping_votes.ini'); |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/observations/ListeObservations.php |
---|
29,7 → 29,6 |
class ListeObservations { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
51,7 → 50,6 |
'dc' => array('commentaire') |
); |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->conteneur->chargerConfiguration('config_departements_bruts.ini'); |
60,8 → 58,7 |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
static function reformateObservation($obs, $url_pattern = '') { |
204,14 → 201,14 |
return $res; |
} |
/* |
Champs récupérés: |
Pour del_images, la vue retourne déjà ce que nous recherchons de cel_obs et cel_images |
(cel_obs.* et cel_[obs_]images.{id_observation, id_image, date_prise_de_vue AS date, hauteur, largeur}) |
Pour del_commentaires: nous voulons * |
Reste ensuite à formatter. |
Note: le préfixe de table utilisé ici (vdi) n'impacte *aucune* autre partie du code car rien |
n'en dépend pour l'heure. (inutilisation de $req['select']) |
/** |
* Champs récupérés: |
* Pour del_images, la vue retourne déjà ce que nous recherchons de cel_obs et cel_images |
* (cel_obs.* et cel_[obs_]images.{id_observation, id_image, date_prise_de_vue AS date, hauteur, largeur}) |
* Pour del_commentaires: nous voulons * |
* Reste ensuite à formatter. |
* Note: le préfixe de table utilisé ici (vdi) n'impacte *aucune* autre partie du code car rien |
* n'en dépend pour l'heure. (inutilisation de $req['select']) |
*/ |
static function getInfos($idobs, $db) { |
/*$select_fields = implode(',', array_merge( |
218,8 → 215,7 |
array_map(create_function('$a', 'return "vdi.".$a;'), self::$sql_fields_liaisons['dob']), |
array_map(create_function('$a', 'return "vdi.".$a;'), self::$sql_fields_liaisons['di']), |
array_map(create_function('$a', 'return "du.".$a;'), self::$sql_fields_liaisons['du'])));*/ |
$select_fields = array_merge(self::$sql_fields_liaisons['dob'], |
self::$sql_fields_liaisons['di']); |
$select_fields = array_merge(self::$sql_fields_liaisons['dob'], self::$sql_fields_liaisons['di']); |
$req_s = sprintf('SELECT %s FROM v_del_image vdi'. |
// ' LEFT JOIN del_commentaire AS dc ON di.id_observation = dc.ce_observation AND dc.nom_sel IS NOT NULL'. |
' WHERE id_observation IN (%s)', |
228,7 → 224,6 |
return $db->recupererTous($req_s); |
} |
/** |
* Complément à DelTk::sqlAddConstraint() |
* |
255,8 → 250,7 |
$db->proteger(strtolower($tag))); |
} |
$req['where'][] = '(' . implode(' AND ', $subwhere) . ')'; |
} |
else { |
} else { |
$req['where'][] = sprintf('LOWER(CONCAT(%s)) REGEXP %s', |
DelTk::sqlAddIfNullPourConcat(array('vdi.mots_cles_texte', 'vdi.i_mots_cles_texte')), |
$db->proteger(strtolower(implode('|', $p['masque.tag']['OR'])))); |
268,10 → 262,11 |
} |
} |
/* Le masque fait une recherche générique parmi de nombreux champs ci-dessus. |
Nous initialisons donc ces paramètres (excepté masque biensur), et nous rappelons |
récursivement. À la seule différence que nous n'utiliserons que $or_req['where'] |
imploded par des " OR ". */ |
/** Le masque fait une recherche générique parmi de nombreux champs ci-dessus. |
* Nous initialisons donc ces paramètres (excepté masque biensur), et nous rappelons |
* récursivement. À la seule différence que nous n'utiliserons que $or_req['where'] |
* imploded par des " OR ". |
*/ |
static function sqlAddMasqueConstraint($p, $db, &$req, Conteneur $c = NULL) { |
if(!empty($p['masque'])) { |
$or_params = array('masque.auteur' => $p['masque'], |
313,14 → 308,12 |
} |
} |
private function configurer() { |
$this->mappingVotes = $this->conteneur->getParametre('mapping_votes'); |
$this->mappingCommentaire = $this->conteneur->getParametre('mapping_commentaire'); |
} |
/* |
/** |
* @param $req: la représentation de la requête MySQL complète, à amender. |
*/ |
static function addTypeConstraints($val, $db, &$req, Conteneur $c) { |
356,14 → 349,12 |
} |
} |
/** |
* Récupérer toutes les déterminations et le nombre de commentaire au total |
* @param array $observations la liste des observations à mettre à jour |
* */ |
*/ |
private function chargerDeterminations(&$observations) { |
$idObs = array_values(array_map(create_function('$a', 'return $a["id_observation"];'), |
$observations)); |
$idObs = array_values(array_map(create_function('$a', 'return $a["id_observation"];'), $observations)); |
$r = sprintf('SELECT * FROM del_commentaire AS dc WHERE dc.nom_sel IS NOT NULL AND ce_observation IN (%s) -- %s', |
implode(',',$idObs), |
__FILE__ . ':' . __LINE__); |
396,7 → 387,6 |
$proposition_formatee['votes'][$vote['id_vote']] = $this->formaterVote($vote); |
} |
// chargerNombreCommentaire() |
// Charger le nombre de commentaires (sans détermination) associé à l'observation |
$listeCommentaires = $this->bdd->recupererTous(sprintf( |
425,7 → 415,7 |
/** |
* Formater un vote en fonction du fichier de configuration config_votes.ini |
* @param $votes array() |
* */ |
*/ |
private function formaterVote($vote) { |
$retour = array(); |
foreach ($vote as $param=>$valeur) { |
/trunk/services/modules/0.1/observations/ListeObservationsWidget.php |
---|
18,7 → 18,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
31,8 → 30,7 |
$this->conteneur->chargerConfiguration('config_departements_bruts.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
347,7 → 345,7 |
' INNER JOIN del_obs_image AS doi ON doi.id_observation = dob.id_observation '. |
$this->chargerClauseWhere().' '. |
"ORDER BY {$this->tri} {$this->directionTri} ". |
$this->gestionBdd->getLimitSql(); |
' LIMIT '.$this->navigation->getDepart().', '.$this->navigation->getLimite(); |
return $this->bdd->recupererTous($requete); |
} |
/trunk/services/modules/0.1/observations/VoteObservation.php |
---|
16,7 → 16,6 |
class VoteObservation extends RestService { |
protected $conteneur; |
protected $gestionBdd; |
protected $bdd; |
protected $navigation; |
23,8 → 22,7 |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
$this->navigation = $conteneur->getNavigation(); |
$this->conteneur->chargerConfiguration('config_mapping_votes.ini'); |
} |
/trunk/services/modules/0.1/syndication/SyndicationTagsParProtocole.php |
---|
25,7 → 25,7 |
private $masque = array(); |
private $mappingFiltre = array(); |
private $conteneur = null; |
private $gestionBdd = null; |
private $bdd = null; |
private $navigation = null; |
private $type_rss = null; |
38,7 → 38,7 |
$this->conteneur->chargerConfiguration('config_syndication_tagsparprotocole.ini'); |
$this->mappingFiltre = $this->conteneur->getParametre('mapping_masque'); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $conteneur->getBdd(); |
$this->navigation = $conteneur->getNavigation(); |
} |
286,7 → 286,7 |
$this->chargerClauseWhere().' '. |
'ORDER BY date DESC '. |
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite(); |
$elements = $this->gestionBdd->getBdd()->recupererTous($requete); |
$elements = $this->bdd->recupererTous($requete); |
return $elements; |
} |
300,7 → 300,7 |
foreach ($tableauMasque as $idMasque => $valeurMasque) { |
$idMasque = str_replace('masque.', '', $idMasque); |
$champMasque = $this->mappingFiltre[$idMasque]; |
$masqueMotif = $this->gestionBdd->getBdd()->proteger($valeurMasque); |
$masqueMotif = $this->bdd->proteger($valeurMasque); |
switch ($idMasque) { |
case 'image': |
/trunk/services/modules/0.1/syndication/SyndicationVotesParProtocole.php |
---|
24,7 → 24,7 |
private $masque = array(); |
private $mappingFiltre = array(); |
private $conteneur = null; |
private $gestionBdd = null; |
private $bdd = null; |
private $navigation = null; |
private $type_rss = null; |
37,7 → 37,7 |
$this->conteneur->chargerConfiguration('config_syndication_votesparprotocole.ini'); |
$this->mappingFiltre = $this->conteneur->getParametre('mapping_masque'); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $conteneur->getBdd(); |
$this->navigation = $conteneur->getNavigation(); |
} |
276,7 → 276,7 |
'ORDER BY divo.date DESC '. |
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite(); |
$elements = $this->gestionBdd->getBdd()->recupererTous($requete); |
$elements = $this->bdd->recupererTous($requete); |
return $elements; |
} |
291,13 → 291,13 |
$idMasque = str_replace('masque.', '', $idMasque); |
switch ($idMasque) { |
case 'image': |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->gestionBdd->getBdd()->proteger($valeurMasque); |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->bdd->proteger($valeurMasque); |
break; |
case 'protocole': |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->gestionBdd->getBdd()->proteger($valeurMasque).' '; |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->bdd->proteger($valeurMasque).' '; |
break; |
default: |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->gestionBdd->getBdd()->proteger($valeurMasque); |
$where[] = ' '.$this->mappingFiltre[$idMasque].' = '.$this->bdd->proteger($valeurMasque); |
break; |
} |
} |
320,19 → 320,19 |
if(count($tableauNomPrenom) == 2) { |
// on teste potentiellement un nom prenom ou bien un prénom nom |
$masque = '('. |
'(dc.utilisateur_nom LIKE '.$this->gestionBdd->getBdd()->proteger($tableauNomPrenom[0].'%').' AND '. |
'dc.utilisateur_prenom LIKE '.$this->gestionBdd->getBdd()->proteger($tableauNomPrenom[1].'%').') OR '. |
'(dc.utilisateur_nom LIKE '.$this->gestionBdd->getBdd()->proteger($tableauNomPrenom[1].'%').' AND '. |
'dc.utilisateur_prenom LIKE '.$this->gestionBdd->getBdd()->proteger($tableauNomPrenom[0].'%').')'. |
'(dc.utilisateur_nom LIKE '.$this->bdd->proteger($tableauNomPrenom[0].'%').' AND '. |
'dc.utilisateur_prenom LIKE '.$this->bdd->proteger($tableauNomPrenom[1].'%').') OR '. |
'(dc.utilisateur_nom LIKE '.$this->bdd->proteger($tableauNomPrenom[1].'%').' AND '. |
'dc.utilisateur_prenom LIKE '.$this->bdd->proteger($tableauNomPrenom[0].'%').')'. |
')'; |
} else { |
$masque = '( |
(dc.utilisateur_nom LIKE '.$this->gestionBdd->getBdd()->proteger($auteurId.'%').' OR '. |
'dc.utilisateur_prenom LIKE '.$this->gestionBdd->getBdd()->proteger($auteurId.'%').')'. |
(dc.utilisateur_nom LIKE '.$this->bdd->proteger($auteurId.'%').' OR '. |
'dc.utilisateur_prenom LIKE '.$this->bdd->proteger($auteurId.'%').')'. |
')'; |
} |
} else { |
$masque = " do.utilisateur_courriel LIKE ".$this->gestionBdd->getBdd()->proteger($valeurMasque.'%')." "; |
$masque = " do.utilisateur_courriel LIKE ".$this->bdd->proteger($valeurMasque.'%')." "; |
} |
} |
return $masque; |
/trunk/services/modules/0.1/syndication/SyndicationCommentaires.php |
---|
21,7 → 21,7 |
private $masque = array(); |
private $mappingFiltre = array(); |
private $conteneur = null; |
private $gestionBdd = null; |
private $bdd = null; |
private $navigation = null; |
public function __construct(Conteneur $conteneur = null) { |
29,7 → 29,7 |
$this->conteneur->chargerConfiguration('config_syndication_commentaires.ini'); |
$this->mappingFiltre = $this->conteneur->getParametre('mapping_masque'); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $conteneur->getBdd(); |
$this->navigation = $conteneur->getNavigation(); |
} |
245,7 → 245,7 |
'ORDER BY dc.date DESC '. |
'LIMIT '.$this->navigation->getDepart().','.$this->navigation->getLimite().' '; |
$elements = $this->gestionBdd->getBdd()->recupererTous($requete); |
$elements = $this->bdd->recupererTous($requete); |
return $elements; |
} |
260,8 → 260,8 |
foreach ($tableauMasque as $idMasque => $valeurMasque) { |
$idMasque = str_replace('masque.', '', $idMasque); |
$champ = $this->mappingFiltre[$idMasque]; |
$valeurMasquePattern = $this->gestionBdd->getBdd()->proteger($valeurMasque.'%'); |
$valeurMasqueProtegee = $this->gestionBdd->getBdd()->proteger($valeurMasque); |
$valeurMasquePattern = $this->bdd->proteger($valeurMasque.'%'); |
$valeurMasqueProtegee = $this->bdd->proteger($valeurMasque); |
switch ($idMasque) { |
case 'espece': |
288,14 → 288,14 |
if (is_numeric($auteurId)) { |
$whereAuteur = " dc.ce_utilisateur = $auteurId "; |
} else { |
$auteurIdMotif = $this->gestionBdd->getBdd()->proteger($auteurId.'%'); |
$auteurIdMotif = $this->bdd->proteger($auteurId.'%'); |
if (strpos($auteurId, '@') === false) { |
$tableauNomPrenom = explode(' ', $auteurId, 2); |
if (count($tableauNomPrenom) == 2) { |
// on teste potentiellement un nom prenom ou bien un prénom nom |
$nomMotif = $this->gestionBdd->getBdd()->proteger($tableauNomPrenom[0].'%'); |
$prenomMotif = $this->gestionBdd->getBdd()->proteger($tableauNomPrenom[1].'%'); |
$nomMotif = $this->bdd->proteger($tableauNomPrenom[0].'%'); |
$prenomMotif = $this->bdd->proteger($tableauNomPrenom[1].'%'); |
$whereAuteur = ' ('. |
"(dc.utilisateur_nom LIKE $nomMotif AND dc.utilisateur_prenom LIKE $prenomMotif) ". |
/trunk/services/modules/0.1/determinations/ListeImagesDeterminationsProbables.php |
---|
22,7 → 22,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
36,8 → 35,7 |
$this->conteneur->chargerConfiguration('config_determinations.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/determinations/ValiderDetermination.php |
---|
18,7 → 18,6 |
class ValiderDetermination { |
private $conteneur; |
private $gestionBdd; |
private $bdd; |
private $idObs = null; |
private $idProposition = null; |
28,8 → 27,7 |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->conteneur->chargerConfiguration('config_determinations.ini'); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
public function modifier($ressources, $parametres) { |
/trunk/services/modules/0.1/plantnet/Changements.php |
---|
24,7 → 24,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
40,8 → 39,7 |
$this->conteneur->chargerConfiguration('config_plantnet.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/commentaires/ConsulterCommentaire.php |
---|
20,7 → 20,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
32,8 → 31,7 |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
170,9 → 168,9 |
* Chargement depuis la bdd de tous les commentaires |
* */ |
private function chargerCommentaires() { |
$requeteLiaisons = 'SELECT DISTINCT SQL_CALC_FOUND_ROWS * FROM del_commentaire '; |
$requeteLiaisons .= $this->chargerClauseWhere(); |
$requeteLiaisons .= $this->gestionBdd->getLimitSql(); |
$requeteLiaisons = 'SELECT DISTINCT SQL_CALC_FOUND_ROWS * FROM del_commentaire '. |
$this->chargerClauseWhere(). |
' LIMIT '.$this->navigation->getDepart().', '.$this->navigation->getLimite(); |
return $this->bdd->recupererTous($requeteLiaisons); |
} |
/trunk/services/modules/0.1/commentaires/ListeCommentaires.php |
---|
20,7 → 20,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
31,8 → 30,7 |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
154,9 → 152,9 |
* */ |
private function chargerCommentaires() { |
$requeteLiaisons = 'SELECT DISTINCT SQL_CALC_FOUND_ROWS * FROM del_commentaire '; |
$requeteLiaisons .= $this->chargerClauseWhere(); |
$requeteLiaisons .= $this->gestionBdd->getLimitSql(); |
$requeteLiaisons = 'SELECT DISTINCT SQL_CALC_FOUND_ROWS * FROM del_commentaire '. |
$this->chargerClauseWhere(). |
' LIMIT '.$this->navigation->getDepart().', '.$this->navigation->getLimite(); |
return $this->bdd->recupererTous($requeteLiaisons); |
} |
/trunk/services/modules/0.1/commentaires/SupprimerCommentaire.php |
---|
20,7 → 20,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
34,8 → 33,7 |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/commentaires/AjouterCommentaire.php |
---|
1,18 → 1,18 |
<?php |
// declare(encoding='UTF-8'); |
/** |
* Le web service image récupère toutes les données de la table del_obs_images |
* pour retourner une liste d'images associée à une observation |
* Permet d'ajouter un commentaire. |
* |
* @category php 5.2 |
* @package del |
* @subpackage images |
* @category DEL |
* @package Services |
* @subpackage Commentaires |
* @version 0.1 |
* @author Mathias CHOUET <mathias@tela-botanica.org> |
* @author Jean-Pascal MILCENT <jpm@tela-botanica.org> |
* @copyright Copyright (c) 2012, Tela Botanica (accueil@tela-botanica.org) |
* @license http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL |
* @license http://www.gnu.org/licenses/gpl.html Licence GNU-GPL |
* @version $Id: Bdd.php 403 2012-02-22 14:35:20Z gduche $ |
* @see http://www.tela-botanica.org/wikini/eflore/wakka.php?wiki=ApiIdentiplante01Images |
* @author Aurelien PERONNET <aurelien@tela-botanica.org> |
* @license GPL v3 <http://www.gnu.org/licenses/gpl.txt> |
* @license CECILL v2 <http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt> |
* @copyright 1999-2014 Tela Botanica <accueil@tela-botanica.org> |
*/ |
class AjouterCommentaire { |
20,7 → 20,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
27,14 → 26,13 |
private $commentaire; |
public function __construct(Conteneur $conteneur = null) { |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
public function __construct(Conteneur $conteneur) { |
$this->conteneur = $conteneur; |
$this->conteneur->chargerConfiguration('config_commentaires.ini'); |
$this->conteneur->chargerConfiguration('config_mapping_commentaires.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
257,5 → 255,4 |
return implode(', ', $valeurs); |
} |
} |
?> |
} |
/trunk/services/modules/0.1/motscles/ListeMotsCles.php |
---|
19,7 → 19,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
30,8 → 29,7 |
$this->conteneur->chargerConfiguration('config_mapping_mots_cles.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/motscles/SupprimerMotCle.php |
---|
21,7 → 21,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
32,8 → 31,7 |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/motscles/AjouterMotCle.php |
---|
21,7 → 21,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
private $bdd; |
private $parametres = array(); |
private $ressources = array(); |
32,9 → 31,7 |
$this->conteneur = $conteneur == null ? new Conteneur() : $conteneur; |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |
/trunk/services/modules/0.1/protocoles/ListeProtocoles.php |
---|
19,7 → 19,6 |
private $conteneur; |
private $navigation; |
private $masque; |
private $gestionBdd; |
protected $bdd; |
private $parametres = array(); |
private $ressources = array(); |
29,8 → 28,7 |
$this->conteneur->chargerConfiguration('config_mapping_votes.ini'); |
$this->navigation = $conteneur->getNavigation(); |
$this->masque = $conteneur->getMasque(); |
$this->gestionBdd = $conteneur->getGestionBdd(); |
$this->bdd = $this->gestionBdd->getBdd(); |
$this->bdd = $this->conteneur->getBdd(); |
} |
/** |