From 9825930cd4d07f9cad1f9e74875eca7db7b96cb9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 4 May 2003 09:18:56 +0000
Subject: [PATCH] implemented new phpgw-pref account_display as default for
 select-account

---
 etemplate/doc/referenz.html               | 22 +++++++++++++---------
 etemplate/inc/class.select_widget.inc.php |  5 ++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/etemplate/doc/referenz.html b/etemplate/doc/referenz.html
index 59dd5084b9..139c3189ec 100644
--- a/etemplate/doc/referenz.html
+++ b/etemplate/doc/referenz.html
@@ -534,17 +534,21 @@ implement only a subset of XUL. Here are the main differences:</p>
 			(id will be ''), additional attr see sub-types<p>
 		xml: <b>type</b>: can be set to get several predefined select-contents, in that case you dont need to set
 			the content as descripted above (if set it too its in front of the predefined rows): <br>
-			<b>select-cat</b>: Select a phpgw category<br>
-			<b>select-account</b>: Select a user and/or group, determined by the options-field:<br>
-				,{accounts(default)|groups|both},{0(only lid)|1(only names/default)|2(both)}<br>
-			<b>select-percent, select-priority, select-access, select-country, select-state</b>: as you expect
-				by the name<br>
-			<b>select-year, select-month, select-day</b>: options for year: ,start,end (start and end can be a number of
+			<b>select-cat</b>:<br>
+				Select a phpgw category<br>
+			<b>select-account</b>:<br>
+				Select a user and/or group, determined by the options-field:<br>
+				,{accounts(default)|groups|both},{''(phpgw-default)|0(only lid)|1(only names)|2(both)}<br>
+			<b>select-percent, select-priority, select-access, select-country, select-state</b>:<br>
+				as you expect by the name<br>
+			<b>select-year, select-month, select-day</b>:<br>
+				options for year: ,start,end (start and end can be a number of
 				years from now or if > 100 a absolut year)<br>
-			<b>select-number</b>: Select a number out of a range specified by the options-field:<br>
+			<b>select-number</b>:<br>
+				Select a number out of a range specified by the options-field:<br>
 				,{start (default=1)},{end (incl., default=10)},{decrement (default=1)}<br>
-			<b>select-app</b>: Select an application, availible options: 
-				,{''=user enabled(default)|installed|all)}
+			<b>select-app</b>:<br>
+				Select an application, availible options: ,{''=user enabled(default)|installed|all)}
 	</td>
 </tr>
 <tr>
diff --git a/etemplate/inc/class.select_widget.inc.php b/etemplate/inc/class.select_widget.inc.php
index 09b03465a7..3d7597cabe 100644
--- a/etemplate/inc/class.select_widget.inc.php
+++ b/etemplate/inc/class.select_widget.inc.php
@@ -565,7 +565,6 @@
 				case 2:
 					$info .= '&lt;'.$acc['account_lid'].'&gt; ';
 					// fall-through
-				default:
 				case 1:
 					$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
 						$acc['account_firstname'].' '.$acc['account_lastname'];
@@ -573,6 +572,10 @@
 				case '0':
 					$info .= $acc['account_lid'];
 					break;
+				default:			// use the phpgw default
+					$info = $GLOBALS['phpgw']->common->display_fullname($acc['account_lid'],
+						$acc['account_firstname'],$acc['account_lastname']);
+					break;
 			}
 			return $info;
 		}