X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxnet.php;h=1251ba6697c11e8d20e72b928321a59b8bb24dc1;hb=fda78a6777a5f385537fc9f291afb310e12525e5;hp=1e76f674489fb1df549d6b1e15867f9a858a61da;hpb=0d602b8f5fe4fc8cd42dc61a442d14f32bb19056;p=platal.git

diff --git a/classes/xnet.php b/classes/xnet.php
index 1e76f67..1251ba6 100644
--- a/classes/xnet.php
+++ b/classes/xnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,52 +21,49 @@
 
 class Xnet extends Platal
 {
-    function Xnet()
+    public function __construct()
     {
-        $modules = func_get_args();
-        call_user_func_array(array(&$this, 'Platal'), $modules);
+        parent::__construct(
+            'xnet',
 
-        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';
-            }
-        }
+            'bandeau',
+            'geoloc',
+            'payment',
+            'xnetevents',
+            'xnetgrp',
+            'xnetlists',
+            'xnetnl'
+        );
     }
 
-    function find_nearest_key($key, &$array)
+    public function hook_map($name)
     {
-        global $globals;
-        if (in_array('%grp', array_keys($array)) &&  $key == $globals->asso('diminutif')) {
-            return '%grp';
+        if ($name == 'grp') {
+            global $globals;
+            if ($globals->asso()) {
+                return $globals->asso('shortname');
+            }
         }
-        return parent::find_nearest_key($key, $array);
-    }
-
-    function near_hook()
-    {
-        global $globals;
-        return str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
+        return null;
     }
 
-    function find_hook()
+    protected function find_hook()
     {
         $ans = parent::find_hook();
-        if ($ans && $this->ns) {
-            $this->path    = $this->ns . substr($this->path, 5);
-            $this->argv[0] = $this->ns . substr($this->argv[0], 5);
-        }
+        $this->https = false;
         return $ans;
     }
 
-    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);
     }
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>