Introduced ifDhtIsBooting(), updated TODOs.txt

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/hub/interfaces/distributable/class_Distributable.php b/application/hub/interfaces/distributable/class_Distributable.php
index 50bd97aec72fa94cc4062ee9db39778a925d248f..8adbc8d64b822eef96c3b40e86a24a9f7aacf22e 100644 (file)
--- a/application/hub/interfaces/distributable/class_Distributable.php
+++ b/application/hub/interfaces/distributable/class_Distributable.php
@@ -90,6 +90,13 @@ interface Distributable extends FrameworkInterface {
         * @return      $isFullyBooted  Whether the DHT is fully booted
         */
        function hasFullyBootstrapped ();
+
+       /**
+        * Whether this DHT's state is 'booting'
+        *
+        * @return      $isBooting      Whether this DHT is currently booting
+        */
+       function ifDhtIsBooting ();
 }
 
 // [EOF]

diff --git a/application/hub/main/dht/class_BaseDht.php b/application/hub/main/dht/class_BaseDht.php
index 6ad3beda35309fb8c317a99e83ddf1aeb6e6c54e..d81cbcd2934286114453df0a1554a6367cedb345 100644 (file)
--- a/application/hub/main/dht/class_BaseDht.php
+++ b/application/hub/main/dht/class_BaseDht.php
@@ -182,6 +182,20 @@ abstract class BaseDht extends BaseHubSystem {
                return $isPending;
        }
 
+       /**
+        * Whether this DHT's state is 'booting'
+        *
+        * @return      $isBooting      Whether this DHT is currently booting
+        */
+       public function ifDhtIsBooting () {
+               // Call state instance
+               $isBooting = $this->getStateInstance()->ifDhtIsBooting();
+
+               // Return status
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BASE-DHT[' . __METHOD__ . ':' . __LINE__ . '] isBooting=' . intval($isBooting));
+               return $isBooting;
+       }
+
        /**
         * Publishes next entry found in stack. This method shall also update the
         * corresponding dabase entry.

diff --git a/application/hub/main/states/dht/class_BaseDhtState.php b/application/hub/main/states/dht/class_BaseDhtState.php
index f9edc47ee1f4c578d1bac9632c69d0cf13255bfb..88c2de0c645ca90128b5fbb1ecd21ac0e8b47fc0 100644 (file)
--- a/application/hub/main/states/dht/class_BaseDhtState.php
+++ b/application/hub/main/states/dht/class_BaseDhtState.php
@@ -7,6 +7,7 @@
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
+ * @todo               Create generic DHT interface
  *
  * 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
@@ -47,6 +48,20 @@ class BaseDhtState extends BaseState {
                        throw new InvalidStateException($this, self::EXCEPTION_INVALID_STATE);
                } // END - if
        }
+
+       /**
+        * Checks whether the DHT's state is 'booting' by comparing it with the
+        * state's class name.
+        *
+        * @return      $isBooting      Whether this DHT's state is 'booting'
+        */
+       public function ifDhtIsBooting () {
+               // Check state
+               $isBooting = ($this instanceof DhtBootingState);
+
+               // Return status
+               return $isBooting;
+       }
 }
 
 // [EOF]

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index eb1cc4e2f795c9dd4ec6e7d9daf3d78c4f53fd07..df870a106d9eb0bdb5c1f234e624bb54bf8be2f1 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -1,7 +1,7 @@
 ### WARNING: THIS FILE IS AUTO-GENERATED BY ./todo-builder.sh ###
 ### DO NOT EDIT THIS FILE. ###
-./application/hub/config.php:679:// @TODO This and the next value is very static again
-./application/hub/config.php:743:// @TODO This is very static, rewrite it to more flexible
+./application/hub/config.php:745:// @TODO This and the next value is very static again
+./application/hub/config.php:809:// @TODO This is very static, rewrite it to more flexible
 ./application/hub/interfaces/apt-proxy/class_AptProxy.php:10: * @todo          We need to find a better name for this interface
 ./application/hub/interfaces/chat/class_Chatter.php:10: * @todo                We need to find a better name for this interface
 ./application/hub/interfaces/cruncher/class_CruncherHelper.php:10: * @todo             We need to find a better name for this interface
