projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UpdateCriteria currently needs to overwrite addCriteria().
[core.git]
/
inc
/
includes.php
diff --git
a/inc/includes.php
b/inc/includes.php
index f4088d9045e2593a8efd68a7f9eac83d889deff8..4b868980c7abd04d97536962b078fcd4f9652fcc 100644
(file)
--- a/
inc/includes.php
+++ b/
inc/includes.php
@@
-2,11
+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 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009
- 2015
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
+ * @todo Minimize 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
@@
-23,14
+25,17
@@
*/
// Include the class loader function
*/
// Include the class loader function
-require(FrameworkConfiguration::getInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
+require(FrameworkConfiguration::get
Self
Instance()->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 file.
+ */
+ClassLoader::getSelfInstance()->loadExtraConfigs();
-// Register hooks here
-require(FrameworkConfiguration::getInstance()->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
@@
-46,11
+51,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 = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
+ $application = FrameworkConfiguration::get
Self
Instance()->getConfigEntry('default_application');
}
} else {
// Set the "application selector" application
}
} else {
// Set the "application selector" application
- $application = FrameworkConfiguration::getInstance()->getConfigEntry('default_application');
+ $application = FrameworkConfiguration::get
Self
Instance()->getConfigEntry('default_application');
}
// Secure it, by keeping out tags
}
// Secure it, by keeping out tags
@@
-60,7
+65,7
@@
$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
-FrameworkConfiguration::getInstance()->setConfigEntry('app_name', $application);
+FrameworkConfiguration::get
Self
Instance()->setConfigEntry('app_name', $application);
// [EOF]
?>
// [EOF]
?>