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

diff --git a/classes/xnet.php b/classes/xnet.php
index c88a8c7..be74a32 100644
--- a/classes/xnet.php
+++ b/classes/xnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,57 +21,40 @@
 
 class Xnet extends Platal
 {
-    function Xnet()
+    public function __construct()
     {
-        $modules = func_get_args();
-        call_user_func_array(array(&$this, 'Platal'), $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';
-            }
-        }
-    }
-
-    function find_nearest_key($key, &$array)
-    {
-        global $globals;
-        $k = parent::find_nearest_key($key, $array);
-        if (is_null($k) && in_array('%grp', array_keys($array)) && $globals->asso()) {
-            return '%grp';
-        }
-        return $k;
+        parent::__construct('xnet', 'xnetgrp', 'xnetlists', 'xnetevents',
+                            'payment', 'bandeau');
     }
 
-    function near_hook()
+    public function hook_map($name)
     {
-        $link = parent::near_hook();
-        if (strpos($link, '%grp') !== false) {
+        if ($name == 'grp') {
             global $globals;
-            return str_replace('%grp', $globals->asso('diminutif'), $link);
+            if ($globals->asso()) {
+                return $globals->asso('shortname');
+            }
         }
-        return $link;
+        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 enc=utf-8:
 ?>