Group base URL does not anymore need the trailing slash.

[platal.git] / include / xnet / page.inc.php

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 7bb8971..d716ee3 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -19,10 +19,10 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once dirname(__FILE__).'/../../classes/Page.php';
-
 class XnetPage extends PlatalPage
 {
+    var $nomenu = false;
+
     // {{{ function XnetPage()
 
     function XnetPage($tpl, $type=SKINNED)
@@ -43,6 +43,9 @@ class XnetPage extends PlatalPage
 
     function run()
     {
+        if (!$this->nomenu) {
+            $this->useMenu();
+        }
         $this->_run('xnet/skin.tpl');
     }
 
@@ -63,32 +66,28 @@ class XnetPage extends PlatalPage
 
         $menu = array();
 
-        if (S::logged()) {
-            $sub = array();
-            $sub['déconnexion']   = 'exit';
-            $menu['no_title'] = $sub;
-        }
-
         $sub = array();
-        $sub['accueil']           = '';
         $sub['liste des groupes'] = 'plan';
-        $menu["Menu Principal"]   = $sub;
-
-        if (S::logged() && (is_member() || may_update())) {
+        $sub['documentation']     = 'Xnet';
+        $sub['Signaler un bug']   = array('link' => 'send_bug', 'onclick' => 'send_bug();return false'); 
+        $menu["no_title"]   = $sub;
+        
+        if (S::logged() && $globals->asso()) {
             $sub = array();
             $dim = $globals->asso('diminutif');
-            $sub['présentation'] = "$dim/";
-            if (may_update() || $globals->asso('pub') == 'public') {
+            $sub['présentation'] = "login/$dim/";
+            if (may_update() || (is_member()  && $globals->asso('pub') == 'public')) {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
-                if ($globals->xnet->geoloc)
-                    $sub['carte'] = "$dim/geoloc.php";
+                $sub['trombinoscope'] = "$dim/trombi";
+                $sub['carte'] = "$dim/geoloc";
             }
-            if ($globals->asso('mail_domain')) {
+            if ((is_member() || may_update()) && $globals->asso('mail_domain')) {
                 $sub['listes de diffusion'] = "$dim/lists";
-                $sub['envoyer un mail']     = "$dim/mail";
             }
             $sub['événement'] = "$dim/events";
-            $sub['télépaiement'] = "$dim/paiement";
+            if (may_update() || is_member()) {
+                $sub['télépaiement'] = "$dim/paiement";
+            }
 
             $menu[$globals->asso('nom')] = $sub;
         }
@@ -96,7 +95,9 @@ class XnetPage extends PlatalPage
         if (S::logged() && may_update()) {
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
+            $sub['gérer les annonces'] = "$dim/admin/announces";
             if ($globals->asso('mail_domain')) {
+                $sub['envoyer un mail']     = "$dim/mail";
                 $sub['créer une liste']     = "$dim/lists/create";
                 $sub['créer un alias']      = "$dim/alias/create";
             }
@@ -104,6 +105,10 @@ class XnetPage extends PlatalPage
                 $sub['gérer les groupes'] = 'admin';
             }
             $menu['Administrer'] = $sub;
+        } elseif (S::has_perms()) {
+            $sub = array();
+            $sub['gérer les groupes'] = 'admin';
+            $menu['Administrer'] = $sub;
         }
 
         $this->assign('menu', $menu);
@@ -124,9 +129,9 @@ function list_all_my_groups($params)
                FROM  groupex.asso    AS a
          INNER JOIN  groupex.membres AS m ON m.asso_id = a.id
               WHERE  m.uid={?}", S::v('uid'));
-    $html = '<div>Mes groupes :</div>';
+    $html = '<div>Mes groupes (<a href="exit">déconnexion</a>) :</div>';
     while (list($nom, $mini) = $res->next()) {
-        $html .= "<a class='gp' href='$mini/'>&bull; $nom</a>";
+        $html .= "<span class='gp'>&bull; <a href='$mini/'>$nom</a></span>";
     }
     return $html;
 }