projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
should be more encapsulated (abstracted)
[core.git]
/
inc
/
includes.php
diff --git
a/inc/includes.php
b/inc/includes.php
index 61e8bb971e5f0cce769619492a337cd0e9bcff84..baa8a6362b6fd3a422a3dcd5d61d2387192cb819 100644
(file)
--- a/
inc/includes.php
+++ b/
inc/includes.php
@@
-4,7
+4,7
@@
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007
- 2009 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007
, 2008 Roland Haeder, 2009 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
@@
-22,17
+22,18
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
// Include the class loader function
// Include the class loader function
-require(
sprintf("%sinc/loader/class_ClassLoader.php", $cfg->readConfig('base_path'))
);
+require(
FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php'
);
// Shall we include additional configs where you can configure some things? Then
// Load matching config
ClassLoader::getInstance()->loadExtraConfigs();
// Shall we include additional configs where you can configure some things? Then
// Load matching config
ClassLoader::getInstance()->loadExtraConfigs();
+// Register hooks here
+require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/hooks.php');
+
// Does the user has an application specified?
// Does the user has an application specified?
+// @TODO Find a nicer OOP-ed way for this
if (!empty($_GET['app'])) {
// Set the application from string
$application = (string) $_GET['app'];
if (!empty($_GET['app'])) {
// Set the application from string
$application = (string) $_GET['app'];
@@
-45,11
+46,11
@@
if (!empty($_GET['app'])) {
$application = trim($app[1]);
} else {
// Invalid entry found, first must be "app"!
$application = trim($app[1]);
} else {
// Invalid entry found, first must be "app"!
- $application =
$cfg->readConfig
('default_application');
+ $application =
FrameworkConfiguration::getInstance()->getConfigEntry
('default_application');
}
} else {
// Set the "application selector" application
}
} else {
// Set the "application selector" application
- $application =
$cfg->readConfig
('default_application');
+ $application =
FrameworkConfiguration::getInstance()->getConfigEntry
('default_application');
}
// Secure it, by keeping out tags
}
// Secure it, by keeping out tags
@@
-59,18
+60,11
@@
$application = htmlentities(strip_tags($application), ENT_QUOTES);
$application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
// Set the application name for later usage
$application = preg_replace('/([^a-z0-9_-])+/i', '', $application);
// Set the application name for later usage
-$cfg->setConfigEntry('app_name', $application);
-
-// Register auto-load function with the SPL
-spl_autoload_register('ClassLoader::autoLoad');
+FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
-/**
- * Is the devel package included?
- */
-if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
- /**
- * Load all development includes
- */
+// Is the devel package included?
+if (is_dir(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'devel')) {
+ // Load all development includes
ClassLoader::getInstance()->scanClassPath('devel');
} // END - if
ClassLoader::getInstance()->scanClassPath('devel');
} // END - if