moving big functions out of index.php
This commit is contained in:
Shish
parent
45d5a30f8a
commit
a70484be31
3 changed files with 145 additions and 131 deletions
21
core/default_config.inc.php
Normal file
21
core/default_config.inc.php
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
<?php
|
||||||
|
// to change these system-level settings, do define("FOO", 123); in config.php
|
||||||
|
function _d($name, $value) {if(!defined($name)) define($name, $value);}
|
||||||
|
_d("DATABASE_DSN", null); // string PDO database connection details
|
||||||
|
_d("CACHE_DSN", null); // string cache connection details
|
||||||
|
_d("DEBUG", false); // boolean print various debugging details
|
||||||
|
_d("DEBUG_SQL", false); // boolean dump SQL queries to data/sql.log
|
||||||
|
_d("COVERAGE", false); // boolean activate xdebug coverage monitor
|
||||||
|
_d("CONTEXT", null); // string file to log performance data into
|
||||||
|
_d("CACHE_MEMCACHE", false); // boolean store complete rendered pages in memcache
|
||||||
|
_d("CACHE_DIR", false); // boolean store complete rendered pages on disk
|
||||||
|
_d("CACHE_HTTP", false); // boolean output explicit HTTP caching headers
|
||||||
|
_d("COOKIE_PREFIX", 'shm'); // string if you run multiple galleries with non-shared logins, give them different prefixes
|
||||||
|
_d("SPEED_HAX", false); // boolean do some questionable things in the name of performance
|
||||||
|
_d("COMPILE_ELS", false); // boolean pre-build the list of event listeners
|
||||||
|
_d("NICE_URLS", false); // boolean force niceurl mode
|
||||||
|
_d("WH_SPLITS", 1); // int how many levels of subfolders to put in the warehouse
|
||||||
|
_d("VERSION", 'trunk'); // string shimmie version
|
||||||
|
_d("SCORE_VERSION", 's2hack/'.VERSION); // string SCore version
|
||||||
|
_d("TIMEZONE", null); // string timezone
|
||||||
|
?>
|
||||||
|
|
@ -935,6 +935,10 @@ function _stripslashes_r($arr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function _sanitise_environment() {
|
function _sanitise_environment() {
|
||||||
|
if(TIMEZONE) {
|
||||||
|
date_default_timezone_set(TIMEZONE);
|
||||||
|
}
|
||||||
|
|
||||||
if(DEBUG) {
|
if(DEBUG) {
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
}
|
}
|
||||||
|
|
@ -951,6 +955,120 @@ function _sanitise_environment() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function _load_themelets($_theme) {
|
||||||
|
ctx_log_start("Loading themelets");
|
||||||
|
|
||||||
|
if(file_exists('themes/'.$_theme.'/custompage.class.php')) require_once 'themes/'.$_theme.'/custompage.class.php';
|
||||||
|
require_once 'themes/'.$_theme.'/layout.class.php';
|
||||||
|
require_once 'themes/'.$_theme.'/themelet.class.php';
|
||||||
|
|
||||||
|
$themelets = glob("ext/*/theme.php");
|
||||||
|
foreach($themelets as $filename) {
|
||||||
|
require_once $filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
$custom_themelets = glob('themes/'.$_theme.'/*.theme.php');
|
||||||
|
if($custom_themelets) {
|
||||||
|
$m = array();
|
||||||
|
foreach($custom_themelets as $filename) {
|
||||||
|
if(preg_match('/themes\/'.$_theme.'\/(.*)\.theme\.php/',$filename,$m)
|
||||||
|
&& in_array('ext/'.$m[1].'/theme.php', $themelets)) {
|
||||||
|
require_once $filename;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx_log_endok();
|
||||||
|
}
|
||||||
|
|
||||||
|
function _load_extensions() {
|
||||||
|
global $_event_listeners;
|
||||||
|
|
||||||
|
ctx_log_start("Loading extensions");
|
||||||
|
|
||||||
|
if(COMPILE_ELS && file_exists("data/event_listeners.php")) {
|
||||||
|
require_once("data/event_listeners.php");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$all_events = array();
|
||||||
|
foreach(get_declared_classes() as $class) {
|
||||||
|
if(is_subclass_of($class, "Event")) {
|
||||||
|
$all_events[] = $class;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach(get_declared_classes() as $class) {
|
||||||
|
$rclass = new ReflectionClass($class);
|
||||||
|
if($rclass->isAbstract()) {
|
||||||
|
// don't do anything
|
||||||
|
}
|
||||||
|
elseif(is_subclass_of($class, "SimpleExtension")) {
|
||||||
|
$c = new $class();
|
||||||
|
$c->i_am($c);
|
||||||
|
$my_events = array();
|
||||||
|
foreach(get_class_methods($c) as $method) {
|
||||||
|
if(substr($method, 0, 2) == "on") {
|
||||||
|
$my_events[] = substr($method, 2) . "Event";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
add_event_listener($c, $c->get_priority(), $my_events);
|
||||||
|
}
|
||||||
|
elseif(is_subclass_of($class, "Extension")) {
|
||||||
|
$c = new $class();
|
||||||
|
add_event_listener($c, $c->get_priority(), $all_events);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(COMPILE_ELS) {
|
||||||
|
$p = "<"."?php\n";
|
||||||
|
|
||||||
|
foreach(get_declared_classes() as $class) {
|
||||||
|
$rclass = new ReflectionClass($class);
|
||||||
|
if($rclass->isAbstract()) {}
|
||||||
|
elseif(is_subclass_of($class, "SimpleExtension")) {
|
||||||
|
$p .= "\$$class = new $class(); ";
|
||||||
|
$p .= "\${$class}->i_am(\$$class);\n";
|
||||||
|
}
|
||||||
|
elseif(is_subclass_of($class, "Extension")) {
|
||||||
|
$p .= "\$$class = new $class();\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$p .= "\$_event_listeners = array(\n";
|
||||||
|
foreach($_event_listeners as $event => $listeners) {
|
||||||
|
$p .= "\t'$event' => array(\n";
|
||||||
|
foreach($listeners as $id => $listener) {
|
||||||
|
$p .= "\t\t$id => \$".get_class($listener).",\n";
|
||||||
|
}
|
||||||
|
$p .= "\t),\n";
|
||||||
|
}
|
||||||
|
$p .= ");\n";
|
||||||
|
|
||||||
|
$p .= "?".">";
|
||||||
|
file_put_contents("data/event_listeners.php", $p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx_log_endok();
|
||||||
|
}
|
||||||
|
|
||||||
|
function _fatal_error(Exception $e) {
|
||||||
|
$version = VERSION;
|
||||||
|
$message = $e->getMessage();
|
||||||
|
//$trace = var_dump($e->getTrace());
|
||||||
|
header("HTTP/1.0 500 Internal Error");
|
||||||
|
echo '
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Internal error - SCore-'.$version.'</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Internal Error</h1>
|
||||||
|
<p>'.$message.'
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Turn ^^ into ^ and ^s into /
|
* Turn ^^ into ^ and ^s into /
|
||||||
*
|
*
|
||||||
|
|
|
||||||
137
index.php
137
index.php
|
|
@ -55,34 +55,11 @@ if(empty($database_dsn) && !file_exists("config.php")) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
require_once "config.php";
|
require_once "config.php";
|
||||||
|
require_once "core/default_config.inc.php";
|
||||||
// to change these system-level settings, do define("FOO", 123); in config.php
|
|
||||||
function _d($name, $value) {if(!defined($name)) define($name, $value);}
|
|
||||||
_d("DATABASE_DSN", null); // string PDO database connection details
|
|
||||||
_d("CACHE_DSN", null); // string cache connection details
|
|
||||||
_d("DEBUG", false); // boolean print various debugging details
|
|
||||||
_d("DEBUG_SQL", false); // boolean dump SQL queries to data/sql.log
|
|
||||||
_d("COVERAGE", false); // boolean activate xdebug coverage monitor
|
|
||||||
_d("CONTEXT", null); // string file to log performance data into
|
|
||||||
_d("CACHE_MEMCACHE", false); // boolean store complete rendered pages in memcache
|
|
||||||
_d("CACHE_DIR", false); // boolean store complete rendered pages on disk
|
|
||||||
_d("CACHE_HTTP", false); // boolean output explicit HTTP caching headers
|
|
||||||
_d("COOKIE_PREFIX", 'shm'); // string if you run multiple galleries with non-shared logins, give them different prefixes
|
|
||||||
_d("SPEED_HAX", false); // boolean do some questionable things in the name of performance
|
|
||||||
_d("COMPILE_ELS", false); // boolean pre-build the list of event listeners
|
|
||||||
_d("NICE_URLS", false); // boolean force niceurl mode
|
|
||||||
_d("WH_SPLITS", 1); // int how many levels of subfolders to put in the warehouse
|
|
||||||
_d("VERSION", 'trunk'); // string shimmie version
|
|
||||||
_d("SCORE_VERSION", 's2hack/'.VERSION); // string SCore version
|
|
||||||
_d("TIMEZONE", null); // string timezone
|
|
||||||
|
|
||||||
// set up and purify the environment
|
|
||||||
if(TIMEZONE) {
|
|
||||||
date_default_timezone_set(TIMEZONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once "core/util.inc.php";
|
require_once "core/util.inc.php";
|
||||||
require_once "lib/context.php";
|
require_once "lib/context.php";
|
||||||
|
|
||||||
|
// set up and purify the environment
|
||||||
if(CONTEXT) {
|
if(CONTEXT) {
|
||||||
ctx_set_log(CONTEXT);
|
ctx_set_log(CONTEXT);
|
||||||
}
|
}
|
||||||
|
|
@ -105,7 +82,6 @@ try {
|
||||||
}
|
}
|
||||||
ctx_log_endok();
|
ctx_log_endok();
|
||||||
|
|
||||||
|
|
||||||
ctx_log_start("Connecting to DB");
|
ctx_log_start("Connecting to DB");
|
||||||
// connect to the database
|
// connect to the database
|
||||||
$database = new Database();
|
$database = new Database();
|
||||||
|
|
@ -113,101 +89,14 @@ try {
|
||||||
$config = new DatabaseConfig($database);
|
$config = new DatabaseConfig($database);
|
||||||
ctx_log_endok();
|
ctx_log_endok();
|
||||||
|
|
||||||
|
|
||||||
ctx_log_start("Loading themelets");
|
|
||||||
// load the theme parts
|
// load the theme parts
|
||||||
$_theme = $config->get_string("theme", "default");
|
$_theme = $config->get_string("theme", "default");
|
||||||
if(!file_exists('themes/'.$_theme)) $_theme = "default";
|
if(!file_exists('themes/'.$_theme)) $_theme = "default";
|
||||||
if(file_exists('themes/'.$_theme.'/custompage.class.php')) require_once 'themes/'.$_theme.'/custompage.class.php';
|
_load_themelets($_theme);
|
||||||
require_once 'themes/'.$_theme.'/layout.class.php';
|
|
||||||
require_once 'themes/'.$_theme.'/themelet.class.php';
|
|
||||||
|
|
||||||
$themelets = glob("ext/*/theme.php");
|
_load_extensions();
|
||||||
foreach($themelets as $filename) {
|
|
||||||
require_once $filename;
|
|
||||||
}
|
|
||||||
|
|
||||||
$custom_themelets = glob('themes/'.$_theme.'/*.theme.php');
|
|
||||||
if($custom_themelets) {
|
|
||||||
$m = array();
|
|
||||||
foreach($custom_themelets as $filename) {
|
|
||||||
if(preg_match('/themes\/'.$_theme.'\/(.*)\.theme\.php/',$filename,$m)
|
|
||||||
&& in_array('ext/'.$m[1].'/theme.php', $themelets)) {
|
|
||||||
require_once $filename;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ctx_log_endok();
|
|
||||||
|
|
||||||
|
|
||||||
ctx_log_start("Loading extensions");
|
|
||||||
// initialise the extensions
|
|
||||||
global $_event_listeners;
|
|
||||||
if(COMPILE_ELS && file_exists("data/event_listeners.php")) {
|
|
||||||
require_once("data/event_listeners.php");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$all_events = array();
|
|
||||||
foreach(get_declared_classes() as $class) {
|
|
||||||
if(is_subclass_of($class, "Event")) {
|
|
||||||
$all_events[] = $class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
foreach(get_declared_classes() as $class) {
|
|
||||||
$rclass = new ReflectionClass($class);
|
|
||||||
if($rclass->isAbstract()) {
|
|
||||||
// don't do anything
|
|
||||||
}
|
|
||||||
elseif(is_subclass_of($class, "SimpleExtension")) {
|
|
||||||
$c = new $class();
|
|
||||||
$c->i_am($c);
|
|
||||||
$my_events = array();
|
|
||||||
foreach(get_class_methods($c) as $method) {
|
|
||||||
if(substr($method, 0, 2) == "on") {
|
|
||||||
$my_events[] = substr($method, 2) . "Event";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
add_event_listener($c, $c->get_priority(), $my_events);
|
|
||||||
}
|
|
||||||
elseif(is_subclass_of($class, "Extension")) {
|
|
||||||
$c = new $class();
|
|
||||||
add_event_listener($c, $c->get_priority(), $all_events);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(COMPILE_ELS) {
|
|
||||||
$p = "<"."?php\n";
|
|
||||||
|
|
||||||
foreach(get_declared_classes() as $class) {
|
|
||||||
$rclass = new ReflectionClass($class);
|
|
||||||
if($rclass->isAbstract()) {}
|
|
||||||
elseif(is_subclass_of($class, "SimpleExtension")) {
|
|
||||||
$p .= "\$$class = new $class(); ";
|
|
||||||
$p .= "\${$class}->i_am(\$$class);\n";
|
|
||||||
}
|
|
||||||
elseif(is_subclass_of($class, "Extension")) {
|
|
||||||
$p .= "\$$class = new $class();\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$p .= "\$_event_listeners = array(\n";
|
|
||||||
foreach($_event_listeners as $event => $listeners) {
|
|
||||||
$p .= "\t'$event' => array(\n";
|
|
||||||
foreach($listeners as $id => $listener) {
|
|
||||||
$p .= "\t\t$id => \$".get_class($listener).",\n";
|
|
||||||
}
|
|
||||||
$p .= "\t),\n";
|
|
||||||
}
|
|
||||||
$p .= ");\n";
|
|
||||||
|
|
||||||
$p .= "?".">";
|
|
||||||
file_put_contents("data/event_listeners.php", $p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ctx_log_endok();
|
|
||||||
ctx_log_endok("Initialisation");
|
ctx_log_endok("Initialisation");
|
||||||
|
|
||||||
|
|
||||||
ctx_log_start("Page generation");
|
ctx_log_start("Page generation");
|
||||||
// start the page generation waterfall
|
// start the page generation waterfall
|
||||||
$page = class_exists("CustomPage") ? new CustomPage() : new Page();
|
$page = class_exists("CustomPage") ? new CustomPage() : new Page();
|
||||||
|
|
@ -222,22 +111,8 @@ try {
|
||||||
ctx_log_endok();
|
ctx_log_endok();
|
||||||
}
|
}
|
||||||
catch(Exception $e) {
|
catch(Exception $e) {
|
||||||
$version = VERSION;
|
|
||||||
$message = $e->getMessage();
|
|
||||||
//$trace = var_dump($e->getTrace());
|
|
||||||
header("HTTP/1.0 500 Internal Error");
|
|
||||||
echo '
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Internal error - SCore-'.$version.'</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Internal Error</h1>
|
|
||||||
<p>'.$message.'
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
';
|
|
||||||
if($database && $database->db) $database->db->rollback();
|
if($database && $database->db) $database->db->rollback();
|
||||||
|
_fatal_error($e);
|
||||||
ctx_log_ender();
|
ctx_log_ender();
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
Reference in a new issue