From ade7a6bdbff7bac9493fa3acb5c6a96a1c09574b Mon Sep 17 00:00:00 2001
From: bettina <bettina@alumni.egroupware.org>
Date: Sat, 5 Jan 2002 23:57:41 +0000
Subject: [PATCH] address format

---
 addressbook/templates/default/format_de.tpl | 10 +++----
 addressbook/templates/default/format_us.tpl | 10 +++----
 phpgwapi/inc/class.contacts_shared.inc.php  | 32 +++++++++++++++------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/addressbook/templates/default/format_de.tpl b/addressbook/templates/default/format_de.tpl
index bd202565ca..843ef9ff88 100644
--- a/addressbook/templates/default/format_de.tpl
+++ b/addressbook/templates/default/format_de.tpl
@@ -2,18 +2,18 @@
 
 <table border="0" cellpadding="2" cellspacing="2">
 	<tr>
-		<td><font face="{font}">{company}</font></td>
+		<td><font face="{font}" size="{fontsize}">{company}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{department}</font></td>
+		<td><font face="{font}" size="{fontsize}">{department}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{street}</font></td>
+		<td><font face="{font}" size="{fontsize}">{street}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{zip}&nbsp;{city}</font></td>
+		<td><font face="{font}" size="{fontsize}">{zip}&nbsp;{city}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{country}</font></td>
+		<td><font face="{font}" size="{fontsize}">{country}</font></td>
 	</tr>
 </table>
diff --git a/addressbook/templates/default/format_us.tpl b/addressbook/templates/default/format_us.tpl
index 351ca61084..87e81a4ad5 100644
--- a/addressbook/templates/default/format_us.tpl
+++ b/addressbook/templates/default/format_us.tpl
@@ -2,18 +2,18 @@
 
 <table border="0" cellpadding="2" cellspacing="2">
 	<tr>
-		<td><font face="{font}">{company}</font></td>
+		<td><font face="{font}" size="{fontsize}">{company}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{department}</font></td>
+		<td><font face="{font}" size="{fontsize}">{department}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{street}</font></td>
+		<td><font face="{font}" size="{fontsize}">{street}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{city},&nbsp;{state}&nbsp;{zip}</font></td>
+		<td><font face="{font}" size="{fontsize}">{city},&nbsp;{state}&nbsp;{zip}</font></td>
 	</tr>
 	<tr>
-		<td><font face="{font}">{country}</font></td>
+		<td><font face="{font}" size="{fontsize}">{country}</font></td>
 	</tr>
 </table>
diff --git a/phpgwapi/inc/class.contacts_shared.inc.php b/phpgwapi/inc/class.contacts_shared.inc.php
index 4a78b5fe22..6883620cb7 100644
--- a/phpgwapi/inc/class.contacts_shared.inc.php
+++ b/phpgwapi/inc/class.contacts_shared.inc.php
@@ -278,7 +278,7 @@
 			return $new_ldap;
 		}
 
-		function formatted_address($id, $business = True)
+		function formatted_address($id, $business = True, $afont = '', $asize = '2')
 		{
 			$t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
 			$s = CreateObject('phpgwapi.sbox');
@@ -350,7 +350,13 @@
 				$a = $t->set_file(array('address_format' => 'format_us.tpl'));
 			}
 
-			$a .= $t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
+			if (!$afont)
+			{
+				$afont = $GLOBALS['phpgw_info']['theme']['font'];
+			}
+
+			$a .= $t->set_var('font',$afont);
+			$a .= $t->set_var('fontsize',$asize);
 			$a .= $t->set_var('company',$company);
 			$a .= $t->set_var('department',$address[0]['org_unit']);
 			$a .= $t->set_var('street',$street);
@@ -368,7 +374,7 @@
 			return $a;
 		}
 
-		function formatted_address_full($id, $business = True, $fontsize = '2')
+		function formatted_address_full($id, $business = True, $afont = '', $asize = '2')
 		{
 			$t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
 			$s = CreateObject('phpgwapi.sbox');
@@ -450,8 +456,13 @@
 				$a = $t->set_file(array('address_format' => 'full_format_us.tpl'));
 			}
 
-			$a .= $t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
-			$a .= $t->set_var('fontsize',$fontsize);
+			if (!$afont)
+			{
+				$afont = $GLOBALS['phpgw_info']['theme']['font'];
+			}
+
+			$a .= $t->set_var('font',$afont);
+			$a .= $t->set_var('fontsize',$asize);
 			$a .= $t->set_var('lang_url',lang('url'));
 			$a .= $t->set_var('lang_email',lang('email'));
 			$a .= $t->set_var('lang_fax',lang('fax number'));
@@ -477,7 +488,7 @@
 			return $a;
 		}
 
-		function formatted_address_line($id, $business = True, $fontsize = '2')
+		function formatted_address_line($id, $business = True, $afont = '', $asize = '2')
 		{
 			$t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));
 			$s = CreateObject('phpgwapi.sbox');
@@ -548,8 +559,13 @@
 				$a = $t->set_file(array('address_format' => 'line_format_us.tpl'));
 			}
 
-			$a .= $t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
-			$a .= $t->set_var('fontsize',$fontsize);
+			if (!$afont)
+			{
+				$afont = $GLOBALS['phpgw_info']['theme']['font'];
+			}
+
+			$a .= $t->set_var('font',$afont);
+			$a .= $t->set_var('fontsize',$asize);
 			$a .= $t->set_var('company',$company);
 			$a .= $t->set_var('street',$street);
 			$a .= $t->set_var('city',$city);