Stops the Google Apps spam on OTRS, and spams validation@ instead.

[platal.git] / templates / geoloc / address.tpl

diff --git a/templates/geoloc/address.tpl b/templates/geoloc/address.tpl
index 05145a5..07a227a 100644 (file)
--- a/templates/geoloc/address.tpl
+++ b/templates/geoloc/address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,52 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
+{display_address adr=$address titre=$titre titre_div=$titre_div no_div=$no_div for=$for pos=$pos}
 
-      {if $address.adr1 || $address.countrytxt || $geoloc_address.city || $address.tel || $address.fax || $address.mobile}
-      {if $no_div neq 1}
-      <div class="adresse">
-      {/if}
-        {if $titre && ($address.adr1 || $address.city || $address.countrytxt)}
-          {if $titre_div}
-            <div class="titre">
-              {$titre}
-            </div>
-          {else}
-            <em>{$titre}</em><br />
-          {/if}
-        {/if}
-        {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
-        {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
-        {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
-        {if $address.city}<strong>{$address.postcode} {$address.city}</strong><br />{/if}
-        {if $address.countrytxt}
-        <strong>{$address.countrytxt}{if $address.region && $address.countrytxt != 'France'} ({$address.region}){/if}</strong>
-        {/if}
-        
-        {if $address.tel}
-        <div>
-          <em>Tél : </em>
-          <strong>{$address.tel}</strong>
-        </div>
-        {/if}
-
-        {if $address.fax}
-        <div>
-          <em>Fax : </em>
-          <strong>{$address.fax}</strong>
-        </div>
-        {/if}
-        
-        {if $address.mobile}
-        <div>
-          <em>Mobile : </em>
-          <strong>{$address.mobile}</strong>
-        </div>
-        {/if}
-
-      {if $no_div neq 1}
-      </div>
-      {/if}
-      {/if}
-
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}