Changeset 492

Timestamp:

07/05/07 15:46:04 (2 years ago)

Author:

laurentj

Message:

enhancement #207 : the session variable name is now configurable in the auth plugin, to have multiple authentification in a same application. p=Frédéric Guillot

Files:

trunk/lib/jelix-modules/jauth/install/var/config/auth.coord.ini.php (modified) (1 diff)
trunk/lib/jelix-modules/jauth/install/var/config/auth.coord.ini.php (modified) (1 diff)
trunk/lib/jelix/auth/jAuth.class.php (modified) (7 diffs)
trunk/lib/jelix/auth/jAuth.class.php (modified) (7 diffs)
trunk/lib/jelix/CREDITS (modified) (1 diff)
trunk/lib/jelix/CREDITS (modified) (1 diff)
trunk/lib/jelix/plugins/coord/auth/auth.coord.ini.php.dist (modified) (1 diff)
trunk/lib/jelix/plugins/coord/auth/auth.coord.ini.php.dist (modified) (1 diff)
trunk/lib/jelix/plugins/coord/auth/auth.coord.php (modified) (3 diffs)
trunk/lib/jelix/plugins/coord/auth/auth.coord.php (modified) (3 diffs)

Legend:

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

trunk/lib/jelix-modules/jauth/install/var/config/auth.coord.ini.php

r485	r492
9	9
10	10	;============ Paramètres pour le plugin
	11	; nom de la session
	12	session_name = "JELIX_USER"
	13
11	14	; indique si on effectue un contrôle sur l'adresse ip
12	15	; qui a démarré la session.

trunk/lib/jelix-modules/jauth/install/var/config/auth.coord.ini.php

r485	r492
9	9
10	10	;============ Paramètres pour le plugin
	11	; nom de la session
	12	session_name = "JELIX_USER"
	13
11	14	; indique si on effectue un contrôle sur l'adresse ip
12	15	; qui a démarré la session.

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

r484	r492
4	4	* @subpackage auth
5	5	* @author Laurent Jouanneau
6		* @contributor
7		* @copyright 2001-2005 CopixTeam, 2005-2007 Laurent Jouanneau
	6	* @contributor Frédéric Guillot
	7	* @copyright 2001-2005 CopixTeam, 2005-2007 Laurent Jouanneau, 2007 Frédéric Guillot
8	8	* Classe orginellement issue d'une branche experimentale du
9	9	* framework Copix 2.3dev. http://www.copix.org (jAuth)
…	…
112	112	}
113	113	$config = & $plugin->config;
	114
	115	if (!isset($config['session_name'])
	116	\|\| $config['session_name'] == ''){
	117
	118	$config['session_name'] = 'JELIX_USER';
	119	}
114	120	}
115	121	return $config;
…	…
281	287
282	288	$dr = self::_getDriver();
	289	$config = self::_getConfig();
	290
283	291	if($user = $dr->verifyPassword($login, $password)){
284	292
…	…
290	298	}
291	299
292		$_SESSION[~~'JELIX_USER'~~] = $user;
	300	$_SESSION[$config['session_name']] = $user;
293	301	jEvent::notify ('AuthLogin', array('login'=>$login));
294	302	return true;
…	…
301	309	*/
302	310	public static function logout(){
303		jEvent::notify ('AuthLogout', array('login'=>$_SESSION['JELIX_USER']->login));
304		$_SESSION['JELIX_USER'] = new jDummyAuthUser();
	311
	312	$config = self::_getConfig();
	313	jEvent::notify ('AuthLogout', array('login'=>$_SESSION[$config['session_name']]->login));
	314	$_SESSION[$config['session_name']] = new jDummyAuthUser();
305	315	jAcl::clearCache();
306	316	}
…	…
311	321	*/
312	322	public static function isConnected(){
313		return (isset($_SESSION['JELIX_USER']) && $_SESSION['JELIX_USER']->login != '');
	323
	324	$config = self::_getConfig();
	325	return (isset($_SESSION[$config['session_name']]) && $_SESSION[$config['session_name']]->login != '');
314	326	}
315	327
…	…
319	331	*/
320	332	public static function getUserSession (){
321		if (! isset ($_SESSION['JELIX_USER'])){
322		$_SESSION['JELIX_USER'] = new jDummyAuthUser();
323		}
324		return $_SESSION['JELIX_USER'];
	333	$config = self::_getConfig();
	334	if (! isset ($_SESSION[$config['session_name']])){
	335	$_SESSION[$config['session_name']] = new jDummyAuthUser();
	336	}
	337	return $_SESSION[$config['session_name']];
325	338	}
326	339

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

r484	r492
4	4	* @subpackage auth
5	5	* @author Laurent Jouanneau
6		* @contributor
7		* @copyright 2001-2005 CopixTeam, 2005-2007 Laurent Jouanneau
	6	* @contributor Frédéric Guillot
	7	* @copyright 2001-2005 CopixTeam, 2005-2007 Laurent Jouanneau, 2007 Frédéric Guillot
8	8	* Classe orginellement issue d'une branche experimentale du
9	9	* framework Copix 2.3dev. http://www.copix.org (jAuth)
…	…
112	112	}
113	113	$config = & $plugin->config;
	114
	115	if (!isset($config['session_name'])
	116	\|\| $config['session_name'] == ''){
	117
	118	$config['session_name'] = 'JELIX_USER';
	119	}
114	120	}
115	121	return $config;
…	…
281	287
282	288	$dr = self::_getDriver();
	289	$config = self::_getConfig();
	290
