X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Ffunction.display_address.php;h=c69958924e52d22817f78b3f86586ff1a0d8558c;hb=8320b6fba6fa245dd71ae9c11b2a2a03f923d15d;hp=6a632ad8ea5fd96e7ab6bb1918b18c3972153c51;hpb=5e4417a9f3f2dfa9ad9207de4022beeb14c797df;p=platal.git

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 6a632ad..c699589 100644
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -40,11 +40,9 @@ function smarty_function_display_address($param, &$smarty)
 {
     require_once('geoloc.inc.php');
     $txtad = get_address_text($param['adr']);
-    if (!$txtad &&
-        !$param['adr']['tels'] && !count($param['adr']['tels']) &&
-        !$param['adr']['tel'] &&
-        !$param['adr']['fax'] &&
-        !$param['adr']['mobile']) return "";
+    if (!$txtad && !$param['adr']['tels'] && !count($param['adr']['tels'])) {
+        return "";
+    }
 
     $lines = explode("\n", $txtad);
     $idt   = array_shift($lines);
@@ -88,29 +86,9 @@ function smarty_function_display_address($param, &$smarty)
     {
         $txthtml .= "<strong>".$line."</strong><br/>\n";
     }
-    if ($param['adr']['tel'])
-        $txthtml .= "<div>\n<em>Tél : </em>\n<strong>".$param['adr']['tel']."</strong>\n</div>\n";
-    if ($param['adr']['fax'])
-        $txthtml .= "<div>\n<em>Fax : </em>\n<strong>".$param['adr']['fax']."</strong>\n</div>\n";
-    if ($param['adr']['mobile'])
-        $txthtml .= "<div>\n<em>Mob : </em>\n<strong>".$param['adr']['mobile']."</strong>\n</div>\n";
-    if ($param['adr']['tels'] && count($param['adr']['tels'])) {
-        foreach ($param['adr']['tels'] as $tel) {
-            switch ($tel['tel_type']) {
-            case 'fixed':
-                $tel_type = 'Tél';
-                break;
-            case 'fax':
-                $tel_type = 'Fax';
-                break;
-            case 'mobile':
-                $tel_type = 'Mob';
-                break;
-            default:
-                $tel_type = $tel['tel_type'];
-            }
-            $txthtml .= "<div>\n<em>" . $tel_type . "&nbsp;: </em>\n<strong>" . $tel['tel'] . "</strong>\n</div>\n";
-        }
+    if(isset($param['adr']['tels'])) {
+        require_once('function.display_phones.php');
+        $txthtml .= smarty_function_display_phones($param['adr'],$smarty);
     }
     if (!$param['nodiv']) {
         $pos = $param['pos'] ? " style='float: " . $param['pos'] . "'" : '';