X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=74483c3d94e033cbae2901c207fc798d1ef15795;hb=9b42c0b551d0ce7286e5b719ab49959829e99031;hp=2294f2c6feb0ac20eef3e245ad2ab5a4a7f1b193;hpb=413b6645804efb872230c65154a6ca1737785b73;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 2294f2c..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,6 +69,11 @@ function smarty_function_display_address($param, &$smarty)
$map = "
";
+ if ($adr->flags->hasflag('mail')) {
+ $mail = '
';
+ } else {
+ $mail = '';
+ }
$comment = "";
if ($adr->comment != "")
{
@@ -79,9 +94,9 @@ 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)
{
@@ -90,7 +105,7 @@ function smarty_function_display_address($param, &$smarty)
if ($adr->phones() != null) {
require_once 'function.display_phones.php';
$txthtml .= smarty_function_display_phones(array('tels' => $adr->phones()),$smarty);
- } else if ($param['phones'] != null) {
+ } else if (isset($param['phones']) && count($param['phones'])) {
require_once 'function.display_phones.php';
$txthtml .= smarty_function_display_phones(array('tels' => $param['phones']),$smarty);
}
@@ -101,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:
?>