From 96bad27d64f977d6b02a37dd85ea1f5e6eb67197 Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Fri, 28 Aug 2009 23:57:45 +1000
Subject: [PATCH] Fix: clear passwords were being encoded with blowfish by
 default

---
 lib/TemplateRender.php |  4 ++--
 lib/functions.php      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php
index b24feed..9d6f14d 100644
--- a/lib/TemplateRender.php
+++ b/lib/TemplateRender.php
@@ -2376,8 +2376,8 @@ function deleteAttribute(attrName,friendlyName,i)
 			$id,htmlspecialchars($attribute->getName()),$i,
 			$id,htmlspecialchars($attribute->getName()),$i);
 
-		foreach (password_types() as $v)
-			printf('<option value="%s" %s>%s</option>',$v,($v == $default) ? 'selected' : '',$v);
+		foreach (password_types() as $v => $display)
+			printf('<option value="%s" %s>%s</option>',$v,($v == $default) ? 'selected' : '',$display);
 
 		echo '</select>';
 	}
diff --git a/lib/functions.php b/lib/functions.php
index 4696998..7e3fa9d 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -2085,15 +2085,15 @@ function password_types() {
 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
 
 	return array(
-		'blowfish',
-		'clear',
-		'crypt',
-		'ext_des',
-		'md5',
-		'md5crypt',
-		'sha',
-		'smd5',
-		'ssha'
+		'blowfish'=>'blowfish',
+		''=>'clear',
+		'crypt'=>'crypt',
+		'ext_des'=>'ext_des',
+		'md5'=>'md5',
+		'md5crypt'=>'md5crypt',
+		'sha'=>'sha',
+		'smd5'=>'smd5',
+		'ssha'=>'ssha'
 	);
 }