holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update addresses

Browse Source
This commit is contained in:
bettina 2001-06-22 05:55:15 +00:00
parent c51d053f5f
commit 11d0e8247d
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addressbook/inc/class.contacts_shared.inc.php
View File

@ -306,26 +306,27 @@
if ($country == 'DE') if ($country == 'DE')
{ {
$t->set_file(array('address_format' => 'format_de.tpl')); $a = $t->set_file(array('address_format' => 'format_de.tpl'));
} }
elseif ($country == 'US') elseif ($country == 'US')
{ {
$t->set_file(array('address_format' => 'format_us.tpl')); $a = $t->set_file(array('address_format' => 'format_us.tpl'));
} }
$t->set_var('font',$font); $a .= $t->set_var('font',$font);
$t->set_var('title',$title); $a .= $t->set_var('title',$title);
$t->set_var('firstname',$address[0]['n_given']); $a .= $t->set_var('firstname',$address[0]['n_given']);
$t->set_var('lastname',$address[0]['n_family']); $a .= $t->set_var('lastname',$address[0]['n_family']);
$t->set_var('company',$address[0]['org_name']); $a .= $t->set_var('company',$address[0]['org_name']);
$t->set_var('department',$address[0]['org_unit']); $a .= $t->set_var('department',$address[0]['org_unit']);
$t->set_var('street',$street); $a .= $t->set_var('street',$street);
$t->set_var('city',$city); $a .= $t->set_var('city',$city);
$t->set_var('zip',$zip); $a .= $t->set_var('zip',$zip);
$t->set_var('state',$state); $a .= $t->set_var('state',$state);
$t->set_var('country',$country); $a .= $t->set_var('country',lang($country));
$t->pparse('out','address_format'); $a .= $t->fp('out','address_format');
return $a;
} }
} }
?> ?>

2
addressbook/templates/default/format_de.tpl
View File

@ -1,7 +1,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<table border="0" cellpadding="2" cellspacing="2"> <table border="0" cellpadding="2" cellspacing="2">
<tr> <tr>
<td><font face="{font}">{title}&nbsp;{firstname}&nbsp;{lastname}</font></td> <td><font face="{font}">{title}{firstname}&nbsp;{lastname}</font></td>
</tr> </tr>
<tr> <tr>
<td><font face="{font}">{company}</font></td> <td><font face="{font}">{company}</font></td>

2
addressbook/templates/default/format_us.tpl
View File

@ -1,7 +1,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<table border="0" cellpadding="2" cellspacing="2"> <table border="0" cellpadding="2" cellspacing="2">
<tr> <tr>
<td><font face="{font}">{title}&nbsp;{firstname}&nbsp;{lastname}</font></td> <td><font face="{font}">{title}{firstname}&nbsp;{lastname}</font></td>
</tr> </tr>
<tr> <tr>
<td><font face="{font}">{company}</font></td> <td><font face="{font}">{company}</font></td>