X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxnetpage.php;h=610f26cfa7468aab7059e4f2c3857e4cc7001b48;hb=7267c7df02133723ed3cf8e6f20660ec025d5034;hp=918f122bf6bfc21935dda299283a837d921d4835;hpb=483da16573717c21c7e6da3eacc094048ab7d72f;p=platal.git

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index 918f122..610f26c 100644
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,6 +41,9 @@ class XnetPage extends PlPage
             $this->assign('is_admin', may_update());
             $this->assign('is_member', is_member());
         }
+        $this->addJsLink('jquery.xorg.js');
+        $this->addJsLink('overlib.js');
+        $this->addJsLink('core.js');
         $this->addJsLink('xorg.js');
         $this->setTitle('Les associations polytechniciennes');
     }
@@ -52,6 +55,8 @@ class XnetPage extends PlPage
     {
         if (!$this->nomenu) {
             $this->useMenu();
+        } else {
+            $this->assign('menu', false);
         }
         $this->_run('xnet/skin.tpl');
     }
@@ -76,6 +81,9 @@ class XnetPage extends PlPage
         $sub = array();
         $sub['tous les groupes'] = 'plan';
         $sub['documentation']     = 'Xnet';
+        if (S::user()->type == 'xnet') {
+            $sub['mon compte'] = 'edit';
+        }
         $sub['signaler un bug']   = array('href' => 'send_bug/'.$_SERVER['REQUEST_URI'], 'class' => 'popup_840x600');
         $menu["no_title"]   = $sub;
 
@@ -95,6 +103,9 @@ class XnetPage extends PlPage
                 if ($globals->asso('mail_domain')) {
                     $sub['listes de diffusion'] = "$dim/lists";
                 }
+                if ($globals->asso('has_nl')) {
+                    $sub['newsletter'] = "$dim/nl";
+                }
             }
             $sub['événement'] = "$dim/events";
             if ($perms->hasFlag('groupmember')) {
@@ -113,12 +124,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');
@@ -139,8 +150,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>';