283	291	if($user = $dr->verifyPassword($login, $password)){
284	292
…	…
290	298	}
291	299
292		$_SESSION[~~'JELIX_USER'~~] = $user;
	300	$_SESSION[$config['session_name']] = $user;
293	301	jEvent::notify ('AuthLogin', array('login'=>$login));
294	302	return true;
…	…
301	309	*/
302	310	public static function logout(){
303		jEvent::notify ('AuthLogout', array('login'=>$_SESSION['JELIX_USER']->login));
304		$_SESSION['JELIX_USER'] = new jDummyAuthUser();
	311
	312	$config = self::_getConfig();
	313	jEvent::notify ('AuthLogout', array('login'=>$_SESSION[$config['session_name']]->login));
	314	$_SESSION[$config['session_name']] = new jDummyAuthUser();
305	315	jAcl::clearCache();
306	316	}
…	…
311	321	*/
312	322	public static function isConnected(){
313		return (isset($_SESSION['JELIX_USER']) && $_SESSION['JELIX_USER']->login != '');
	323
	324	$config = self::_getConfig();
	325	return (isset($_SESSION[$config['session_name']]) && $_SESSION[$config['session_name']]->login != '');
314	326	}
315	327
…	…
319	331	*/
320	332	public static function getUserSession (){
321		if (! isset ($_SESSION['JELIX_USER'])){
322		$_SESSION['JELIX_USER'] = new jDummyAuthUser();
323		}
324		return $_SESSION['JELIX_USER'];
	333	$config = self::_getConfig();
	334	if (! isset ($_SESSION[$config['session_name']])){
	335	$_SESSION[$config['session_name']] = new jDummyAuthUser();
	336	}
	337	return $_SESSION[$config['session_name']];
325	338	}
326	339

trunk/lib/jelix/CREDITS

r448	r492
46	46	- patch sur la connexion postgresql (#123)
47	47
	48	Frédéric Guillot (aka fg)
	49	- patch pour authentification multiple dans une même session (#207)
	50
48	51	Cedric
49	52	- patch correctif sur jFile::read

trunk/lib/jelix/CREDITS

r448	r492
46	46	- patch sur la connexion postgresql (#123)
47	47
	48	Frédéric Guillot (aka fg)
	49	- patch pour authentification multiple dans une même session (#207)
	50
48	51	Cedric
49	52	- patch correctif sur jFile::read

trunk/lib/jelix/plugins/coord/auth/auth.coord.ini.php.dist

r480	r492
9	9
10	10	;============ Paramètres pour le plugin
	11	; nom de la session
	12	session_name = "JELIX_USER"
	13
11	14	; indique si on effectue un contrôle sur l'adresse ip
12	15	; qui a démarré la session.

trunk/lib/jelix/plugins/coord/auth/auth.coord.ini.php.dist

r480	r492
9	9
10	10	;============ Paramètres pour le plugin
	11	; nom de la session
	12	session_name = "JELIX_USER"
	13
11	14	; indique si on effectue un contrôle sur l'adresse ip
12	15	; qui a démarré la session.

trunk/lib/jelix/plugins/coord/auth/auth.coord.php

r482	r492
4	4	* @subpackage coord_plugin
5	5	* @author Croes Gérald
6		* @contributor Laurent Jouanneau
7		* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Frédéric Guillot
	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau, 2007 Frédéric Guillot
8	8	* Une partie du code est issue d'une version experimentale de la classe
9	9	* PluginAuth issue du framework Copix 2.3dev20050901.
…	…
27	27	function __construct($conf){
28	28	$this->config = $conf;
	29
	30	if (!isset($this->config['session_name'])
	31	\|\| $this->config['session_name'] == ''){
	32
	33	$this->config['session_name'] = 'JELIX_USER';
	34	}
29	35	}
30	36
…	…
51	57	}
52	58	}
53
	59
54	60	//Creating the user's object if needed
55		if (! isset ($_SESSION[~~'JELIX_USER'~~])){
	61	if (! isset ($_SESSION[$this->config['session_name']])){
56	62	$notLogged = true;
57		$_SESSION[~~'JELIX_USER'~~] = new jDummyAuthUser();
	63	$_SESSION[$this->config['session_name']] = new jDummyAuthUser();
58	64	}else{
59	65	$notLogged = ! jAuth::isConnected();

trunk/lib/jelix/plugins/coord/auth/auth.coord.php

r482	r492
4	4	* @subpackage coord_plugin
5	5	* @author Croes Gérald
6		* @contributor Laurent Jouanneau
7		* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau
	6	* @contributor Laurent Jouanneau, Frédéric Guillot
	7	* @copyright 2001-2005 CopixTeam, 2005-2006 Laurent Jouanneau, 2007 Frédéric Guillot
8	8	* Une partie du code est issue d'une version experimentale de la classe
9	9	* PluginAuth issue du framework Copix 2.3dev20050901.
…	…
27	27	function __construct($conf){
28	28	$this->config = $conf;
	29
	30	if (!isset($this->config['session_name'])
	31	\|\| $this->config['session_name'] == ''){
	32
	33	$this->config['session_name'] = 'JELIX_USER';
	34	}
29	35	}
30	36
…	…
51	57	}
52	58	}
53
	59
54	60	//Creating the user's object if needed
55		if (! isset ($_SESSION[~~'JELIX_USER'~~])){
	61	if (! isset ($_SESSION[$this->config['session_name']])){
56	62	$notLogged = true;
57		$_SESSION[~~'JELIX_USER'~~] = new jDummyAuthUser();
	63	$_SESSION[$this->config['session_name']] = new jDummyAuthUser();
58	64	}else{
59	65	$notLogged = ! jAuth::isConnected();

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 492

Legend: