projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes promo display in marketing page.
[platal.git]
/
classes
/
xnetpage.php
diff --git
a/classes/xnetpage.php
b/classes/xnetpage.php
index
293fa9c
..
f4d8e00
100644
(file)
--- a/
classes/xnetpage.php
+++ b/
classes/xnetpage.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
08
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* 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->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');
}
// }}}
}
// }}}
@@
-72,9
+77,9
@@
class XnetPage extends PlPage
$menu = array();
$sub = array();
$menu = array();
$sub = array();
- $sub['
liste d
es groupes'] = 'plan';
+ $sub['
tous l
es groupes'] = 'plan';
$sub['documentation'] = 'Xnet';
$sub['documentation'] = 'Xnet';
- $sub['signaler un bug'] = array('href' => 'send_bug
'
, 'class' => 'popup_840x600');
+ $sub['signaler un bug'] = array('href' => 'send_bug
/'.$_SERVER['REQUEST_URI']
, 'class' => 'popup_840x600');
$menu["no_title"] = $sub;
$perms = S::v('perms');
$menu["no_title"] = $sub;
$perms = S::v('perms');
@@
-85,7
+90,6
@@
class XnetPage extends PlPage
if ($perms->hasFlag('groupannu')) {
$sub['annuaire du groupe'] = "$dim/annuaire";
$sub['trombinoscope'] = "$dim/trombi";
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')) {
}
if ($perms->hasFlag('groupmember')) {
if ($globals->asso('forum')) {
@@
-112,12
+116,12
@@
class XnetPage extends PlPage
$sub['créer une liste'] = "$dim/lists/create";
$sub['créer un alias'] = "$dim/alias/create";
}
$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;
$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');
$sub = array();
$sub['gérer les groupes'] = 'admin';
$sub['clear cache'] = 'purge_cache?token=' . S::v('xsrf_token');
@@
-137,11
+141,10
@@
function list_all_my_groups($params)
if (!S::logged()) {
return;
}
if (!S::logged()) {
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
- WHERE m.uid={?}", S::v('uid'));
+ $res = XDB::iterRow('SELECT a.nom, a.diminutif
+ 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>';
while (list($nom, $mini) = $res->next()) {
$links = '<a href="exit">déconnexion</a>';
$html = '<div>Mes groupes (' . $links . ') :</div>';
while (list($nom, $mini) = $res->next()) {