Continued:
authorRoland Häder <roland@mxchange.org>
Sun, 12 Dec 2021 07:05:34 +0000 (08:05 +0100)
committerRoland Häder <roland@mxchange.org>
Sun, 12 Dec 2021 07:05:34 +0000 (08:05 +0100)
- removed more // END - <something> occurances as I don't do them anymore

Signed-off-by: Roland Häder <roland@mxchange.org>
68 files changed:
application/tests/exceptions.php
contrib/chash/chash.php
contrib/chash/lib/functions.php
contrib/exp/exp1.php
contrib/exp/exp2.php
contrib/lfdb2/read.php
contrib/lfdb2/write.php
framework/main/classes/cache/class_MemoryCache.php
framework/main/classes/commands/console/class_ConsoleFuseCommand.php
framework/main/classes/criteria/class_BaseCriteria.php
framework/main/classes/criteria/dataset/class_DataSetCriteria.php
framework/main/classes/criteria/search/class_SearchCriteria.php
framework/main/classes/crypto/class_CryptoHelper.php
framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
framework/main/classes/database/frontend/user/class_UserDatabaseFrontend.php
framework/main/classes/feature/class_FrameworkFeature.php
framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
framework/main/classes/file_directories/io_stream/class_FileIoStream.php
framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
framework/main/classes/filter/validator/class_EmailValidatorFilter.php
framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
framework/main/classes/images/class_BaseImage.php
framework/main/classes/iterator/default/class_DefaultIterator.php
framework/main/classes/iterator/registry/class_RegistryIterator.php
framework/main/classes/language/class_LanguageSystem.php
framework/main/classes/mailer/debug/class_DebugMailer.php
framework/main/classes/output/class_
framework/main/classes/output/console/class_ConsoleOutput.php
framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
framework/main/classes/points/class_UserPoints.php
framework/main/classes/registry/class_
framework/main/classes/registry/format_upgrade/database/class_
framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php
framework/main/classes/registry/generic/class_GenericRegistry.php
framework/main/classes/request/class_BaseRequest.php
framework/main/classes/request/console/class_ConsoleRequest.php
framework/main/classes/request/html/class_HtmlRequest.php
framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
framework/main/classes/resolver/class_
framework/main/classes/response/class_BaseResponse.php
framework/main/classes/response/html/class_HtmlResponse.php
framework/main/classes/response/image/class_ImageResponse.php
framework/main/classes/rng/class_RandomNumberGenerator.php
framework/main/classes/template/image/class_ImageTemplateEngine.php
framework/main/classes/template/mail/class_MailTemplateEngine.php
framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
framework/main/classes/user/class_BaseUser.php
framework/main/classes/user/member/class_Member.php
framework/main/classes/utils/strings/class_StringUtils.php
framework/main/exceptions/class_FrameworkException.php
framework/main/middleware/compressor/class_CompressorChannel.php
framework/main/tests/controller/console/class_TestsConsoleDefaultNewsController.php
tests/bootstrap.php

index a336bb98e68c8d0d22afeac9d5b8bc64fad01e81..bdcf2cb596a4428e99388f89fe18b180efbadf88 100644 (file)
@@ -42,7 +42,7 @@ function tests_exception_handler ($exceptionInstance) {
                        // Convert arguments type into human-readable
                        foreach ($traceArray['args'] as $arg) {
                                $argsString .= ', ' . gettype($arg);
-                       } // END - foreach
+                       }
                        $argsString = substr($argsString, 2);
 
                        // Set missing file/line
@@ -64,7 +64,7 @@ Line   : %d\n",
                                basename($traceArray['file']),
                                $traceArray['line']
                        );
-               } // END - foreach
+               }
 
                // Construct the message
                $message = sprintf("--------------------------------------------------------------------------------
@@ -121,7 +121,7 @@ function tests_assert_handler (string $file, int $line, $code) {
        // Empty code?
        if ($code === '') {
                $code = '<em>Unknown</em>';
-       } // END - if
+       }
 
        // Create message
        $message = sprintf('File: %s, Line: %s, Code: %s',
index 4dfc6075e2c180dc72857f80840b5c8fc5bf3845..4911ba57036e2c22603c4abe0ccb738e22bd968d 100644 (file)
@@ -169,7 +169,7 @@ while (true) {
                                // Reset timer
                                $timeDisplay = microtime(true);
                                $GLOBALS['iteration_second']  = 0;
-                       } // END - if
+                       }
 
                        // Time spend from last flush
                        $testTime = abs(microtime(true) - $GLOBALS['time_flush']);
@@ -178,7 +178,7 @@ while (true) {
                        if ($testTime >= $GLOBALS['flush_file_time']) {
                                // Flush check-point file
                                flushCheckPointFile($GLOBALS['current_hash']);
-                       } // END - if
+                       }
 
                        // Time spend from last found block
                        $testTime = abs(microtime(true) - $GLOBALS['found_time']);
@@ -200,7 +200,7 @@ while (true) {
                                                if (!isset($hash['root_hash'])) {
                                                        // Bad file
                                                        die('INCONSISTENCY: hash=' . print_r($hash, true));
-                                               } // END - if
+                                               }
 
                                                if (isset($rootHashes[$hash['root_hash']])) {
                                                        // Count up
@@ -209,23 +209,21 @@ while (true) {
                                                        // First entry found
                                                        $rootHashes[$hash['root_hash']] = 1;
                                                }
-                                       } // END - foreach
-                               } // END - foreach
+                                       }
+                               }
 
                                // Find best root hash
                                $bestRootHash = '';
                                $bestRootCount = 0;
                                foreach ($rootHashes as $hash => $count) {
-                                       // Debug message
-                                       //* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
-
                                        // Is a better one found?
+                                       //* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
                                        if ($count > $bestRootCount) {
                                                // Remember it
                                                $bestRootHash  = $hash;
                                                $bestRootCount = $count;
-                                       } // END - if
-                               } // END - foreach
+                                       }
+                               }
 
                                // Output message
                                print ('bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
@@ -249,10 +247,10 @@ while (true) {
 
                                                        // Abort search
                                                        break;
-                                               } // END - if
-                                       } // END - for
-                               } // END - foreach
-                       } // END - if
+                                               }
+                                       }
+                               }
+                       }
 
                        // Next round
                        $GLOBALS['iteration']++;
@@ -261,27 +259,25 @@ while (true) {
                        //* NOISY-DEBUG: */ print('nonceHash=' . $nonceHash . PHP_EOL);
                        //* NOISY-DEBUG: */ print('sumNonce=' . $sumNonce . PHP_EOL);
                        //* NOISY-DEBUG: */ print('sumGenesis=' . $GLOBALS['sum_genesis'] . PHP_EOL);
-               } // END - while
+               }
 
                // If the iteration is zero, then no hash is found
                if ($GLOBALS['iteration'] == 0) {
                        // Bad hash found
                        $timeBadHashes += abs(microtime(true) - $timeHash);
 
-                       // And next round
-                       //* NOISY-DEBUG: */ print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
-
                        // Nothing found, so calculate new nonce
+                       //* NOISY-DEBUG: */ print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
                        calculateNonce();
                        continue;
-               } // END - if
+               }
 
                // Add amount of hashes per block (multiple-hash)
                $GLOBALS['hashes_block'] += $GLOBALS['iteration'] * $GLOBALS['hash_cycles'] + $GLOBALS['hash_cycles'];
 
                // Push found hash
                addFoundHash($nonceHash);
-       } // END - while
+       }
 
        // Flush check-point file
        flushCheckPointFile($GLOBALS['current_hash']);
@@ -317,4 +313,4 @@ while (true) {
        $rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(true) - START_TIME) * 3600;
 
        print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
-} // END - while
+}
index 666d4000dd2fc04f7992bed0f648263bc2e10299..fe05fd3820f9677c56bdcf9a66c0f16fb00724e5 100644 (file)
@@ -29,7 +29,7 @@ function multipleHashString ($str) {
        for ($idx = 0; $idx < ($GLOBALS['hash_cycles'] - 1); $idx++) {
                // Over-hash the given hash
                $hash = hashString($hash);
-       } // END - for
+       }
 
        // Return it
        return $hash;
