Renamed 'seperator' to 'separator'

diff --git a/application/hub/main/class_BaseHubSystem.php b/application/hub/main/class_BaseHubSystem.php
index 36645bb1505403072c9d2beb9084dd9f29a153eb..b0abb8c4ae30f9da24d95b953069e97e1b8366e5 100644 (file)
--- a/application/hub/main/class_BaseHubSystem.php
+++ b/application/hub/main/class_BaseHubSystem.php
@@ -26,9 +26,9 @@ class BaseHubSystem extends BaseFrameworkSystem {
        const EXCEPTION_UNSUPPORTED_ERROR_HANDLER = 0x900;
 
        /**
-        * Seperator for all bootstrap node entries
+        * Separator for all bootstrap node entries
         */
-       const BOOTSTRAP_NODES_SEPERATOR = ';';
+       const BOOTSTRAP_NODES_SEPARATOR = ';';
 
        /**
         * An instance of a node

diff --git a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
index 651f99e09f40c0f17fa79acf72929745468f71b2..d1de1423206502e795ab3adc259f13e5fc989384 100644 (file)
--- a/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
+++ b/application/hub/main/discovery/package/class_PackageRecipientDiscovery.php
@@ -64,7 +64,7 @@ class PackageRecipientDiscovery extends BaseHubDiscovery implements Discoverable
                        // All upper hubs, these are currently the bootstrap nodes and later on prepended list-nodes
                        case NetworkPackage::NETWORK_TARGET_UPPER_HUBS:
                                // Get all bootstrap nodes
-                               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPERATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $node) {
+                               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $node) {
                                        // Debug message
                                        /* DEBUG: */ $this->debugOutput('DISCOVERY: Adding node ' . $node . ' as recipient.');
 

diff --git a/application/hub/main/listener/class_BaseListener.php b/application/hub/main/listener/class_BaseListener.php
index a95bc976378e1d00bdf672d726ebc47c2f58e1fd..8e232d4b274ed330183a227acfd0e814f4df09b5 100644 (file)
--- a/application/hub/main/listener/class_BaseListener.php
+++ b/application/hub/main/listener/class_BaseListener.php
@@ -299,7 +299,7 @@ class BaseListener extends BaseHubSystem implements Visitable {
        /**
         * Monitors incoming raw data from the handler and transfers it to the
         * given receiver instance. This method should not be called, please call
-        * the decorator's version instead to seperator node/client traffic.
+        * the decorator's version instead to separator node/client traffic.
         *
         * @param       $receiverInstance       An instance of a Receivable class
         * @return      void

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index 5bfc26f7d4b44c721d3088df622005b1be437ea6..61b9c2e9c843d717061c7fdbb83e158eb0e0130b 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -184,7 +184,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                $isFound = false;
 
                // Run through all configured IPs
-               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPERATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $ipPort) {
+               foreach (explode(BaseHubSystem::BOOTSTRAP_NODES_SEPARATOR, $this->getConfigInstance()->getConfigEntry('hub_bootstrap_nodes')) as $ipPort) {
                        // Split it up in IP/port
                        $ipPortArray = explode(':', $ipPort);
 

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index 499bd7d7a672bd6f7bf1c5d42f884ac2c63a1cb4..9b96b2fb9bd3f0d17d978ef1eccbe16a2bb44450 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -47,14 +47,14 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Receiva
        const PACKAGE_MASK = '%s%s%s%s%s%s%s';
 
        /**
-        * Seperator for the above mask
+        * Separator for the above mask
         */
-       const PACKAGE_MASK_SEPERATOR = '^';
+       const PACKAGE_MASK_SEPARATOR = '^';
 
        /**
-        * Seperator for checksum
+        * SEPARATOR for checksum
         */
-       const PACKAGE_CHECKSUM_SEPERATOR = '_';
+       const PACKAGE_CHECKSUM_SEPARATOR = '_';
 
        /**
         * Array indexes for above mask, start with zero
@@ -87,14 +87,14 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Receiva
        const PACKAGE_STATUS_FAILED  = 'failed';
 
        /**
-        * Tags seperator
+        * Tags SEPARATOR
         */
-       const PACKAGE_TAGS_SEPERATOR = ';';
+       const PACKAGE_TAGS_SEPARATOR = ';';
 
        /**
-        * Raw package data seperator
+        * Raw package data SEPARATOR
         */
-       const PACKAGE_DATA_SEPERATOR = '#';
+       const PACKAGE_DATA_SEPARATOR = '#';
 
        /**
         * Stacker name for "undeclared" packages
@@ -222,9 +222,9 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Receiva
                // @TODO crc32() is very weak, but it needs to be fast
                $hash = crc32(
                        $content .
-                       self::PACKAGE_CHECKSUM_SEPERATOR .
+                       self::PACKAGE_CHECKSUM_SEPARATOR .
                        $nodeInstance->getSessionId() .
-                       self::PACKAGE_CHECKSUM_SEPERATOR .
+                       self::PACKAGE_CHECKSUM_SEPARATOR .
                        $this->getCompressorInstance()->getCompressorExtension()
                );
 
@@ -420,7 +420,7 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Receiva
                        // - separator
                        self::PACKAGE_MASK_SEPARATOR,
                        // 3.) Tags
-                       implode(self::PACKAGE_TAGS_SEPERATOR, $helperInstance->getPackageTags()),
+                       implode(self::PACKAGE_TAGS_SEPARATOR, $helperInstance->getPackageTags()),
                        // - separator
                        self::PACKAGE_MASK_SEPARATOR,
                        // 4.) Checksum
@@ -638,8 +638,8 @@ class NetworkPackage extends BaseFrameworkSystem implements Deliverable, Receiva
                 */
                assert($decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] == BaseRawDataHandler::SOCKET_ERROR_UNHANDLED);
 
-               // Remove the last chunk seperator (because it is being added and we don't need it)
-               if (substr($decodedData[BaseRawDataHandler::PACKAGE_DECODED_DATA], -1, 1) == PackageFragmenter::CHUNK_SEPERATOR) {
+               // Remove the last chunk SEPARATOR (because it is being added and we don't need it)
+               if (substr($decodedData[BaseRawDataHandler::PACKAGE_DECODED_DATA], -1, 1) == PackageFragmenter::CHUNK_SEPARATOR) {
                        // It is there and should be removed
                        $decodedData[BaseRawDataHandler::PACKAGE_DECODED_DATA] = substr($decodedData[BaseRawDataHandler::PACKAGE_DECODED_DATA], 0, -1);
                } // END - if

diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index d7481c2452f26f485ff9d41e1709979e6652657e..e8e62aaad812223285fc036d4152ebd8645df9c8 100644 (file)
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -72,19 +72,19 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
        const MAX_SERIAL_LENGTH = 8;
 
        /**
-        * Seperator between chunk data, serial number and chunk hash
+        * Separator between chunk data, serial number and chunk hash
         */
-       const CHUNK_DATA_HASH_SEPERATOR = '@';
+       const CHUNK_DATA_HASH_SEPARATOR = '@';
 
        /**
-        * Seperator for all chunk hashes
+        * SEPARATOR for all chunk hashes
         */
-       const CHUNK_HASH_SEPERATOR = ';';
+       const CHUNK_HASH_SEPARATOR = ';';
 
        /**
-        * Seperator between two chunks
+        * SEPARATOR between two chunks
         */
-       const CHUNK_SEPERATOR = '|';
+       const CHUNK_SEPARATOR = '|';
 
        /**
         * Identifier for hash chunk
@@ -158,9 +158,9 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
         */
        private function getProcessedPackagesIndex (array $packageData) {
                return (
-                       $packageData[NetworkPackage::PACKAGE_DATA_SENDER]    . NetworkPackage::PACKAGE_DATA_SEPERATOR .
-                       $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] . NetworkPackage::PACKAGE_DATA_SEPERATOR .
-                       $packageData[NetworkPackage::PACKAGE_DATA_CONTENT]   . NetworkPackage::PACKAGE_DATA_SEPERATOR
+                       $packageData[NetworkPackage::PACKAGE_DATA_SENDER]    . NetworkPackage::PACKAGE_DATA_SEPARATOR .
+                       $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT] . NetworkPackage::PACKAGE_DATA_SEPARATOR .
+                       $packageData[NetworkPackage::PACKAGE_DATA_CONTENT]   . NetworkPackage::PACKAGE_DATA_SEPARATOR
                );
        }
 
