projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/core/1.1.1/maint' into core/master
[platal.git]
/
classes
/
plsession.php
diff --git
a/classes/plsession.php
b/classes/plsession.php
index
d4549c9
..
7a243be
100644
(file)
--- a/
classes/plsession.php
+++ b/
classes/plsession.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
08
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-103,7
+103,6
@@
abstract class PlSession
*/
public function start($level)
{
*/
public function start($level)
{
- $backup = S::i($level);
if ($this->checkAuth($level)) {
return true;
}
if ($this->checkAuth($level)) {
return true;
}
@@
-187,11
+186,10
@@
abstract class PlSession
*/
public function startSUID($user, $perms = null)
{
*/
public function startSUID($user, $perms = null)
{
- if (S::
has('suid'
)) {
+ if (S::
suid(
)) {
return false;
}
return false;
}
- $backup = $_SESSION;
- $_SESSION = array();
+ $backup = S::changeSession(array());
$this->fillSession();
S::set('suid', $backup);
if (!$this->startSessionAs($user, AUTH_SUID)) {
$this->fillSession();
S::set('suid', $backup);
if (!$this->startSessionAs($user, AUTH_SUID)) {
@@
-209,10
+207,10
@@
abstract class PlSession
*/
public function stopSUID()
{
*/
public function stopSUID()
{
- if (!S::
has('suid'
)) {
+ if (!S::
suid(
)) {
return false;
}
return false;
}
-
$_SESSION = $_SESSION['suid']
;
+
S::changeSession(S::v('suid'))
;
return true;
}
return true;
}