@@ -55,7 +55,7 @@ function calculateSumFromHash ($hash) {
        for ($idx = 0; $idx < (strlen($decode) / 2); $idx++) {
                // And add it
                $sum = $sum + hexdec(substr($decode, $idx, 2));
-       } // END - for
+       }
 
        // And return it
        //* NOISY-DEBUG: */ printf('[%s:%d]: sum=%d - EXIT!' . PHP_EOL, __FUNCTION__, __LINE__, $sum);
@@ -207,5 +207,5 @@ function loadCheckpointFile () {
                $GLOBALS['current_hash']   = $data[9];
                $GLOBALS['root_hash']      = $data[10];
                $GLOBALS['found_hashes']   = json_decode(gzuncompress(base64_decode($data[11])), TRUE);
-       } // END - if
+       }
 }
index c750e12c5d36d7852e1c104ed972fa9069936c3c..4808935205e289f941fa25704e19ea017514e26c 100644 (file)
@@ -12,7 +12,7 @@ $x = 1; $y = 0;
 for ($i = 1; $i <= $totalDays; $i++) {
        $x = bcmul($x, 2);
        $y = bcadd($y, $x);
-} // END - foreach
+}
 
 print 'After ' . $totalDays . ' days (' . $years . ' years) you have eaten ' . $y . ' fruits.' . PHP_EOL;
 print 'Length:' . strlen($y) . PHP_EOL;
index d83a33c6bc12dc9ac0317e03c323ceb7339d54f9..c51211e0eb8b696efbb6f7736ba5721f084a4f92 100644 (file)
@@ -22,7 +22,7 @@ for ($i = 1; $i <= $totalMonths; $i++) {
        $balance = bcadd($balance, $interest);
 
        print 'Month ' . $i . ': rate=' . bcmul($rate, 100) . '%,interest=' . $interest . ',balance=' . $balance . PHP_EOL;
-} // END - foreach
+}
 
 print 'After ' . $totalMonths . ' months (' . $years . ' years) you have ' . $balance . ' EUR back.' . PHP_EOL;
 //print 'Length:' . strlen($balance) . PHP_EOL;
index da41e10278a6e2a80f8fa0dda4c2471b5df098bc..b68b879bfec82113954fc798f0434c51919efc91 100644 (file)
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE === 8) {
        $__factor = constant('__FACTOR_64');
        $__format = constant('__FORMAT_READ_64');
        $__step   = constant('__STEP_64');
-} // END - if
+}
 
 $buffer = file_get_contents('test.data.bin' . ($__factor * 2)) or die('Please run write.php first!' . PHP_EOL);
 
@@ -58,8 +58,8 @@ for ($pos = 0; $pos < strlen($buffer); $pos += 8) {
 
                //print 'chr=' . $chr . PHP_EOL;
                $decoded .= chr($chr);
-       } // END - for
-} // END - for
+       }
+}
 
 $decoded = gzuncompress($decoded);
 
index 2b25a6a69aca426be843a4d6ffc77fc92ec78e52..9d1445c55d5aad7a9975cc42f74cf1ee2c4e8abf 100644 (file)
@@ -27,7 +27,7 @@ if (PHP_INT_SIZE === 8) {
        $__right  = constant('__RIGHT_64');
        $__format = constant('__FORMAT_WRITE_64');
        $__step   = constant('__STEP_64');
-} // END - if
+}
 
 $str = gzcompress(file_get_contents('test.data'), 9);
 
@@ -46,8 +46,8 @@ for ($idx = 0; $idx < strlen($str); $idx += $__step) {
                        $big += $add;
 
                        //print 'idx=' . $idx . ',i=' . $i . ',ord=' . $ord . ',factor=' . $factor . ',add=' . $add . ',big=' . $big . PHP_EOL;
-               } // END - if
-       } // END - for
+               }
+       }
 
        $l = ($big & $__left) >>$__factor;
        $r = $big & $__right;
@@ -56,7 +56,7 @@ for ($idx = 0; $idx < strlen($str); $idx += $__step) {
        //print 'big=' . $big . ',unpacked('.strlen($unpacked) . ')='.md5($unpacked).PHP_EOL;
 
        $encoded .= $unpacked;
-} // END - for
+}
 
 print 'Hash(' . strlen($encoded) . ')=' . md5($encoded) . PHP_EOL;
 print 'Encoded ' . strlen($str) . ' bytes into ' . strlen($encoded) . ' bytes ...' . PHP_EOL;
index ee26ab3623951486c65c5ae47067b897d8bbf4bf..6dae7c1ba74be924dfad670d3c6219d7848a5348 100644 (file)
@@ -97,7 +97,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
                                // Not found
                                $exists = false;
                        }
-               } // END - if
+               }
 
                // Return status
                return $exists;
@@ -128,7 +128,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
                if ($this->offsetExists($offset)) {
                        // Then get the data from it
                        $data = $this->dataCache->offsetGet($offset);
-               } // END - if
+               }
 
                // Return data
                return $data;
@@ -146,7 +146,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
                        // Purge only existing keys
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHE: Unsetting cache ' . $offset);
                        $this->dataCache->offsetUnset($offset);
-               } // END - if
+               }
        }
 
 }
index 7b62c8fde3a3ade7e47be0123570949d814ea163..7d38e84f261be30eb782c4f5784601208aae7ba4 100644 (file)
@@ -79,7 +79,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable {
 
                        // Abort here
                        return;
-               } // END - if
+               }
 
                // @TODO Unfinished
                $this->partialStub('Still unfinished! ;-)');
index 9331121ce29431f00ba316ab51dc2f5df7e53b78..de4cd3ee278b09bcbc1adc0650e533ab46db6800 100644 (file)
@@ -50,7 +50,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                foreach (array('default', 'choice', 'exclude') as $criteriaType) {
                        // Init it
                        $this->initGenericArrayKey('criteria', $criteriaType, 'entries');
-               } // END - foreach
+               }
        }
 
        /**
@@ -169,7 +169,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                foreach ($this->getGenericArray('criteria') as $criteriaType => $dummy) {
                        // Remove it
                        $this->unsetGenericArrayElement('criteria', $criteriaType, 'entries', $criteriaKey);
-               } // END - foreach
+               }
        }
 
        /**
@@ -353,8 +353,8 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                                        // Then count this one up
                                        $counted++;
                                }
-                       } // END - foreach
-               } // END - foreach
+                       }
+               }
 
                // Now check if expected criteria counts match
                $matches = ($counted == $this->countGenericArrayGroup('criteria', $criteriaType));
@@ -421,7 +421,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                                        urlencode($criteriaValue)
                                );
                        }
-               } // END - foreach
+               }
 
                // Remove last semicolon
                $cacheKey = substr($cacheKey, 0, -1);
index 5413cfeae992fb5fa9ef286ebcb92349fd509fd8..7341889e7698dda4475132f8aadd29d62510a7aa 100644 (file)
@@ -209,7 +209,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
                        foreach ($primaryKeys as $primaryKey) {
                                // Add it
                                $return .= trim($this->getCriteriaElemnent($primaryKey));
-                       } // END - foreach
+                       }
 
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATA-SET-CRITERIA: tableName=' . $this->getTableName() . ',return=' . $return . ' - EXIT!');
index 1cac25bab218f240a392af7d7874b62b257922aa..fd1e80446650f8466fe23ff9bc0b2a2c527c6fcb 100644 (file)
@@ -202,7 +202,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
 
                                // Debug message
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: match=' . $match . ',isMatching=' . intval($isMatching));
-                       } // END - foreach
+                       }
 
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',value[]=' . count($valueArray) . ',idx=' . $idx . ',isMatching=' . intval($isMatching) . ' - CHOICE-MATCH');
index 133cc135683493e887051e0da59423c9dacdd3aa..0455b2a1882cf6d9d62fd699cfa4f44cc5512bdf 100644 (file)
@@ -95,7 +95,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                if (is_null(self::$selfInstance)) {
                        // Then get a new one
                        self::$selfInstance = self::createCryptoHelper();
-               } // END - if
+               }
 
                // Return the instance
                return self::$selfInstance;
@@ -184,7 +184,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('extension_uuid_loaded') === true) {
                        // Then add it as well
                        $uuid = uuid_create();
-               } // END - if
+               }
 
                // Return it
                return $uuid;
@@ -212,7 +212,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 
                        // Then extract the X first characters from the hash as our salt
                        $salt = substr($oldHash, 0, $length);
-               } // END - if
+               }
 
                // Hash the password with salt
                //* DEBUG: */ echo "salt=".$salt."/plain=".$str."<br />\n";
