Merge branch 'master' into devel

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index fad6266466a6a49f586f60f63e1bb81fa674a8b7..3cecb5c8b6c3825d5e2e116ba05a2574191231ba 100644 (file)
--- 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,7 +20,15 @@
 define('INSTALLDIR', dirname(__FILE__));
 define('LACONICA', true);
 
-require_once(INSTALLDIR . "/lib/common.php");
+require_once INSTALLDIR . '/lib/common.php';
+
+// get and cache current user
+
+$user = common_current_user();
+
+// initialize language env
+
+common_init_language();
 
 $action = $_REQUEST['action'];
 
@@ -28,23 +36,39 @@ 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)) {
-    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;
-       }
-    call_user_func(array($action_obj, 'handle'), $_REQUEST);
+
+    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 (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