Changeset 936

Timestamp:

05/19/08 16:38:28 (7 months ago)

Author:

laurentj

Message:

jAuth : renamed persistanceEnabled event parameter by persistence, and this parameter contains the timestamp of the persistence timeout

Files:

trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/lib/jelix/auth/jAuth.class.php

r935	r936
303	303
304	304	$_SESSION[$config['session_name']] = $user;
305		$persistence~~Enabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable'])~~;
	305	$persistence = 0;
306	306
307	307	// Add a cookie for session persistance, if enabled
308		if($persist~~enceEnabled~~) {
	308	if($persistant && isset($config['persistant_enable']) && $config['persistant_enable']) {
309	309	if(!isset($config['persistant_crypt_key']) \|\| !isset($config['persistant_cookie_name'])){
310	310	throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
…	…
312	312
313	313	if(isset($config['persistant_duration']))
314		$~~cookieDuration~~=$config['persistant_duration']*86400;
	314	$persistence=$config['persistant_duration']*86400;
315	315	else
316		$~~cookieDuration~~=86400; // 24h
317		$~~cookieDuration+=~~time();
	316	$persistence=86400; // 24h
	317	$persistence += time();
318	318	$encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
319		setcookie($config['persistant_cookie_name'].'[login]', $login, $~~cookieDuration~~, $config['persistant_cookie_path']);
320		setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $~~cookieDuration~~, $config['persistant_cookie_path']);
321		}
322
323		jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence~~Enabled'=>$persistenceEnabled~~));
	319	setcookie($config['persistant_cookie_name'].'[login]', $login, $persistence, $config['persistant_cookie_path']);
	320	setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $persistence, $config['persistant_cookie_path']);
	321	}
	322
	323	jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence'=>$persistence));
324	324	return true;
325	325	}else

trunk/lib/jelix/auth/jAuth.class.php

r935	r936
303	303
304	304	$_SESSION[$config['session_name']] = $user;
305		$persistence~~Enabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable'])~~;
	305	$persistence = 0;
306	306
307	307	// Add a cookie for session persistance, if enabled
308		if($persist~~enceEnabled~~) {
	308	if($persistant && isset($config['persistant_enable']) && $config['persistant_enable']) {
309	309	if(!isset($config['persistant_crypt_key']) \|\| !isset($config['persistant_cookie_name'])){
310	310	throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
…	…
312	312
313	313	if(isset($config['persistant_duration']))
314		$~~cookieDuration~~=$config['persistant_duration']*86400;
	314	$persistence=$config['persistant_duration']*86400;
315	315	else
316		$~~cookieDuration~~=86400; // 24h
317		$~~cookieDuration+=~~time();
	316	$persistence=86400; // 24h
	317	$persistence += time();
318	318	$encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
319		setcookie($config['persistant_cookie_name'].'[login]', $login, $~~cookieDuration~~, $config['persistant_cookie_path']);
320		setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $~~cookieDuration~~, $config['persistant_cookie_path']);
321		}
322
323		jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence~~Enabled'=>$persistenceEnabled~~));
	319	setcookie($config['persistant_cookie_name'].'[login]', $login, $persistence, $config['persistant_cookie_path']);
	320	setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $persistence, $config['persistant_cookie_path']);
	321	}
	322
	323	jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence'=>$persistence));
324	324	return true;
325	325	}else

trunk/lib/jelix/auth/jAuth.class.php

r935	r936
303	303
304	304	$_SESSION[$config['session_name']] = $user;
305		$persistence~~Enabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable'])~~;
	305	$persistence = 0;
306	306
307	307	// Add a cookie for session persistance, if enabled
308		if($persist~~enceEnabled~~) {
	308	if($persistant && isset($config['persistant_enable']) && $config['persistant_enable']) {
309	309	if(!isset($config['persistant_crypt_key']) \|\| !isset($config['persistant_cookie_name'])){
310	310	throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
…	…
312	312
313	313	if(isset($config['persistant_duration']))
314		$~~cookieDuration~~=$config['persistant_duration']*86400;
	314	$persistence=$config['persistant_duration']*86400;
315	315	else
316		$~~cookieDuration~~=86400; // 24h
317		$~~cookieDuration+=~~time();
	316	$persistence=86400; // 24h
	317	$persistence += time();
318	318	$encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
319		setcookie($config['persistant_cookie_name'].'[login]', $login, $~~cookieDuration~~, $config['persistant_cookie_path']);
320		setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $~~cookieDuration~~, $config['persistant_cookie_path']);
321		}
322
323		jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence~~Enabled'=>$persistenceEnabled~~));
	319	setcookie($config['persistant_cookie_name'].'[login]', $login, $persistence, $config['persistant_cookie_path']);
	320	setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $persistence, $config['persistant_cookie_path']);
	321	}
	322
	323	jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence'=>$persistence));
324	324	return true;
325	325	}else

trunk/lib/jelix/auth/jAuth.class.php

r935	r936
303	303
304	304	$_SESSION[$config['session_name']] = $user;
305		$persistence~~Enabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable'])~~;
	305	$persistence = 0;
306	306
307	307	// Add a cookie for session persistance, if enabled
308		if($persist~~enceEnabled~~) {
	308	if($persistant && isset($config['persistant_enable']) && $config['persistant_enable']) {
309	309	if(!isset($config['persistant_crypt_key']) \|\| !isset($config['persistant_cookie_name'])){
310	310	throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
…	…
312	312
313	313	if(isset($config['persistant_duration']))
314		$~~cookieDuration~~=$config['persistant_duration']*86400;
	314	$persistence=$config['persistant_duration']*86400;
315	315	else
316		$~~cookieDuration~~=86400; // 24h
317		$~~cookieDuration+=~~time();
	316	$persistence=86400; // 24h
	317	$persistence += time();
318	318	$encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
319		setcookie($config['persistant_cookie_name'].'[login]', $login, $~~cookieDuration~~, $config['persistant_cookie_path']);
320		setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $~~cookieDuration~~, $config['persistant_cookie_path']);
321		}
322
323		jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence~~Enabled'=>$persistenceEnabled~~));
	319	setcookie($config['persistant_cookie_name'].'[login]', $login, $persistence, $config['persistant_cookie_path']);
	320	setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $persistence, $config['persistant_cookie_path']);
	321	}
	322
	323	jEvent::notify ('AuthLogin', array('login'=>$login, 'persistence'=>$persistence));
324	324	return true;
325	325	}else

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 936

Legend:

trunk/lib/jelix/auth/jAuth.class.php

trunk/lib/jelix/auth/jAuth.class.php

trunk/lib/jelix/auth/jAuth.class.php

trunk/lib/jelix/auth/jAuth.class.php