@@ -9,7 +9,9 @@
 ./application/hub/interfaces/helper/connections/class_ConnectionHelper.php:38:  * @todo        We may want to implement a filter for ease notification of other objects like our pool
 ./application/hub/interfaces/helper/messages/class_MessageHelper.php:10: * @todo               Please find another name for this interface
 ./application/hub/interfaces/helper/nodes/class_NodeHelper.php:10: * @todo             We need to find a better name for this interface
-./application/hub/main/class_BaseHubSystem.php:493:                            // @TODO On some systems it is 134, on some 107?
+./application/hub/interfaces/wrapper/class_NodeDhtWrapper.php:122:      * @todo        Add minimum/maximum age limitations
+./application/hub/interfaces/wrapper/class_NodeDhtWrapper.php:132:      * @todo        Add timestamp to dataset instance
+./application/hub/main/class_BaseHubSystem.php:500:                            // @TODO On some systems it is 134, on some 107?
 ./application/hub/main/commands/console/class_HubConsoleAptProxyCommand.php:107:        * @todo        Should we add some more filters?
 ./application/hub/main/commands/console/class_HubConsoleAptProxyCommand.php:58:         * @todo        Try to create a AptProxyActivationTask or so
 ./application/hub/main/commands/console/class_HubConsoleChatCommand.php:107:    * @todo        Should we add some more filters?
@@ -22,17 +24,19 @@
 ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:108:         * @todo        Implement this method
 ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:138:         * @todo        0% done
 ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:98:         // @TODO Implement this method
-./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:382:            // @TODO Unimplemented part
-./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:434:     * @todo        Add minimum/maximum age limitations
-./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:462:     * @todo        Add timestamp to dataset instance
+./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:383:            // @TODO Unimplemented part
+./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:435:     * @todo        Add minimum/maximum age limitations
+./application/hub/main/database/wrapper/node/class_NodeDistributedHashTableDatabaseWrapper.php:463:     * @todo        Add timestamp to dataset instance
 ./application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php:174:    * @todo        Unfinished area
 ./application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php:216:    * @todo        Unfinished area
-./application/hub/main/dht/class_BaseDht.php:124:       * @todo        Add minimum/maximum age limitations
-./application/hub/main/dht/class_BaseDht.php:157:                      // @TODO Maybe add more small checks?
-./application/hub/main/dht/class_BaseDht.php:84:        * @todo        Find more to do here
+./application/hub/main/dht/class_BaseDht.php:129:       * @todo        Add minimum/maximum age limitations
+./application/hub/main/dht/class_BaseDht.php:162:                      // @TODO Maybe add more small checks?
+./application/hub/main/dht/class_BaseDht.php:204:       * @todo        Find out if loadDescriptorXml() can be called only once to avoid a lot methods working.
+./application/hub/main/dht/class_BaseDht.php:244:       * @todo        0% done
+./application/hub/main/dht/class_BaseDht.php:89:        * @todo        Find more to do here
 ./application/hub/main/dht/node/class_NodeDhtFacade.php:61:     * @todo        Does this data need to be enriched with more meta data?
-./application/hub/main/discovery/package/class_PackageRecipientDiscovery.php:93:        * @todo        Add some validation of recipient field, e.g. ip:port is found
-./application/hub/main/discovery/package/class_PackageRecipientDiscovery.php:94:        * @todo        The if() does only check for TCP, not UDP, e.g. try to get a $handlerInstance here
+./application/hub/main/discovery/package/class_PackageRecipientDiscovery.php:86:        * @todo        Add some validation of recipient field, e.g. ip:port is found
+./application/hub/main/discovery/package/class_PackageRecipientDiscovery.php:87:        * @todo        The if() does only check for TCP, not UDP, e.g. try to get a $handlerInstance here
 ./application/hub/main/factories/socket/class_SocketFactory.php:10: * @todo            Find an interface for hub helper
 ./application/hub/main/filter/apt-proxy/class_AptProxyInitializationFilter.php:54:      * @todo        0% done
 ./application/hub/main/filter/apt-proxy/class_AptProxyPhpRequirementsFilter.php:55:     * @todo        Add more test and try to add an extra message to the thrown exception
@@ -65,21 +69,24 @@
 ./application/hub/main/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php:115:   * @todo        0% done
 ./application/hub/main/handler/answer-status/requests/class_RequestNodeListAnswerOkayHandler.php:63:    * @todo        Do some more here: Handle karma, et cetera?
 ./application/hub/main/handler/class_BaseHandler.php:66:        * @todo        Rewrite this to use DHT
