Check for config file when running
When running the full system, check for a config file, and throw an error if none is found.
This commit is contained in:
parent
09ebc965d5
commit
f9babf6a7d
|
@ -61,6 +61,14 @@ function main()
|
||||||
{
|
{
|
||||||
global $user, $action;
|
global $user, $action;
|
||||||
|
|
||||||
|
if (!_have_config()) {
|
||||||
|
$msg = sprintf(_("No configuration file found. Try running ".
|
||||||
|
"the installation program first."));
|
||||||
|
$sac = new ServerErrorAction($msg);
|
||||||
|
$sac->showPage();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// For database errors
|
// For database errors
|
||||||
|
|
||||||
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
|
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
|
||||||
|
|
|
@ -187,6 +187,12 @@ foreach ($_config_files as $_config_file) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function _have_config()
|
||||||
|
{
|
||||||
|
global $_have_a_config;
|
||||||
|
return $_have_a_config;
|
||||||
|
}
|
||||||
|
|
||||||
// XXX: Throw a conniption if database not installed
|
// XXX: Throw a conniption if database not installed
|
||||||
|
|
||||||
// Fixup for laconica.ini
|
// Fixup for laconica.ini
|
||||||
|
|
|
@ -81,7 +81,7 @@ function common_language()
|
||||||
|
|
||||||
// If there is a user logged in and they've set a language preference
|
// If there is a user logged in and they've set a language preference
|
||||||
// then return that one...
|
// then return that one...
|
||||||
if (common_logged_in()) {
|
if (_have_config() && common_logged_in()) {
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
$user_language = $user->language;
|
$user_language = $user->language;
|
||||||
if ($user_language)
|
if ($user_language)
|
||||||
|
@ -315,6 +315,10 @@ function common_current_user()
|
||||||
{
|
{
|
||||||
global $_cur;
|
global $_cur;
|
||||||
|
|
||||||
|
if (!_have_config()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
if ($_cur === false) {
|
if ($_cur === false) {
|
||||||
|
|
||||||
if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
|
if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user