- if (!$user && common_config('site', 'private')) {
- $public_actions = array('openidlogin', 'finishopenidlogin',
- 'recoverpassword', 'api', 'doc');
- $login_action = 'openidlogin';
- if (!common_config('site', 'openidonly')) {
- $public_actions[] = 'login';
- $public_actions[] = 'register';
- $login_action = 'login';
- }
- if (!in_array($action, $public_actions) &&
- !preg_match('/rss$/', $action)) {
- common_redirect(common_local_url($login_action));
- return;
- }
+ if (!$user && common_config('site', 'private')
+ && !isLoginAction($action)
+ && !preg_match('/rss$/', $action)
+ ) {
+ common_redirect(common_local_url('login'));
+ return;