+./application/hub/main/handler/message-types/answer/class_NodeMessageDhtBootstrapAnswerHandler.php:93:  * @todo        ~30% done
 ./application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php:71:                  // @TODO Throw an exception here instead of dying
-./application/hub/main/handler/network/class_BaseRawDataHandler.php:146:        * @todo        This method will be moved to a better place
+./application/hub/main/handler/network/class_BaseRawDataHandler.php:147:        * @todo        This method will be moved to a better place
 ./application/hub/main/handler/network/udp/class_UdpRawDataHandler.php:58:      * @todo        0%
-./application/hub/main/handler/tasks/class_TaskHandler.php:138:                // @TODO Messurement can be added around this call
-./application/hub/main/helper/connection/class_BaseConnectionHelper.php:203:                   // @TODO Move this to the socket error handler
-./application/hub/main/helper/connection/class_BaseConnectionHelper.php:231:    * @todo        Rewrite the while() loop to a iterator to not let the software stay very long here
+./application/hub/main/handler/tasks/class_TaskHandler.php:139:                // @TODO Messurement can be added around this call
+./application/hub/main/helper/connection/class_BaseConnectionHelper.php:204:                   // @TODO Move this to the socket error handler
+./application/hub/main/helper/connection/class_BaseConnectionHelper.php:232:    * @todo        Rewrite the while() loop to a iterator to not let the software stay very long here
 ./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:10: * @todo         Find an interface for hub helper
-./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:139:         * @todo        We may want to implement a filter for ease notification of other objects like our pool
+./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:142:         * @todo        We may want to implement a filter for ease notification of other objects like our pool
 ./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:49:  * @todo        $errorCode/-Message are now in handleSocketError()'s call-back methods
-./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:86:         // @TODO The whole resolving part should be moved out and made more configurable
+./application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php:89:         // @TODO The whole resolving part should be moved out and made more configurable
 ./application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php:10: * @todo         Find an interface for hub helper
 ./application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php:56:  * @todo        Implement a filter for ease notification of other objects like the pool
 ./application/hub/main/helper/dht/class_DhtBootstrapHelper.php:10: * @todo             Find an interface for hub helper
+./application/hub/main/helper/dht/class_DhtPublishEntryHelper.php:10: * @todo          Find an interface for hub helper
 ./application/hub/main/helper/node/announcement/class_NodeAnnouncementHelper.php:10: * @todo           Find an interface for hub helper
 ./application/hub/main/helper/node/answer/announcement/class_NodeAnnouncementMessageAnswerHelper.php:10: * @todo               Find an interface for hub helper
+./application/hub/main/helper/node/answer/dht/class_NodeDhtBootstrapMessageAnswerHelper.php:10: * @todo                Find an interface for hub helper
 ./application/hub/main/helper/node/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php:10: * @todo                Find an interface for hub helper
 ./application/hub/main/helper/node/connection/class_NodeSelfConnectHelper.php:10: * @todo              Find an interface for hub helper
 ./application/hub/main/helper/node/requests/class_NodeRequestNodeListHelper.php:10: * @todo            Find an interface for hub helper
@@ -99,40 +106,38 @@
 ./application/hub/main/lists/groups/class_ListGroupList.php:61:         * @todo        0% done
 ./application/hub/main/nodes/boot/class_HubBootNode.php:110:           // @TODO Add some filters here
 ./application/hub/main/nodes/boot/class_HubBootNode.php:58:     * @todo        add some more special bootstrap things for this boot node