index f85f4badd2dac3bdbe8951a619c901abd7e91ff1..455213ec393fcfba4a27a87b25ab50f967e241ea 100644 (file)
@@ -67,7 +67,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
                        // Set the new instance
                        $this->setCacheInstance(ObjectFactory::createObjectByConfiguredName('cache_class'));
-               } // END - if
+               }
        }
 
        /**
@@ -126,7 +126,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-               } // END - if
+               }
 
                // Does this key exists in cache?
                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -134,7 +134,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // Purge the cache
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Calling this->cacheInstance->purgeOffset(%s) ...', $cacheKey));
                        $this->getCacheInstance()->purgeOffset($cacheKey);
-               } // END - if
+               }
 
                // Handle it over to the middleware
                FrameworkBootstrap::getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
@@ -159,13 +159,13 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-               } // END - if
+               }
 
                // Does this key exists in cache?
                if ((FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) && ($this->getCacheInstance()->offsetExists($cacheKey))) {
                        // Purge the cache
                        $this->getCacheInstance()->purgeOffset($cacheKey);
-               } // END - if
+               }
 
                // Handle it over to the middleware
                FrameworkBootstrap::getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);
@@ -207,7 +207,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
                        // First get a key suitable for our cache and extend it with this class name
                        $cacheKey = $this->getCacheKeyByCriteria($criteriaInstance, $onlyKeys);
-               } // END - if
+               }
 
                // Does this key exists in cache?
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -228,7 +228,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
                                        // A valid result has returned from the database layer
                                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Setting cacheKey=%s with result()=%d entries', $cacheKey, count($result)));
                                        $this->getCacheInstance()->offsetSet($cacheKey, $result);
-                               } // END - if
+                               }
                        } else {
                                // This invalid result must be wrapped
                                $result = array(
@@ -269,7 +269,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 
                        // Debug message
                        //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: numRows=' . $numRows);
-               } // END - if
+               }
 
                // Return the result
                return $numRows;
index 9b303a73f8d62e9a294e44570aa6bd03de47d504..e49d772300b926f4a1e9008aadd5bece2549d80c 100644 (file)
@@ -114,7 +114,7 @@ class UserDatabaseFrontend extends BaseDatabaseFrontend implements ManageableAcc
                        if (is_null($updateInstance)) {
                                // Throw an exception here
                                throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-                       } // END - if
+                       }
 
                        // Get search instance from update instance
                        $searchInstance = $updateInstance->getSearchInstance();
@@ -123,8 +123,8 @@ class UserDatabaseFrontend extends BaseDatabaseFrontend implements ManageableAcc
                        if (is_null($searchInstance)) {
                                // Throw an exception here
                                throw new NullPointerException($updateInstance, self::EXCEPTION_IS_NULL_POINTER);
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                // Generate a data set object
                $dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_USER));
index 5bfb48f5a6781bda8c4e540573a9ff48382bc83c..0f67a15be50cb0c1a15dfdb12126d6ad73f824de 100644 (file)
@@ -82,7 +82,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 
                        // Check configuration
                        self::$enabledFeatures[$featureName]['is_enabled'] = (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) === 'Y');
-               } // END - if
+               }
 
                // Return "cached" status
                return self::$enabledFeatures[$featureName]['is_enabled'];
@@ -111,7 +111,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
                                // Then it can't be available
                                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not enabled.', $featureName));
                                return false;
-                       } // END - if
+                       }
 
                        // Create config key (for feature class lookup)
                        $configKey = sprintf('feature_%s_class', $featureName);
@@ -128,7 +128,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
                                // Feature class not found
                                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not available due to missing feature class. Disabling feature ...', $featureName));
                        }
-               } // END - if
+               }
 
                // Return "cached" status
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: featureName=%s,isAvailable=%d - EXIT!', $featureName, intval(self::$enabledFeatures[$featureName]['is_available'])));
@@ -164,7 +164,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
                if (!is_callable($callable)) {
                        // Not callable method requested
                        throw new FeatureMethodNotCallableException(array(self::$enabledFeatures[$featureName]['instance'], $featureMethod), self::EXCEPTION_FEATURE_METHOD_NOT_CALLABLE);
-               } // END - if
+               }
 
                // Then call it
                $return = call_user_func_array($callable, $args);
index 7eb73dfa310e06d0a3c8266350b82a3ce5b9f298..d6c195b473ac74f8dca77fe7c7d4ea9a72777620 100644 (file)
@@ -63,7 +63,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework
                if ($this->getDirectoryIteratorInstance() instanceof DirectoryIterator) {
                        // Try to close a directory
                        $this->closeDirectory();
-               } // END - if
+               }
 
                // Call the parent destructor
                parent::__destruct();
@@ -170,8 +170,8 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework
                                // To next entry
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DIRECTORY-POINTER: Invoking directoryIteratorInstance->next() ...');
                                $this->getDirectoryIteratorInstance()->next();
-                       } // END - while
-               } // END - if
+                       }
+               }
 
                // Return read line
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('DIRECTORY-POINTER: fileInfoInstance[%s]=%s - EXIT!', gettype($fileInfoInstance), $fileInfoInstance));
index e679aadf247c0211b9674f3b297b8088a44cf200..61fc5f123db042e86b56a47192fb879a1773b9dc 100644 (file)
@@ -76,7 +76,7 @@ class FrameworkRawFileInputPointer extends BaseFileIo implements InputPointer {
                if ((is_null($fileObject)) || ($fileObject === false)) {
                        // Something bad happend
                        throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-               } // END - if
+               }
 
                // Create new instance
                $pointerInstance = new FrameworkRawFileInputPointer();
index 46eb376143976f907c8e8ef88d5e03ca6096d3f5..27565cef23d3f1194b2f26ffb9cfb123d798b254 100644 (file)
@@ -80,7 +80,7 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
                if ((is_null($fileObject)) || ($fileObject === false)) {
                        // Something bad happend
                        throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-               } // END - if
+               }
 
                // Create new instance
                $pointerInstance = new FrameworkTextFileInputPointer();
index 6c793b84b6e12f7306a09c6975c2a51998f3ed9e..551791f3b33f321a4d39753d93ae3e825012988b 100644 (file)
@@ -101,7 +101,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                                // Bail out
                                ApplicationEntryPoint::exitApplication('The application has made a fatal error. Exception: ' . $e->__toString() . ' with message: ' . $e->getMessage());
                        }
-               } // END - for
+               }
 
                // Write a header information for validation purposes
                $fileInstance->writeToFile(sprintf('%s%s%s%s%s%s%s%s%s' . PHP_EOL,
@@ -136,7 +136,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 
                        // Advance to the next 50-chars block
                        $idx += 50;
-               } // END - while
+               }
 
                // Close the file
                unset($fileInstance);
@@ -168,11 +168,11 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                        // Break infinite loop maybe caused by the input handler
                        if ($lastBuffer == $inputBuffer) {
                                break;
-                       } // END - if
+                       }
 
                        // Remember last read line for avoiding possible infinite loops
                        $lastBuffer = $inputBuffer;
-               } // END - while
+               }
 
                // Close directory handle
                unset($fileInstance);
@@ -198,7 +198,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                                if (count($header) != 4) {
                                        // Throw an exception
                                        throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-                               } // END - if
+                               }
                        } elseif (substr($rawLine, 0, 5) == self::FILE_IO_DATA_BLOCK_ID) {
                                // Is a data line!
                                $data = explode(self::FILE_IO_SEPARATOR, $rawLine);
@@ -212,7 +212,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                                        if (md5($data[0]) != $data[1]) {
                                                // MD5 hash did not match!
                                                throw new InvalidMD5ChecksumException(array($this, md5($data[0]), $data[1]), self::EXCEPTION_MD5_CHECKSUMS_MISMATCH);
-                                       } // END - if
+                                       }
                                } else {
                                        // Invalid count!
                                        throw new InvalidArrayCountException(array($this, 'data', count($data), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
@@ -224,19 +224,19 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                                // Other raw lines than header/data tagged lines and re-add the new-line char
                                $readData .= $rawLine . PHP_EOL;
                        }
-               } // END - foreach
+               }
 
                // Was raw lines read and no header/data?
                if ((!empty($readData)) && (count($header) == 0) && (count($data) == 0)) {
                        // Return raw lines back
                        return $readData;
-               } // END - if
+               }
 
                // Was a header found?
                if (count($header) != 4) {
                        // Throw an exception
                        throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-               } // END - if
+               }
 
                // Decode all from Base64
                $readData = @base64_decode($readData);
@@ -245,13 +245,13 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
                if (strlen($readData) != $header[2]) {
                        // Size did not match
                        throw new InvalidDataLengthException(array($this, strlen($readData), $header[2]), self::EXCEPTION_UNEXPECTED_STRING_SIZE);
-               } // END - if
+               }
 
                // Validate the decoded data with the final MD5 hash
                if (md5($readData) != $header[3]) {
                        // MD5 hash did not match!
                        throw new InvalidMD5ChecksumException(array($this, md5($readData), $header[3]), self::EXCEPTION_MD5_CHECKSUMS_MISMATCH);
-               } // END - if
+               }
 
                // Return all in an array
                return array(
index 7b4e098684826ca9f70a3fab3d0451d61beb5f0f..2436b0f48c8f91cc71552f395a1f2b9a950865b3 100644 (file)
@@ -59,14 +59,14 @@ class FrameworkRawFileOutputPointer extends BaseFileIo implements OutputPointer
                if (is_null($mode)) {
                        // No infoInstance given
                        throw new InvalidArgumentException('Parameter "mode" is empty');
-               } // END - if
+               }
 
                // Try to open a handler
                $fileObject = $infoInstance->openFile($mode);
                if ((is_null($fileObject)) || ($fileObject === false)) {
                        // Something bad happend
                        throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-               } // END - if
+               }
 
                // Create new instance
                $pointerInstance = new FrameworkRawFileOutputPointer();
index a1bc2cacbcf65fcc418ed211dc21780eef534724..33aa707c7367588e134a247c5d49bd473840d365 100644 (file)
@@ -60,7 +60,7 @@ class FrameworkTextFileOutputPointer extends BaseFileIo implements OutputPointer
                if (empty($mode)) {
                        // No filename given
                        throw new InvalidArgumentException('Parameter "mode" is empty');
-               } // END - if
+               }
 
                // Try to open a handler
                $fileObject = $fileInstance->openFile($mode);
@@ -69,7 +69,7 @@ class FrameworkTextFileOutputPointer extends BaseFileIo implements OutputPointer
                if ((is_null($fileObject)) || ($fileObject === false)) {
                        // Something bad happend
                        throw new FileIoException($fileInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-               } // END - if
+               }
 
                // Create new instance
                $pointerInstance = new FrameworkTextFileOutputPointer();
index 8d1d827c93114bfc57aedea2c353acd2630752b1..44da75c394aee525e94c2044113c9cf29520aadd 100644 (file)
@@ -124,7 +124,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
                                // Abort here
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-                       } // END - elseif
+                       }
                } elseif (empty($email)) {
                        // Empty field!
                        $requestInstance->requestIsValid(false);
@@ -134,7 +134,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - elseif
+               }
        }
 
        /**
@@ -151,19 +151,19 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Is the user already there?
-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {
                        // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
+                       $userInstance = $registryInstance->getInstance('user');
                        $userInstance->setEmailAddress($email);
                } else {
                        // If this instance is created then the username *does* exist
                        $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByEmail'), array($email));
 
                        // Remember this user instance in our registry for later usage
-                       $registry->addInstance('user', $userInstance);
+                       $registryInstance->addInstance('user', $userInstance);
                }
 
                // Does the email exist?
index d910bdf7d4ad764904927f395a2d20f18b12ab62..87a8ebe6f0caa5f27e1fd1fc266f909c24ac9109 100644 (file)
@@ -106,7 +106,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - elseif
+               }
        }
 
 }
index 97eb61dfdfe2b0d73a4b20cbf45b1b6400132893..e42a47480f571a96fd29687fcd89639be2b1095a 100644 (file)
@@ -117,12 +117,12 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Is the user already there?
-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {
                        // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
+                       $userInstance = $registryInstance->getInstance('user');
                        $userInstance->setUserName($userName);
                } else {
                        // If this instance is created then the username *does* exist
@@ -131,7 +131,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
                                $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByUsername'), array($userName));
 
                                // Remember this user instance in our registry for later usage
-                               $registry->addInstance('user', $userInstance);
+                               $registryInstance->addInstance('user', $userInstance);
                        } catch (UsernameMissingException $e) {
                                // User was not found
                        }
index d0a5da9775333dafa1d5aa55d0db606a11fe15eb..1fd67958854f2bfd81d7973547233a282afe7759 100644 (file)
@@ -88,8 +88,8 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 
                                // Abort here
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                if (empty($password)) {
                        // Password is empty
@@ -100,7 +100,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
 
                // Get a user instance
                $userInstance = GenericRegistry::getRegistry()->getInstance('user');
@@ -115,7 +115,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
                if ($currentHash != $passHash) {
                        // Throw an exception here to stop the proccessing
                        throw new AccountPasswordMismatchException($this, BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
+               }
        }
 
 }
index 80bab34a9d0c7d6d9e10df45f2a1785569262c56..e7c44c41812128e9c2f169b375da060433020246 100644 (file)
@@ -70,7 +70,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('day_of_birth_unset');
-               } // END - if
+               }
 
                // Month of birth set?
                if (!$requestInstance->isRequestElementSet('birth_month')) {
@@ -79,7 +79,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('month_of_birth_unset');
-               } // END - if
+               }
 
                // Year of birth set?
                if (!$requestInstance->isRequestElementSet('birth_year')) {
@@ -88,13 +88,13 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('year_of_birth_unset');
-               } // END - if
+               }
 
                // Is the request still valid?
                if (!$requestInstance->isRequestValid()) {
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
 
                // Now comes the final check
                $birthCheck = mktime(
@@ -116,7 +116,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
        }
 
 }
index 7cc1256f0c4824bf9b7e2049bc39b9a8d837d2f4..7330ae3904f17aafdc72f4b8256577af5e1e1178 100644 (file)
@@ -106,7 +106,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 
                        // Stop processing here
                        exit();
-               } // END - if
+               }
        }
 
 }
index 21ee3765015d3a28cb8cecf2d3af707fbbb30722..637dedb9d7f7081f50df6a3b8e8d3ea973bd978d 100644 (file)
@@ -76,7 +76,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
                        // Skip further processing
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
 
                // Create config entry
                $configKey = sprintf('%s_captcha_secured',
@@ -87,7 +87,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) != 'Y') {
                        // Not enabled, so don't check
                        return;
-               } // END - if
+               }
 
                // Get the captcha code
                $captchaCode = $requestInstance->getRequestElement('c_code');
@@ -153,7 +153,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
                        // Skip further processing
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - not the same!
+               }
        }
 
 }
index 0cd03f9458e7e05613f6b71e7ce2f461dd375372..b273870fb16d21ac5defb8640c15e15e83911dc0 100644 (file)
@@ -119,12 +119,12 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Is the user already there?
-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {
                        // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
+                       $userInstance = $registryInstance->getInstance('user');
                        $userInstance->setUserGuest($userName);
                } else {
                        // If this instance is created then the username *does* exist
@@ -133,7 +133,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                                $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_class'), 'createGuestByUsername'), array($userName));
 
                                // Remember this user instance in our registry for later usage
-                               $registry->addInstance('user', $userInstance);
+                               $registryInstance->addInstance('user', $userInstance);
                        } catch (UsernameMissingException $e) {
                                // User was not found
                        }
index e57bfda2d5cc4a7ccddd9cb9842e301a8cc1fe72..f55b632d8092774e266ce077e526e972e5157f74 100644 (file)
@@ -117,12 +117,12 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Is the user already there?
-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {
                        // Use the instance for checking for the email
-                       $userInstance = $registry->getInstance('user');
+                       $userInstance = $registryInstance->getInstance('user');
                        $userInstance->setUserName($userName);
                } else {
                        // If this instance is created then the username *does* exist
@@ -131,7 +131,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
                                $userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByUsername'), array($userName));
 
                                // Remember this user instance in our registry for later usage
-                               $registry->addInstance('user', $userInstance);
+                               $registryInstance->addInstance('user', $userInstance);
                        } catch (UsernameMissingException $e) {
                                // User was not found
                        }
@@ -141,7 +141,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
                if ((is_null($userInstance)) || ($userInstance->ifUsernameExists() === false)) {
                        // This username is still available
                        $alreadyTaken = false;
-               } // END - if
+               }
 
                // Return the result
                return $alreadyTaken;
index 47dbb780c4fa924b38cd050c35313fe9ecaddbb5..8c31ee9d1a3ae0b9357661253fad1fff7666ea26 100644 (file)
@@ -77,7 +77,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 
                        // Stop processing here
                        exit();
-               } // END - if
+               }
        }
 
 }
index d2524deead39bcbbac9f814c6cd717ea5852ab93..ea98a930b906bf3bfb28c800d2dc3c866a09bed8 100644 (file)
@@ -79,7 +79,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 
                        // Stop processing here
                        exit();
-               } // END - if
+               }
 
                // Is the user account confirmed?
                if ($userInstance->getField(UserDatabaseFrontend::DB_COLUMN_USER_STATUS) != FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_unconfirmed')) {
@@ -91,7 +91,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 
                        // Stop processing here
                        exit();
-               } // END - if
+               }
 
                // Add this instance to registry
                GenericRegistry::getRegistry()->addInstance('user', $userInstance);
index 3b6582eda7e811128da4f95a3ccefeedaa875dbc..6736a78c6208de55b06763166ecf8c07889c47a7 100644 (file)
@@ -68,7 +68,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
        public function FsOpen ($path, FuseFileInfo $fi) {
                if (($fi->flags & FUSE_O_ACCMODE) != FUSE_O_RDONLY) {
                        return -FUSE_ENOACCES;
-               } // END - if
+               }
 
                return -FUSE_ENOERR;
        }
@@ -88,7 +88,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 
                if ($offset > strlen($data)) {
                        return 0;
-               } // END - if
+               }
 
                $buf = substr( $data, $offset, $size );
 
@@ -105,7 +105,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
        public function FsReadDir ($path, array &$buf) {
                if (strcmp($path, '/') != 0) {
                        return -FUSE_ENOENT;
-               } // END - if
+               }
 
                $buf[] = '.';
                $buf[] = '..';
index 31fa98b0e0418f226a4408b83592560250fa2e7e..01793e5062e183892504986f38548e58b94a9350 100644 (file)
@@ -94,7 +94,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (is_null($formId)) {
                        // Use form id from form name
                        $formId = $formName;
-               } // END - if
+               }
 
                // Set form name
                $helperInstance->setFormName($formName);
@@ -158,7 +158,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ($this->ifGroupOpenedPreviously()) {
                                // Then automatically close it here
                                $this->addFormGroup();
-                       } // END - if
+                       }
 
                        // Simply close it
                        $this->formOpened = false;
@@ -182,7 +182,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="text" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -225,7 +225,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="password" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -253,7 +253,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="hidden" name="%s" value="%s" />',
@@ -310,7 +310,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Set whether the check box is checked...
                $checked = ($fieldChecked ? ' checked="checked"' : ' ');
@@ -340,7 +340,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'reset'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="reset" class="reset_button" id="%s_reset" value="%s" />',
@@ -365,7 +365,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'submit'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="submit" class="submit_button" id="%s_submit" name="%s_submit" value="%s" />',
@@ -404,7 +404,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->ifGroupOpenedPreviously() === false) && ($groupId === $this->getPreviousGroupId())) {
                        // Abort here silently
                        return false;
-               } // END - if
+               }
 
                // Initialize content with closing div by default
                $content = "    </div>\n</div><!-- Group - CLOSE //-->";
@@ -432,7 +432,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ($this->ifSubGroupOpenedPreviously()) {
                                // Close it here
                                $this->addFormSubGroup();
-                       } // END - if
+                       }
 
                        // Get previous group id
                        $prevGroupId = $this->getPreviousGroupId();
@@ -444,7 +444,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ((!empty($groupId)) && ($groupId != $prevGroupId)) {
                                //* DEBUG: */ echo $groupId.'/'.$prevGroupId."<br />\n";
                                $this->addFormGroup($groupId, $groupText);
