Merge commit 'origin/master' into fusionax

[platal.git] / classes / xnetpage.php

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index f020535..1cff3c8 100644 (file)
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,7 +41,11 @@ class XnetPage extends PlPage
             $this->assign('is_admin', may_update());
             $this->assign('is_member', is_member());
         }
+        $this->addJsLink('jquery.js');
+        $this->addJsLink('overlib.js');
+        $this->addJsLink('wiki.js');
         $this->addJsLink('xorg.js');
+        $this->setTitle('Les associations polytechniciennes');
     }
 
     // }}}
@@ -86,7 +90,6 @@ class XnetPage extends PlPage
             if ($perms->hasFlag('groupannu')) {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
                 $sub['trombinoscope'] = "$dim/trombi";
-                $sub['planisphère'] = "$dim/geoloc";
             }
             if ($perms->hasFlag('groupmember')) {
                 if ($globals->asso('forum')) {
@@ -113,12 +116,12 @@ class XnetPage extends PlPage
                 $sub['créer une liste']     = "$dim/lists/create";
                 $sub['créer un alias']      = "$dim/alias/create";
             }
-            if (S::has_perms()) {
+            if (S::admin()) {
                 $sub['gérer les groupes'] = array('href' => 'admin', 'style' => 'color: gray;');
                 $sub['clear cache'] = array('href' => 'purge_cache?token=' . S::v('xsrf_token'), 'style' => 'color: gray;');
             }
             $menu['Administrer'] = $sub;
-        } elseif (S::has_perms()) {
+        } elseif (S::admin()) {
             $sub = array();
             $sub['gérer les groupes'] = 'admin';
             $sub['clear cache'] = 'purge_cache?token=' . S::v('xsrf_token');
@@ -140,8 +143,8 @@ function list_all_my_groups($params)
     }
     $res = XDB::iterRow(
             "SELECT  a.nom, a.diminutif
-               FROM  groupex.asso    AS a
-         INNER JOIN  groupex.membres AS m ON m.asso_id = a.id
+               FROM  #groupex#.asso    AS a
+         INNER JOIN  #groupex#.membres AS m ON m.asso_id = a.id
               WHERE  m.uid={?}", S::v('uid'));
     $links = '<a href="exit">déconnexion</a>';
     $html = '<div>Mes groupes (' . $links . ') :</div>';