-./application/hub/main/nodes/class_BaseHubNode.php:115:         * @todo        Make this code more generic and move it to CryptoHelper or
-./application/hub/main/nodes/class_BaseHubNode.php:412:         * @todo        Try to make this method more generic so we can move it in BaseFrameworkSystem
-./application/hub/main/nodes/class_BaseHubNode.php:452:         * @todo        Change the first if() block to check for a specific state
-./application/hub/main/nodes/class_BaseHubNode.php:645:         * @todo        Add checking if this node has been announced to the sender node
-./application/hub/main/nodes/class_BaseHubNode.php:665:         * @todo        Add checking if this node has been announced to the sender node
-./application/hub/main/nodes/class_BaseHubNode.php:738:         * @todo        Find more to do here
-./application/hub/main/nodes/class_BaseHubNode.php:751:         * @todo        Handle thrown exception
+./application/hub/main/nodes/class_BaseHubNode.php:120:         * @todo        Make this code more generic and move it to CryptoHelper or
+./application/hub/main/nodes/class_BaseHubNode.php:417:         * @todo        Try to make this method more generic so we can move it in BaseFrameworkSystem
+./application/hub/main/nodes/class_BaseHubNode.php:457:         * @todo        Change the first if() block to check for a specific state
+./application/hub/main/nodes/class_BaseHubNode.php:663:         * @todo        Add checking if this node has been announced to the sender node
+./application/hub/main/nodes/class_BaseHubNode.php:683:         * @todo        Add checking if this node has been announced to the sender node
+./application/hub/main/nodes/class_BaseHubNode.php:767:         * @todo        Find more to do here
+./application/hub/main/nodes/class_BaseHubNode.php:780:         * @todo        Handle thrown exception
 ./application/hub/main/nodes/list/class_HubListNode.php:58:     * @todo        Implement more bootstrap steps
 ./application/hub/main/nodes/list/class_HubListNode.php:79:            // @TODO Add some filters here
 ./application/hub/main/nodes/master/class_HubMasterNode.php:58:         * @todo        Implement this method
 ./application/hub/main/nodes/master/class_HubMasterNode.php:83:                // @TODO Add some filters here
 ./application/hub/main/nodes/regular/class_HubRegularNode.php:58:       * @todo        Implement this method
 ./application/hub/main/nodes/regular/class_HubRegularNode.php:79:              // @TODO Add some filters here
-./application/hub/main/package/class_NetworkPackage.php:1006:           * @todo Unsupported feature of "signed" messages commented out
-./application/hub/main/package/class_NetworkPackage.php:1095:   * @todo        Implement verification of all sent tags here?
+./application/hub/main/package/class_NetworkPackage.php:1117:   * @todo        This may be enchanced for outgoing packages?
+./application/hub/main/package/class_NetworkPackage.php:1148:           * @todo Unsupported feature of "signed" messages commented out
+./application/hub/main/package/class_NetworkPackage.php:1237:   * @todo        Implement verification of all sent tags here?
 ./application/hub/main/package/class_NetworkPackage.php:23: * @todo            Needs to add functionality for handling the object's type
-./application/hub/main/package/class_NetworkPackage.php:309:           // @TODO md5() is very weak, but it needs to be fast
-./application/hub/main/package/class_NetworkPackage.php:383:           // @TODO md5() is very weak, but it needs to be fast
-./application/hub/main/package/class_NetworkPackage.php:543:                   // @TODO We may want to do somthing more here?
-./application/hub/main/package/class_NetworkPackage.php:581:    * @todo        Unfinished area, signatures are currently NOT fully supported
-./application/hub/main/package/class_NetworkPackage.php:691:                   // @TODO Add some logging here
-./application/hub/main/package/class_NetworkPackage.php:824:                   // @TODO Add some logging here
-./application/hub/main/package/class_NetworkPackage.php:975:    * @todo        This may be enchanced for outgoing packages?
+./application/hub/main/package/class_NetworkPackage.php:339:           // @TODO md5() is very weak, but it needs to be fast
+./application/hub/main/package/class_NetworkPackage.php:413:           // @TODO md5() is very weak, but it needs to be fast
+./application/hub/main/package/class_NetworkPackage.php:576:                   // @TODO We may want to do somthing more here?
+./application/hub/main/package/class_NetworkPackage.php:611:    * @todo        Unfinished area, signatures are currently NOT fully supported
 ./application/hub/main/package/fragmenter/class_PackageFragmenter.php:275:      * @todo        Implement a way to send non-announcement packages with extra-salt
 ./application/hub/main/package/fragmenter/class_PackageFragmenter.php:370:             // @TODO This assert broke packages where the hash chunk was very large: assert(strlen($rawData) <= NetworkPackage::TCP_PACKAGE_SIZE);
-./application/hub/main/package/fragmenter/class_PackageFragmenter.php:437:      * @todo        $helperInstance is unused
+./application/hub/main/package/fragmenter/class_PackageFragmenter.php:441:      * @todo        $helperInstance is unused
 ./application/hub/main/producer/cruncher/keys/class_CruncherKeyProducer.php:106:                       // @TODO Send the produced key bundle to the unit producer's input queue
 ./application/hub/main/producer/cruncher/keys/class_CruncherKeyProducer.php:62:         * @todo        Find something for init phase of this key producer
 ./application/hub/main/producer/cruncher/keys/class_CruncherKeyProducer.php:72:         * @todo        ~30% done
 ./application/hub/main/producer/cruncher/work_units/class_CruncherTestUnitProducer.php:79:      * @todo        ~60% done
 ./application/hub/main/producer/cruncher/work_units/class_CruncherTestUnitProducer.php:88:                     // @TODO Unfinished work here
