Fix a missing urlencode in group auth that leads to some encoding failures

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

diff --git a/include/xnet/session.inc.php b/include/xnet/session.inc.php
index f319d80..175a031 100644 (file)
--- a/include/xnet/session.inc.php
+++ b/include/xnet/session.inc.php
@@ -23,7 +23,7 @@ class XnetSession
 {
     // {{{ function init
 
-    public static function init() 
+    public static function init()
     {
         global $globals;
 
@@ -47,12 +47,20 @@ class XnetSession
             $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;
         }
@@ -96,11 +104,15 @@ class XnetSession
     // }}}
     // {{{ doAuthX
 
-    public static function doAuthX() 
+    public static function doAuthX()
     {
         global $globals, $page;
 
         if (md5('1'.S::v('challenge').$globals->xnet->secret.Get::i('uid').'1') != Get::v('auth')) {
+            if (!$page) {
+                require_once 'xnet.inc.php';
+                new_skinned_page('platal/index.tpl');
+            }
             $page->kill("Erreur d'authentification avec polytechnique.org !");
         }
 
@@ -151,7 +163,7 @@ class XnetSession
     // {{{ killSuid
 
     public static function killSuid()
-    {   
+    {
         if (!S::has('suid')) {
             return;
         }
@@ -203,7 +215,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'])) {