diff --git a/include/api.php b/include/api.php index 51caa9019..f85379891 100644 --- a/include/api.php +++ b/include/api.php @@ -242,7 +242,7 @@ function api_login(App $a) throw new UnauthorizedException("This API requires login"); } - Authentication::authenticate_success($record); + Authentication::success($record); $_SESSION["allow_api"] = true; diff --git a/mod/manage.php b/mod/manage.php index d54b92a3a..9e724c1e9 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -110,7 +110,7 @@ function manage_post(App $a) { unset($_SESSION['sysmsg_info']); } - Authentication::authenticate_success($r[0], true, true); + Authentication::success($r[0], true, true); if ($limited_id) { $_SESSION['submanage'] = $original_id; diff --git a/mod/openid.php b/mod/openid.php index a9930d044..ca1129fd5 100644 --- a/mod/openid.php +++ b/mod/openid.php @@ -51,7 +51,7 @@ function openid_content(App $a) { unset($_SESSION['openid']); - Authentication::authenticate_success($r[0],true,true); + Authentication::success($r[0],true,true); // just in case there was no return url set // and we fell through diff --git a/src/Core/Authentication.php b/src/Core/Authentication.php index 3e53a5ae9..2fbadcc92 100644 --- a/src/Core/Authentication.php +++ b/src/Core/Authentication.php @@ -65,7 +65,7 @@ class Authentication extends BaseObject * @param type $interactive * @param type $login_refresh */ - public static function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) + public static function success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) { $a = self::getApp(); diff --git a/src/Module/Login.php b/src/Module/Login.php index 3c123b198..fc3b3fb49 100644 --- a/src/Module/Login.php +++ b/src/Module/Login.php @@ -154,7 +154,7 @@ class Login extends BaseModule // if we haven't failed up this point, log them in. $_SESSION['remember'] = $remember; $_SESSION['last_login_date'] = DateTimeFormat::utcNow(); - Authentication::authenticate_success($record, true, true); + Authentication::success($record, true, true); if (x($_SESSION, 'return_url')) { $return_url = $_SESSION['return_url']; @@ -202,7 +202,7 @@ class Login extends BaseModule // Do the authentification if not done by now if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) { - Authentication::authenticate_success($user); + Authentication::success($user); if (Config::get('system', 'paranoia')) { $_SESSION['addr'] = $data->ip; @@ -255,7 +255,7 @@ class Login extends BaseModule $_SESSION['last_login_date'] = DateTimeFormat::utcNow(); $login_refresh = true; } - Authentication::authenticate_success($user, false, false, $login_refresh); + Authentication::success($user, false, false, $login_refresh); } } }