X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=47af0b03038f8bda9d288a54f59cd5f4319c95e8;hb=9891bd15f772caef0c199a98f036e976bf4ab94a;hp=1ac380106fe972d3ce3d2a0c853d391448c53ef7;hpb=80ca1b4e452e761903acd2a72d9fe21716a1098e;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 1ac3801..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 .= "
".$param['titre']."
\n";
- else
- $txthtml .= "".$param['titre']."
\n";
+ if ($param['titre_div'])
+ $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
+ else
+ $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 (!$params['nodiv'])
- {
- $txthtml = "\n".$txthtml."
\n";
+ $txthtml .= "".$line."
\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'] . "'" : '';
+ $txthtml = "\n".$txthtml."
\n";
}
return $txthtml;
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>