X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.display_address.php;h=02e1edc5ae4877478e3a98de80ed23a50c88be81;hb=45ea6160465aeba0aa780e49c12272819dedffd1;hp=7114a2b4af4abfd213deabb3d135429a4eadb814;hpb=950a769bb3f3154de64960ffc5cac111263bc8b0;p=platal.git

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 7114a2b..02e1edc 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -36,12 +36,23 @@ function display_address_isIdentity($idt, $value, $test_reverse = true)
     return false;
 }
 
-function smarty_function_display_address($param, &$smarty)
+function smarty_function_display_address($param, $smarty)
 {
-    require_once('geoloc.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);
@@ -59,9 +70,9 @@ function smarty_function_display_address($param, &$smarty)
         .   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('&amp;', '&quot;'), $param['adr']['comment']);
+        $commentHtml = str_replace(array('&', '"'), array('&amp;', '&quot;'), $adr->comment);
         $commentJs = str_replace(array('\\', '\''), array('\\\\', '\\\''), $commentHtml);
         $comment = "<img style=\"margin-left: 5px;\" src=\"images/icons/comments.gif\""
             . " onmouseover=\"return overlib('"
@@ -84,11 +95,14 @@ function smarty_function_display_address($param, &$smarty)
     }
     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'] . "'" : '';