Rewrote all TODO lines, 'hooks.php' is now fully deprecated and emptied

diff --git a/inc/classes.php b/inc/classes.php
index 74227ad546990759bd141a827177e84d19f1b24e..0feb519e4fe24e26f67a77eaeea4a223eeefbce0 100644 (file)
--- 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 f56baa3a4a329d08110bcc53909dadc3b80217da..7a008ecec1013f30aae59874e2b393761c23e35b 100644 (file)
--- 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 5906751c307e0dd2da53af6431bd9e65ac152321..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/inc/hooks.php
+++ b/inc/hooks.php
@@ -1,32 +1,3 @@
 <?php
-/**
- * Register hooks and other functions/methods
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @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 <http://www.gnu.org/licenses/>.
- */
-
-// 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 0174a4ab86a022604aca2164f5a0d3870d596764..122ce1802582fdee15f60f45eba56914b08f1b5a 100644 (file)
--- 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 9bef3cf238e2dbcd1adc2558808a90bc0f5037e5..81482bbb45e4bdfa770506a80e97822f588a4a66 100644 (file)
--- 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 6075f4c2fe4bf5b3df4b500e80db57525da1d079..73806ea2e5ba676b4b37d1ff5817cf7dd44a5c41 100644 (file)
--- 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