--- FreeBSD/tinderbox/webui/index.php	2007/11/15 15:29:46	1.1.1.1.2.2
+++ FreeBSD/tinderbox/webui/index.php	2007/11/16 23:03:38	1.1.1.1.2.4
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Paefchen: FreeBSD/tinderbox/webui/index.php,v 1.1.1.1.2.1 2007/11/13 07:39:25 as Exp $
+# $Paefchen: FreeBSD/tinderbox/webui/index.php,v 1.1.1.1.2.3 2007/11/16 22:52:43 as Exp $
 # $MCom: portstools/tinderbox/webui/index.php,v 1.22 2007/10/13 02:28:47 ade Exp $
 #
 
@@ -67,24 +67,17 @@ if (! defined('TEMPLATESURL'))	define('TEMPLATESURL',	
 if (! defined('TEMPLATESDIR'))	define('TEMPLATESDIR',	isset($templatesdir) ? $templatesdir : WWWROOT.'/templates/'.TEMPLATE);
 if (! defined('SHOWTIMER'))		define('SHOWTIMER',		false);
 
+foreach (array('WWWROOT', 'TBROOT', 'TEMPLATESDIR') as $dir)
+	if (! is_dir(constant($dir)))
+		die(sprintf("Error => config: dir %s not found (%s)\n",
+			constant($dir), $dir));
+
 set_include_path(get_include_path().PATH_SEPARATOR.'module'
     .PATH_SEPARATOR.'core');
 
-function __autoload($class) {
-	require_once $class . '.php';
-}
+require_once 'functions.php';
+require_once TEMPLATESDIR.'/messages.inc';
 
-function module_list() {
-	return preg_split('/[,; ]+/', MODULES);
-}
-
-function module_instance($module) {
-	static $instances;
-	if (! isset($instances))
-		$instances = array();
-}
-	
-
 foreach (module_list() as $moduleName) {
 	$className = 'module' . $moduleName;
 
@@ -96,8 +89,6 @@ foreach (module_list() as $moduleName) {
 	/* as xxx */
 	$$className = new $className;
 }
-
-require_once TEMPLATESDIR.'/messages.inc';
 
 if (defined('MODULE_USERS')) {
 	$moduleUsers->start();