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

---
 inc/functions.php | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'inc/functions.php')

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) {
-- 
cgit v1.3