@@ -254,7 +254,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                        // Hash size
                        strlen($hash) -
                        // Length of sperators
-                       (strlen(self::CHUNK_DATA_HASH_SEPERATOR) * 2) -
+                       (strlen(self::CHUNK_DATA_HASH_SEPARATOR) * 2) -
                        // Length of max serial number
                        self::MAX_SERIAL_LENGTH
                );
@@ -311,8 +311,8 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                // Generate end-of-package marker
                $rawData =
                        self::END_OF_PACKAGE_IDENTIFIER .
-                       $finalHash . self::CHUNK_HASH_SEPERATOR .
-                       $chunkHash . self::CHUNK_SEPERATOR;
+                       $finalHash . self::CHUNK_HASH_SEPARATOR .
+                       $chunkHash . self::CHUNK_SEPARATOR;
 
                // Also get a hash from it
                $chunkHash = $this->generateHashFromRawData($rawData);
@@ -324,7 +324,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
 
        /**
         * Splits the given encoded data into smaller chunks, the size of the final
-        * and the seperator is being subtracted from chunk size to fit it into a
+        * and the SEPARATOR is being subtracted from chunk size to fit it into a
         * TCP package (512 bytes).
         *
         * @param       $rawData        Raw data string
@@ -353,9 +353,9 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
 
                        // Prepend the hash to the chunk
                        $chunk = (
-                               $chunkHash . self::CHUNK_DATA_HASH_SEPERATOR .
-                               $this->getNextHexSerialNumber() . self::CHUNK_DATA_HASH_SEPERATOR .
-                               $chunk . self::CHUNK_SEPERATOR
+                               $chunkHash . self::CHUNK_DATA_HASH_SEPARATOR .
+                               $this->getNextHexSerialNumber() . self::CHUNK_DATA_HASH_SEPARATOR .
+                               $chunk . self::CHUNK_SEPARATOR
                        );
 
                        // Make sure the chunk is not larger than a TCP package can hold
@@ -382,7 +382,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
         */
        private function prependHashChunk ($rawData, $finalHash) {
                // "Implode" the whole array of hashes into one string
-               $rawData = self::HASH_CHUNK_IDENTIFIER . implode(self::CHUNK_HASH_SEPERATOR, $this->chunkHashes[$finalHash]);
+               $rawData = self::HASH_CHUNK_IDENTIFIER . implode(self::CHUNK_HASH_SEPARATOR, $this->chunkHashes[$finalHash]);
 
                // Also get a hash from it
                $chunkHash = $this->generateHashFromRawData($rawData);
@@ -401,9 +401,9 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
 
                        // Prepend the hash to the chunk
                        $chunk =
-                               $chunkHash . self::CHUNK_DATA_HASH_SEPERATOR .
-                               $this->getNextHexSerialNumber() . self::CHUNK_DATA_HASH_SEPERATOR .
-                               $chunk . self::CHUNK_SEPERATOR
+                               $chunkHash . self::CHUNK_DATA_HASH_SEPARATOR .
+                               $this->getNextHexSerialNumber() . self::CHUNK_DATA_HASH_SEPARATOR .
+                               $chunk . self::CHUNK_SEPARATOR
                        ;
 
                        // Make sure the chunk is not larger than a TCP package can hold
@@ -430,7 +430,7 @@ class PackageFragmenter extends BaseFrameworkSystem implements Fragmentable, Reg
                // Is this package already fragmented?
                if (!$this->isPackageProcessed($packageData)) {
                        // First we need to "implode" the array
-                       $rawData = implode(NetworkPackage::PACKAGE_DATA_SEPERATOR, $packageData);
+                       $rawData = implode(NetworkPackage::PACKAGE_DATA_SEPARATOR, $packageData);
 
                        // Generate the final hash from the raw data (not encoded!)
                        $finalHash = $this->generateHashFromRawData($rawData);

diff --git a/application/hub/main/tags/package/class_PackageTags.php b/application/hub/main/tags/package/class_PackageTags.php
index 79ced828473d0c9a3c5e82a658b574bc50ebd174..4047b961d88e678b2ae63410a6c0680f663a9c76 100644 (file)
--- a/application/hub/main/tags/package/class_PackageTags.php
+++ b/application/hub/main/tags/package/class_PackageTags.php
@@ -100,10 +100,10 @@ class PackageTags extends BaseTags implements Tagable {
                 * We take a look at the tags (in most cases only one is needed) so
                 * first we need the content data splitted up into all it's parts.
                 */
-               $contentData = explode(NetworkPackage::PACKAGE_MASK_SEPERATOR, $packageData[NetworkPackage::PACKAGE_DATA_CONTENT]);
+               $contentData = explode(NetworkPackage::PACKAGE_MASK_SEPARATOR, $packageData[NetworkPackage::PACKAGE_DATA_CONTENT]);
 
                // Get the tags and store them locally
-               $this->setTags(explode(NetworkPackage::PACKAGE_TAGS_SEPERATOR, $contentData[NetworkPackage::INDEX_TAGS]));
+               $this->setTags(explode(NetworkPackage::PACKAGE_TAGS_SEPARATOR, $contentData[NetworkPackage::INDEX_TAGS]));
        }
 
        /**