-                       } // END - if
+                       }
                }
        }
 
@@ -476,7 +476,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->ifSubGroupOpenedPreviously() === false) && ($subGroupId == $this->getPreviousSubGroupId())) {
                        // Abort here silently
                        return false;
-               } // END - if
+               }
 
                // Initialize content with closing div by default
                $content = "    </div>\n</div><!-- Sub group- CLOSE //-->";
@@ -509,7 +509,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        // All call it again if sub group name is not empty
                        if ((!empty($subGroupId)) && ($subGroupId != $prevSubGroupId)) {
                                $this->addFormSubGroup($subGroupId, $subGroupText);
-                       } // END - if
+                       }
                }
        }
 
@@ -527,7 +527,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Default is no title attribute
                $titleAttribute = '';
@@ -536,7 +536,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (!empty($fieldTitle)) {
                        // Create title attribute
                        $titleAttribute = sprintf(' title="%s" data-toggle="tooltip"', $fieldTitle);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<label class="col-form-label" for="%s_%s_field"%s>
@@ -566,7 +566,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf("       <div id=\"form_note_%s\">
@@ -594,7 +594,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Shall we close or open the sub group?
                if (($this->ifSubGroupOpenedPreviously() === false) && ($this->getPreviousSubGroupId() !== $selectId)) {
@@ -604,7 +604,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                                $firstEntry = sprintf("<option value=\"invalid\" disabled=\"disabled\">%s</option>\n",
                                        $firstEntry
                                );
-                       } // END - if
+                       }
 
                        // Construct the opening select tag
                        $content = sprintf("<select class=\"select_box\" id=\"%s_%s\" name=\"%s\">\n%s",
@@ -641,7 +641,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifSubGroupOpenedPreviously() === false) {
                        // Then throw an exception here
                        throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-               } // END - if
+               }
 
                // Render the content
                $content = sprintf("<option value=\"invalid\" class=\"suboption suboption_%s\" disabled=\"disabled\">%s</option>\n",
@@ -669,7 +669,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifSubGroupOpenedPreviously() === false) {
                        // Then throw an exception here
                        throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-               } // END - if
