}
global $globals;
- if (!S::logged()) {
+ if (!S::logged() && $globals->xnet->auth_baseurl) {
// prevent connection to be linked to disconnection
if (($i = strpos($_SERVER['REQUEST_URI'], 'exit')) !== false)
$returl = "http://{$_SERVER['SERVER_NAME']}".substr($_SERVER['REQUEST_URI'], 0, $i);
else
$returl = "http://{$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}";
- $url = "https://www.polytechnique.org/auth-groupex";
+ $url = $globals->xnet->auth_baseurl;
$url .= "?session=" . session_id();
$url .= "&challenge=" . S::v('challenge');
$url .= "&pass=" . md5(S::v('challenge') . $globals->xnet->secret);
if ($globals->asso('pub') != 'private') {
$perms->addFlag('groupannu');
}
+ } else if ($globals->asso('pub') == 'public') {
+ $perms->addFlag('groupannu');
}
if ($globals->asso('cat') == 'Promotions') {
$perms->addFlag('groupannu');
protected function doAuth($level)
{
if (S::identified()) { // ok, c'est bon, on n'a rien à faire
- return User::getSilentWithValues(null, array('user_id' => S::i('uid')));
+ return User::getSilentWithValues(null, array('uid' => S::i('uid')));
}
if (!Get::has('auth')) {
return null;
}
Get::kill('auth');
S::set('auth', AUTH_MDP);
- return User::getSilentWithValues(null, array('user_id' => Get::i('uid')));
+ return User::getSilentWithValues(null, array('uid' => Get::i('uid')));
}
protected function startSessionAs($user, $level)