diff options
author | Evan Prodromou <evan@prodromou.name> | 2008-12-20 19:23:32 -0500 |
---|---|---|
committer | Evan Prodromou <evan@prodromou.name> | 2008-12-20 19:23:32 -0500 |
commit | b8c0091390a9d0377eab80d77c9605d6b0ee428e (patch) | |
tree | 9a986cd246c22fedc6f48274b3fee4c6fd3cb7d7 /_darcs/pristine | |
parent | d18c621bcf038f172141bd302911a313e6f5c30b (diff) |
first step of phpcs-cleanup of index.php
darcs-hash:20081221002332-84dde-5834e12499fff0a23a8a6a76018f8beaa5ea8a96.gz
Diffstat (limited to '_darcs/pristine')
-rw-r--r-- | _darcs/pristine/index.php | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/_darcs/pristine/index.php b/_darcs/pristine/index.php index d387740fc..3cecb5c8b 100644 --- a/_darcs/pristine/index.php +++ b/_darcs/pristine/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(); @@ -41,30 +41,34 @@ if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) { if (!$user && common_config('site', 'private') && !in_array($action, array('login', 'openidlogin', 'finishopenidlogin', - 'recoverpassword', 'api', 'doc', 'register'))) -{ + '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->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); - } + call_user_func(array($action_obj, 'handle'), $_REQUEST); + } } else { common_user_error(_('Unknown action')); }
\ No newline at end of file |