+               }
 
                // Render the content
                $content = sprintf("<option value=\"%s\" class=\"option option_%s\">%s</option>\n",
index d61d83cde7ea27ce041ca135f0f6cc13e9cc73be..9871126c46fc911007c9bd22c8d7a5523e7d2477 100644 (file)
@@ -95,7 +95,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (is_null($requestInstance)) {
                        // Throw an exception here
                        throw new NullPointerException($helperInstance, self::EXCEPTION_IS_NULL_POINTER);
-               } // END - if
+               }
 
                // Get page (this will throw an exception if not set)
                $command = StringUtils::convertDashesToUnderscores($requestInstance->getRequestElement('command'));
@@ -107,7 +107,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (!is_null($linkBase)) {
                        // Then output a deprecation message
                        $helperInstance->deprecationWarning('[' . __METHOD__ . ':' . __LINE__ . ']:  linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.');
-               } // END - if
+               }
 
                // Determine link base from config now and 'command' request
                try {
@@ -118,7 +118,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if (is_null($linkBase)) {
                                // Then throw again the exception
                                throw new NoConfigEntryException(array(__CLASS__, ($configEntry)), FrameworkConfiguration::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
-                       } // END - if
+                       }
                }
 
                // Set link base
@@ -202,7 +202,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously()) {
                        // Then close it
                        $this->closePreviousGroupByContent('');
-               } // END - if
+               }
 
                // Get the content
                $content = $this->renderContent();
