From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Thu, 23 Nov 2006 00:27:48 +0000 (+0000)
Subject: Group base URL does not anymore need the trailing slash.
X-Git-Tag: xorg/0.9.12~54
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=27ae65e38edd32fd2154c3c9c852eb5b8ffc0b3b;p=platal.git

Group base URL does not anymore need the trailing slash.
Fix menu link to keep authentification

do not forget to run make on your copy of platal


git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1144 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/include/globals.inc.php.in b/include/globals.inc.php.in
index 8673f7e..a99a6b4 100644
--- a/include/globals.inc.php.in
+++ b/include/globals.inc.php.in
@@ -102,7 +102,9 @@ class PlatalGlobals
 
         if (is_null($aid)) {
             $gp = Get::v('n');
-            $gp = substr($gp, 0, strpos($gp, '/'));
+            if ($p = strpos($gp, '/')) {
+                $gp = substr($gp, 0, $p);
+            }
 
             if ($gp) {
                 $res = XDB::query('SELECT  a.*, d.nom AS domnom
diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index d7deaa3..d716ee3 100644
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -75,7 +75,7 @@ class XnetPage extends PlatalPage
         if (S::logged() && $globals->asso()) {
             $sub = array();
             $dim = $globals->asso('diminutif');
-            $sub['présentation'] = "$dim/";
+            $sub['présentation'] = "login/$dim/";
             if (may_update() || (is_member()  && $globals->asso('pub') == 'public')) {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
                 $sub['trombinoscope'] = "$dim/trombi";