Handle address escaping at display; closes #1592

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index a7ccd3d08062f4d454f3913134ac185aa9709bae..c0344ad00cb2d083b17a19cf9500625821f4fba5 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -1726,7 +1726,7 @@ class Adherent
                     if ($this->_address_continuation !== '' && $this->_address_continuation !== null) {
                         $address .= "\n" . $this->_address_continuation;
                     }
-                    return htmlspecialchars($address, ENT_QUOTES);
+                    return $address;
                     break;
                 case 'sname':
                     return $this->getNameWithCase($this->_name, $this->_surname);

diff --git a/galette/templates/default/gestion_adherents.tpl b/galette/templates/default/gestion_adherents.tpl
index bb46503a929d69d4490418dbdf75be094d242337..fc8ae326b800682fa828e5bc5b44d38dae421c40 100644 (file)
--- a/galette/templates/default/gestion_adherents.tpl
+++ b/galette/templates/default/gestion_adherents.tpl
@@ -225,7 +225,7 @@ We have to use a template file, so Smarty will do its work (like replacing varia
                 {assign var="value" value=$member->sfullname}
             {elseif $column->field_id eq 'pseudo_adh'}
                 {assign var="lrclass" value="$rclass nowrap"}
-                {assign var=value value=$member->$propname|escape}
+                {assign var=value value=$member->$propname}
             {elseif $column->field_id eq 'tel_adh' or $column->field_id eq 'gsm_adh'}
                 {assign var="lrclass" value="$rclass nowrap"}
             {elseif $column->field_id eq 'id_statut'}
@@ -238,7 +238,8 @@ We have to use a template file, so Smarty will do its work (like replacing varia
             {elseif $column->field_id eq 'pref_lang'}
                 {assign var="value" value=$i18n->getNameFromId($member->language)}
             {elseif $column->field_id eq 'adresse_adh'}
-                {assign var="value" value=$member->saddress|nl2br}
+                {assign var="value" value=$member->saddress|escape|nl2br}
+                {assign var="escaped" value=true}
             {elseif $column->field_id eq 'bool_display_info'}
                 {assign var="value" value=$member->sappears_in_list}
             {elseif $column->field_id eq 'activite_adh'}
@@ -260,7 +261,7 @@ We have to use a template file, so Smarty will do its work (like replacing varia
                 {else}
                     {assign var=value value=$propvalue}
                 {/if}
-            {else}
+            {else if !isset($escaped)}
                 {assign var=value value=$value|escape}
             {/if}
 

diff --git a/galette/templates/default/voir_adherent.tpl b/galette/templates/default/voir_adherent.tpl
index 8d4d8112d870ee0b026c549310b39f3209c310c8..9fdb96c6722c8b5ed328934c351df68644174f3e 100644 (file)
--- a/galette/templates/default/voir_adherent.tpl
+++ b/galette/templates/default/voir_adherent.tpl
@@ -155,7 +155,7 @@ We have to use a template file, so Smarty will do its work (like replacing varia
         {elseif $element->field_id eq 'pref_lang'}
             {assign var="value" value=$pref_lang}
         {elseif $element->field_id eq 'adresse_adh'}
-            {assign var="value" value=$member->saddress|nl2br}
+            {assign var="value" value=$member->saddress|escape|nl2br}
         {elseif $element->field_id eq 'bool_display_info'}
             {assign var="value" value=$member->sappears_in_list}
         {elseif $element->field_id eq 'activite_adh'}