@@ -228,7 +228,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously()) {
                        // Then close it here
                        $this->closePreviousGroupByContent('');
-               } // END - if
+               }
 
                // Generate the group content
                $content = sprintf('<%s id="group_%s_%s">%s',
@@ -257,13 +257,13 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $groupNote), self::EXCEPTION_GROUP_NOT_OPENED);
-               } // END - if
+               }
 
                // Is a previous sub group open?
                if ($this->ifSubGroupOpenedPreviously()) {
                        // Then close it
                        $this->closePreviousSubGroupByContent('</' . $groupCode . '>');
-               } // END - if
+               }
 
                // Generate the group content
                $content = sprintf('<%s id="subgroup_%s_%s">%s',
@@ -290,7 +290,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifGroupOpenedPreviously() === false) {
                        // No group was opened before!
                        throw new NoGroupOpenedException(array($this, $linkAction . '(' . $linkText . ')'), self::EXCEPTION_GROUP_NOT_OPENED);
-               } // END - if
+               }
 
                // Default parameter SEPARATOR is &amp;
                $separator = self::EXTRA_PARAMETER_SEPARATOR;
@@ -300,7 +300,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (count($linkArray) == 0) {
                        // No question mark
                        $separator = self::FIRST_PARAMETER_SEPARATOR;
-               } // END - if
+               }
 
                // Prepare action
                $action = sprintf('%saction=%s',
index b7e9f6ccc21a5a338f19c991f4418643ac4c85dd..0efd8f962b77431eb5e5c777f9789faab8ad5aea 100644 (file)
@@ -533,7 +533,7 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
                                        // Set the image string
                                        //* DEBUG: */ print __METHOD__.": size={$size}, x={$x}, y={$y}, string={$imageString}<br />\n";
                                        imagestring($this->getImageResource(), $size, $x, $y, $imageString, $foreColor);
-                               } // END - foreach
+                               }
                                break;
                }
 
