summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-10 11:53:35 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-10 11:53:35 -0400
commite9ed20a69d8f646bc85151c1e890f5828a966fcf (patch)
treee72bdf25cc94c630c31863d2985b1f29b4b27414 /index.php
parent17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (diff)
parent14b46e2183f10359cc53d597913a878f53e23719 (diff)
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
Diffstat (limited to 'index.php')
-rw-r--r--index.php20
1 files changed, 14 insertions, 6 deletions
diff --git a/index.php b/index.php
index 2e74d38fb..980b9881b 100644
--- a/index.php
+++ b/index.php
@@ -182,12 +182,20 @@ function main()
// If the site is private, and they're not on one of the "public"
// parts of the site, redirect to login
- if (!$user && common_config('site', 'private') &&
- !in_array($action, array('login', 'openidlogin', 'finishopenidlogin',
- 'recoverpassword', 'api', 'doc', 'register')) &&
- !preg_match('/rss$/', $action)) {
- common_redirect(common_local_url('login'));
- return;
+ 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;
+ }
}
$action_class = ucfirst($action).'Action';