From 472dd21a7bc60147afff7bf100bbb6c9f339d0fc Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Sat, 23 Jan 2010 20:03:27 +0000
Subject: Added alpha, and sha1 string types to random_string() in the String
 Helper.

---
 system/helpers/string_helper.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index 67cbd0eb6..4767f0b5f 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -186,22 +186,27 @@ if ( ! function_exists('reduce_multiples'))
  * Useful for generating passwords or hashes.
  *
  * @access	public
- * @param	string 	type of random string.  Options: alunum, numeric, nozero, unique
+ * @param	string 	type of random string.  basic, alpha, alunum, numeric, nozero, unique, md5, encrypt and sha1
  * @param	integer	number of characters
  * @return	string
- */
+ */	
 if ( ! function_exists('random_string'))
-{	
+{
 	function random_string($type = 'alnum', $len = 8)
 	{					
 		switch($type)
 		{
+			case 'basic'	: return mt_rand();
+			  break;
 			case 'alnum'	:
 			case 'numeric'	:
 			case 'nozero'	:
+			case 'alpha'	:
 		
 					switch ($type)
 					{
+						case 'alpha'	:	$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+							break;
 						case 'alnum'	:	$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 							break;
 						case 'numeric'	:	$pool = '0123456789';
@@ -217,12 +222,22 @@ if ( ! function_exists('random_string'))
 					}
 					return $str;
 			  break;
-			case 'unique' : return md5(uniqid(mt_rand()));
+			case 'unique'	: 
+			case 'md5' 		: 
+				
+						return md5(uniqid(mt_rand()));
+			  break;
+			case 'encrypt'	: 
+			case 'sha1'	: 
+		
+						$CI =& get_instance();
+						$CI->load->helper('security');
+		
+						return do_hash(uniqid(mt_rand(), TRUE), 'sha1');
 			  break;
 		}
 	}
 }
-
 // ------------------------------------------------------------------------
 
 /**
-- 
cgit v1.2.3-24-g4f1b