From c237b016e60c6073eeee14f08463f20c47169a79 Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Wed, 16 Feb 2011 16:21:14 +1100
Subject: [PATCH] Better way of loading configuration

---
 inc/config.php    |  1 +
 inc/functions.php | 38 ++++++++++++++++++++++++++++++++++++++
 mod.php           |  4 ----
 post.php          |  4 ----
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index c60ecace..5d798581 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -173,6 +173,7 @@
 	$config['file_index']	= 'index.html';
 	$config['file_page']	= '%d.html';
 	$config['file_mod']		= 'mod.php';
+	$config['file_post']	= 'post.php';
 	
 	// Multi-board (%s is board abbreviation)
 	$config['board_path']	= '%s/';
diff --git a/inc/functions.php b/inc/functions.php
index cc2a02f8..1c9f6b78 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1,4 +1,42 @@
 <?php
+	loadConfig();
+	
+	function loadConfig() {
+		global $board, $config;
+		
+		require 'config.php';
+		if (file_exists('inc/instance-config.php')) {
+			require 'instance-config.php';
+		}
+		
+		$config['post_url']		= $config['root'] . $config['file_post'];
+		
+		$config['url_match'] = '/^' .
+			(preg_match($config['url_regex'], $config['root']) ? '' :
+				(@$_SERVER['HTTPS']?'https':'http') .
+				':\/\/'.$_SERVER['HTTP_HOST']) .
+				preg_quote($config['root'], '/') .
+			'(' .
+					str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
+				'|' .
+					str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
+					preg_quote($config['file_index'], '/') .
+				'|' .
+					str_replace('%s', '\w{1,8}', preg_quote($config['board_path'], '/')) .
+					str_replace('%d', '\d+', preg_quote($config['file_page'], '/')) .
+				'|' .
+					preg_quote($config['file_mod'], '/') .
+				'\?\/.+' .
+			')$/i';
+		
+		$config['dir']['static']	= $config['root'] . 'static/';
+		
+		$config['image_sticky']		= $config['dir']['static'] . 'sticky.gif';
+		$config['image_locked']		= $config['dir']['static'] . 'locked.gif';
+		$config['image_deleted']	= $config['dir']['static'] . 'deleted.png';
+		$config['image_zip']		= $config['dir']['static'] . 'zip.png';
+	}
+	
 	function sprintf3($str, $vars, $delim = '%') {
 		$replaces = array();
 		foreach($vars as $k => $v) {
diff --git a/mod.php b/mod.php
index 40244b4a..ff7db7fb 100644
--- a/mod.php
+++ b/mod.php
@@ -1,10 +1,6 @@
 <?php
 	require 'inc/functions.php';
 	require 'inc/display.php';
-	require 'inc/config.php';
-	if (file_exists('inc/instance-config.php')) {
-		require 'inc/instance-config.php';
-	}
 	require 'inc/template.php';
 	require 'inc/database.php';
 	require 'inc/user.php';
diff --git a/post.php b/post.php
index 431be0c0..1f2d879f 100644
--- a/post.php
+++ b/post.php
@@ -1,10 +1,6 @@
 <?php	
 	require 'inc/functions.php';
 	require 'inc/display.php';
-	require 'inc/config.php';
-	if (file_exists('inc/instance-config.php')) {
-		require 'inc/instance-config.php';
-	}
 	require 'inc/template.php';
 	require 'inc/database.php';
 	require 'inc/user.php';