badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move yet more stuff out of index.php

Browse source
This commit is contained in:
Shish 2012-10-16 23:05:11 +01:00
parent b141632785
commit d8c670eaa6
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/util.inc.php
View file

@ -1,6 +1,7 @@
<?php <?php
require_once "lib/recaptchalib.php"; require_once "lib/recaptchalib.php";
require_once "lib/securimage/securimage.php"; require_once "lib/securimage/securimage.php";
require_once "lib/context.php";
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Input / Output Sanitising * * Input / Output Sanitising *
@ -1177,6 +1178,16 @@ function _sanitise_environment() {
error_reporting(E_ALL); error_reporting(E_ALL);
} }
if(CONTEXT) {
ctx_set_log(CONTEXT);
ctx_log_start(@$_SERVER["REQUEST_URI"], true, true);
}
if(COVERAGE) {
_start_coverage();
register_shutdown_function("_end_coverage");
}
assert_options(ASSERT_ACTIVE, 1); assert_options(ASSERT_ACTIVE, 1);
assert_options(ASSERT_BAIL, 1); assert_options(ASSERT_BAIL, 1);

9
index.php
View file

@ -49,17 +49,8 @@ if(!file_exists("data/config/shimmie.conf.php")) {
} }
require_once "core/sys_config.inc.php"; require_once "core/sys_config.inc.php";
require_once "core/util.inc.php"; require_once "core/util.inc.php";
require_once "lib/context.php";
// set up and purify the environment // set up and purify the environment
if(CONTEXT) {
ctx_set_log(CONTEXT);
}
ctx_log_start(@$_SERVER["REQUEST_URI"], true, true);
if(COVERAGE) {
_start_coverage();
register_shutdown_function("_end_coverage");
}
_version_check(); _version_check();
_sanitise_environment(); _sanitise_environment();