X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxnetpage.php;h=12b50dff82c28132f4aaa5f381b74f188345c1c9;hb=f15d1307ff3829d58f26923e93ff4825b6eb278b;hp=9ccdf371b6a14db56237dbbb10f7c93c39ebaade;hpb=5b516e6be17378ace0e375b9da14a46051bf0f4e;p=platal.git

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index 9ccdf37..12b50df 100644
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,6 +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('secure_hash.js');
+        $this->addJsLink('sha1.js');
+        $this->addJsLink('wiki.js');
         $this->addJsLink('xorg.js');
         $this->setTitle('Les associations polytechniciennes');
     }
@@ -52,6 +57,8 @@ class XnetPage extends PlPage
     {
         if (!$this->nomenu) {
             $this->useMenu();
+        } else {
+            $this->assign('menu', false);
         }
         $this->_run('xnet/skin.tpl');
     }
@@ -76,6 +83,9 @@ class XnetPage extends PlPage
         $sub = array();
         $sub['tous les groupes'] = 'plan';
         $sub['documentation']     = 'Xnet';
+        if (S::user()->type == 'xnet') {
+            $sub['mon compte'] = 'member/edit';
+        }
         $sub['signaler un bug']   = array('href' => 'send_bug/'.$_SERVER['REQUEST_URI'], 'class' => 'popup_840x600');
         $menu["no_title"]   = $sub;
 
@@ -139,8 +149,8 @@ function list_all_my_groups($params)
         return;
     }
     $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  groups    AS a
+                     INNER JOIN  group_members AS m ON m.asso_id = a.id
                           WHERE  m.uid = {?}', S::i('uid'));
     $links = '<a href="exit">déconnexion</a>';
     $html = '<div>Mes groupes (' . $links . ') :</div>';