projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not give latitude and longitude as arguments as they are always the same.
[platal.git]
/
classes
/
xnetpage.php
diff --git
a/classes/xnetpage.php
b/classes/xnetpage.php
index
9f86aca
..
d32374d
100644
(file)
--- a/
classes/xnetpage.php
+++ b/
classes/xnetpage.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
11
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,12
@@
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());
}
+ if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
+ $this->addJsLink('json2.js');
+ }
+ $this->addJsLink('jquery.xorg.js');
+ $this->addJsLink('overlib.js');
+ $this->addJsLink('core.js');
$this->addJsLink('xorg.js');
$this->setTitle('Les associations polytechniciennes');
}
$this->addJsLink('xorg.js');
$this->setTitle('Les associations polytechniciennes');
}
@@
-52,6
+58,8
@@
class XnetPage extends PlPage
{
if (!$this->nomenu) {
$this->useMenu();
{
if (!$this->nomenu) {
$this->useMenu();
+ } else {
+ $this->assign('menu', false);
}
$this->_run('xnet/skin.tpl');
}
}
$this->_run('xnet/skin.tpl');
}
@@
-76,6
+84,10
@@
class XnetPage extends PlPage
$sub = array();
$sub['tous les groupes'] = 'plan';
$sub['documentation'] = 'Xnet';
$sub = array();
$sub['tous les groupes'] = 'plan';
$sub['documentation'] = 'Xnet';
+ if (S::user()->type == 'xnet') {
+ $sub['mon compte'] = 'edit';
+ $sub['mon mot de passe'] = 'password';
+ }
$sub['signaler un bug'] = array('href' => 'send_bug/'.$_SERVER['REQUEST_URI'], 'class' => 'popup_840x600');
$menu["no_title"] = $sub;
$sub['signaler un bug'] = array('href' => 'send_bug/'.$_SERVER['REQUEST_URI'], 'class' => 'popup_840x600');
$menu["no_title"] = $sub;
@@
-87,7
+99,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')) {
@@
-96,6
+107,9
@@
class XnetPage extends PlPage
if ($globals->asso('mail_domain')) {
$sub['listes de diffusion'] = "$dim/lists";
}
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')) {
}
$sub['événement'] = "$dim/events";
if ($perms->hasFlag('groupmember')) {
@@
-114,6
+128,9
@@
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 (!$globals->asso('has_nl')) {
+ $sub['créer la newsletter'] = "$dim/admin/nl/enable";
+ }
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;');
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;');
@@
-139,11
+156,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()) {