<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
return false;
}
-function smarty_function_display_address($param, &$smarty)
+function smarty_function_display_address($param, $smarty)
{
- require_once('geocoding.inc.php');
- $txtad = $param['adr']['text'];
- if (!$txtad && !$param['adr']['tels'] && !count($param['adr']['tels'])) {
- return "";
+ $adr = $param['adr'];
+ $txtad = $adr->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 = '<div class="adresse" style="float: ' . $param['pos'] . '">' . $txthtml . '</div>';
+ }
+ return $txthtml;
}
$lines = explode("\n", $txtad);
. urlencode(implode(", ", $lines) . " ($idt)")
. "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
$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 = "<img style=\"margin-left: 5px;\" src=\"images/icons/comments.gif\""
. " onmouseover=\"return overlib('"
}
foreach ($lines as $line)
{
- $txthtml .= "<strong>".$line."</strong><br/>\n";
+ $txthtml .= "<strong>" . pl_entities($line) . "</strong><br/>\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'] . "'" : '';