index cdceda7d1980174cf6e725c7019fa7288b45ad79..c7f8e1320b551ddd70b8de2fb51b9897b0b19981 100644 (file)
@@ -79,7 +79,7 @@ class DefaultIterator extends BaseIterator implements Iterator, Registerable {
                if (!$this->valid()) {
                        // Throw an exception here
                        throw new IndexOutOfBoundsException($this->key(), self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
-               } // END - if
+               }
 
                // Now get the entry
                $current = $this->getListInstance()->getEntry($this->key());
index 781e38a4974d458a13a5f680f378226ab4bf9eb6..b0a28dc5a8301405b961ad9370598a497311d568 100644 (file)
@@ -124,7 +124,7 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
                if (count($entries) > 0) {
                        // Debugging:
                        /* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: UNFINISHED: entries=%s', __METHOD__, __LINE__, print_r($entries, TRUE)));
-               } // END - if
+               }
 
                // Get instance registry entries from it
                $entries = $this->getRegistryInstance()->getInstanceRegistry();
@@ -185,8 +185,8 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('REGISTRY-ITERATOR[instance]: key=%s - Adding ...', $key));
                                //* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: key=%s,entry=%s', __METHOD__, __LINE__, $key, print_r($entry, TRUE)));
                                array_push($this->registryKeys['instance'], $key);
-                       } // END - foreach
-               } // END - if
+                       }
+               }
 
                // Trace message
                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('REGISTRY-ITERATOR: EXIT!');
index 483acb1ab31cbed9941773ebd4fd54d429755027..2fc352a6729839348862b418d8f41c3bb00b1402 100644 (file)
@@ -95,7 +95,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                                FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path'),
                                $applicationInstance->getAppShortName()
                        );
-               } // END - if
+               }
 
                // Is the base path valid?
                if (empty($languageBasePath)) {
@@ -213,7 +213,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                if ($this->langStrings->offsetExists($messageId)) {
                        // Return the message string
                        $messageText = $this->langStrings->offsetGet($messageId);
-               } // END - if
+               }
 
                // Return the text
                return $messageText;
index a1e58a5182557a6052ff49666c80dd61c51cafc9..7a606f9eeefb06f105bd533894032e5bd7600894 100644 (file)
@@ -126,8 +126,8 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 
                                // Transfer the data to the response
                                $templateInstance->transferToResponse($responseInstance);
-                       } // END - foreach
-               } // END - foreach
+                       }
+               }
        }
 
        /**
index 7fd46736e54a3afe2482e5236842c3644f077978..6eb9f1a1a7f11fb94e857a1eb97b0443920581d6 100644 (file)
@@ -63,8 +63,8 @@ class ???Output extends BaseOutput implements OutputStreamer, Registerable {
                        if (!empty($contentType)) {
                                // Set the header
                                FrameworkBootstrap::getResponseInstance()->addHeader('Content-type', $contentType);
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                // Return instance
                return self::$!!!Instance;
index 545e27b4763a64689468b4c5811ea4f5daeebf74..25b5527f10c42ef299cc759600ae92d6acd60e0b 100644 (file)
@@ -66,7 +66,7 @@ class ConsoleOutput extends BaseOutput implements OutputStreamer {
                        @header(sprintf('Content-type: %s',
                                $contentType
                        ));
-               } // END - if
+               }
 
                // Return instance
                return self::$consoleInstance;
@@ -82,7 +82,7 @@ class ConsoleOutput extends BaseOutput implements OutputStreamer {
                if (is_null(self::$consoleInstance)) {
                        $contentType = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('web_content_type');
                        self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-               } // END - if
+               }
 
                // Return the instance
                return self::$consoleInstance;
index 005944189e31b66bb9d3efe921704b885f37efae..b0b8cb08a4dadde31d092bb7139060b4263597a2 100644 (file)
@@ -74,8 +74,8 @@ class DebugErrorLogOutput extends BaseDebugOutput implements Debugger, OutputStr
                        if (!empty($err)) {
                                // Log this line
                                error_log(html_entity_decode(strip_tags($err)), 0);
-                       } // END - if
-               } // END - foreach
+                       }
+               }
        }
 
        /**
index 523698fdefe374c1a26d49299027950cad244873..0110e689ab55a195960dea21903c663e5743fb76 100644 (file)
@@ -134,7 +134,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 
                        // Has he enought points?
                        $hasRequired = ($currEntry['points'] >= $requiredPoints);
-               } // END - if
+               }
 
                // Return the result
                return $hasRequired;
index 3d679d40845365ec3515c847de240096a601ab2d..c3620c357ecf6c60297524df4e818c37c894e7f3 100644 (file)
@@ -55,7 +55,7 @@ class ???Registry extends BaseRegistry implements Register {
                if (is_null(self::$registryInstance)) {
                        // Not yet, so create one
                        self::$registryInstance = new ???Registry();
-               } // END - if
+               }
 
                // Return the instance
                return self::$registryInstance;
index 5a7db692ea8d1e576aec327a425040793aab3518..24e19b2351f0af9944bcfd8e0b3a628264f14e5b 100644 (file)
@@ -48,7 +48,7 @@ class ???FormatUpgradeRegistry extends BaseRegistry implements RegisterableForma
                if (is_null(self::$registryInstance)) {
                        // Not yet, so create one
                        self::$registryInstance = new ???FormatUpgradeRegistry();
-               } // END - if
+               }
 
                // Return the instance
                return self::$registryInstance;
index d3a289218b8cf447fb42c9d57fbc3ccfa32e3101..ecc6478e10f29c443d5d3c9b9d194ac485cf1f16 100644 (file)
@@ -56,7 +56,7 @@ class LocalFileDatabaseFormatUpgradeRegistry extends BaseRegistry implements Reg
                if (is_null(self::$registryInstance)) {
                        // Not yet, so create one
                        self::$registryInstance = new LocalFileDatabaseFormatUpgradeRegistry();
-               } // END - if
+               }
 
                // Return the instance
                return self::$registryInstance;
index aa0dc486b5a8b66288afadd7ee85c290b0fad25a..7811622635a18438559a30ad2a0bcca9d26b3bf2 100644 (file)
@@ -52,7 +52,7 @@ class GenericRegistry extends BaseRegistry implements Register {
                if (is_null(self::$registryInstance)) {
                        // Not yet, so create one
                        self::$registryInstance = new GenericRegistry();
-               } // END - if
+               }
 
                // Return the instance
                return self::$registryInstance;
index bab5320496f848394199f92842bb22ce5adb656f..d70fe58e7cfadf82de51c0b4a2e9f27397c134b4 100644 (file)
@@ -82,7 +82,7 @@ abstract class BaseRequest extends BaseFrameworkSystem {
 
                        // Secure it against attacks
                        $value = htmlentities(strip_tags($value), ENT_QUOTES);
-               } // END - if
+               }
 
                // Return the element's value
                return $value;
index f7fec02db09a2ab6816ee15d27af57e59d8a9b9c..c8b91d7bab9b1765d655c0d54c839d8ad74cf3c4 100644 (file)
@@ -65,7 +65,7 @@ class ConsoleRequest extends BaseRequest implements Requestable {
                if ((!isset($_SERVER['argv'])) || (!isset($_SERVER['argc']))) {
                        // Maybe not right PHP mode? (needs CLI?)
                        trigger_error(sprintf('[%s:%d]: argv/argc not set: %s', __METHOD__, __LINE__, print_r($_SERVER, true)), E_USER_ERROR);
-               } // END - if
+               }
 
                // Get the "request data" from the command-line argument list
                $args = $_SERVER['argv'];
@@ -74,13 +74,13 @@ class ConsoleRequest extends BaseRequest implements Requestable {
                if ($_SERVER['argc'] < 2) {
                        // Skip this
                        return;
-               } // END - if
+               }
 
                // Is the first element "index.php" ?
                if ($args[0] == 'index.php') {
                        // Then remove it
                        array_shift($args);
-               } // END - if
+               }
 
                // Try to determine next parameters
                foreach ($args as $arg) {
@@ -95,7 +95,7 @@ class ConsoleRequest extends BaseRequest implements Requestable {
                                // Set a name=value pair escaped and secured
                                $this->setRequestElement($argArray[0], escapeshellcmd($argArray[1]));
                        }
-               } // END - foreach
+               }
        }
 
        /**
index 5620782a23d33c43842798a8fd547d47979c0d9b..ae79f709137221d2af374bed38f870474d8f055b 100644 (file)
@@ -114,7 +114,7 @@ class HtmlRequest extends BaseRequest implements Requestable {
                // Does this header exist?
                if (isset($_SERVER[$name])) {
                        $headerValue = $_SERVER[$name];
-               } // END - if
+               }
 
                // Return the value
                return $headerValue;
@@ -143,7 +143,7 @@ class HtmlRequest extends BaseRequest implements Requestable {
                if (isset($_COOKIE[$cookieName])) {
                        // Then get it
                        $cookieValue = $_COOKIE[$cookieName];
-               } // END - if
+               }
 
                // Return the value
                return $cookieValue;
index 54d5fd76a859b043b610523c46d589fe9d886724..55a313e8f84c5a5a6bb72c0dbec5adbaa95cb971 100644 (file)
@@ -97,13 +97,13 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
                // Is the action empty? Then fall back to default action
                if (empty($actionName)) {
                        $actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-               } // END - if
+               }
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {
                        // This action is invalid!
                        throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $actionInstance = $this->loadAction();
@@ -112,7 +112,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
                if ((!is_object($actionInstance)) || (!$actionInstance instanceof Actionable)) {
                        // This action has an invalid instance!
                        throw new InvalidActionInstanceException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Set last action
                $this->setResolvedInstance($actionInstance);
@@ -137,13 +137,13 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
                // Is the action empty? Then fall back to default action
                if (empty($actionName)) {
                        $actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-               } // END - if
+               }
 
                // Check if action is valid
                if ($this->isActionValid($actionName) === false) {
                        // This action is invalid!
                        throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $actionInstance = $this->loadAction();
index 21a0859afba09152001e45c97f8ae43248fae4a5..d9fcab2a42f2e067a6b06cafb1d090680fbce1ff 100644 (file)
@@ -90,7 +90,7 @@ class ???Resolver extends BaseResolver implements Resolver {
                if ($this->is|||Valid($!!!Name) === false) {
                        // This action is invalid!
                        throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $!!!Instance = $this->load|||();
@@ -99,7 +99,7 @@ class ???Resolver extends BaseResolver implements Resolver {
                if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
                        // This action has an invalid instance!
                        throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Set last action
                $this->setResolvedInstance($!!!Instance);
@@ -124,13 +124,13 @@ class ???Resolver extends BaseResolver implements Resolver {
                // Is the action empty? Then fall back to default action
                if (empty($!!!Name)) {
                        $!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-               } // END - if
+               }
 
                // Check if action is valid
                if ($this->is|||Valid($!!!Name) === false) {
                        // This action is invalid!
                        throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-               } // END - if
+               }
 
                // Get the action
                $!!!Instance = $this->load|||();
index f23073408383f1f6982809ac532c75d58e4e5920..8bc2d373d56fb01cbc139f8942f4b244c05c8042 100644 (file)
@@ -200,7 +200,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
                        foreach ($this->responseHeaders as $name => $value) {
                                header($name . ': ' . $value);
                                //* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('name=' . $name . ',value=' . $value);
-                       } // END - foreach
+                       }
 
                        // Send cookies out?
                        if (count($this->cookies) > 0) {
@@ -210,7 +210,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
 
                                // Remove them all
                                $this->cookies = [];
-                       } // END - if
+                       }
                }
 
                // Are there some error messages?
index ebfb0a261da8d9213d646107dcb0ee8d49f0457f..4150ca9d7fc156415cf8779d07153530cb307b93 100644 (file)
@@ -81,13 +81,13 @@ class HtmlResponse extends BaseResponse implements Responseable {
                        // Throw an exception here
                        //* DEBUG: */ return;
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Shall we encrypt the cookie?
                if ($encrypted) {
                        // Unsupported at the moment
                        $this->partialStub('Encryption is unsupported at the moment.');
-               } // END - if
+               }
 
                // For slow browsers set the cookie array element first
                $_COOKIE[$cookieName] = $cookieValue;
@@ -95,7 +95,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
                // Get all config entries
                if (is_null($expires)) {
                        $expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
-               } // END - if
+               }
 
                $path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
                $domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
@@ -129,7 +129,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
                if (headers_sent()) {
                        // Throw an exception here
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Assign application data
                $this->getTemplateInstance()->assignApplicationData($applicationInstance);
@@ -145,11 +145,11 @@ class HtmlResponse extends BaseResponse implements Responseable {
                        // Is there a / in front of the relative URL?
                        if (substr($url, 0, 1) == '/') {
                                $url = substr($url, 1);
-                       } // END - if
+                       }
 
                        // No, then extend it with our base URL
                        $url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
-               } // END - if
+               }
 
                // Add redirect header
                $this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -181,7 +181,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
 
                        // Remove it from array
                        unset($_COOKIE[$cookieName]);
