Merge from lnApp

2011-05-09 17:40:50 +10:00
parent 8814447096
commit 8b658b497a
46 changed files with 466 additions and 200 deletions
--- a/application/config/auth.php
+++ b/application/config/auth.php
@@ -12,18 +12,11 @@
 */

 return array(
-
-	'driver'        => 'ORM',
-	'hash_method'   => 'sha1',
-	'salt_pattern'  => '1, 3, 5, 9, 14, 15, 20, 21, 28, 30',
-	'lifetime'      => 1209600,
-	'session_key'   => 'admin_name',
-	'forced_key'    => 'auth_forced',
-
-	// Username/password combinations for the Auth File driver
-	'users' => array(
-		// 'admin' => 'b3154acf3a344170077d11bdb5fff31532f679a1919e716a02',
-	),
-
+	'driver'       => 'ORM',
+	'hash_method'  => 'sha1',
+	'salt_pattern' => '1, 3, 5, 9, 14, 15, 20, 21, 28, 30',
+	'lifetime'     => 1209600,
+	'session_key'  => 'username',
+	'forced_key'   => 'auth_forced',
 );
 ?>