Merge branch '2' of github.com:benedmunds/CodeIgniter-Ion-Auth into 2

Author: benedmunds

config/ion_auth.php

@@ -91,7 +91,7 @@
 $config['email_activation']     = FALSE; 				// Email Activation for registration
 $config['manual_activation']    = FALSE; 				// Manual Activation for registration
 $config['remember_users']       = TRUE; 				// Allow users to be remembered and enable auto-login
-$config['user_expire']          = 86500; 				// How long to remember the user (seconds)
+$config['user_expire']          = 86500; 				// How long to remember the user (seconds). Set to zero for no expiration
 $config['user_extend_on_login'] = FALSE; 				// Extend the users cookies everytime they auto-login
 $config['track_login_attempts'] = FALSE;				// Track the number of failed login attempts for each user or ip.
 $config['maximum_login_attempts']     = 3; 				// The maximum number of failed login attempts.

models/ion_auth_model.php

@@ -1427,10 +1427,21 @@ public function set_lang($lang = 'en')
 	{
 		$this->trigger_events('set_lang');
 
+		// if the user_expire is set to zero we'll set the expiration two years from now.
+		if($this->config->item('user_expire', 'ion_auth') === 0)
+		{
+			$expire = (60*60*24*365*2);
+		}
+		// otherwise use what is set
+		else
+		{
+			$expire = $this->config->item('user_expire', 'ion_auth');
+		}
+
 		set_cookie(array(
 			'name'   => 'lang_code',
 			'value'  => $lang,
-			'expire' => $this->config->item('user_expire', 'ion_auth') + time()
+			'expire' => $expire
 		));
 
 		return TRUE;
@@ -1459,16 +1470,27 @@ public function remember_user($id)
 
 		if ($this->db->affected_rows() > -1)
 		{
+			// if the user_expire is set to zero we'll set the expiration two years from now.
+			if($this->config->item('user_expire', 'ion_auth') === 0)
+			{
+				$expire = (60*60*24*365*2);
+			}
+			// otherwise use what is set
+			else
+			{
+				$expire = $this->config->item('user_expire', 'ion_auth');
+			}
+			
 			set_cookie(array(
 			    'name'   => 'identity',
 			    'value'  => $user->{$this->identity_column},
-			    'expire' => $this->config->item('user_expire', 'ion_auth'),
+			    'expire' => $expire
 			));
 
 			set_cookie(array(
 			    'name'   => 'remember_code',
 			    'value'  => $salt,
-			    'expire' => $this->config->item('user_expire', 'ion_auth'),
+			    'expire' => $expire
 			));
 
 			$this->trigger_events(array('post_remember_user', 'remember_user_successful'));

models/ion_auth_mongodb_model.php

@@ -1620,12 +1620,23 @@ public function set_lang($lang = 'en')
 	{
 		$this->trigger_events('set_lang');
 
+		// if the user_expire is set to zero we'll set the expiration two years from now.
+		if($this->config->item('user_expire', 'ion_auth') === 0)
+		{
+			$expire = (60*60*24*365*2);
+		}
+		// otherwise use what is set
+		else
+		{
+			$expire = $this->config->item('user_expire', 'ion_auth');
+		}
+
 		set_cookie(array(
 			'name'   => 'lang_code',
 			'value'  => $lang,
-			'expire' => $this->config->item('user_expire', 'ion_auth') + time(),
+			'expire' => $expire
 		));
-
+		
 		return TRUE;
 	}
 
@@ -1636,7 +1647,7 @@ public function set_lang($lang = 'en')
 	 *
 	 * @return bool
 	 */
-	private function remember_user($id)
+	public function remember_user($id)
 	{
 		$this->trigger_events('pre_remember_user');
 
@@ -1658,16 +1669,27 @@ private function remember_user($id)
 		// Set cookies
 		if ($updated)
 		{
+			// if the user_expire is set to zero we'll set the expiration two years from now.
+			if($this->config->item('user_expire', 'ion_auth') === 0)
+			{
+				$expire = (60*60*24*365*2);
+			}
+			// otherwise use what is set
+			else
+			{
+				$expire = $this->config->item('user_expire', 'ion_auth');
+			}
+			
 			set_cookie(array(
-				'name'   => 'identity',
-				'value'  => $user->{$this->identity_column},
-				'expire' => $this->config->item('user_expire', 'ion_auth'),
+			    'name'   => 'identity',
+			    'value'  => $user->{$this->identity_column},
+			    'expire' => $expire
 			));
 
 			set_cookie(array(
-				'name'   => 'remember_code',
-				'value'  => $salt,
-				'expire' => $this->config->item('user_expire', 'ion_auth'),
+			    'name'   => 'remember_code',
+			    'value'  => $salt,
+			    'expire' => $expire
 			));
 
 			$this->trigger_events(array('post_remember_user', 'remember_user_successful'));

userguide/index.html

@@ -202,7 +202,7 @@ <h3>Config</h3>
 		<li>'max_password_length' - Maximum length of passwords.  DEFAULT is '20'.</li>
 		<li>'email_activation' - TRUE or FALSE. Sets whether to require email activation or not. DEFAULT is 'false'.</li>
 		<li>'remember_users' - TRUE or FALSE. Sets whether to enable 'remember me' functionality or not. DEFAULT is 'true'.</li>
-		<li>'user_expire' - Sets how long to remember the user for in seconds. DEFAULT is '86500'.</li>
+		<li>'user_expire' - Sets how long to remember the user for in seconds. Set to zero for no expiration. DEFAULT is '86500'.</li>
 		<li>'user_extend_on_login' -  TRUE or FALSE.  Extend the users session expiration on login. DEFAULT is 'false'.</li>
 		<li>'email_type' - Email content type. DEFAULT us 'html'.</li>
 		<li>'email_templates' -  Folder where the email view templates are stored. DEFAULT is 'auth/email/'.</li>