-               } // END - if
+               }
        }
 
        /**
@@ -195,7 +195,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
                if (isset($_COOKIE[$cookieName])) {
                        // Update the cookie
                        $this->addCookie($cookieName, $_COOKIE[$cookieName], false);
-               } // END - if
+               }
        }
 
 }
index 75b3b1bace3804713f4127fdd4baab707662d272..d8531206d913a264a149401bba1db4a0cca795fb 100644 (file)
@@ -118,7 +118,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                // Get all config entries
                if (is_null($expires)) {
                        $expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
-               } // END - if
+               }
 
                $path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
                $domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
@@ -152,7 +152,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                if (headers_sent()) {
                        // Throw an exception here
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Assign application data
                $this->getTemplateInstance()->assignApplicationData($applicationInstance);
@@ -170,7 +170,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                        // No, then extend it with our base URL
                        $url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
-               } // END - if
+               }
 
                // Add redirect header
                $this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -226,7 +226,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                        // Remove it from array
                        unset($_COOKIE[$cookieName]);
-               } // END - if
+               }
        }
 
        /**
@@ -240,7 +240,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                if (isset($_COOKIE[$cookieName])) {
                        // Update the cookie
                        $this->addCookie($cookieName, $_COOKIE[$cookieName], false);
-               } // END - if
+               }
        }
 
 }
index 803ff0b7b6d560afc366c0d1596df65fb7bb1359..57b1a6f6f00559ee92818a3f422b893b59be92a1 100644 (file)
@@ -122,7 +122,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('is_single_server') == 'Y') {
                        // Then use that IP for extra security
                        $serverIp = FrameworkBootstrap::detectServerAddress();
-               } // END - if
+               }
 
                // Yet-another fixed salt. This is not dependend on server software or date
                if ($extraInstance instanceof FrameworkInterface) {
@@ -159,7 +159,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // Is the number <1, then fix it to default length
                if ($length < 1) {
                        $length = $this->rndStrLen;
-               } // END - if
+               }
 
                // Initialize the string
                $randomString = '';
@@ -168,7 +168,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                for ($idx = 0; $idx < $length; $idx++) {
                        // Add a random character and add it to our string
                        $randomString .= chr($this->randomNumber(0, 255));
-               } // END - for
+               }
 
                // Return the random string a little mixed up
                return str_shuffle($randomString);
@@ -216,7 +216,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                // Get key
                if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
                        $key = md5($this->getFixedSalt());
-               } // END - if
+               }
 
                // Return it
                return $key;
index c9268cfe6b74541de6b7e758235d4f41e183a03e..80a81446f2b2d1d3ce5141f7720c93ef12970fb7 100644 (file)
@@ -262,7 +262,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
                if (empty($characters)) {
                        // Then skip it silently
                        return;
-               } // END - if
+               }
 
                // Unfinished work!
                $this->partialStub('Handling extra characters is not yet supported!');
index 2f80bf29d744a7c013b4fd7879dabd4e74a3637d..44dfeb0523630111bca7546526b5e848a0671129 100644 (file)
@@ -232,7 +232,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                if (empty($characters)) {
                        // Then skip it silently
                        return;
-               } // END - if
+               }
 
                // Add the message now
                $this->assignVariable('message', $characters);
index 7ae3382ac26071c83d57f58234b7ba0d1893200a..cbbf4a736a026a290ef65fe393ab7d1330c0d66a 100644 (file)
@@ -179,7 +179,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (empty($templateName)) {
                        // Set generic template name
                        $templateName = $this->typePrefix . '_' . $this->xmlTemplateType . '_template_type';
-               } // END - if
+               }
 
                // Set template type
                $this->setTemplateType(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($templateName));
@@ -266,7 +266,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (is_null($value)) {
                        // Bah, needs fixing.
                        $this->debugInstance(sprintf('[%s:%d]: key=%s returns NULL', __METHOD__, __LINE__, $key));
-               } // END - if
+               }
 
                // Return value
                return $value;
@@ -296,7 +296,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 
                        // Save the parsed raw content in our dependency array
                        $this->dependencyContent[$node] = $templateInstance->getRawTemplateData();
-               } // END - if
+               }
        }
 
        /**
@@ -352,7 +352,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
                if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) {
                        // Did not match!
                        throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), XmlParser::EXCEPTION_XML_NODE_MISMATCH);
-               } // END - if
+               }
 
                // Construct method name
                $methodName = 'finish' . StringUtils::convertToClassName($nodeName);
index 07ec57f168bc008004ba5f868125088b3178a2bd..468f235dc0902bcf6de2ed1d2295dd413fcedafa 100644 (file)
@@ -157,7 +157,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
                        // And finally set it
                        $this->setResultInstance($resultInstance);
-               } // END - if
+               }
 
                // Rewind it
                $this->getResultInstance()->rewind();
@@ -166,7 +166,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
                if ($this->getResultInstance()->valid()) {
                        // Entry found
                        $exists = true;
-               } // END - if
+               }
 
                // Return the status
                return $exists;
@@ -201,7 +201,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
                        // And finally set it
                        $this->setResultInstance($resultInstance);
-               } // END - if
+               }
 
                // Rewind it
                $this->getResultInstance()->rewind();
@@ -218,8 +218,8 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
                                // Set the username
                                $this->setUserName($currEntry['username']);
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                // Return the status
                return $exists;
@@ -256,7 +256,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
                        // And finally set it
                        $this->setResultInstance($resultInstance);
-               } // END - if
+               }
 
                // Rewind it and advance to first entry
                $this->getResultInstance()->rewind();
@@ -269,7 +269,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
                        // So does the hashes match?
                        //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '<br />' . $this->getResultInstance()->getFoundValue() . '<br />';
                        $matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
-               } // END - if
+               }
 
                // Return the status
                return $matches;
@@ -291,7 +291,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
                if (isset($entry['pass_hash'])) {
                        // Get it
                        $passHash = $entry['pass_hash'];
-               } // END - if
+               }
 
                // And return the hash
                return $passHash;
index dbf872257336d391c223742f7ee984f5e5579cf2..34e0627163f9ed83ea075fcb72c89db4b8510a29 100644 (file)
@@ -132,7 +132,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
                // If there is no action use the default on
                if (is_null($lastAction)) {
                        $lastAction = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('login_default_action');
-               } // END - if
+               }
 
                // Get a critieria instance
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
index 257d325d5e23b44c947c479b327fcbb30cef3162..c95dc11dc3bffd4c1cae817a4a8262543f01a59b 100644 (file)
@@ -428,7 +428,7 @@ final class StringUtils extends BaseFrameworkSystem {
                        //* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('STRING-UTILS: big=%d,chunk(%d)=%s', $big, strlen($chunk), md5($chunk)));
 
                        $packed .= $chunk;
-               } // END - for
+               }
 
                // Return it
                //* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('STRING-UTILS: packed=%s - EXIT!', $packed));
index d7bbe1c49d8282c5caa0972369c7e4257fcf18f5..ebee4d486e95bc1a6fdc1802ab1db342a3d92f87 100644 (file)
@@ -129,7 +129,7 @@ abstract class FrameworkException extends ReflectionException {
                                        if (!is_array($debug)) {
                                                $info .= $debug . ', ';
                                        }
-                               } // END - foreach
+                               }
 
                                // Remove last chars (commata, space)
                                $info = substr($info, 0, -2);
index 798f6e48e559d1da9439558148f0148b0482845d..79d834565e36973e48a7b43428d3c78f13f13b8a 100644 (file)
@@ -106,7 +106,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
                                        // No more searches required because we have found a valid compressor stream
                                        break;
                                }
-                       } // END - while
+                       }
 
                        // Close the directory
                        $directoryInstance->closeDirectory();
index adfe0459a4de3389eec6ec6b38574cb8002c429a..1fabb5a207269c235aca93822e5c37e32b4d76a9 100644 (file)
@@ -46,7 +46,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro
                // Init additional filter chains
                foreach (array('bootstrap', 'tests', 'shutdown') as $filterChain) {
                        $this->initFilterChain($filterChain);
-               } // END - foreach
+               }
        }
 
        /**
index 6e479a71566982dcc79e295196600cad0f2fdb9c..b2428e8e69a6d06c827e858e6192f82bbc68e919 100644 (file)
@@ -38,7 +38,7 @@ unset($_SERVER['argv'][1]);
 if (extension_loaded('xdebug')) {
        // Quiet it a bit as this interfers with the nice testing output
        ini_set('xdebug.show_exception_trace', FALSE);
-} // END - if
+}
 
 // Autoload more stuff
 require dirname(__DIR__) . '/vendor/autoload.php';