Index and Action use Exceptions

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

diff --git a/index.php b/index.php
index 1edff0e4904907c5d1f14077a2ece17fa5f72114..075ee967687a1c37d63dc60ac0d9417324973661 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,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();
 
@@ -40,30 +40,52 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
 // parts of the site, redirect to login
 
 if (!$user && common_config('site', 'private') &&
-    !in_array($action, array('login', 'openidlogin', 'finishopenidlogin', 'api', 'doc')))
-{
+    !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";
-    $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 (call_user_func(array($action_obj, 'prepare'), $_REQUEST)) {
-               call_user_func(array($action_obj, 'handle'), $_REQUEST);
-       }
+if (!file_exists($actionfile)) {
+    $cac = new ClientErrorAction();
+    $cac->handle(array('code' => 404,
+                       'message' => _('Unknown action')));
 } else {
-    common_user_error(_('Unknown action'));
-}
\ No newline at end of file
+
+    include_once $actionfile;
+
+    $action_class = ucfirst($action).'Action';
+
+    $action_obj = new $action_class();
+
+    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;
+    }
+
+    try {
+        if ($action_obj->prepare($_REQUEST)) {
+            $action_obj->handle($_REQUEST);
+        }
+    } catch (ClientException cex) {
+        $cac = new ClientErrorAction();
+        $cac->handle(array('code' => $cex->code,
+                           'message' => $cex->message));
+    } catch (ServerException sex) { // snort snort guffaw
+        $sac = new ServerErrorAction();
+        $sac->handle(array('code' => $sex->code,
+                           'message' => $sex->message));
+    } catch (Exception ex) {
+        $sac = new ServerErrorAction();
+        $sac->handle(array('code' => 500,
+                           'message' => $ex->message));
+    }
+}