X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=74483c3d94e033cbae2901c207fc798d1ef15795;hb=9b42c0b551d0ce7286e5b719ab49959829e99031;hp=66cb09c12914b76416e3362c41278965d5033536;hpb=0783a5ed4d3409bcd7a7e1d908696159999810c8;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 66cb09c..74483c3 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
text;
+ if (!$txtad) {
+ $txthtml = '';
+ if ($adr->phones() && count($adr->phones())) {
+ require_once 'function.display_phones.php';
+ $txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()), $smarty);
+ } elseif (isset($param['phones']) && count($param['phones'])) {
+ require_once 'function.display_phones.php';
+ $txthtml .= smarty_function_display_phones(array('tels' => $param['phones']), $smarty);
+ }
+ if (!isset($param['nodiv']) && $txthtml != '' && isset($param['pos'])) {
+ $txthtml = '
' . $txthtml . '
';
+ }
+ return $txthtml;
+ }
$lines = explode("\n", $txtad);
$idt = array_shift($lines);
@@ -61,29 +69,45 @@ function smarty_function_display_address($param, &$smarty)
$map = "";
+ if ($adr->flags->hasflag('mail')) {
+ $mail = ' ';
+ } else {
+ $mail = '';
+ }
+ $comment = "";
+ if ($adr->comment != "")
+ {
+ $commentHtml = str_replace(array('&', '"'), array('&', '"'), $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 . $mail . $comment . "
\n";
else
- $txthtml .= "".pl_entity_decode($param['titre'])." ".$map."
\n";
+ $txthtml .= '' . pl_entity_decode($param['titre']) . ' ' . $map . $mail . $comment . "
\n";
}
foreach ($lines as $line)
{
- $txthtml .= "".$line."
\n";
+ $txthtml .= "" . pl_entities($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 ($adr->phones() != null) {
+ require_once 'function.display_phones.php';
+ $txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()),$smarty);
+ } else if (isset($param['phones']) && count($param['phones'])) {
+ require_once 'function.display_phones.php';
+ $txthtml .= smarty_function_display_phones(array('tels' => $param['phones']),$smarty);
}
if (!$param['nodiv']) {
$pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';
@@ -92,5 +116,5 @@ function smarty_function_display_address($param, &$smarty)
return $txthtml;
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>