X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=d387740fc230624fc99e660045877efc88125cb3;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=de39dd020c37aace898489c3194c49facac5c862;hpb=4c8dfadf2d11373d9518fea94a05d4a04f74589e;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index de39dd020c..d387740fc2 100644
--- a/index.php
+++ b/index.php
@@ -36,6 +36,16 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
     common_redirect(common_local_url('public'));
 }
 
+// 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)) {
@@ -52,7 +62,9 @@ if (file_exists($actionfile)) {
 		}
 		$config['db']['database'] = $mirror;
 	}
-    call_user_func(array($action_obj, 'handle'), $_REQUEST);
+    if (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
+		call_user_func(array($action_obj, 'handle'), $_REQUEST);
+	}
 } else {
     common_user_error(_('Unknown action'));
 }
\ No newline at end of file