projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release of plat/al 1.1.4
[platal.git]
/
modules
/
auth
/
auth.inc.php
diff --git
a/modules/auth/auth.inc.php
b/modules/auth/auth.inc.php
index
ab488d1
..
334c51d
100644
(file)
--- a/
modules/auth/auth.inc.php
+++ b/
modules/auth/auth.inc.php
@@
-48,7
+48,12
@@
function gpex_make($chlg, $privkey, $datafields, $charset)
$personnal_data['prenom'] = $personnal_data['firstname'];
$personnal_data['flags'] = $user->profile()->isFemale() ? 'femme' : '';
} else {
$personnal_data['prenom'] = $personnal_data['firstname'];
$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) {
}
foreach ($fieldarr as $val) {
@@
-62,12
+67,11
@@
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 uid = {?} 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