-./application/hub/main/recipient/dht/class_DhtRecipient.php:56:         * @todo        0% done
 ./application/hub/main/registry/socket/class_SocketRegistry.php:71:            // @TODO Tested again base class, rewrite it to a generic interface!
 ./application/hub/main/resolver/state/peer/class_PeerStateResolver.php:59:      * @todo        ~30% done
+./application/hub/main/states/dht/class_BaseDhtState.php:10: * @todo           Create generic DHT interface
 ./application/hub/main/states/node/active/class_NodeActiveState.php:75:         * @todo        We might want to move some calls to this method to fill it with life
 ./application/hub/main/states/node/init/class_NodeInitState.php:60:     * @todo        We might want to move some calls to this method to fill it with life
 ./application/hub/main/statistics/connection/class_ConnectionStatisticsHelper.php:11: * @todo          Find an interface for hub helper
@@ -156,12 +161,14 @@
 ./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:10: * @todo          This template engine does not make use of setTemplateType()
 ./application/hub/main/template/answer/announcement/class_XmlAnnouncementAnswerTemplateEngine.php:92:   * @todo        Find something useful with this!
 ./application/hub/main/template/answer/class_BaseXmlAnswerTemplateEngine.php:10: * @todo               This template engine does not make use of setTemplateType()
+./application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php:10: * @todo           This template engine does not make use of setTemplateType()
+./application/hub/main/template/answer/dht/class_XmlDhtBootstrapAnswerTemplateEngine.php:95:    * @todo        Find something useful with this!
 ./application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php:10: * @todo           This template engine does not make use of setTemplateType()
 ./application/hub/main/template/answer/requests/class_XmlRequestNodeListAnswerTemplateEngine.php:82:    * @todo        Find something useful with this!
-./application/hub/main/template/bootstrap/class_XmlDhtBootstrapTemplateEngine.php:10: * @todo          This template engine does not make use of setTemplateType()
 ./application/hub/main/template/class_BaseXmlTemplateEngine.php:10: * @todo            This template engine does not make use of setTemplateType()
 ./application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php:10: * @todo             This template engine does not make use of setTemplateType()
 ./application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php:77:      * @todo        Find something useful with this!
+./application/hub/main/template/dht/class_XmlDhtBootstrapTemplateEngine.php:10: * @todo                This template engine does not make use of setTemplateType()
 ./application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php:10: * @todo            This template engine does not make use of setTemplateType()
 ./application/hub/main/template/entries/class_XmlRequestNodeListEntryTemplateEngine.php:64:     * @todo        Find something useful with this!
 ./application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php:10: * @todo          This template engine does not make use of setTemplateType()
@@ -169,6 +176,7 @@
 ./application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php:90:   * @todo        Find something useful with this!
 ./application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php:10: * @todo            This template engine does not make use of setTemplateType()
 ./application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php:270:    * @todo        Handle $keyCount
+./application/hub/main/template/publish/class_XmlDhtPublishEntryTemplateEngine.php:10: * @todo         This template engine does not make use of setTemplateType()
 ./application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php:10: * @todo                This template engine does not make use of setTemplateType()
 ./application/hub/main/template/requests/class_XmlRequestNodeListTemplateEngine.php:74:         * @todo        Find something useful with this!
 ./application/hub/main/tools/class_HubTools.php:177:                    * @TODO Please try to encapsulate this PHP call into an own class
@@ -177,11 +185,11 @@
 ./core/inc/classes/interfaces/class_FrameworkInterface.php:11: * @todo         Find a better name for this interface
 ./core/inc/classes/interfaces/criteria/extended/class_LocalSearchCriteria.php:30:       * @todo        Find a nice casting here. (int) allows until and including 32766.
 ./core/inc/classes/interfaces/criteria/extended/class_LocalSearchCriteria.php:54:       * @todo        Find a nice casting here. (int) allows until and including 32766.
-./core/inc/classes/main/class_BaseFrameworkSystem.php:1766:     * @todo        Write a logging mechanism for productive mode
-./core/inc/classes/main/class_BaseFrameworkSystem.php:1780:                    // @TODO Finish this part!
+./core/inc/classes/main/class_BaseFrameworkSystem.php:1777:     * @todo        Write a logging mechanism for productive mode
+./core/inc/classes/main/class_BaseFrameworkSystem.php:1792:                    // @TODO Finish this part!
 ./core/inc/classes/main/class_BaseFrameworkSystem.php:205:     // @todo Try to clean these constants up
