X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=02e1edc5ae4877478e3a98de80ed23a50c88be81;hb=9dd0544eb8fa39338b76e30c37022a1f76ed83eb;hp=28c6c4fa78f42b212ab32cfe56591c25d99ef983;hpb=00ca0ad5370df5be4a0272364fb16a4385ffabfe;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 28c6c4f..02e1edc 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);
@@ -60,7 +70,7 @@ function smarty_function_display_address($param, &$smarty)
. urlencode(implode(", ", $lines) . " ($idt)")
. "\">
";
$comment = "";
- if ($param['adr']['comment'] != "")
+ if ($adr->comment != "")
{
$commentHtml = str_replace(array('&', '"'), array('&', '"'), $adr->comment);
$commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
@@ -85,11 +95,14 @@ function smarty_function_display_address($param, &$smarty)
}
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'] . "'" : '';