X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fxorg%2Fsession.inc.php;h=9d783e268168906e50743855ac0db0c12aea350b;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=2ad778455b6b762f36195459bf321f554a5c902a;hpb=cdfe0063c9b6b0fad10dd6d97ae2f25010e3620c;p=platal.git diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index 2ad7784..9d783e2 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -19,42 +19,31 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once('platal/session.inc.php'); +require_once 'platal/session.inc.php'; // {{{ class XorgSession -class XorgSession extends DiogenesCoreSession +class XorgSession { - // {{{ function XorgSession() + // {{{ function init - function XorgSession() - { - $this->DiogenesCoreSession(); - if (!Session::has('uid')) { + function init() { + S::init(); + if (!S::has('uid')) { try_cookie(); } set_skin(); + $_SESSION['session'] = new XorgSession; } // }}} - // {{{ function init - - function init() { - @session_start(); - if (!Session::has('session')) { - $_SESSION['session'] = new XorgSession; - } - } - - // }}} // {{{ function destroy() - + function destroy() { - @session_destroy(); - unset($_SESSION); + S::destroy(); XorgSession::init(); } - + // }}} // {{{ function doAuth() @@ -65,22 +54,19 @@ class XorgSession extends DiogenesCoreSession function doAuth(&$page,$new_name=false) { global $globals; - if (identified()) { // ok, c'est bon, on n'a rien à faire + if (S::identified()) { // ok, c'est bon, on n'a rien à faire return true; } - if (Session::has('session')) { - $session =& Session::getMixed('session'); - } - if (Env::has('username') && Env::has('response') && isset($session->challenge)) + if (Env::has('username') && Env::has('response') && S::has('challenge')) { // si on vient de recevoir une identification par passwordpromptscreen.tpl // ou passwordpromptscreenlogged.tpl $uname = Env::get('username'); - + if (Env::get('domain') == "alias") { - - $res = $globals->xdb->query( + + $res = XDB::query( "SELECT redirect FROM virtual INNER JOIN virtual_redirect USING(vid) @@ -94,24 +80,24 @@ class XorgSession extends DiogenesCoreSession } else { $login = $uname; } - + $field = (!$redirect && preg_match('/^\d*$/', $uname)) ? 'id' : 'alias'; - $res = $globals->xdb->query( + $res = XDB::query( "SELECT u.user_id, u.password FROM auth_user_md5 AS u INNER JOIN aliases AS a ON ( a.id=u.user_id AND type!='homonyme' ) WHERE a.$field = {?} AND u.perms IN('admin','user')", $login); - - $logger =& Session::getMixed('log'); + + $logger =& S::v('log'); if (list($uid, $password) = $res->fetchOneRow()) { require_once('secure_hash.inc.php'); - $expected_response=hash_encrypt("$uname:$password:{$session->challenge}"); + $expected_response=hash_encrypt("$uname:$password:".S::v('challenge')); // le password de la base est peut-être encore encodé en md5 if (Env::get('response') != $expected_response) { $new_password = hash_xor(Env::get('xorpass'), $password); - $expected_response = hash_encrypt("$uname:$new_password:{$session->challenge}"); + $expected_response = hash_encrypt("$uname:$new_password:".S::v('challenge')); if (Env::get('response') == $expected_response) { - $globals->xdb->execute("UPDATE auth_user_md5 SET password = {?} WHERE user_id = {?}", $new_password, $uid); + XDB::execute("UPDATE auth_user_md5 SET password = {?} WHERE user_id = {?}", $new_password, $uid); } } if (Env::get('response') == $expected_response) { @@ -124,21 +110,21 @@ class XorgSession extends DiogenesCoreSession // pour que la modification soit effective dans le reste de la page $_COOKIE['ORGdomain'] = $domain; } - - unset($session->challenge); - if ($logger) { - $logger->log('auth_ok'); + + S::kill('challenge'); + if ($logger) { + $logger->log('auth_ok'); } start_connexion($uid, true); if (Env::get('remember', 'false') == 'true') { - $cookie = hash_encrypt(Session::get('password')); + $cookie = hash_encrypt(S::v('password')); setcookie('ORGaccess',$cookie,(time()+25920000),'/','',0); if ($logger) { $logger->log("cookie_on"); } } else { setcookie('ORGaccess', '', time() - 3600, '/', '', 0); - + if ($logger) { $logger->log("cookie_off"); } @@ -151,7 +137,7 @@ class XorgSession extends DiogenesCoreSession $logger->log('auth_fail','bad login'); } } - $this->doLogin($page,$new_name); + XorgSession::doLogin($page,$new_name); } // }}} @@ -163,16 +149,16 @@ class XorgSession extends DiogenesCoreSession */ function doAuthCookie(&$page) { - if (logged()) { + if (S::logged()) { return; } if (Env::has('username') and Env::has('response')) { - return $this->doAuth($page); + return XorgSession::doAuth($page); } if ($r = try_cookie()) { - return $this->doAuth($page,($r>0)); + return XorgSession::doAuth($page,($r>0)); } } @@ -183,16 +169,16 @@ class XorgSession extends DiogenesCoreSession */ function doLogin(&$page, $new_name=false) { - if (logged() and !$new_name) { + if (S::logged() and !$new_name) { $page->changeTpl('password_prompt_logged.tpl'); - $page->addJsLink('javascript/do_challenge_response_logged.js.php'); + $page->addJsLink('javascript/do_challenge_response_logged.js'); $page->assign("xorg_tpl", "password_prompt_logged.tpl"); $page->run(); } else { $page->changeTpl('password_prompt.tpl'); - $page->addJsLink('javascript/do_challenge_response.js.php'); + $page->addJsLink('javascript/do_challenge_response.js'); $page->assign("xorg_tpl", "password_prompt.tpl"); - + global $globals; if ($globals->mail->alias_dom) { $page->assign("domains", Array( @@ -207,26 +193,6 @@ class XorgSession extends DiogenesCoreSession } // }}} - // {{{ function getUserId() - - function getUserId($auth,$username) - { - global $globals; - $res = $globals->xdb->query("SELECT id FROM aliases WHERE alias = {?}",$username); - return $res->fetchOneCell(); - } - - // }}} - // {{{ function getUsername() - - function getUsername($auth,$uid) - { - global $globals; - $res = $globals->xdb->query("SELECT alias FROM aliases WHERE id = {?} AND type='a_vie'", $uid); - return $res->fetchOneCell(); - } - - // }}} } // }}} @@ -238,12 +204,11 @@ class XorgSession extends DiogenesCoreSession */ function try_cookie() { - global $globals; if (Cookie::get('ORGaccess') == '' or !Cookie::has('ORGuid')) { return -1; } - $res = @$globals->xdb->query( + $res = @XDB::query( "SELECT user_id,password FROM auth_user_md5 WHERE user_id = {?} AND perms IN('admin','user')", Cookie::getInt('ORGuid') ); @@ -272,8 +237,7 @@ function try_cookie() */ function start_connexion ($uid, $identified) { - global $globals; - $res = $globals->xdb->query(" + $res = XDB::query(" SELECT u.user_id AS uid, prenom, nom, perms, promo, matricule, password, FIND_IN_SET('femme', u.flags) AS femme, UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, a.alias AS forlife, a2.alias AS bestalias, q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash @@ -286,14 +250,14 @@ function start_connexion ($uid, $identified) ORDER BY s.start DESC LIMIT 1", $uid); $sess = $res->fetchOneAssoc(); - $suid = Session::getMixed('suid'); - + $suid = S::v('suid'); + if ($suid) { $logger = new DiogenesCoreLogger($uid, $suid); - $logger->log("suid_start", Session::get('forlife')." by {$suid['uid']}"); + $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}"); $sess['suid'] = $suid; } else { - $logger = Session::getMixed('log', new DiogenesCoreLogger($uid)); + $logger = S::v('log', new DiogenesCoreLogger($uid)); $logger->log("connexion", $_SERVER['PHP_SELF']); setcookie('ORGuid', $uid, (time()+25920000), '/', '', 0); } @@ -310,9 +274,9 @@ function start_connexion ($uid, $identified) function set_skin() { global $globals; - if (logged() && $globals->skin->enable) { - $uid = Session::getInt('uid'); - $res = $globals->xdb->query("SELECT skin,skin_tpl + if (S::logged() && $globals->skin->enable) { + $uid = S::v('uid'); + $res = XDB::query("SELECT skin,skin_tpl FROM auth_user_quick AS a INNER JOIN skins AS s ON a.skin=s.id WHERE user_id = {?} AND skin_tpl != ''", $uid);