Permalink
Browse files

Merge branch 'master' of github.com:socialigniter/socialigniter

  • Loading branch information...
bnvk committed Apr 15, 2012
2 parents a2922c4 + c0d0f19 commit b8278dd53bf12a2bd2771c375a5ac40f301f4b0f
@@ -36,11 +36,11 @@ $config['super_admin_group'] = 'superadmin'; // Super administrators
$config['admin_group'] = 'admin'; // Admin group
$config['default_group'] = 'user'; // Default group
$config['comments_group'] = 'user'; // Comments group
-$config['min_username_length'] = 3; // Minimum Required Length of Username
+$config['min_username_length'] = 2; // Minimum Required Length of Username
$config['max_username_length'] = 32; // Maximum Allowed Length of Username
-$config['min_password_length'] = 8; // Minimum Required Length of Password
+$config['min_password_length'] = 6; // Minimum Required Length of Password
$config['max_password_length'] = 20; // Maximum Allowed Length of Password
-$config['password_strength'] = 3; // Maximum Allowed Length of Password
+$config['password_strength'] = 2; // Strength of Password
$config['email_activation'] = FALSE; // Checks password strength for numbers. Current max score is 3 ADD MORE
$config['remember_users'] = TRUE; // Allow users to be remembered and enable auto-login
$config['user_expire'] = 150000; // How long to remember the user (seconds)
@@ -99,7 +99,7 @@ function create_post()
);
// If Activation Email
- if (config_item('email_activation') == false)
+ if (config_item('email_activation') == FALSE)
{
$message = $this->load->view(config_item('email_templates').config_item('email_signup'), $data, true);
@@ -176,8 +176,6 @@ function login_post()
if ($user = $this->social_auth->login($this->input->post('email'), $this->input->post('password'), $remember, $session))
{
// Get User Data
- //$user = $this->social_auth->get_user('email', $this->input->post('email'), TRUE);
- //$user->email = $this->input->post('email');
$meta = $this->social_auth->get_user_meta($user->user_id);
$message = array('status' => 'success', 'message' => 'Success you will now be logged in', 'user' => $user, 'meta' => $meta);
@@ -250,24 +248,12 @@ function signup_post()
}
// Check "remember me"
- if ($this->input->post('remember') == 1)
- {
- $remember = TRUE;
- }
- else
- {
- $remember = FALSE;
- }
+ if ($this->input->post('remember') == 1) $remember = TRUE;
+ else $remember = FALSE;
// Store Session Data
- if ($this->input->post('session') == 1)
- {
- $session = TRUE;
- }
- else
- {
- $session = FALSE;
- }
+ if ($this->input->post('session') == 1) $session = TRUE;
+ else $session = FALSE;
// Login User
if ($this->social_auth->login($user->email, $this->input->post('password'), $remember, $session))
@@ -19,7 +19,7 @@ function __construct()
{
parent::__construct();
- if (!$this->social_auth->logged_in()) redirect('login', 'refresh');
+ if (!$this->social_auth->logged_in()) redirect('login');
// Load Values
$this->data['head'] = $this->load->view(config_item('dashboard_theme').'/partials/head_dashboard.php', $this->data, true);

0 comments on commit b8278dd

Please sign in to comment.