projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved setter/getter from 'hub' code as also 'city' uses it.
[core.git]
/
inc
/
includes.php
diff --git
a/inc/includes.php
b/inc/includes.php
index 95d8086fbf84d876e4f1397137683ed33c89fbca..39be877dfe44369e0210269a3d8542b535be5102 100644
(file)
--- a/
inc/includes.php
+++ b/
inc/includes.php
@@
-2,13
+2,13
@@
/**
* Loads more include files by using the generic class loader
*
/**
* Loads more include files by using the generic class loader
*
- * @author Roland Haeder <webmaster@ship
-
simu.org>
+ * @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 201
1
Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 201
5
Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @license GNU GPL 3.0 or any newer version
- * @link http://www.ship
-
simu.org
+ * @link http://www.shipsimu.org
* @deprecated
* @deprecated
- * @todo
We should m
inimize these includes
+ * @todo
M
inimize these includes
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-27,12
+27,15
@@
// Include the class loader function
require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
// Include the class loader function
require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
-// Shall we include additional configs where you can configure some things? Then
-// Load matching config
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */
ClassLoader::getSelfInstance()->loadExtraConfigs();
ClassLoader::getSelfInstance()->loadExtraConfigs();
-// Register hooks here
-require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
+// Register auto-load function with the SPL
+// @TODO This makes the core depending on the SPL. But it should be installed anyway.
+spl_autoload_register('ClassLoader::autoLoad');
// Does the user has an application specified?
// @TODO Find a nicer OOP-ed way for this
// Does the user has an application specified?
// @TODO Find a nicer OOP-ed way for this
@@
-64,5
+67,8
@@
$application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
// Set the application name for later usage
FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
// Set the application name for later usage
FrameworkConfiguration::getSelfInstance()->setConfigEntry('app_name', $application);
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
+
// [EOF]
?>
// [EOF]
?>