X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Ffunction.display_address.php;h=74483c3d94e033cbae2901c207fc798d1ef15795;hb=73317355964c4cd538157f8b281a1384b7e38e4d;hp=28c6c4fa78f42b212ab32cfe56591c25d99ef983;hpb=0073747ac81cc9cff9e43847eb008f0e815255f0;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 28c6c4f..74483c3 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
text;
- if (!$txtad && !$adr->phones() && !count($adr->phones())) {
- return "";
+ 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);
@@ -59,8 +69,13 @@ function smarty_function_display_address($param, &$smarty)
$map = "
";
+ if ($adr->flags->hasflag('mail')) {
+ $mail = '
';
+ } else {
+ $mail = '';
+ }
$comment = "";
- if ($param['adr']['comment'] != "")
+ if ($adr->comment != "")
{
$commentHtml = str_replace(array('&', '"'), array('&', '"'), $adr->comment);
$commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
@@ -79,17 +94,20 @@ function smarty_function_display_address($param, &$smarty)
if ($param['titre'])
{
if ($param['titre_div'])
- $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
+ $txthtml .= '' . pl_entity_decode($param['titre']) . ' ' . $map . $mail . $comment . "
\n";
else
- $txthtml .= "".pl_entity_decode($param['titre'])." ".$map.$comment."
\n";
+ $txthtml .= '' . pl_entity_decode($param['titre']) . ' ' . $map . $mail . $comment . "
\n";
}
foreach ($lines as $line)
{
- $txthtml .= "".$line."
\n";
+ $txthtml .= "" . pl_entities($line) . "
\n";
}
- if($adr->phones() != null) {
- require_once('function.display_phones.php');
+ 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'] . "'" : '';
@@ -98,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:
?>