projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improves search on address components.
[platal.git]
/
modules
/
auth
/
auth.inc.php
diff --git
a/modules/auth/auth.inc.php
b/modules/auth/auth.inc.php
index
c158ff2
..
334c51d
100644
(file)
--- a/
modules/auth/auth.inc.php
+++ b/
modules/auth/auth.inc.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 *
@@
-34,23
+34,32
@@
function gpex_make($chlg, $privkey, $datafields, $charset)
$user =& S::user();
if ($user->hasProfile()) {
$user =& S::user();
if ($user->hasProfile()) {
- /
/ XXX: Transition table for auth.
+ /
* Transition table for authentification. */
$personnal_data = $user->profile()->data();
$personnal_data = $user->profile()->data();
+ $personnal_data['full_promo'] = $personnal_data['promo'];
+ $personnal_data['promo'] = $personnal_data['entry_year'];
$personnal_data['matricule'] = $personnal_data['xorg_id'];
$personnal_data['matricule_ax'] = $personnal_data['ax_id'];
$personnal_data['matricule'] = $personnal_data['xorg_id'];
$personnal_data['matricule_ax'] = $personnal_data['ax_id'];
- $personnal_data['promo_sortie'] = $personnal_data['
promo'] + 3; // FIXME: Hum, not that good
+ $personnal_data['promo_sortie'] = $personnal_data['
grad_year'];
$personnal_data['nationalite'] = $personnal_data['nationality1'];
$personnal_data['naissance'] = $personnal_data['birthdate'];
$personnal_data['deces'] = $personnal_data['deathdate'];
$personnal_data['nationalite'] = $personnal_data['nationality1'];
$personnal_data['naissance'] = $personnal_data['birthdate'];
$personnal_data['deces'] = $personnal_data['deathdate'];
+ $personnal_data['nom'] = $personnal_data['lastname'];
+ $personnal_data['prenom'] = $personnal_data['firstname'];
$personnal_data['flags'] = $user->profile()->isFemale() ? 'femme' : '';
} else {
$personnal_data['flags'] = $user->profile()->isFemale() ? 'femme' : '';
} else {
- $personnal_data = array();
+ // Missing fields: promo, entry_year, grad_year, ax_id, xorg_id, forlife
+ $personnal_data = array(
+ 'lastname' => $user->lastname,
+ 'firstname' => $user->firstname,
+ 'sex' => $user->gender
+ );
}
foreach ($fieldarr as $val) {
// Determine the requested value, and add it to the answer.
if ($val == 'perms') {
}
foreach ($fieldarr as $val) {
// Determine the requested value, and add it to the answer.
if ($val == 'perms') {
- $params .= gpex_prepare_param($val, S::
has_perms
() ? 'admin' : 'user', $tohash, $charset);
+ $params .= gpex_prepare_param($val, S::
admin
() ? 'admin' : 'user', $tohash, $charset);
} else if ($val == 'forlife') {
$params .= gpex_prepare_param($val, S::v('hruid'), $tohash, $charset);
} else if (S::has($val)) {
} else if ($val == 'forlife') {
$params .= gpex_prepare_param($val, S::v('hruid'), $tohash, $charset);
} else if (S::has($val)) {
@@
-58,23
+67,22
@@
function gpex_make($chlg, $privkey, $datafields, $charset)
} else if (isset($personnal_data[$val])) {
$params .= gpex_prepare_param($val, $personnal_data[$val], $tohash, $charset);
} else if ($val == 'username') {
} else if (isset($personnal_data[$val])) {
$params .= gpex_prepare_param($val, $personnal_data[$val], $tohash, $charset);
} else if ($val == 'username') {
- $res = XDB::query("SELECT alias
- FROM aliases
- WHERE id = {?} AND FIND_IN_SET('bestalias', flags)",
- S::i('uid'));
- $min_username = $res->fetchOneCell();
- $params .= gpex_prepare_param($val, $min_username, $tohash, $charset);
+ $min_username = XDB::fetchOneCell('SELECT email
+ FROM email_source_account
+ WHERE uid = {?} AND FIND_IN_SET(\'bestalias\', flags)',
+ S::i('uid'));
+ $params .= gpex_prepare_param($val, (is_null($min_username) ? '' : $min_username), $tohash, $charset);
} else if ($val == 'grpauth') {
if (isset($_GET['group'])) {
$res = XDB::query("SELECT perms
} else if ($val == 'grpauth') {
if (isset($_GET['group'])) {
$res = XDB::query("SELECT perms
- FROM group
ex.membre
s
- INNER JOIN group
ex.asso
ON(id = asso_id)
+ FROM group
_member
s
+ INNER JOIN group
s
ON(id = asso_id)
WHERE uid = {?} AND diminutif = {?}",
S::v('uid'), $_GET['group']);
$perms = $res->fetchOneCell();
} else {
// if no group asked, return main rights
WHERE uid = {?} AND diminutif = {?}",
S::v('uid'), $_GET['group']);
$perms = $res->fetchOneCell();
} else {
// if no group asked, return main rights
- $perms = S::
has_perms
() ? 'admin' : 'membre';
+ $perms = S::
admin
() ? 'admin' : 'membre';
}
$params .= gpex_prepare_param($val, $perms, $tohash, $charset);
} else {
}
$params .= gpex_prepare_param($val, $perms, $tohash, $charset);
} else {