WebSVN – eFlore/Applications.coel-consultation – Diff – //trunk/controleurs/aControleur.php

  * @package		Collection
  * @author		Jean-Pascal MILCENT <jpm@tela-botanica.org>
  * @copyright	2010 Tela-Botanica
  * @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		SVN: $Id: aControleur.php 132 2010-07-12 10:25:11Z jpm $
+ * @version		SVN: $Id: aControleur.php 144 2010-08-30 16:22:52Z jpm $
  */
 abstract class aControleur extends Controleur {
 	const FMT_DATE = '%d/%m/%Y';// Supporte les formats de dates non valides (1989-00-00)
 		$this->url->unsetVariablesRequete(array('module', 'id'));
 		return $url;
+	}
+	protected function obtenirUrlFicheCollection($id_collection) {
+		$url = $this->obtenirObjetUrlFicheCollection($id_collection);
+		return $url->getURL();
+	}
-	protected function obtenirUrlFicheCollection($id_collection) {
+	protected function obtenirObjetUrlFicheCollection($id_collection) {
 		$this->url->setRequete(false);
 		$this->url->setVariableRequete('module', 'FicheCollection');
 		$this->url->setVariableRequete('id', $id_collection);
-		$url = $this->url->getURL();
+		$url = clone $this->url;
 		$this->url->unsetVariablesRequete(array('module', 'id'));
 		return $url;
+	}
 		if (count($tableau) > 0) {
 			foreach ($tableau as $cle => &$valeur) {
 				if ($valeur == '') {
 					$valeur = '&nbsp;';
 				} else if (is_string($valeur)) {
-					$valeur = preg_replace('/&(?!amp;)/i', '&amp;', $valeur, -1);
+					$valeur = $this->remplacerEsperluette($valeur);
 				} else if (is_array($valeur)) {
 					$this->postraiterDonnees($valeur);
+				}
+			}
+		}
+	}
+	private function remplacerEsperluette($txt) {
+		$txt = preg_replace('/&(?!([a-z]+|#[0-9]+|#x[0-9a-f]+);)/i', '&amp;', $txt, -1);
+		return $txt;
+	}
 	protected function chargerPiedDePage() {
 		$donnees['appli'] = Application::getInfo();
 		$this->setSortie(self::RENDU_PIED, $this->getVue('pied', $donnees));
+	}
+}

Subversion Repositories eFlore/Applications.coel-consultation

(root)//trunk/controleurs/aControleur.php – Rev 132 → 144