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

diff --git a/classes/xnet.php b/classes/xnet.php
index 1e76f67..9983aba 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,10 +21,10 @@
 
 class Xnet extends Platal
 {
-    function Xnet()
+    public function __construct()
     {
         $modules = func_get_args();
-        call_user_func_array(array(&$this, 'Platal'), $modules);
+        parent::__construct($modules);
 
         global $globals;
         if ($globals->asso()) {
@@ -38,7 +38,7 @@ class Xnet extends Platal
         }
     }
 
-    function find_nearest_key($key, &$array)
+    protected function find_nearest_key($key, array &$array)
     {
         global $globals;
         if (in_array('%grp', array_keys($array)) &&  $key == $globals->asso('diminutif')) {
@@ -47,15 +47,26 @@ class Xnet extends Platal
         return parent::find_nearest_key($key, $array);
     }
 
-    function near_hook()
+    public function near_hook()
     {
         global $globals;
-        return str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
+        $link = str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
+        if ($link != $this->path) {
+            return $link;
+        }
+        return null;
+    }
+
+    public function pl_self($n = null)
+    {
+        global $globals;
+        return str_replace('%grp', $globals->asso('diminutif'), parent::pl_self($n));
     }
 
-    function find_hook()
+    protected function find_hook()
     {
         $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);
@@ -63,10 +74,11 @@ class Xnet extends Platal
         return $ans;
     }
 
-    function force_login(&$page)
+    public function force_login(PlPage &$page)
     {
         http_redirect(S::v('loginX'));
     }
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>