X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxnet.php;h=be74a32793ec0b0364f3c65f89e30562b7283e47;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=bc30b178e960678c136410c7347f7ddca4d01e2e;hpb=dd9bac8f7903e9924525ad8db3e38650ff5ad1b6;p=platal.git

diff --git a/classes/xnet.php b/classes/xnet.php
index bc30b17..be74a32 100644
--- a/classes/xnet.php
+++ b/classes/xnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,36 +23,17 @@ class Xnet extends Platal
 {
     public function __construct()
     {
-        $modules = func_get_args();
-        parent::__construct($modules);
-
-        global $globals;
-        if ($globals->asso()) {
-            if ($p = strpos($this->path, '/')) {
-                $this->ns   = substr($this->path, 0, $p).'/';
-                $this->path = '%grp'.substr($this->path, $p);
-            } else {
-                $this->ns   = $this->path.'/';
-                $this->path = '%grp';
-            }
-        }
-    }
-
-    protected function find_nearest_key($key, array &$array)
-    {
-        global $globals;
-        if (in_array('%grp', array_keys($array)) &&  $key == $globals->asso('diminutif')) {
-            return '%grp';
-        }
-        return parent::find_nearest_key($key, $array);
+        parent::__construct('xnet', 'xnetgrp', 'xnetlists', 'xnetevents',
+                            'payment', 'bandeau');
     }
 
-    public function near_hook()
+    public function hook_map($name)
     {
-        global $globals;
-        $link = str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
-        if ($link != $this->path) {
-            return $link;
+        if ($name == 'grp') {
+            global $globals;
+            if ($globals->asso()) {
+                return $globals->asso('shortname');
+            }
         }
         return null;
     }
@@ -61,16 +42,17 @@ class Xnet extends Platal
     {
         $ans = parent::find_hook();
         $this->https = false;
-        if ($ans && $this->ns) {
-            $this->path    = $this->ns . substr($this->path, 5);
-            $this->argv[0] = $this->ns . substr($this->argv[0], 5);
-        }
         return $ans;
     }
 
-    public function force_login(&$page)
+    public function force_login(PlPage &$page)
     {
-        http_redirect(S::v('loginX'));
+        $redirect = S::v('loginX');
+        if (!$redirect) {
+            $page->trigError('Impossible de s\'authentifier. Problème de configuration de plat/al.');
+            return;
+        }
+        http_redirect($redirect);
     }
 }