-./core/inc/classes/main/class_BaseFrameworkSystem.php:428:             // @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
-./core/inc/classes/main/class_BaseFrameworkSystem.php:502:      * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
+./core/inc/classes/main/class_BaseFrameworkSystem.php:429:             // @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
+./core/inc/classes/main/class_BaseFrameworkSystem.php:503:      * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
 ./core/inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64:  * @todo        Add some stuff here: Some personal data, app/game related data
 ./core/inc/classes/main/commands/web/class_WebProblemCommand.php:58:    * @todo        0% done
 ./core/inc/classes/main/commands/web/class_WebStatusCommand.php:58:     * @todo        0% done
@@ -203,6 +211,7 @@
 ./core/inc/classes/main/criteria/search/class_SearchCriteria.php:102:   * @todo        Find a nice casting here. (int) allows until and including 32766.
 ./core/inc/classes/main/criteria/search/class_SearchCriteria.php:70:    * @todo        Find a nice casting here. (int) allows until and including 32766.
 ./core/inc/classes/main/database/databases/class_LocalFileDatabase.php:327:     * @todo        Do some checks on the database directory and files here
+./core/inc/classes/main/database/databases/class_LocalFileDatabase.php:605:     * @todo        Add more generic non-public data for removal
 ./core/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php:427:  * @todo        Find something useful with this!
 ./core/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php:85:   * @todo        0% done
 ./core/inc/classes/main/filter/change/class_EmailChangeFilter.php:55:   * @todo        Implement email change of the user here. HINT: Use the User class!
@@ -249,12 +258,12 @@
 ./core/inc/classes/main/result/class_DatabaseResult.php:393:    * @todo        Find a caching way without modifying the result array
 ./core/inc/classes/main/rng/class_RandomNumberGenerator.php:175:        * @todo        I had a better random number generator here but now it is somewhere lost :(
 ./core/inc/classes/main/rng/class_RandomNumberGenerator.php:97:         * @todo        Add site key for stronger salt!
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1017:     * @todo        Unfinished work or don't die here.
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1042:                            // @TODO Non-string found so we need some deeper analysis...
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1120:                    // @TODO This silent abort should be logged, maybe.
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1128:                    // @TODO Old behaviour, will become obsolete!
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1131:                    // @TODO Yet another old way
-./core/inc/classes/main/template/class_BaseTemplateEngine.php:1231:     * @todo        Make this code some nicer...
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:1070:                    // @TODO This silent abort should be logged, maybe.
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:1078:                    // @TODO Old behaviour, will become obsolete!
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:1081:                    // @TODO Yet another old way
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:1289:     * @todo        Make this code some nicer...
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:967:      * @todo        Unfinished work or don't die here.
+./core/inc/classes/main/template/class_BaseTemplateEngine.php:992:                             // @TODO Non-string found so we need some deeper analysis...
 ./core/inc/classes/main/template/console/class_ConsoleTemplateEngine.php:10: * @todo           This template engine does not make use of setTemplateType()
 ./core/inc/classes/main/template/image/class_ImageTemplateEngine.php:215:       * @todo        Find something usefull with this!
 ./core/inc/classes/main/template/image/class_ImageTemplateEngine.php:235:       * @todo        Add cache creation here
@@ -326,7 +335,7 @@
 ./application/hub/main/tasks/hub/decoder/class_HubPackageDecoderTask.php:2:// @DEPRECATED
 ./application/hub/main/tasks/hub/ping/class_HubPingTask.php:2:// @DEPRECATED
 ./application/hub/main/tasks/hub/update/class_HubUpdateCheckTask.php:2:// @DEPRECATED
-./application/hub/main/template/bootstrap/class_XmlBootstrapTemplateEngine.php:2:// @DEPRECATED
+./application/hub/main/template/dht/class_XmlBootstrapTemplateEngine.php:2:// @DEPRECATED
 ./core/inc/classes/exceptions/main/class_MissingMethodException.php:14: * @deprecated  Please do no longer use this exception
 ./core/inc/classes/interfaces/database/backend/class_DatabaseFrontendInterface.php:2:// @DEPRECATED
 ./core/inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php:2:// @DEPRECATED