Used correct method

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index 897120c888bfb67b20b368a1e57752cdb6173e33..898f925d793f2a523ff881615c312cbf4ae86b28 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -136,7 +136,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
         */
        private function generatePrivateKeyAndHash (LocalSearchCriteria $searchInstance) {
                // Generate a pseudo-random string
         */
        private function generatePrivateKeyAndHash (LocalSearchCriteria $searchInstance) {
                // Generate a pseudo-random string

-               $randomString = $this->generateRandomString(255);
+               $randomString = $this->getCryptoInstance()->randomString(255);

 
                // Hash and encrypt the string so we become a node id (also documented as "hub id")
                $this->setPrivateKey($this->getCryptoInstance()->encryptString($randomString));
 
                // Hash and encrypt the string so we become a node id (also documented as "hub id")
                $this->setPrivateKey($this->getCryptoInstance()->encryptString($randomString));


@@ -286,7 +286,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
                        self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Re-using found node-id: ' . $this->getNodeId() . '');
                } else {
                        // Generate a pseudo-random string
                        self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Re-using found node-id: ' . $this->getNodeId() . '');
                } else {
                        // Generate a pseudo-random string

-                       $randomString = $this->generateRandomString(255);
+                       $randomString = $this->getCryptoInstance()->randomString(255);

 
                        // Hash and encrypt the string so we become a node id (also documented as "hub id")
                        $this->setNodeId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString)));
 
                        // Hash and encrypt the string so we become a node id (also documented as "hub id")
                        $this->setNodeId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString)));

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 5f91113006ec6d973dce8dbcbae44a7e85652626..3e1b778e6b1917976a522a06bb38d277c39f5708 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -178,7 +178,6 @@
 ./inc/classes/main/class_BaseFrameworkSystem.php:494:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
 ./inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64:       * @todo        Add some stuff here: Some personal data, app/game related data
 ./inc/classes/main/commands/web/class_WebProblemCommand.php:58:         * @todo        0% done
 ./inc/classes/main/class_BaseFrameworkSystem.php:494:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
 ./inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64:       * @todo        Add some stuff here: Some personal data, app/game related data
 ./inc/classes/main/commands/web/class_WebProblemCommand.php:58:         * @todo        0% done

-./inc/classes/main/commands/web/class_WebResendLinkCommand.php:67:             // @TODO Rewrite this code to make use of generateRandomString() from 'hub' project

 ./inc/classes/main/commands/web/class_WebStatusCommand.php:58:  * @todo        0% done
 ./inc/classes/main/console/class_ConsoleTools.php:268:  * @todo        This should be moved out to an external class, e.g. HttpClient
 ./inc/classes/main/console/class_ConsoleTools.php:269:  * @todo        Make IP, host name, port and script name configurable
 ./inc/classes/main/commands/web/class_WebStatusCommand.php:58:  * @todo        0% done
 ./inc/classes/main/console/class_ConsoleTools.php:268:  * @todo        This should be moved out to an external class, e.g. HttpClient
 ./inc/classes/main/console/class_ConsoleTools.php:269:  * @todo        Make IP, host name, port and script name configurable