Renamed method to better naming scheme ('bootstrapping' node or 'bootstrap node'?).

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

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index b0ab5adb4e880b186ff37635d1ff67613e6868bd..29f84ac7a54e55b89ec97cf31fc85b430ce60cae 100644 (file)
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -59,7 +59,7 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
         */
        public function doBootstrapping () {
                // Now check if the IP address matches one of the bootstrap nodes
-               if ($this->ifAddressMatchesBootstrappingNodes($this->getConfigInstance()->detectServerAddress())) {
+               if ($this->ifAddressMatchesBootstrapNodes($this->getConfigInstance()->detectServerAddress())) {
                        // Get our port from configuration
                        $ourPort = $this->getConfigInstance()->getConfigEntry('node_listen_port');
 
@@ -69,12 +69,12 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable {
                        // Is the port the same?
                        if ($bootPort == $ourPort) {
                                // It is the same!
-                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: IP/port matches bootstrapping node ' . $this->getBootIpPort() . '.');
+                               self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: IP/port matches bootstrap node ' . $this->getBootIpPort() . '.');
 
                                // Now, does the mode match
                                if ($this->getRequestInstance()->getRequestElement('mode') == self::NODE_TYPE_BOOT) {
                                        // Output debug message
-                                       self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Our node is a valid bootstrapping node.');
+                                       self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: Our node is a valid bootstrap node.');
                                } else {
                                        // Output warning
                                        self::createDebugInstance(__CLASS__)->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=' . BaseHubNode::NODE_TYPE_BOOT . ' detected.');

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index c3e4b7d21521497c420e7d5a2df2a95123a9caaf..027091571d8abc8d12dc1a0f183067eb84a14d73 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -37,7 +37,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
        const OBJECT_LIST_SEPARATOR = ',';
 
        /**
-        * IP/port number of bootstrapping node
+        * IP/port number of bootstrap node
         */
        private $bootIpPort = '';
 
@@ -200,12 +200,12 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
        }
 
        /**
-        * Checks whether the given IP address matches one of the bootstrapping nodes
+        * Checks whether the given IP address matches one of the bootstrap nodes
         *
         * @param       $remoteAddr             IP address to checkout against our bootstrapping list
         * @return      $isFound                Whether the IP is found
         */
-       protected function ifAddressMatchesBootstrappingNodes ($remoteAddr) {
+       protected function ifAddressMatchesBootstrapNodes ($remoteAddr) {
                // By default nothing is found
                $isFound = FALSE;