Merge pull request #38 from REJack/master

some fixes and db_profile added

application/config/aauth.php

@@ -9,67 +9,71 @@
 
 // Config variables
 
-$config['aauth'] = array(
-    'login_page' => '/login',
 // if user don't have permisssion to see the page he will be
 // redirected the page spesificed below
-    'no_permission' => '/',
+$config['aauth']['no_permission'] = '/';
 //name of admin group
-    'admin_group' => 'admin',
+$config['aauth']['admin_group'] = 'admin';
 //name of default group, the new user is added in it
-    'default_group' => 'default',
+$config['aauth']['default_group'] = 'default';
 // public group , people who not logged in
-    'public_group' => 'public',
+$config['aauth']['public_group'] = 'public';
 // The table which contains users
-    'users' => 'aauth_users',
+$config['aauth']['db_profile'] = 'default';
+
+$config['aauth']['users'] = 'aauth_users';
 // the group table
-    'groups' => 'aauth_groups',
+$config['aauth']['groups'] = 'aauth_groups';
 // 
-    'user_to_group' => 'aauth_user_to_group',
+$config['aauth']['user_to_group'] = 'aauth_user_to_group';
 // permitions
-    'perms' => 'aauth_perms',
+$config['aauth']['perms'] = 'aauth_perms';
 // perms to group
-    'perm_to_group' => 'aauth_perm_to_group',
+$config['aauth']['perm_to_group'] = 'aauth_perm_to_group';
 // perms to group
-    'perm_to_user' => 'aauth_perm_to_user',
+$config['aauth']['perm_to_user'] = 'aauth_perm_to_user';
 // pm table
-    'pms' => 'aauth_pms',
+$config['aauth']['pms'] = 'aauth_pms';
 // system variables
-    'system_variables' => 'aauth_system_variables',
+$config['aauth']['system_variables'] = 'aauth_system_variables';
 // user variables
-    'user_variables' => 'aauth_user_variables',
+$config['aauth']['user_variables'] = 'aauth_user_variables';
 
 // remember time
-    'remember' => ' +3 days',
+$config['aauth']['remember'] = ' +3 days';
 
 // pasword maximum char long (min is 4)
-    'max' => 13,
+$config['aauth']['max'] = 13;
 
 // non alphanumeric characters that are allowed in a name
-    'valid_chars' => array(' ', '\''),
+$config['aauth']['valid_chars'] = array(' ', '\'');
 
 // ddos protection,
 //if it is true, the user will be banned temporary when he exceed the login 'try'
-    'ddos_protection' => true,
+$config['aauth']['ddos_protection'] = true;
 
-    'recaptcha_active' => false, 
+$config['aauth']['recaptcha_active'] = false;
-    'recaptcha_login_attempts' => 4,
+$config['aauth']['recaptcha_login_attempts'] = 4;
-    'recaptcha_siteKey' => '', 
+$config['aauth']['recaptcha_siteKey'] = '';
-    'recaptcha_secret' => '', 
+$config['aauth']['recaptcha_secret'] = '';
 
 // login attempts time interval
 // default 20 times in one hour
-    'max_login_attempt' => 10,
+$config['aauth']['max_login_attempt'] = 10;
 
 // to register email verifitaion need? true / false
-    'verification' => false,
+$config['aauth']['verification'] = false;
 
-    // system email.
+$config['aauth']['login_with_name'] = false;
-    'email' => 'admin@admin.com',
-    'name' => 'Emre Akay'
 
-);
+// system email.
+$config['aauth']['email'] = 'admin@admin.com';
+$config['aauth']['name'] = 'Emre Akay';
 
+// Link for verification without site_url or base_url
+$config['aauth']['verification_link'] = '/account/verification/';
+// Link for reset_password without site_url or base_url
+$config['aauth']['reset_password_link'] = '/account/reset_password/';
 
 /* End of file aauth.php */
 /* Location: ./application/config/aauth.php */

application/language/english/aauth_lang.php

@@ -5,11 +5,11 @@
 // Account verification
 $lang['aauth_email_verification_subject'] = 'Account Verification';
 $lang['aauth_email_verification_code'] = 'Your verification code is: ';
-$lang['aauth_email_verification_link'] = " You can also click on (or copy and paste) the following link\n\nhttp://yourdomain/account/verification/";
+$lang['aauth_email_verification_text'] = " You can also click on (or copy and paste) the following link\n\n";
 
 // Password reset
 $lang['aauth_email_reset_subject'] = 'Reset Password';
-$lang['aauth_email_reset_link'] = "To reset your password click on (or copy and paste in your browser address bar) the link below:\n\nhttp://yourdomain/account/reset_password/";
+$lang['aauth_email_reset_text'] = "To reset your password click on (or copy and paste in your browser address bar) the link below:\n\n";
 
 // Password reset success
 $lang['aauth_email_reset_success_subject'] = 'Successful Pasword Reset';
@@ -26,9 +26,15 @@ $lang['aauth_error_password_invalid'] = 'Invalid password';
 $lang['aauth_error_username_invalid'] = 'Invalid Username';
 $lang['aauth_error_username_required'] = 'Username required';
 
+// Account update errors
+$lang['aauth_error_update_email_exists'] = 'Email address already exists on the system.  Please enter a different email address.';
+$lang['aauth_error_update_username_exists'] = "Username already exists on the system.  Please enter a different username.";
+
+
 // Access errors
 $lang['aauth_error_no_access'] = 'Sorry, you do not have access to the resource you requested.';
-$lang['aauth_error_login_failed'] = 'E-mail Address and Password do not match.';
+$lang['aauth_error_login_failed_email'] = 'E-mail Address and Password do not match.';
+$lang['aauth_error_login_failed_name'] = 'Username and Password do not match.';
 $lang['aauth_error_login_attempts_exceeded'] = 'You have exceeded your login attempts, your account has now been locked.';
 $lang['aauth_error_recaptcha_not_correct'] = 'Sorry, the reCAPTCHA text entered was incorrect.';