Port X.org session management to the new session format.

[platal.git] / include / xnet / session.inc.php

diff --git a/include/xnet/session.inc.php b/include/xnet/session.inc.php
index 4a85ef8..e3e544e 100644 (file)
--- a/include/xnet/session.inc.php
+++ b/include/xnet/session.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,26 +21,58 @@
 
 class XnetSession
 {
+    public function __construct()
+    {
+        self::init();
+    }
+
     // {{{ function init
 
-    public static function init() {
+    public static function init()
+    {
         global $globals;
 
         S::init();
 
+        if (!S::logged() && Get::has('auth')) {
+            XnetSession::doAuthX();
+        }
+
         if (!S::logged()) {
             // prevent connexion to be linked to deconnexion
             if (($i = strpos($_SERVER['REQUEST_URI'], 'exit')) !== false)
                 $returl = "http://{$_SERVER['SERVER_NAME']}".substr($_SERVER['REQUEST_URI'], 0, $i);
             else
                 $returl = "http://{$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}";
-            $url  = "https://www.polytechnique.org/auth-groupex.php";
+            $url  = "https://www.polytechnique.org/auth-groupex";
             $url .= "?session=" . session_id();
             $url .= "&challenge=" . S::v('challenge');
             $url .= "&pass=" . md5(S::v('challenge') . $globals->xnet->secret);
             $url .= "&url=".urlencode($returl);
             $_SESSION['loginX'] = $url;
         }
+
+        if (S::logged() && $globals->asso()) {
+            $perms = S::v('perms');
+            $perms->rmFlag('groupadmin');
+            $perms->rmFlag('groupmember');
+            $perms->rmFlag('groupannu');
+            if (may_update()) {
+                $perms->addFlag('groupadmin');
+                $perms->addFlag('groupmember');
+                $perms->addFlag('groupannu');
+            }
+            if (is_member()) {
+                $perms->addFlag('groupmember');
+                if ($globals->asso('pub') != 'private') {
+                    $perms->addFlag('groupannu');
+                }
+            }
+            if ($globals->asso('cat') == 'Promotions') {
+                $perms->addFlag('groupannu');
+            }
+            $_SESSION['perms'] = $perms;
+        }
     }
 
     // }}}
@@ -81,10 +113,13 @@ class XnetSession
     // }}}
     // {{{ doAuthX
 
-    public static function doAuthX() {
-        global $globals, $page;
+    public static function doAuthX()
+    {
+        global $globals;
 
         if (md5('1'.S::v('challenge').$globals->xnet->secret.Get::i('uid').'1') != Get::v('auth')) {
+            Get::kill('auth');
+            $page =& Platal::page();
             $page->kill("Erreur d'authentification avec polytechnique.org !");
         }
 
@@ -99,8 +134,12 @@ class XnetSession
              LIMIT  1", Get::i('uid'));
         $_SESSION = array_merge($_SESSION, $res->fetchOneAssoc());
         $_SESSION['auth'] = AUTH_MDP;
+        require_once 'xorg/session.inc.php';
+        $_SESSION['perms'] =& XorgSession::make_perms(S::v('perms'));
         S::kill('challenge');
         S::kill('loginX');
+        S::kill('may_update');
+        S::kill('is_member');
         Get::kill('auth');
         Get::kill('uid');
         $path = Get::v('n');
@@ -123,14 +162,15 @@ class XnetSession
         if (!S::has('suid')) {
             $_SESSION['suid'] = $_SESSION;
         }
-        $_SESSION['perms'] = 'user';
+        require_once 'xorg/session.inc.php';
+        $_SESSION['perms'] =& XorgSession::make_perms('user');
     }
 
     // }}}
     // {{{ killSuid
 
     public static function killSuid()
-    {   
+    {
         if (!S::has('suid')) {
             return;
         }
@@ -182,7 +222,7 @@ function may_update($force = false, $lose = false)
 /** Get membership informations for the current asso
  * @param force Force membership to be read from database
  * @param lose  Force membership to be false
- */ 
+ */
 function is_member($force = false, $lose = false)
 {
     if (!isset($_SESSION['is_member'])) {