From 3e7b52c2fa981c8aef9d455dff94ff309d3e1ee0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 27 Aug 2012 21:03:06 +0000 Subject: [PATCH] Rewrote all TODO lines, 'hooks.php' is now fully deprecated and emptied --- inc/classes.php | 2 +- inc/database.php | 2 +- inc/hooks.php | 31 +------------------------------ inc/includes.php | 7 ++++--- inc/output.php | 2 +- inc/selector.php | 2 +- 6 files changed, 9 insertions(+), 37 deletions(-) diff --git a/inc/classes.php b/inc/classes.php index 74227ad5..0feb519e 100644 --- a/inc/classes.php +++ b/inc/classes.php @@ -7,7 +7,7 @@ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team * @license GNU GPL 3.0 or any newer version * @deprecated - * @todo We should minimize these includes + * @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 diff --git a/inc/database.php b/inc/database.php index f56baa3a..7a008ece 100644 --- a/inc/database.php +++ b/inc/database.php @@ -8,7 +8,7 @@ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @deprecated - * @todo We should minimize these includes + * @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 diff --git a/inc/hooks.php b/inc/hooks.php index 5906751c..f551ef47 100644 --- a/inc/hooks.php +++ b/inc/hooks.php @@ -1,32 +1,3 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org - * @deprecated - * @todo We should 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// 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'); - -// [EOF] +// @DEPRECATED ?> diff --git a/inc/includes.php b/inc/includes.php index 0174a4ab..122ce180 100644 --- a/inc/includes.php +++ b/inc/includes.php @@ -8,7 +8,7 @@ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @deprecated - * @todo We should minimize these includes + * @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 @@ -31,8 +31,9 @@ require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . // Load matching config 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 diff --git a/inc/output.php b/inc/output.php index 9bef3cf2..81482bbb 100644 --- a/inc/output.php +++ b/inc/output.php @@ -8,7 +8,7 @@ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @deprecated - * @todo We should minimize these includes + * @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 diff --git a/inc/selector.php b/inc/selector.php index 6075f4c2..73806ea2 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -8,7 +8,7 @@ * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @deprecated - * @todo We should minimize these includes + * @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 -- 2.30.2