X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=plugins%2Ffunction.display_address.php;h=85a9210a1657e0194170f96983e3bae16bb1fc62;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=c69958924e52d22817f78b3f86586ff1a0d8558c;hpb=32d8754be017db3aa656812fca2a92704ebe29ae;p=platal.git
diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index c699589..85a9210 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);
@@ -59,9 +70,9 @@ function smarty_function_display_address($param, &$smarty)
. urlencode(implode(", ", $lines) . " ($idt)")
. "\">
";
$comment = "";
- if ($param['adr']['comment'] != "")
+ if ($adr->comment != "")
{
- $commentHtml = str_replace(array('&', '"'), array('&', '"'), $param['adr']['comment']);
+ $commentHtml = str_replace(array('&', '"'), array('&', '"'), $adr->comment);
$commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
$comment = "![](\"images/icons/comments.gif\"")
\n";
+ $txthtml .= "" . pl_entities($line) . "
\n";
}
- if(isset($param['adr']['tels'])) {
- require_once('function.display_phones.php');
- $txthtml .= smarty_function_display_phones($param['adr'],$smarty);
+ 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'] . "'" : '';