X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Ffunction.display_address.php;h=c69958924e52d22817f78b3f86586ff1a0d8558c;hb=543b59ccbecdf438b99b888ed775f48046bb9981;hp=b755e92fbdf77141d44708a890ad12d0e93437be;hpb=1a5db4b8879c2bfab008fb41e4be357b94f6a52a;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index b755e92..c699589 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
";
+ $comment = "";
+ if ($param['adr']['comment'] != "")
+ {
+ $commentHtml = str_replace(array('&', '"'), array('&', '"'), $param['adr']['comment']);
+ $commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
+ $comment = "";
+ }
if ($restore) {
array_unshift($lines, $idt);
}
if ($param['titre'])
{
if ($param['titre_div'])
- $txthtml .= "
".$param['titre'].$map."
\n";
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
else
- $txthtml .= "".$param['titre']."".$map."
\n";
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
}
foreach ($lines as $line)
{
$txthtml .= "".$line."
\n";
}
- if ($param['adr']['tel'])
- $txthtml .= "\nTél : \n".$param['adr']['tel']."\n
\n";
- if ($param['adr']['fax'])
- $txthtml .= "\nFax : \n".$param['adr']['fax']."\n
\n";
- if ($param['adr']['mobile'])
- $txthtml .= "\nTél : \n".$param['adr']['mobile']."\n
\n";
- if ($param['adr']['tels'] && count($param['adr']['tels'])) {
- foreach ($param['adr']['tels'] as $tel)
- $txthtml .= "\n".$tel['tel_type']." : \n".$tel['tel']."\n
\n";
+ if(isset($param['adr']['tels'])) {
+ require_once('function.display_phones.php');
+ $txthtml .= smarty_function_display_phones($param['adr'],$smarty);
}
if (!$param['nodiv']) {
$pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';