X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Ffunction.display_address.php;h=47af0b03038f8bda9d288a54f59cd5f4319c95e8;hb=4a55e7da9dd68b35034d207a25d8ffb292f30403;hp=07ce7c3c59c043aa3d931a060dacaa4ebd798345;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 07ce7c3..47af0b0 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 .= "
".pl_entity_decode($param['titre'])." ".$map."
\n";
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
else
- $txthtml .= "".pl_entity_decode($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'] . "'" : '';