X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=387b642e2c6a2e8a81772bbbf8b29f36b1c1ffcc;hb=5cdead72cdee1261e506cdc89dd81242bfb9ba84;hp=8a2afbd7f1d4136d97f2556b5ec91d3352c55e45;hpb=624940a9f42e9ac166f8f8c613b681439e7fdc7a;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index 8a2afbd7f1..387b642e2c 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -20,13 +20,13 @@
 define('INSTALLDIR', dirname(__FILE__));
 define('LACONICA', true);
 
-require_once(INSTALLDIR . "/lib/common.php");
+require_once INSTALLDIR . '/lib/common.php';
 
-# get and cache current user
+// get and cache current user
 
 $user = common_current_user();
 
-# initialize language env
+// initialize language env
 
 common_init_language();
 
@@ -36,29 +36,39 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
     common_redirect(common_local_url('public'));
 }
 
-if (!$user && common_config('site', 'private') && $action != 'login') {
+// 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'))) {
     common_redirect(common_local_url('login'));
 }
 
 $actionfile = INSTALLDIR."/actions/$action.php";
 
 if (file_exists($actionfile)) {
-    require_once($actionfile);
-    $action_class = ucfirst($action)."Action";
+
+    include_once $actionfile;
+
+    $action_class = ucfirst($action).'Action';
+
     $action_obj = new $action_class();
-	if ($config['db']['mirror'] && $action_obj->is_readonly()) {
-		if (is_array($config['db']['mirror'])) {
-			# "load balancing", ha ha
-			$k = array_rand($config['db']['mirror']);
-			$mirror = $config['db']['mirror'][$k];
-		} else {
-			$mirror = $config['db']['mirror'];
-		}
-		$config['db']['database'] = $mirror;
-	}
+
+    if ($config['db']['mirror'] && $action_obj->isReadOnly()) {
+        if (is_array($config['db']['mirror'])) {
+            // "load balancing", ha ha
+            $k = array_rand($config['db']['mirror']);
+
+            $mirror = $config['db']['mirror'][$k];
+        } else {
+            $mirror = $config['db']['mirror'];
+        }
+        $config['db']['database'] = $mirror;
+    }
     if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
-		call_user_func(array($action_obj, 'handle'), $_REQUEST);
-	}
+        call_user_func(array($action_obj, 'handle'), $_REQUEST);
+    }
 } else {
     common_user_error(_('Unknown action'));
 }
\ No newline at end of file