From e9026bc4389ce79bde17c4337e98b3b4f0c55da3 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 4 Mar 2017 23:30:35 +0100 Subject: [PATCH 01/11] moved to own sub directory, execute them as ./contrib/foo.sh Signed-off-by: Roland Haeder --- .gitattributes | 4 ++-- clear-cache.sh => contrib/clear-cache.sh | 0 find-bad-php.sh => contrib/find-bad-php.sh | 0 package.sh => contrib/package.sh | 0 pdepend.sh => contrib/pdepend.sh | 0 rebuild_doc.sh => contrib/rebuild_doc.sh | 0 todo-builder.sh => contrib/todo-builder.sh | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename clear-cache.sh => contrib/clear-cache.sh (100%) rename find-bad-php.sh => contrib/find-bad-php.sh (100%) rename package.sh => contrib/package.sh (100%) rename pdepend.sh => contrib/pdepend.sh (100%) rename rebuild_doc.sh => contrib/rebuild_doc.sh (100%) rename todo-builder.sh => contrib/todo-builder.sh (100%) diff --git a/.gitattributes b/.gitattributes index dfe0770..17cdcd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -# Auto detect text files and perform LF normalization -* text=auto +# Use Linux/Uni* line-feed for new lines (prevents converting) +* text=lf diff --git a/clear-cache.sh b/contrib/clear-cache.sh similarity index 100% rename from clear-cache.sh rename to contrib/clear-cache.sh diff --git a/find-bad-php.sh b/contrib/find-bad-php.sh similarity index 100% rename from find-bad-php.sh rename to contrib/find-bad-php.sh diff --git a/package.sh b/contrib/package.sh similarity index 100% rename from package.sh rename to contrib/package.sh diff --git a/pdepend.sh b/contrib/pdepend.sh similarity index 100% rename from pdepend.sh rename to contrib/pdepend.sh diff --git a/rebuild_doc.sh b/contrib/rebuild_doc.sh similarity index 100% rename from rebuild_doc.sh rename to contrib/rebuild_doc.sh diff --git a/todo-builder.sh b/contrib/todo-builder.sh similarity index 100% rename from todo-builder.sh rename to contrib/todo-builder.sh -- 2.39.2 From d6cbd0cfbc6357bcc6b7163842cd00a020003263 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 16 Feb 2023 18:33:56 +0100 Subject: [PATCH 02/11] Continued: - updated index.php which is the entrance to any application, including daemons and tools on console - updated 'core' framework --- Doxyfile => contrib/Doxyfile | 0 core | 2 +- inc | 1 - index.php | 194 +++++++++++++++++++++++------------ 4 files changed, 132 insertions(+), 65 deletions(-) rename Doxyfile => contrib/Doxyfile (100%) delete mode 120000 inc diff --git a/Doxyfile b/contrib/Doxyfile similarity index 100% rename from Doxyfile rename to contrib/Doxyfile diff --git a/core b/core index 1893995..ad17ce1 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1893995b39b02c07012c5f3795654fb9251b5ebd +Subproject commit ad17ce1c5fe13f2290e74bec676f23e65c2e9100 diff --git a/inc b/inc deleted file mode 120000 index 1f8dea2..0000000 --- a/inc +++ /dev/null @@ -1 +0,0 @@ -core/inc \ No newline at end of file diff --git a/index.php b/index.php index 51eb50e..51a9f47 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,20 @@ * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -28,9 +44,9 @@ */ final class ApplicationEntryPoint { /** - * Core path + * Framework path */ - private static $corePath = ''; + private static $frameworkPath = ''; /** * The application's emergency exit @@ -42,99 +58,104 @@ final class ApplicationEntryPoint { * @return void * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper */ - public static final function app_exit ($message = '', $code = FALSE, $extraData = '', $silentMode = FALSE) { + public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) { // Is this method already called? if (isset($GLOBALS['app_die_called'])) { // Then output the text directly exit($message); - } // END - if + } // This method shall not be called twice - $GLOBALS['app_die_called'] = TRUE; + $GLOBALS['app_die_called'] = true; // Is a message set? if (empty($message)) { // No message provided $message = 'No message provided.'; - } // END - if + } // Get config instance - $configInstance = FrameworkConfiguration::getSelfInstance(); + $configInstance = FrameworkBootstrap::getConfigurationInstance(); // Do we have debug installation? - if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === TRUE)) { + if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { // Abort here - exit(); - } // END - if + exit; + } // Get some instances - $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('html_template_class'); + $templateClassName = $configInstance->getConfigEntry('html_template_class'); $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE $templateInstance = NULL; // Get response instance - $responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance(); + $responseInstance = FrameworkBootstrap::getResponseInstance(); // Is the template engine loaded? - if ((class_exists($tpl)) && (is_object($languageInstance))) { + if ((class_exists($templateClassName)) && ($languageInstance instanceof ManageableLanguage)) { // Use the template engine for putting out (nicer look) the message try { // Get the template instance from our object factory - $templateInstance = ObjectFactory::createObjectByName($tpl); + $templateInstance = ObjectFactory::createObjectByName($templateClassName); } catch (FrameworkException $e) { - exit(sprintf("[Main:] Could not initialize template engine for reason: %s", + exit(sprintf('[Main:] Could not initialize template engine for reason: %s', $e->getMessage() )); } // Get and prepare backtrace for output - $backtraceArray = debug_backtrace(); $backtrace = ''; - foreach ($backtraceArray as $key => $trace) { + foreach (debug_backtrace() as $key => $trace) { // Set missing array elements if (!isset($trace['file'])) { $trace['file'] = __FILE__; - } // END - if + } if (!isset($trace['line'])) { $trace['line'] = __LINE__; - } // END - if + } if (!isset($trace['args'])) { $trace['args'] = array(); - } // END - if + } // Add the traceback path to the final output - $backtrace .= sprintf("%s:%d, %s(%d)
\n", + $backtrace .= sprintf('%s:%d, %s(%d)
' . PHP_EOL, basename($trace['file']), $trace['line'], $trace['function'], count($trace['args']) ); - } // END - foreach + } // Init application instance $applicationInstance = NULL; - // Is the class there? - if (class_exists('ApplicationHelper')) { + /* + * The following class may NOT be loaded at all times. For example, + * it might be the (rare) case that an error has happened BEFORE + * that class had been loaded and cannot be loaded or else an + * infinte loop in invoking this method will take place resulting in + * a stack-overflow error. + */ + if (class_exists('Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper')) { // Get application instance $applicationInstance = ApplicationHelper::getSelfInstance(); // Assign application data - $templateInstance->assignApplicationData($applicationInstance); - } // END - if + $templateInstance->assignApplicationData(); + } // We only try this try { // Assign variables - $templateInstance->assignVariable('message', $message); - $templateInstance->assignVariable('code', $code); - $templateInstance->assignVariable('extra', $extraData); - $templateInstance->assignVariable('backtrace', $backtrace); + $templateInstance->assignVariable('message' , $message); + $templateInstance->assignVariable('code' , $code); + $templateInstance->assignVariable('extra' , $extraData); + $templateInstance->assignVariable('backtrace' , $backtrace); $templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal()); - $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal()); - $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title')); + $templateInstance->assignVariable('total_objects' , ObjectFactory::getTotal()); + $templateInstance->assignVariable('title' , $languageInstance->getMessage('emergency_exit_title')); // Load the template $templateInstance->loadCodeTemplate('emergency_exit'); @@ -150,68 +171,115 @@ final class ApplicationEntryPoint { // Flush the response $responseInstance->flushBuffer(); - } catch (FileIoException $e) { + } catch (FileNotFoundException $e) { // Even the template 'emergency_exit' wasn't found so output both message exit($message . ', exception: ' . $e->getMessage()); } // Good bye... - exit(); + exit; } else { // Output message and die - exit(sprintf('[Main:] Emergency exit reached: %s', + die(sprintf('[Main:] Emergency exit reached: %s', $message )); } } /** - * Determines the correct absolute path for all includes only once per run. - * Other calls of this method are being "cached". + * Determines the correct absolute path for the framework. A set of common + * paths is being tested (first most common for applications, second when + * core tests are being executed and third/forth if the framework has been + * cloned there). * - * @return $corePath Base path (core) for all includes + * @return $frameworkPath Path for framework */ - protected static final function detectCorePath () { + public static final function detectFrameworkPath () { // Is it not set? - if (empty(self::$corePath)) { - // Auto-detect our core path - self::$corePath = str_replace("\\", '/', dirname(__FILE__)); - } // END - if + if (empty(self::$frameworkPath)) { + // Auto-detect core path (first application-common) + foreach (array('core', __DIR__, '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) { + // Create full path for testing + $realPath = realpath($possiblePath); + + // Is it false? + //* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath); + if ($realPath === false) { + // Then, not found. + continue; + } + + // Append framework path + $frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR); + + // First create full-qualified file name (FQFN) to framework/config-global.php + $configFile = $frameworkPath . 'config-global.php'; + + // Is it readable? + //* NOISY-DEBUG: */ printf('[%s:%d]: configFile=%s' . PHP_EOL, __METHOD__, __LINE__, $configFile); + if (is_readable($configFile)) { + // Found one + self::$frameworkPath = $frameworkPath; + + // Abort here + break; + } + } + + // Able to find? + if (!is_dir(self::$frameworkPath)) { + // Is no directory + throw new Exception('Cannot find framework.'); + } + } // Return it - return self::$corePath; + return self::$frameworkPath; + } + + /** + * Getter for root path + * + * @return $rootPath Root path + */ + public static function getRootPath () { + // Get __DIR__, really simple and no detection + return __DIR__; } /** - * The application's main entry point. This class isolates some local + * The framework's main entry point. This class isolates some local * variables which shall not become visible to outside because of security - * concerns. We are doing this here to "emulate" the well-known entry - * point in Java. + * concerns. This is done here to "emulate" the well-known entry point in + * Java. * * @return void */ public static final function main () { - // Load config file - require(self::detectCorePath() . '/inc/config.php'); + // Load bootstrap file + require sprintf('%sbootstrap%sbootstrap.inc.php', self::detectFrameworkPath(), DIRECTORY_SEPARATOR); - // Load all include files - require($cfg->getConfigEntry('base_path') . 'inc/includes.php'); + /* + * Initial bootstrap is done, continue with initialization of + * framework. + */ + FrameworkBootstrap::initFramework(); - // Include the application selector - require($cfg->getConfigEntry('base_path') . 'inc/selector.php'); - } // END - main() -} // END - class + // Next initialize the detected application + FrameworkBootstrap::prepareApplication(); -// Developer mode active? Comment out if no dev! -define('DEVELOPER', TRUE); + /* + * Last step is to start the application, this will also initialize and + * register the application instance in registry. + */ + FrameworkBootstrap::startApplication(); + } +} // Log all exceptions (only debug! This option can create large error logs) -//define('LOG_EXCEPTIONS', TRUE); +//define('LOG_EXCEPTIONS', true); //xdebug_start_trace(); -// Do not remove the following line: +// Call above main() method ApplicationEntryPoint::main(); - -// [EOF] -?> -- 2.39.2 From 00225d81115763e48aa6cfb918d6ec9e9ace39e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 16 Feb 2023 18:43:13 +0100 Subject: [PATCH 03/11] Continued: - updated ApplicationHelper class - updated getting configuration instance - emptied deprecated files to have non-cloned installations cleaned up --- .../shipsimu/class_ApplicationHelper.php | 196 +++++++----------- application/shipsimu/config.php | 5 +- application/shipsimu/data.php | 51 +---- application/shipsimu/exceptions.php | 147 +++++++++---- application/shipsimu/init.php | 47 +---- application/shipsimu/loader.php | 29 +-- application/shipsimu/starter.php | 53 +---- 7 files changed, 195 insertions(+), 333 deletions(-) diff --git a/application/shipsimu/class_ApplicationHelper.php b/application/shipsimu/class_ApplicationHelper.php index 204800f..84d5198 100644 --- a/application/shipsimu/class_ApplicationHelper.php +++ b/application/shipsimu/class_ApplicationHelper.php @@ -1,4 +1,16 @@ * @version 0.0 - * @copyright Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 Ship-Simu Developer Team + * @copyright Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2022 Ship-Simu Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify @@ -38,33 +50,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable { - /** - * The version number of this application - */ - private $appVersion = ''; - - /** - * The human-readable name for this application - */ - private $appName = ''; - - /** - * The short uni*-like name for this application - */ - private $shortName = ''; - - /** - * An instance of this class - */ - private static $selfInstance = NULL; - +class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable { /** * Private constructor * * @return void */ - protected function __construct () { + private function __construct () { // Call parent constructor parent::__construct(__CLASS__); } @@ -76,105 +68,54 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica */ public static final function getSelfInstance () { // Is the instance there? - if (is_null(self::$selfInstance)) { - self::$selfInstance = new ApplicationHelper(); - } // END - if + if (is_null(self::getApplicationInstance())) { + self::setApplicationInstance(new ApplicationHelper()); + } // Return the instance - return self::$selfInstance; + return self::getApplicationInstance(); } /** - * Getter for the version number - * - * @return $appVersion The application's version number - */ - public final function getAppVersion () { - return $this->appVersion; - } - /** - * Setter for the version number + * 1) Setups application data * - * @param $appVersion The application's version number * @return void */ - public final function setAppVersion ($appVersion) { - // Cast and set it - $this->appVersion = (string) $appVersion; + public function setupApplicationData () { + // Set all application data + $this->setAppName('Ship-Simu Shipping Simulator'); + $this->setAppVersion('0.0.0'); + $this->setAppShortName('shipsimu'); } /** - * Getter for human-readable name + * 2) Does initial stuff before starting the application * - * @return $appName The application's human-readable name - */ - public final function getAppName () { - return $this->appName; - } - - /** - * Setter for human-readable name - * - * @param $appName The application's human-readable name * @return void */ - public final function setAppName ($appName) { - // Cast and set it - $this->appName = (string) $appName;; - } + public function initApplication () { + // Get config instance + $cfg = FrameworkBootstrap::getConfigurationInstance(); - /** - * Getter for short uni*-like name - * - * @return $shortName The application's short uni*-like name - */ - public final function getAppShortName () { - return $this->shortName; - } + // Initialize output system + ApplicationHelper::createDebugInstance('ApplicationHelper'); - /** - * Setter for short uni*-like name - * - * @param $shortName The application's short uni*-like name - * @return void - */ - public final function setAppShortName ($shortName) { - // Cast and set it - $this->shortName = (string) $shortName; + /* + * This application needs a database connection then simply call init + * method. + */ + FrameworkBootstrap::initDatabaseInstance(); } /** - * Launches the application + * 3) Launches the application * * @return void */ - public final function entryPoint () { - // Set this application in registry - Registry::getRegistry()->addInstance('app', $this); - - // Default response is console - $response = self::getResponseTypeFromSystem(); - $responseType = self::getResponseTypeFromSystem(); - - // Create a new request object - $requestInstance = ObjectFactory::createObjectByName(self::convertToClassName($response) . 'Request'); - - // Remember request instance here - $this->setRequestInstance($requestInstance); - - // Do we have another response? - if ($requestInstance->isRequestElementSet('request')) { - // Then use it - $response = strtolower($requestInstance->getRequestElement('request')); - $responseType = $response; - } // END - if - - // ... and a new response object - $responseClass = sprintf('%sResponse', self::convertToClassName($response)); - $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); - - // Remember response instance here - $this->setResponseInstance($responseInstance); + public function launchApplication () { + // Get request/response instances + $requestInstance = FrameworkBootstrap::getRequestInstance(); + $responseInstance = FrameworkBootstrap::getResponseInstance(); // Get the parameter from the request $commandName = $requestInstance->getRequestElement('command'); @@ -184,31 +125,55 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Get default command $commandName = $responseInstance->determineDefaultCommand(); + // Debug message + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('commandName[%s]=%s', gettype($commandName), $commandName)); + // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } - // Get a controller resolver - $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); - $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); + // Is the request type 'html' ? + if (FrameworkBootstrap::getRequestTypeFromSystem() == 'html') { + // The language system is needed for this + $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class'); - // Get a controller instance as well - $this->setControllerInstance($resolverInstance->resolveController()); + // And set it here + $this->setLanguageInstance($languageInstance); + } - // Initialize language system - $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class'); + // Configuration entry key + $configEntry = sprintf( + '%s_%s_controller_resolver_class', + $this->getAppShortName(), + FrameworkBootstrap::getRequestTypeFromSystem() + ); - // And set it here - $this->setLanguageInstance($languageInstance); + // Get a controller resolver instance + $resolverInstance = ObjectFactory::createObjectByConfiguredName($configEntry, [ + $commandName, + ]); - // Launch the main routine here + // Get a controller instance as well + $this->setControllerInstance($resolverInstance->resolveController()); + + // Launch the test suite here $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance); + + // Only for console requests as this is the actual daemon + if ($requestType == 'console') { + // -------------------------- Shutdown phase -------------------------- + // Shutting down the hub by saying "good bye" to all connected peers + // and other hubs, flushing all queues and caches. + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress, main loop exited.'); + $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance); + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)'); + } } /** * Assigns extra application-depending data * - * @param $templateInstance An instance of a CompileableTemplate + * @param $templateInstance An instance of a CompileableTemplate class * @return void * @todo Nothing to add? */ @@ -226,7 +191,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Walk through all messages foreach ($messageList as $message) { exit(__METHOD__ . ':MSG:' . $message); - } // END - foreach + } } /** @@ -235,9 +200,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica * @return $masterTemplateName Name of the master template */ public function buildMasterTemplateName () { - return 'node_main'; + return 'node_daemon'; } } - -// [EOF] -?> diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php index 948efec..72cccec 100644 --- a/application/shipsimu/config.php +++ b/application/shipsimu/config.php @@ -1,4 +1,7 @@ setConfigEntry('header_charset', 'utf-8'); diff --git a/application/shipsimu/data.php b/application/shipsimu/data.php index 7b380c2..7d6dcee 100644 --- a/application/shipsimu/data.php +++ b/application/shipsimu/data.php @@ -1,51 +1,2 @@ isClass("ApplicationSelector"))) { return; } - * - * isset() is required to prevent a warning and is_object() is highly required - * when the application itself is requested in URL (hint: index.php?app=your_app) - * - * @author Roland Haeder - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Get config instance -$cfg = FrameworkConfiguration::getSelfInstance(); - -// Get an instance of the helper -$app = call_user_func_array( - array($cfg->getConfigEntry('app_helper_class'), 'getSelfInstance'), - array() -); - -// Set application name and version -$app->setAppName('Ship-Simu Shipping Simulator'); -$app->setAppVersion('0.0.0'); -$app->setAppShortName('ship_simu'); - -// [EOF] -?> +// @DEPRECATED diff --git a/application/shipsimu/exceptions.php b/application/shipsimu/exceptions.php index 8e4e14f..28c8fea 100644 --- a/application/shipsimu/exceptions.php +++ b/application/shipsimu/exceptions.php @@ -1,12 +1,17 @@ * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2022 Ship-Simu Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,32 +24,91 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ -// Our own exception handler -function __exceptionHandler (FrameworkException $e) { - // Call the app_exit() method - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s (%s) has terminated due to an uncaught exception: %s [%s]: %s Backtrace:
%s
", - ApplicationHelper::getSelfInstance()->getAppName(), - ApplicationHelper::getSelfInstance()->getAppShortName(), - $e->__toString(), - $e->getHexCode(), - $e->getMessage(), - $e->getPrintableBackTrace() - ), - $e->getHexCode(), - $e->getExtraData() - ); -} // END - function +// The node's own exception handler +function shipsimu_exception_handler ($exceptionInstance) { + // Is it an object and a valid instance? + if ((is_object($exceptionInstance)) && ($exceptionInstance instanceof Exception)) { + // Init variable + $backTrace = ''; -// Set the new handler -set_exception_handler('__exceptionHandler'); + // Get all call levels from backtrace + foreach ($exceptionInstance->getTrace() as $idx => $traceArray) { + // Init argument string + $argsString = ''; + + // Arguments given? + if (isset($traceArray['args'])) { + // Convert arguments type into human-readable + foreach ($traceArray['args'] as $arg) { + $argsString .= ', ' . gettype($arg); + } + $argsString = substr($argsString, 2); + } + + // Set missing file/line + if (!isset($traceArray['file'])) $traceArray['file'] = 'unknown'; + if (!isset($traceArray['line'])) $traceArray['line'] = '0'; + if (!isset($traceArray['class'])) $traceArray['class'] = 'UnknownObject'; + if (!isset($traceArray['type'])) $traceArray['type'] = '->'; + + $backTrace .= sprintf("---------- Pos %d: ---------- +Method : %s%s%s(%s) +----- Caller: ----- +File : %s +Line : %d\n", + ($idx + 1), + $traceArray['class'], + $traceArray['type'], + $traceArray['function'], + $argsString, + basename($traceArray['file']), + $traceArray['line'] + ); + } + + // Construct the message + $message = sprintf("-------------------------------------------------------------------------------- +Uncaught Exception : %s +-------------------------------------------------------------------------------- +Message : %s +Code : %s +File : %s +Line : %d +-------------------------------------------------------------------------------- +Backtrace: +-------------------------------------------------------------------------------- +%s +--------------------------------------------------------------------------------\n", + trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))), + trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))), + ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())), + $exceptionInstance->getFile(), + $exceptionInstance->getLine(), + trim($backTrace) + ); + + // Output the message + print($message); + } elseif (is_object($exceptionInstance)) { + // Output more details + printf('exceptionInstance=%s', print_r($exceptionInstance, true)); + } else { + /* + * Invalid exception instance detected! Do *only* throw exceptions that + * extends our own exception 'FrameworkException' to get such nice + * outputs like above. + */ + printf('exceptionInstance[]=%s is invalid! Please inform the core developer team.' . PHP_EOL, gettype($exceptionInstance)); + } +} // Error handler -function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) { +function shipsimu_error_handler (int $errno, string $errstr, string $errfile, int $errline, array $errcontext) { // Construct the message - $message = sprintf("File: %s, Line: %s, Code: %s, Message: %s", + $message = sprintf('File: %s, Line: %d, Code: %d, Message: %s', basename($errfile), $errline, $errno, @@ -53,33 +117,38 @@ function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) // Throw an exception here throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR); -} // END - function - -// Set error handler -set_error_handler('__errorHandler'); +} // Assertion handler -function __assertHandler ($file, $line, $code) { +function shipsimu_assert_handler (string $file, int $line, int $code) { // Empty code? - if ($code === "") $code = "Unknown"; + if (empty($code)) { + $code = 'Unknown'; + } // Create message - $message = sprintf("File: %s, Line: %s, Code: %s", + $message = sprintf('File: %s, Line: %d, Code: %d', basename($file), $line, $code ); + // Log assert + syslog(LOG_WARNING, $message); + // Throw an exception here throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED); -} // END - function +} + +// Set error handler +//set_error_handler('shipsimu_error_handler'); + +// Set the new handler +set_exception_handler('shipsimu_exception_handler'); // Init assert handling -assert_options(ASSERT_ACTIVE, 1); -assert_options(ASSERT_WARNING, 0); -assert_options(ASSERT_BAIL, 0); -assert_options(ASSERT_QUIET_EVAL, 0); -assert_options(ASSERT_CALLBACK, '__assertHandler'); - -// [EOF] -?> +assert_options(ASSERT_ACTIVE , true); +assert_options(ASSERT_WARNING , true); +assert_options(ASSERT_BAIL , true); +assert_options(ASSERT_QUIET_EVAL, false); +assert_options(ASSERT_CALLBACK , 'shipsimu_assert_handler'); diff --git a/application/shipsimu/init.php b/application/shipsimu/init.php index 943eb79..7d6dcee 100644 --- a/application/shipsimu/init.php +++ b/application/shipsimu/init.php @@ -1,47 +1,2 @@ isClass("ApplicationSelector"))) { return; } - * - * isset() is required to prevent a warning and is_object() is highly required - * when the application itself is requested in URL (hint: index.php?app=your_app) - * - * @author Roland Haeder - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Get config instance -$cfg = FrameworkConfiguration::getSelfInstance(); - -// Initialize output system -ApplicationHelper::createDebugInstance('ApplicationHelper'); - -// This application needs a database connection then we have to simply include -// the inc/database.php script -require($cfg->getConfigEntry('base_path') . 'inc/database.php'); - -// [EOF] -?> +// @DEPRECATED diff --git a/application/shipsimu/loader.php b/application/shipsimu/loader.php index bcb574f..7d6dcee 100644 --- a/application/shipsimu/loader.php +++ b/application/shipsimu/loader.php @@ -1,29 +1,2 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Scan for application's classes, exceptions and interfaces -ClassLoader::scanApplicationClasses(); - -// [EOF] -?> +// @DEPRECATED diff --git a/application/shipsimu/starter.php b/application/shipsimu/starter.php index b6f4c45..7d6dcee 100644 --- a/application/shipsimu/starter.php +++ b/application/shipsimu/starter.php @@ -1,53 +1,2 @@ - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -// Is there an application helper instance? We need the method main() for -// maining the application -$app = call_user_func_array(array(FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), 'getSelfInstance'), array()); - -// Some sanity checks -if ((empty($app)) || (is_null($app))) { - // Something went wrong! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.", - $application, - FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class') - )); -} elseif (!is_object($app)) { - // No object! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.", - $application - )); -} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) { - // Method not found! - ApplicationEntryPoint::app_exit(sprintf("[Main:] The application %s could not be launched because the method %s is missing.", - $application, - FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method') - )); -} - -// Call user function -call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); - -// [EOF] -?> +// @DEPRECATED -- 2.39.2 From 3b54f8e7ee46f111f4f8058221fa8e23112f4e54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 17 Feb 2023 09:23:34 +0100 Subject: [PATCH 04/11] Continued: - requestIsValid() is now renamed to a propper setter setIsRequestValid() and with no default (setters don't have default values) - removed deprecated closing tag ?> - updated 'core' framework --- application/selector/class_ApplicationHelper.php | 3 --- application/selector/class_ApplicationSelector.php | 3 --- application/selector/config.php | 3 --- application/selector/data.php | 3 --- application/selector/debug.php | 3 --- application/selector/exceptions.php | 3 --- application/selector/init.php | 5 +---- application/selector/loader.php | 3 --- application/selector/starter.php | 3 --- .../shipsimu/classes/actions/class_BaseShipSimuAction.php | 3 --- .../actions/ship-simu/class_ShipSimuLoginAction.php | 3 --- .../actions/ship-simu/class_ShipSimuProfileAction.php | 3 --- .../actions/web/class_WebShipSimuLoginCompanyAction.php | 3 --- .../class_WebShipSimuLoginGovernmentStartupHelpAction.php | 3 --- .../web/class_WebShipSimuLoginGovernmentTrainingAction.php | 3 --- .../actions/web/class_WebShipSimuLoginLogoutAction.php | 3 --- .../actions/web/class_WebShipSimuLoginProfileAction.php | 3 --- .../actions/web/class_WebShipSimuLoginRefillAction.php | 3 --- .../web/class_WebShipSimuLoginStatusProblemAction.php | 3 --- .../actions/web/class_WebShipSimuLoginWelcomeAction.php | 3 --- application/shipsimu/classes/bank/class_BaseBank.php | 3 --- .../shipsimu/classes/bank/money/class_MoneyBank.php | 3 --- application/shipsimu/classes/class_BasePersonell.php | 3 --- application/shipsimu/classes/class_BaseSimulator.php | 3 --- application/shipsimu/classes/class_Merchant.php | 3 --- application/shipsimu/classes/class_WorksContract.php | 3 --- .../commands/web/class_WebShipsimuGuestLoginCommand.php | 5 +---- .../commands/web/class_WebShipsimuProfileCommand.php | 3 --- .../commands/web/class_WebShipsimuRefillCommand.php | 3 --- .../commands/web/class_WebShipsimuRegisterCommand.php | 3 --- .../commands/web/class_WebShipsimuUserLoginCommand.php | 5 +---- .../web/company/class_WebShipSimuCompanyCommand.php | 3 --- .../government/class_WebGovernmentFailedStartupCommand.php | 3 --- .../class_WebGovernmentFailedTrainingCommand.php | 3 --- .../class_WebShipsimuGovernmentStartupCommand.php | 3 --- .../class_WebShipsimuGovernmentTrainingCommand.php | 3 --- .../shipsimu/classes/companies/class_ShippingCompany.php | 3 --- .../shipsimu/classes/constructions/berths/class_Berth.php | 3 --- .../classes/constructions/class_BaseConstruction.php | 3 --- .../shipsimu/classes/constructions/docks/class_DryDock.php | 3 --- .../classes/constructions/harbors/class_Harbor.php | 3 --- .../classes/constructions/terminals/class_Terminal.php | 3 --- .../classes/constructions/yards/class_Shipyard.php | 3 --- .../controller/html/class_HtmlCompanyController.php | 7 ++----- .../html/class_HtmlGovernmentFailedController.php | 7 ++----- application/shipsimu/classes/drives/class_BaseDrive.php | 3 --- application/shipsimu/classes/drives/motor/class_Motor.php | 3 --- .../classes/factories/class_ShipSimuWebNewsFactory.php | 3 --- .../refill/class_RefillRequestCurrencyTestBookFilter.php | 3 --- .../shipsimu/classes/filter/class_BaseShipSimuFilter.php | 3 --- .../class_ShipSimuGovernmentPaysStartupHelpFilter.php | 7 ++----- .../class_ShipSimuGovernmentPaysTrainingFilter.php | 7 ++----- .../classes/filter/page/class_RefillPageFilter.php | 5 +---- .../validator/class_RefillRequestValidatorFilter.php | 5 +---- .../validator/class_ShipSimuUserStatusGuestFilter.php | 7 ++----- .../classes/government/class_SimplifiedGovernment.php | 3 --- .../shipsimu/classes/login/class_ShipSimuGuestLogin.php | 3 --- .../shipsimu/classes/login/class_ShipSimuUserLogin.php | 3 --- .../classes/login/helper/class_ShipSimuLoginHelper.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuConfirmMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuHomeMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php | 3 --- .../classes/menu/class_ShipSimuLoginFailedMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLoginMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLogoutMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuRegisterMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuStatusMenu.php | 3 --- .../government/class_ShipSimuGovernmentFailedAreaMenu.php | 3 --- .../opening/bank/class_MoneyBankRealtimeOpening.php | 3 --- application/shipsimu/classes/opening/class_BaseOpening.php | 2 -- application/shipsimu/classes/parts/class_BaseShipPart.php | 3 --- .../classes/parts/maschineroom/class_MaschineRoom.php | 3 --- .../classes/personell/class_SimulatorPersonell.php | 3 --- .../classes/personell/company/class_CompanyEmployee.php | 3 --- .../classes/registration/class_ShipSimuRegistration.php | 3 --- .../command/html/class_HtmlCompanyCommandResolver.php | 3 --- .../html/class_HtmlGovernmentFailedCommandResolver.php | 3 --- .../html/class_ShipSimuHtmlControllerResolver.php | 3 --- application/shipsimu/classes/ships/class_BaseShip.php | 3 --- .../classes/ships/passenger/class_PassengerShip.php | 3 --- .../shipsimu/classes/structures/class_BaseStructure.php | 3 --- .../structures/extended/cabines/class_BaseCabin.php | 3 --- .../extended/cabines/ship/class_EconomyCabin.php | 3 --- .../structures/extended/cabines/ship/class_LowCabin.php | 3 --- .../structures/extended/cabines/ship/class_LuxuryCabin.php | 3 --- .../extended/cabines/ship/class_PremierCabin.php | 3 --- .../structures/extended/class_BaseCabinStructure.php | 3 --- .../structures/extended/class_BaseDeckStructure.php | 3 --- .../structures/extended/class_BaseUpperStructure.php | 3 --- .../structures/extended/decks/cargo/class_CarDeck.php | 3 --- .../structures/extended/decks/cargo/class_TrainDeck.php | 3 --- .../structures/extended/decks/cargo/class_TruckDeck.php | 3 --- .../classes/structures/extended/decks/class_BaseDeck.php | 3 --- .../classes/structures/extended/upper/class_Bridge.php | 3 --- .../shipsimu/classes/user/class_ShipSimuBaseUser.php | 3 --- .../shipsimu/classes/user/extended/class_ShipSimuGuest.php | 3 --- .../classes/user/extended/class_ShipSimuMember.php | 5 +---- .../classes/wrapper/class_CompanyDatabaseWrapper.php | 3 --- .../wrapper/class_UserGovernmentDatabaseWrapper.php | 3 --- application/shipsimu/config.php | 3 --- application/shipsimu/debug.php | 3 --- .../shipsimu/exceptions/class_BirthdayInvalidException.php | 3 --- .../exceptions/class_CabinShipMismatchException.php | 3 --- .../exceptions/class_ContractAllreadySignedException.php | 3 --- .../exceptions/class_ContractPartnerMismatchException.php | 3 --- .../exceptions/class_DeckShipMismatchException.php | 3 --- .../exceptions/class_EmptyStructuresListException.php | 3 --- .../exceptions/class_InvalidContractPartnerException.php | 3 --- .../shipsimu/exceptions/class_InvalidIDFormatException.php | 3 --- .../exceptions/class_ItemNotInPriceListException.php | 3 --- .../exceptions/class_ItemNotTradeableException.php | 3 --- .../exceptions/class_MissingSimulatorIdException.php | 3 --- .../exceptions/class_MotorShipMismatchException.php | 3 --- .../exceptions/class_NoShippingCompanyOwnedException.php | 3 --- .../exceptions/class_NoShipyardsConstructedException.php | 3 --- .../class_PersonellListAlreadyCreatedException.php | 3 --- .../exceptions/class_RoomShipMismatchException.php | 3 --- .../exceptions/class_ShipNotConstructedException.php | 3 --- .../exceptions/class_ShipPartNotConstructableException.php | 3 --- .../exceptions/class_StructureShipMismatchException.php | 3 --- .../exceptions/class_StructuresOutOfBoundsException.php | 3 --- .../shipsimu/exceptions/class_ToMuchEmployeesException.php | 3 --- .../exceptions/class_TotalPriceNotCalculatedException.php | 3 --- .../class_UnsupportedLimitationPartException.php | 3 --- .../exceptions/class_WrongGenderSpecifiedException.php | 3 --- application/shipsimu/interfaces/class_BookableAccount.php | 3 --- .../shipsimu/interfaces/class_ConstructableShip.php | 3 --- .../shipsimu/interfaces/class_ConstructableShipPart.php | 3 --- application/shipsimu/interfaces/class_ContractPartner.php | 3 --- application/shipsimu/interfaces/class_Customer.php | 3 --- application/shipsimu/interfaces/class_Personellizer.php | 3 --- application/shipsimu/interfaces/class_SignableContract.php | 3 --- application/shipsimu/interfaces/class_TradeableItem.php | 3 --- core | 2 +- 134 files changed, 17 insertions(+), 415 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 204800f..c3b74da 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -238,6 +238,3 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica return 'node_main'; } } - -// [EOF] -?> diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 8dd0648..381dd56 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -280,6 +280,3 @@ class ApplicationSelector extends BaseFrameworkSystem { } // END - for } } - -// [EOF] -?> diff --git a/application/selector/config.php b/application/selector/config.php index 49fe491..b5a704b 100644 --- a/application/selector/config.php +++ b/application/selector/config.php @@ -54,6 +54,3 @@ $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); // CFG: NEWS-HOME-LIMIT $cfg->setConfigEntry('news_home_limit', 10); - -// [EOF] -?> diff --git a/application/selector/data.php b/application/selector/data.php index 6e63348..a1f07eb 100644 --- a/application/selector/data.php +++ b/application/selector/data.php @@ -38,6 +38,3 @@ $app = call_user_func_array( $app->setAppName('Applikationsauswähler'); $app->setAppVersion('0.1a'); $app->setAppShortName($cfg->getConfigEntry('selector_name')); - -// [EOF] -?> diff --git a/application/selector/debug.php b/application/selector/debug.php index 077d378..f735e72 100644 --- a/application/selector/debug.php +++ b/application/selector/debug.php @@ -21,6 +21,3 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -// [EOF] -?> diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php index 1a93fc0..d653e5e 100644 --- a/application/selector/exceptions.php +++ b/application/selector/exceptions.php @@ -82,6 +82,3 @@ assert_options(ASSERT_WARNING, 0); assert_options(ASSERT_BAIL, 0); assert_options(ASSERT_QUIET_EVAL, 0); assert_options(ASSERT_CALLBACK, '__assertHandler'); - -// [EOF] -?> diff --git a/application/selector/init.php b/application/selector/init.php index 9a0bd10..9aeb9b1 100644 --- a/application/selector/init.php +++ b/application/selector/init.php @@ -33,7 +33,4 @@ ApplicationHelper::createDebugInstance('ApplicationHelper'); // This application needs a database connection then we have to simply include // the inc/database.php script -require($cfg->getConfigEntry('base_path') . 'inc/database.php'); - -// [EOF] -?> +require $cfg->getConfigEntry('base_path') . 'inc/database.php'; diff --git a/application/selector/loader.php b/application/selector/loader.php index bcb574f..6a91215 100644 --- a/application/selector/loader.php +++ b/application/selector/loader.php @@ -24,6 +24,3 @@ // Scan for application's classes, exceptions and interfaces ClassLoader::scanApplicationClasses(); - -// [EOF] -?> diff --git a/application/selector/starter.php b/application/selector/starter.php index b6f4c45..7ba4259 100644 --- a/application/selector/starter.php +++ b/application/selector/starter.php @@ -48,6 +48,3 @@ if ((empty($app)) || (is_null($app))) { // Call user function call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php index 41dcce0..186c151 100644 --- a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php +++ b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php @@ -57,6 +57,3 @@ class BaseShipSimuAction extends BaseAction { // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php index 2fbee37..962faf5 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php @@ -60,6 +60,3 @@ class ShipSimuLoginAction extends BaseShipSimuAction implements PerformableActio // Add your code here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php index 56090bf..e1d47a2 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php @@ -60,6 +60,3 @@ class ShipSimuProfileAction extends BaseShipSimuAction implements PerformableAct // Add your code here... } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php index 842d6cb..1d51201 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginCompanyAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php index fa62481..bb22691 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentStartupHelpAction extends BaseShipSimuAction imp $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_startup_help_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php index fcbc711..1e414b7 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentTrainingAction extends BaseShipSimuAction implem $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_training_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php index 9b066a9..c546241 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginLogoutAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php index 58d6745..b0f13ed 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginProfileAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php index 31c7337..42a2690 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php @@ -82,6 +82,3 @@ class WebShipSimuLoginRefillAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('payment_discovery_filter', array($this))); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php index 8b26b8f..fc0eb31 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginStatusProblemAction extends BaseShipSimuAction implements $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php index d839bd1..b363012 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginWelcomeAction extends BaseShipSimuAction implements Comman // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/class_BaseBank.php b/application/shipsimu/classes/bank/class_BaseBank.php index 21ae0d5..29bc895 100644 --- a/application/shipsimu/classes/bank/class_BaseBank.php +++ b/application/shipsimu/classes/bank/class_BaseBank.php @@ -55,6 +55,3 @@ abstract class BaseBank extends BaseFrameworkSystem { */ public abstract function ifMoneyBankHasOpened (); } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/money/class_MoneyBank.php b/application/shipsimu/classes/bank/money/class_MoneyBank.php index 11d4d9e..f35e756 100644 --- a/application/shipsimu/classes/bank/money/class_MoneyBank.php +++ b/application/shipsimu/classes/bank/money/class_MoneyBank.php @@ -89,6 +89,3 @@ class MoneyBank extends BaseBank implements Registerable { return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BasePersonell.php b/application/shipsimu/classes/class_BasePersonell.php index 8e08ec3..7eecf8d 100644 --- a/application/shipsimu/classes/class_BasePersonell.php +++ b/application/shipsimu/classes/class_BasePersonell.php @@ -241,6 +241,3 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer { unset($this->married); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BaseSimulator.php b/application/shipsimu/classes/class_BaseSimulator.php index e460013..a54ae22 100644 --- a/application/shipsimu/classes/class_BaseSimulator.php +++ b/application/shipsimu/classes/class_BaseSimulator.php @@ -297,6 +297,3 @@ class BaseSimulator extends BaseFrameworkSystem { return $this->currPart; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_Merchant.php b/application/shipsimu/classes/class_Merchant.php index 648e299..25d0220 100644 --- a/application/shipsimu/classes/class_Merchant.php +++ b/application/shipsimu/classes/class_Merchant.php @@ -104,6 +104,3 @@ class Merchant extends BaseFrameworkSystem { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_WorksContract.php b/application/shipsimu/classes/class_WorksContract.php index bbe2f35..d22fc75 100644 --- a/application/shipsimu/classes/class_WorksContract.php +++ b/application/shipsimu/classes/class_WorksContract.php @@ -324,6 +324,3 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { return $totalPrice; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php index 14015a3..1b1fe8a 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -107,6 +107,3 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php index a266f26..37d2c5e 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php @@ -148,6 +148,3 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php index 1c9bd8e..6fdf3d4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php @@ -107,6 +107,3 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName($filterName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php index 181ce2f..3d4ade4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php @@ -112,6 +112,3 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php index 2a33a8f..72486ee 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -119,6 +119,3 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php index 7fed46f..85d616e 100644 --- a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php +++ b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php @@ -83,6 +83,3 @@ class WebShipSimuCompanyCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php index 54ddb05..52824c4 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php @@ -141,6 +141,3 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php index 7119196..4a6bf01 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php @@ -141,6 +141,3 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php index 3153962..3715dc7 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php @@ -91,6 +91,3 @@ class WebShipsimuGovernmentStartupCommand extends BaseCommand implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_government_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php index 035e5e8..8d2eecd 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php @@ -89,6 +89,3 @@ class WebShipsimuGovernmentTrainingCommand extends BaseCommand implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/companies/class_ShippingCompany.php b/application/shipsimu/classes/companies/class_ShippingCompany.php index cee5ccc..7263f0b 100644 --- a/application/shipsimu/classes/companies/class_ShippingCompany.php +++ b/application/shipsimu/classes/companies/class_ShippingCompany.php @@ -661,6 +661,3 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $contractInstance->setMerchantInstance($merchantInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/berths/class_Berth.php b/application/shipsimu/classes/constructions/berths/class_Berth.php index c96ba10..6535ce0 100644 --- a/application/shipsimu/classes/constructions/berths/class_Berth.php +++ b/application/shipsimu/classes/constructions/berths/class_Berth.php @@ -34,6 +34,3 @@ class Berth extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/class_BaseConstruction.php b/application/shipsimu/classes/constructions/class_BaseConstruction.php index af08a39..4e6947d 100644 --- a/application/shipsimu/classes/constructions/class_BaseConstruction.php +++ b/application/shipsimu/classes/constructions/class_BaseConstruction.php @@ -31,6 +31,3 @@ class BaseConstruction extends BaseSimulator { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/docks/class_DryDock.php b/application/shipsimu/classes/constructions/docks/class_DryDock.php index c9d6f8e..c3e07fa 100644 --- a/application/shipsimu/classes/constructions/docks/class_DryDock.php +++ b/application/shipsimu/classes/constructions/docks/class_DryDock.php @@ -31,6 +31,3 @@ class DryDock extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/harbors/class_Harbor.php b/application/shipsimu/classes/constructions/harbors/class_Harbor.php index cf350ce..0d2af38 100644 --- a/application/shipsimu/classes/constructions/harbors/class_Harbor.php +++ b/application/shipsimu/classes/constructions/harbors/class_Harbor.php @@ -82,6 +82,3 @@ class Harbor extends BaseConstruction { $this->shipyardList->append(Shipyard::createShipyard($this, $shipyardName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/terminals/class_Terminal.php b/application/shipsimu/classes/constructions/terminals/class_Terminal.php index 9ae9985..3de0219 100644 --- a/application/shipsimu/classes/constructions/terminals/class_Terminal.php +++ b/application/shipsimu/classes/constructions/terminals/class_Terminal.php @@ -31,6 +31,3 @@ class Terminal extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/yards/class_Shipyard.php b/application/shipsimu/classes/constructions/yards/class_Shipyard.php index 1959f83..630a09b 100644 --- a/application/shipsimu/classes/constructions/yards/class_Shipyard.php +++ b/application/shipsimu/classes/constructions/yards/class_Shipyard.php @@ -210,6 +210,3 @@ class Shipyard extends BaseConstruction { return $result; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php index 741cc5a..fd4b6bf 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php @@ -85,11 +85,11 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php index 217b6b5..65d7865 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php @@ -85,11 +85,11 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/class_BaseDrive.php b/application/shipsimu/classes/drives/class_BaseDrive.php index 56f9802..9968f8e 100644 --- a/application/shipsimu/classes/drives/class_BaseDrive.php +++ b/application/shipsimu/classes/drives/class_BaseDrive.php @@ -59,6 +59,3 @@ class BaseDrive extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/motor/class_Motor.php b/application/shipsimu/classes/drives/motor/class_Motor.php index 2f3479e..708ab69 100644 --- a/application/shipsimu/classes/drives/motor/class_Motor.php +++ b/application/shipsimu/classes/drives/motor/class_Motor.php @@ -51,6 +51,3 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php index e42b021..c60563a 100644 --- a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php +++ b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php @@ -55,6 +55,3 @@ class ShipSimuWebNewsFactory extends BaseFrameworkSystem { // Do some stuff here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php index b7ff113..3e120ef 100644 --- a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php +++ b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php @@ -67,6 +67,3 @@ class RefillRequestCurrencyTestBookFilter extends BaseShipSimuFilter implements $userInstance->bookAmountDirectly($requestInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php index 7a80cf2..afb6ce4 100644 --- a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php +++ b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php @@ -45,6 +45,3 @@ class BaseShipSimuFilter extends BaseFilter { // Add something to do on every filter } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index 7becf12..f02219d 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysStartupHelp() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_startup_failed'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index 75eb1cc..f90d1b9 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysTraining() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_training_failed'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php index d4680ba..b114ca0 100644 --- a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php +++ b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php @@ -60,7 +60,7 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { // Is the configuration variable set? if ($this->getConfigInstance()->getConfigEntry('refill_page_active') === "N") { // Password is empty - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_not_active'); @@ -70,6 +70,3 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php index 3abd7ba..351c643 100644 --- a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php @@ -61,7 +61,7 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera // Are all required request fields set? if (($requestInstance->isRequestElementSet('type') === false) || ($requestInstance->isRequestElementSet('amount') === false)) { // Something important is missing - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_required_fields_missing'); @@ -71,6 +71,3 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php index 989e1d4..06e0996 100644 --- a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php +++ b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php @@ -64,16 +64,13 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter // Is the user account confirmed? if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) == $this->getConfigInstance()->getConfigEntry('user_status_guest')) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_user_status_guest'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/government/class_SimplifiedGovernment.php b/application/shipsimu/classes/government/class_SimplifiedGovernment.php index 8999153..89d4a51 100644 --- a/application/shipsimu/classes/government/class_SimplifiedGovernment.php +++ b/application/shipsimu/classes/government/class_SimplifiedGovernment.php @@ -132,6 +132,3 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { return $maximumPayed; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php index 9725449..802749b 100644 --- a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php @@ -123,6 +123,3 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php index 0b3cf7c..43e7c20 100644 --- a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php @@ -128,6 +128,3 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php index b5c125e..3a7c66d 100644 --- a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php +++ b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php @@ -109,6 +109,3 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { Registry::getRegistry()->addInstance('login', $loginInstance); } } - -// -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php index 1dc56b7..a96ef03 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php @@ -45,6 +45,3 @@ class ShipSimuConfirmMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php index ef01389..93e9e49 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php @@ -45,6 +45,3 @@ class ShipSimuHomeMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php index 038b123..a4e2ce5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginAreaMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php index 6978654..e98e8e5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginFailedMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php index 7aa83e9..a51e7e8 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php index 76b6c68..f08884b 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php @@ -45,6 +45,3 @@ class ShipSimuLogoutMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php index d2438f2..0208c37 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php @@ -45,6 +45,3 @@ class ShipSimuRegisterMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php index fbc0434..876cf3c 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php @@ -45,6 +45,3 @@ class ShipSimuStatusMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php index 0d2112c..6a301af 100644 --- a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php +++ b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuGovernmentFailedAreaMenu extends BaseMenu implements RenderableMen return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php index 5136767..2bc503f 100644 --- a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php +++ b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php @@ -58,6 +58,3 @@ class MoneyBankRealtimeOpening extends BaseOpening { $this->partialStub(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/class_BaseOpening.php b/application/shipsimu/classes/opening/class_BaseOpening.php index 78f8983..e8f886a 100644 --- a/application/shipsimu/classes/opening/class_BaseOpening.php +++ b/application/shipsimu/classes/opening/class_BaseOpening.php @@ -56,5 +56,3 @@ abstract class BaseOpening extends BaseFrameworkSystem { public abstract function ifWithinOpeningTimes (); } -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/class_BaseShipPart.php b/application/shipsimu/classes/parts/class_BaseShipPart.php index aca83a9..8d476bb 100644 --- a/application/shipsimu/classes/parts/class_BaseShipPart.php +++ b/application/shipsimu/classes/parts/class_BaseShipPart.php @@ -46,6 +46,3 @@ class BaseShipPart extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php index bcd7b30..ea31cce 100644 --- a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php +++ b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php @@ -42,6 +42,3 @@ class MaschineRoom extends BaseShipPart { return $roomInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/class_SimulatorPersonell.php b/application/shipsimu/classes/personell/class_SimulatorPersonell.php index 8ff01e7..a0d0206 100644 --- a/application/shipsimu/classes/personell/class_SimulatorPersonell.php +++ b/application/shipsimu/classes/personell/class_SimulatorPersonell.php @@ -322,6 +322,3 @@ class SimulatorPersonell extends BasePersonell { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php index 472692e..a376c00 100644 --- a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php +++ b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php @@ -80,6 +80,3 @@ class CompanyEmployee extends SimulatorPersonell { unset($this->employeeList); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php index 674d189..64c34d5 100644 --- a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php +++ b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php @@ -202,6 +202,3 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time())); } } - -// -?> diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php index 5b5fd9c..112ea35 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php @@ -72,6 +72,3 @@ class HtmlCompanyCommandResolver extends BaseCommandResolver implements CommandR return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php index 16edb50..6aa841e 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php @@ -72,6 +72,3 @@ class HtmlGovernmentFailedCommandResolver extends BaseCommandResolver implements return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php index dc57483..6e4d3b9 100644 --- a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php +++ b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php @@ -99,6 +99,3 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C return $controllerInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/class_BaseShip.php b/application/shipsimu/classes/ships/class_BaseShip.php index ae22ca3..73ab63d 100644 --- a/application/shipsimu/classes/ships/class_BaseShip.php +++ b/application/shipsimu/classes/ships/class_BaseShip.php @@ -162,6 +162,3 @@ class BaseShip extends BaseSimulator { $this->numAnchor = (int) $numAnchor; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php index 70fa5ed..a1e3d5b 100644 --- a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php +++ b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php @@ -82,6 +82,3 @@ class PassengerShip extends BaseShip implements ConstructableShip { return $numBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/class_BaseStructure.php b/application/shipsimu/classes/structures/class_BaseStructure.php index 59318cb..81943ec 100644 --- a/application/shipsimu/classes/structures/class_BaseStructure.php +++ b/application/shipsimu/classes/structures/class_BaseStructure.php @@ -46,6 +46,3 @@ class BaseStructure extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php index b513944..5c178f6 100644 --- a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php @@ -33,6 +33,3 @@ class BaseCabin extends BaseCabinStructure { return ($this->isClass("BaseCabin")); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php index beceae8..84f9091 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php @@ -53,6 +53,3 @@ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php index 23b877c..8d8a3aa 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php @@ -53,6 +53,3 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php index 78cb9c4..fc6d8a9 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php @@ -53,6 +53,3 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php index 522e301..f57329c 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php @@ -53,6 +53,3 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php index 77a81ae..b6300f0 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php @@ -130,6 +130,3 @@ class BaseCabinStructure extends BaseStructure { return $cabinBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php index 0f44a55..86b4245 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php @@ -56,6 +56,3 @@ class BaseDeckStructure extends BaseStructure { return $this->numDecks; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php index dd6934c..b6eacc7 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php @@ -32,6 +32,3 @@ class BaseUpperStructure extends BaseStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php index d87dd09..b6191e9 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php @@ -51,6 +51,3 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php index 07410ea..296114e 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php @@ -51,6 +51,3 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php index 6a87d85..c435caf 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php @@ -52,6 +52,3 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php index 7b92d68..d31a40d 100644 --- a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php @@ -32,6 +32,3 @@ class BaseDeck extends BaseDeckStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php index 1c3b674..43f41cd 100644 --- a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php +++ b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php @@ -50,6 +50,3 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php index 75de2c7..6795a87 100644 --- a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php +++ b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php @@ -256,6 +256,3 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php index a66de18..ca2d531 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php @@ -103,6 +103,3 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { // No updates will be flushed to database! } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php index a37ef16..0f425fa 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php @@ -110,7 +110,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka $userInstance = new ShipSimuMember(); $userInstance->partialStub("We need to add more ways of creating user classes here."); $userInstance->debugBackTrace(); - exit(); + exit; } // Return the prepared instance @@ -215,6 +215,3 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php index 1552e67..28257b1 100644 --- a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php @@ -124,6 +124,3 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { return $this->companyInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php index 6392d6b..294ebc3 100644 --- a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php @@ -65,6 +65,3 @@ class UserGovernmentDatabaseWrapper extends BaseDatabaseWrapper { $requestInstance->debugInstance(); } } - -// [EOF] -?> diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php index 72cccec..266c54c 100644 --- a/application/shipsimu/config.php +++ b/application/shipsimu/config.php @@ -537,6 +537,3 @@ $cfg->setConfigEntry('moneybank_activated', 'Y'); // CFG: MONEYBANK-OPENING-CLASS $cfg->setConfigEntry('moneybank_opening_class', 'MoneyBankRealtimeOpening'); - -// [EOF] -?> diff --git a/application/shipsimu/debug.php b/application/shipsimu/debug.php index 11bf631..832b744 100644 --- a/application/shipsimu/debug.php +++ b/application/shipsimu/debug.php @@ -56,6 +56,3 @@ //define('DEBUG_CONTRACT', true); // Haendler debuggen //define('DEBUG_MERCHANT', true); - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_BirthdayInvalidException.php b/application/shipsimu/exceptions/class_BirthdayInvalidException.php index ed8e189..76f9a7b 100644 --- a/application/shipsimu/exceptions/class_BirthdayInvalidException.php +++ b/application/shipsimu/exceptions/class_BirthdayInvalidException.php @@ -37,6 +37,3 @@ class BirthdayInvalidException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_CabinShipMismatchException.php b/application/shipsimu/exceptions/class_CabinShipMismatchException.php index 6b9120b..870a815 100644 --- a/application/shipsimu/exceptions/class_CabinShipMismatchException.php +++ b/application/shipsimu/exceptions/class_CabinShipMismatchException.php @@ -23,6 +23,3 @@ */ class CabinShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php index fc17f64..ab4b9c8 100644 --- a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php +++ b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php @@ -34,6 +34,3 @@ class ContractAllreadySignedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php index fce9748..f0c9b2a 100644 --- a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php +++ b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php @@ -34,6 +34,3 @@ class ContractPartnerMismatchException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_DeckShipMismatchException.php b/application/shipsimu/exceptions/class_DeckShipMismatchException.php index 937cd6e..998cb60 100644 --- a/application/shipsimu/exceptions/class_DeckShipMismatchException.php +++ b/application/shipsimu/exceptions/class_DeckShipMismatchException.php @@ -23,6 +23,3 @@ */ class DeckShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_EmptyStructuresListException.php b/application/shipsimu/exceptions/class_EmptyStructuresListException.php index 9c1eee2..805bd00 100644 --- a/application/shipsimu/exceptions/class_EmptyStructuresListException.php +++ b/application/shipsimu/exceptions/class_EmptyStructuresListException.php @@ -32,6 +32,3 @@ class EmptyStructuresListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php index 8f4823e..b298119 100644 --- a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php +++ b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php @@ -32,6 +32,3 @@ class InvalidContractPartnerException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidIDFormatException.php b/application/shipsimu/exceptions/class_InvalidIDFormatException.php index 78e2e00..f6265fc 100644 --- a/application/shipsimu/exceptions/class_InvalidIDFormatException.php +++ b/application/shipsimu/exceptions/class_InvalidIDFormatException.php @@ -32,6 +32,3 @@ class InvalidIDFormatException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php index 0013e92..6ed0bae 100644 --- a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php +++ b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php @@ -32,6 +32,3 @@ class ItemNotInPriceListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotTradeableException.php b/application/shipsimu/exceptions/class_ItemNotTradeableException.php index 074f17e..11d3484 100644 --- a/application/shipsimu/exceptions/class_ItemNotTradeableException.php +++ b/application/shipsimu/exceptions/class_ItemNotTradeableException.php @@ -32,6 +32,3 @@ class ItemNotTradeableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php index 09a55f3..6fd3d32 100644 --- a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php +++ b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php @@ -33,6 +33,3 @@ class MissingSimulatorIdException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MotorShipMismatchException.php b/application/shipsimu/exceptions/class_MotorShipMismatchException.php index 7e688c2..601857e 100644 --- a/application/shipsimu/exceptions/class_MotorShipMismatchException.php +++ b/application/shipsimu/exceptions/class_MotorShipMismatchException.php @@ -23,6 +23,3 @@ */ class MotorShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php index 848362e..fcd3581 100644 --- a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php +++ b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php @@ -41,6 +41,3 @@ class NoShippingCompanyOwnedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php index 52cf913..b767993 100644 --- a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php @@ -36,6 +36,3 @@ class NoShipyardsConstructedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php index c89dc44..7a37133 100644 --- a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php +++ b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php @@ -32,6 +32,3 @@ class PersonellListAlreadyCreatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_RoomShipMismatchException.php b/application/shipsimu/exceptions/class_RoomShipMismatchException.php index d84528c..6870871 100644 --- a/application/shipsimu/exceptions/class_RoomShipMismatchException.php +++ b/application/shipsimu/exceptions/class_RoomShipMismatchException.php @@ -23,6 +23,3 @@ */ class RoomShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipNotConstructedException.php b/application/shipsimu/exceptions/class_ShipNotConstructedException.php index 3313c36..7f7905a 100644 --- a/application/shipsimu/exceptions/class_ShipNotConstructedException.php +++ b/application/shipsimu/exceptions/class_ShipNotConstructedException.php @@ -23,6 +23,3 @@ */ class ShipNotConstructedException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php index 48b4fe7..3d42ff4 100644 --- a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php +++ b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php @@ -32,6 +32,3 @@ class ShipPartNotConstructableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructureShipMismatchException.php b/application/shipsimu/exceptions/class_StructureShipMismatchException.php index 62152e8..5495c75 100644 --- a/application/shipsimu/exceptions/class_StructureShipMismatchException.php +++ b/application/shipsimu/exceptions/class_StructureShipMismatchException.php @@ -23,6 +23,3 @@ */ class StructureShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php index 916207f..56fcb78 100644 --- a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php +++ b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php @@ -30,6 +30,3 @@ class StructuresOutOfBoundsException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php index a6bffb0..0c95176 100644 --- a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php +++ b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php @@ -33,6 +33,3 @@ class ToMuchEmployeesException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php index 7aa57ae..218633a 100644 --- a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php +++ b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php @@ -32,6 +32,3 @@ class TotalPriceNotCalculatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php index ee7aa5a..217aa89 100644 --- a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php +++ b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php @@ -30,6 +30,3 @@ class UnsupportedLimitationPartException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php index 306a680..cab603e 100644 --- a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php +++ b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php @@ -30,6 +30,3 @@ class WrongGenderSpecifiedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_BookableAccount.php b/application/shipsimu/interfaces/class_BookableAccount.php index 3f3a575..b794268 100644 --- a/application/shipsimu/interfaces/class_BookableAccount.php +++ b/application/shipsimu/interfaces/class_BookableAccount.php @@ -31,6 +31,3 @@ interface BookableAccount extends FrameworkInterface { */ function bookAmountDirectly (Requestable $requestInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShip.php b/application/shipsimu/interfaces/class_ConstructableShip.php index db76fd5..58aca0c 100644 --- a/application/shipsimu/interfaces/class_ConstructableShip.php +++ b/application/shipsimu/interfaces/class_ConstructableShip.php @@ -23,6 +23,3 @@ */ interface ConstructableShip extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShipPart.php b/application/shipsimu/interfaces/class_ConstructableShipPart.php index 8135bc3..6797a52 100644 --- a/application/shipsimu/interfaces/class_ConstructableShipPart.php +++ b/application/shipsimu/interfaces/class_ConstructableShipPart.php @@ -23,6 +23,3 @@ */ interface ConstructableShipPart extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ContractPartner.php b/application/shipsimu/interfaces/class_ContractPartner.php index 35b4b6d..2f8053c 100644 --- a/application/shipsimu/interfaces/class_ContractPartner.php +++ b/application/shipsimu/interfaces/class_ContractPartner.php @@ -31,6 +31,3 @@ interface ContractPartner extends FrameworkInterface { */ function isContractPartner (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Customer.php b/application/shipsimu/interfaces/class_Customer.php index 5de5210..82093e5 100644 --- a/application/shipsimu/interfaces/class_Customer.php +++ b/application/shipsimu/interfaces/class_Customer.php @@ -50,6 +50,3 @@ interface Customer extends FrameworkInterface { */ function withdrawFromContract (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Personellizer.php b/application/shipsimu/interfaces/class_Personellizer.php index b56df14..e1a7846 100644 --- a/application/shipsimu/interfaces/class_Personellizer.php +++ b/application/shipsimu/interfaces/class_Personellizer.php @@ -195,6 +195,3 @@ interface Personellizer extends FrameworkInterface { */ function decreaseSalary ($sub); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_SignableContract.php b/application/shipsimu/interfaces/class_SignableContract.php index a8f62ce..8bf4d9c 100644 --- a/application/shipsimu/interfaces/class_SignableContract.php +++ b/application/shipsimu/interfaces/class_SignableContract.php @@ -25,6 +25,3 @@ interface SignableContract extends FrameworkInterface { // Sign the contract function signContract (ContractPartner $partnerInstance, ContractPartner $partyInstance); } - -// [EOF] -?> \ No newline at end of file diff --git a/application/shipsimu/interfaces/class_TradeableItem.php b/application/shipsimu/interfaces/class_TradeableItem.php index f850be2..66756c4 100644 --- a/application/shipsimu/interfaces/class_TradeableItem.php +++ b/application/shipsimu/interfaces/class_TradeableItem.php @@ -30,6 +30,3 @@ interface TradeableItem extends FrameworkInterface { */ function isTradeable (); } - -// [EOF] -?> diff --git a/core b/core index ad17ce1..262f905 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ad17ce1c5fe13f2290e74bec676f23e65c2e9100 +Subproject commit 262f905be8d6f9dc9fd02acc9505cb45ef2a53f6 -- 2.39.2 From 7e33cba9b5301452b0cd7336699b15534fe3b2e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 17 Feb 2023 09:26:20 +0100 Subject: [PATCH 05/11] Continued: - removed deprecated .htaccess, please protect this directory by yourself or wait for an "out-of-document-root" patch - added .gitkeep as these directories represent database tables --- application/.htaccess | 1 - application/selector/.htaccess | 1 - application/selector/admin/.htaccess | 1 - application/selector/exceptions/.htaccess | 1 - application/selector/interfaces/.htaccess | 1 - application/selector/language/.htaccess | 1 - application/selector/main/.htaccess | 1 - application/selector/templates/.htaccess | 1 - application/selector/templates/de/.htaccess | 1 - application/selector/templates/de/code/.htaccess | 1 - application/shipsimu/.htaccess | 1 - application/shipsimu/admin/.htaccess | 1 - application/shipsimu/classes/.htaccess | 1 - application/shipsimu/classes/actions/.htaccess | 1 - application/shipsimu/classes/actions/ship-simu/.htaccess | 1 - application/shipsimu/classes/actions/web/.htaccess | 1 - application/shipsimu/classes/bank/.htaccess | 1 - application/shipsimu/classes/commands/.htaccess | 1 - application/shipsimu/classes/commands/web/.htaccess | 1 - application/shipsimu/classes/commands/web/company/.htaccess | 1 - application/shipsimu/classes/commands/web/government/.htaccess | 1 - application/shipsimu/classes/companies/.htaccess | 1 - application/shipsimu/classes/constructions/.htaccess | 1 - application/shipsimu/classes/constructions/berths/.htaccess | 1 - application/shipsimu/classes/constructions/docks/.htaccess | 1 - application/shipsimu/classes/constructions/harbors/.htaccess | 1 - application/shipsimu/classes/constructions/terminals/.htaccess | 1 - application/shipsimu/classes/constructions/yards/.htaccess | 1 - application/shipsimu/classes/controller/.htaccess | 1 - application/shipsimu/classes/controller/html/.htaccess | 1 - application/shipsimu/classes/drives/.htaccess | 1 - application/shipsimu/classes/drives/motor/.htaccess | 1 - application/shipsimu/classes/factories/.htaccess | 1 - application/shipsimu/classes/filter/.htaccess | 1 - application/shipsimu/classes/filter/book/.htaccess | 1 - application/shipsimu/classes/filter/book/refill/.htaccess | 1 - application/shipsimu/classes/filter/government/.htaccess | 1 - application/shipsimu/classes/filter/page/.htaccess | 1 - application/shipsimu/classes/filter/validator/.htaccess | 1 - application/shipsimu/classes/government/.htaccess | 1 - application/shipsimu/classes/login/.htaccess | 1 - application/shipsimu/classes/login/helper/.htaccess | 1 - application/shipsimu/classes/menu/.htaccess | 1 - application/shipsimu/classes/menu/government/.htaccess | 1 - application/shipsimu/classes/opening/.htaccess | 1 - application/shipsimu/classes/opening/bank/.htaccess | 1 - application/shipsimu/classes/parts/.htaccess | 1 - application/shipsimu/classes/parts/maschineroom/.htaccess | 1 - application/shipsimu/classes/personell/.htaccess | 1 - application/shipsimu/classes/personell/company/.htaccess | 1 - application/shipsimu/classes/registration/.htaccess | 1 - application/shipsimu/classes/resolver/.htaccess | 1 - application/shipsimu/classes/resolver/command/.htaccess | 1 - application/shipsimu/classes/resolver/command/html/.htaccess | 1 - application/shipsimu/classes/resolver/controller/.htaccess | 1 - application/shipsimu/classes/resolver/controller/html/.htaccess | 1 - application/shipsimu/classes/ships/.htaccess | 1 - application/shipsimu/classes/ships/passenger/.htaccess | 1 - application/shipsimu/classes/structures/.htaccess | 1 - application/shipsimu/classes/structures/extended/.htaccess | 1 - .../shipsimu/classes/structures/extended/cabines/.htaccess | 1 - .../shipsimu/classes/structures/extended/cabines/ship/.htaccess | 1 - application/shipsimu/classes/structures/extended/decks/.htaccess | 1 - .../shipsimu/classes/structures/extended/decks/cargo/.htaccess | 1 - application/shipsimu/classes/structures/extended/lower/.htaccess | 1 - application/shipsimu/classes/structures/extended/upper/.htaccess | 1 - application/shipsimu/classes/user/.htaccess | 1 - application/shipsimu/classes/user/extended/.htaccess | 1 - application/shipsimu/classes/wrapper/.htaccess | 1 - application/shipsimu/exceptions/.htaccess | 1 - application/shipsimu/interfaces/.htaccess | 1 - application/shipsimu/language/.htaccess | 1 - application/shipsimu/templates/.htaccess | 1 - application/shipsimu/templates/de/.htaccess | 1 - application/shipsimu/templates/de/emails/.htaccess | 1 - application/shipsimu/templates/de/html/.htaccess | 1 - application/shipsimu/templates/de/menu/.htaccess | 1 - application/shipsimu/templates/game/.htaccess | 1 - application/shipsimu/templates/game/building/.htaccess | 1 - application/shipsimu/templates/game/chemicals/.htaccess | 1 - application/shipsimu/templates/game/company/.htaccess | 1 - application/shipsimu/templates/game/container/.htaccess | 1 - application/shipsimu/templates/game/contract/.htaccess | 1 - application/shipsimu/templates/game/drink/.htaccess | 1 - application/shipsimu/templates/game/electronic/.htaccess | 1 - application/shipsimu/templates/game/engine/.htaccess | 1 - application/shipsimu/templates/game/farmer/.htaccess | 1 - application/shipsimu/templates/game/fruit/.htaccess | 1 - application/shipsimu/templates/game/fuel/.htaccess | 1 - application/shipsimu/templates/game/grain/.htaccess | 1 - application/shipsimu/templates/game/lifestock/.htaccess | 1 - application/shipsimu/templates/game/merchant/.htaccess | 1 - application/shipsimu/templates/game/mineral/.htaccess | 1 - application/shipsimu/templates/game/produce/.htaccess | 1 - application/shipsimu/templates/game/research/.htaccess | 1 - application/shipsimu/templates/game/resource/.htaccess | 1 - application/shipsimu/templates/game/ship/.htaccess | 1 - application/shipsimu/templates/game/tank/.htaccess | 1 - application/shipsimu/templates/game/technology/.htaccess | 1 - application/shipsimu/templates/game/types/.htaccess | 1 - application/shipsimu/templates/game/vegetable/.htaccess | 1 - db/.htaccess | 1 - db/company/.gitkeep | 0 db/company/.htaccess | 1 - db/company_user/.htaccess | 1 - db/gov_user/.gitkeep | 0 db/gov_user/.htaccess | 1 - db/news/.gitkeep | 0 db/news/.htaccess | 1 - db/payments/.gitkeep | 0 db/payments/.htaccess | 1 - db/user/.gitkeep | 0 db/user/.htaccess | 1 - db/user_points/.gitkeep | 0 db/user_points/.htaccess | 1 - 115 files changed, 109 deletions(-) delete mode 100644 application/.htaccess delete mode 100644 application/selector/.htaccess delete mode 100644 application/selector/admin/.htaccess delete mode 100644 application/selector/exceptions/.htaccess delete mode 100644 application/selector/interfaces/.htaccess delete mode 100644 application/selector/language/.htaccess delete mode 100644 application/selector/main/.htaccess delete mode 100644 application/selector/templates/.htaccess delete mode 100644 application/selector/templates/de/.htaccess delete mode 100644 application/selector/templates/de/code/.htaccess delete mode 100644 application/shipsimu/.htaccess delete mode 100644 application/shipsimu/admin/.htaccess delete mode 100644 application/shipsimu/classes/.htaccess delete mode 100644 application/shipsimu/classes/actions/.htaccess delete mode 100644 application/shipsimu/classes/actions/ship-simu/.htaccess delete mode 100644 application/shipsimu/classes/actions/web/.htaccess delete mode 100644 application/shipsimu/classes/bank/.htaccess delete mode 100644 application/shipsimu/classes/commands/.htaccess delete mode 100644 application/shipsimu/classes/commands/web/.htaccess delete mode 100644 application/shipsimu/classes/commands/web/company/.htaccess delete mode 100644 application/shipsimu/classes/commands/web/government/.htaccess delete mode 100644 application/shipsimu/classes/companies/.htaccess delete mode 100644 application/shipsimu/classes/constructions/.htaccess delete mode 100644 application/shipsimu/classes/constructions/berths/.htaccess delete mode 100644 application/shipsimu/classes/constructions/docks/.htaccess delete mode 100644 application/shipsimu/classes/constructions/harbors/.htaccess delete mode 100644 application/shipsimu/classes/constructions/terminals/.htaccess delete mode 100644 application/shipsimu/classes/constructions/yards/.htaccess delete mode 100644 application/shipsimu/classes/controller/.htaccess delete mode 100644 application/shipsimu/classes/controller/html/.htaccess delete mode 100644 application/shipsimu/classes/drives/.htaccess delete mode 100644 application/shipsimu/classes/drives/motor/.htaccess delete mode 100644 application/shipsimu/classes/factories/.htaccess delete mode 100644 application/shipsimu/classes/filter/.htaccess delete mode 100644 application/shipsimu/classes/filter/book/.htaccess delete mode 100644 application/shipsimu/classes/filter/book/refill/.htaccess delete mode 100644 application/shipsimu/classes/filter/government/.htaccess delete mode 100644 application/shipsimu/classes/filter/page/.htaccess delete mode 100644 application/shipsimu/classes/filter/validator/.htaccess delete mode 100644 application/shipsimu/classes/government/.htaccess delete mode 100644 application/shipsimu/classes/login/.htaccess delete mode 100644 application/shipsimu/classes/login/helper/.htaccess delete mode 100644 application/shipsimu/classes/menu/.htaccess delete mode 100644 application/shipsimu/classes/menu/government/.htaccess delete mode 100644 application/shipsimu/classes/opening/.htaccess delete mode 100644 application/shipsimu/classes/opening/bank/.htaccess delete mode 100644 application/shipsimu/classes/parts/.htaccess delete mode 100644 application/shipsimu/classes/parts/maschineroom/.htaccess delete mode 100644 application/shipsimu/classes/personell/.htaccess delete mode 100644 application/shipsimu/classes/personell/company/.htaccess delete mode 100644 application/shipsimu/classes/registration/.htaccess delete mode 100644 application/shipsimu/classes/resolver/.htaccess delete mode 100644 application/shipsimu/classes/resolver/command/.htaccess delete mode 100644 application/shipsimu/classes/resolver/command/html/.htaccess delete mode 100644 application/shipsimu/classes/resolver/controller/.htaccess delete mode 100644 application/shipsimu/classes/resolver/controller/html/.htaccess delete mode 100644 application/shipsimu/classes/ships/.htaccess delete mode 100644 application/shipsimu/classes/ships/passenger/.htaccess delete mode 100644 application/shipsimu/classes/structures/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/cabines/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/cabines/ship/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/decks/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/decks/cargo/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/lower/.htaccess delete mode 100644 application/shipsimu/classes/structures/extended/upper/.htaccess delete mode 100644 application/shipsimu/classes/user/.htaccess delete mode 100644 application/shipsimu/classes/user/extended/.htaccess delete mode 100644 application/shipsimu/classes/wrapper/.htaccess delete mode 100644 application/shipsimu/exceptions/.htaccess delete mode 100644 application/shipsimu/interfaces/.htaccess delete mode 100644 application/shipsimu/language/.htaccess delete mode 100644 application/shipsimu/templates/.htaccess delete mode 100644 application/shipsimu/templates/de/.htaccess delete mode 100644 application/shipsimu/templates/de/emails/.htaccess delete mode 100644 application/shipsimu/templates/de/html/.htaccess delete mode 100644 application/shipsimu/templates/de/menu/.htaccess delete mode 100644 application/shipsimu/templates/game/.htaccess delete mode 100644 application/shipsimu/templates/game/building/.htaccess delete mode 100644 application/shipsimu/templates/game/chemicals/.htaccess delete mode 100644 application/shipsimu/templates/game/company/.htaccess delete mode 100644 application/shipsimu/templates/game/container/.htaccess delete mode 100644 application/shipsimu/templates/game/contract/.htaccess delete mode 100644 application/shipsimu/templates/game/drink/.htaccess delete mode 100644 application/shipsimu/templates/game/electronic/.htaccess delete mode 100644 application/shipsimu/templates/game/engine/.htaccess delete mode 100644 application/shipsimu/templates/game/farmer/.htaccess delete mode 100644 application/shipsimu/templates/game/fruit/.htaccess delete mode 100644 application/shipsimu/templates/game/fuel/.htaccess delete mode 100644 application/shipsimu/templates/game/grain/.htaccess delete mode 100644 application/shipsimu/templates/game/lifestock/.htaccess delete mode 100644 application/shipsimu/templates/game/merchant/.htaccess delete mode 100644 application/shipsimu/templates/game/mineral/.htaccess delete mode 100644 application/shipsimu/templates/game/produce/.htaccess delete mode 100644 application/shipsimu/templates/game/research/.htaccess delete mode 100644 application/shipsimu/templates/game/resource/.htaccess delete mode 100644 application/shipsimu/templates/game/ship/.htaccess delete mode 100644 application/shipsimu/templates/game/tank/.htaccess delete mode 100644 application/shipsimu/templates/game/technology/.htaccess delete mode 100644 application/shipsimu/templates/game/types/.htaccess delete mode 100644 application/shipsimu/templates/game/vegetable/.htaccess delete mode 100644 db/.htaccess create mode 100644 db/company/.gitkeep delete mode 100644 db/company/.htaccess delete mode 100644 db/company_user/.htaccess create mode 100644 db/gov_user/.gitkeep delete mode 100644 db/gov_user/.htaccess create mode 100644 db/news/.gitkeep delete mode 100644 db/news/.htaccess create mode 100644 db/payments/.gitkeep delete mode 100644 db/payments/.htaccess create mode 100644 db/user/.gitkeep delete mode 100644 db/user/.htaccess create mode 100644 db/user_points/.gitkeep delete mode 100644 db/user_points/.htaccess diff --git a/application/.htaccess b/application/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/.htaccess b/application/selector/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/admin/.htaccess b/application/selector/admin/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/admin/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/exceptions/.htaccess b/application/selector/exceptions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/exceptions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/interfaces/.htaccess b/application/selector/interfaces/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/interfaces/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/language/.htaccess b/application/selector/language/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/language/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/main/.htaccess b/application/selector/main/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/main/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/templates/.htaccess b/application/selector/templates/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/templates/de/.htaccess b/application/selector/templates/de/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/de/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/selector/templates/de/code/.htaccess b/application/selector/templates/de/code/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/selector/templates/de/code/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/.htaccess b/application/shipsimu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/admin/.htaccess b/application/shipsimu/admin/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/admin/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/.htaccess b/application/shipsimu/classes/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/.htaccess b/application/shipsimu/classes/actions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/ship-simu/.htaccess b/application/shipsimu/classes/actions/ship-simu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/ship-simu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/actions/web/.htaccess b/application/shipsimu/classes/actions/web/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/actions/web/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/bank/.htaccess b/application/shipsimu/classes/bank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/bank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/.htaccess b/application/shipsimu/classes/commands/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/.htaccess b/application/shipsimu/classes/commands/web/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/company/.htaccess b/application/shipsimu/classes/commands/web/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/commands/web/government/.htaccess b/application/shipsimu/classes/commands/web/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/commands/web/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/companies/.htaccess b/application/shipsimu/classes/companies/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/companies/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/.htaccess b/application/shipsimu/classes/constructions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/berths/.htaccess b/application/shipsimu/classes/constructions/berths/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/berths/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/docks/.htaccess b/application/shipsimu/classes/constructions/docks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/docks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/harbors/.htaccess b/application/shipsimu/classes/constructions/harbors/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/harbors/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/terminals/.htaccess b/application/shipsimu/classes/constructions/terminals/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/terminals/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/constructions/yards/.htaccess b/application/shipsimu/classes/constructions/yards/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/constructions/yards/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/controller/.htaccess b/application/shipsimu/classes/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/controller/html/.htaccess b/application/shipsimu/classes/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/drives/.htaccess b/application/shipsimu/classes/drives/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/drives/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/drives/motor/.htaccess b/application/shipsimu/classes/drives/motor/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/drives/motor/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/factories/.htaccess b/application/shipsimu/classes/factories/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/factories/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/.htaccess b/application/shipsimu/classes/filter/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/book/.htaccess b/application/shipsimu/classes/filter/book/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/book/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/book/refill/.htaccess b/application/shipsimu/classes/filter/book/refill/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/book/refill/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/government/.htaccess b/application/shipsimu/classes/filter/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/page/.htaccess b/application/shipsimu/classes/filter/page/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/page/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/filter/validator/.htaccess b/application/shipsimu/classes/filter/validator/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/filter/validator/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/government/.htaccess b/application/shipsimu/classes/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/login/.htaccess b/application/shipsimu/classes/login/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/login/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/login/helper/.htaccess b/application/shipsimu/classes/login/helper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/login/helper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/menu/.htaccess b/application/shipsimu/classes/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/menu/government/.htaccess b/application/shipsimu/classes/menu/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/menu/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/opening/.htaccess b/application/shipsimu/classes/opening/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/opening/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/opening/bank/.htaccess b/application/shipsimu/classes/opening/bank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/opening/bank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/parts/.htaccess b/application/shipsimu/classes/parts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/parts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/parts/maschineroom/.htaccess b/application/shipsimu/classes/parts/maschineroom/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/parts/maschineroom/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/personell/.htaccess b/application/shipsimu/classes/personell/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/personell/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/personell/company/.htaccess b/application/shipsimu/classes/personell/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/personell/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/registration/.htaccess b/application/shipsimu/classes/registration/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/registration/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/.htaccess b/application/shipsimu/classes/resolver/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/command/.htaccess b/application/shipsimu/classes/resolver/command/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/command/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/command/html/.htaccess b/application/shipsimu/classes/resolver/command/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/command/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/controller/.htaccess b/application/shipsimu/classes/resolver/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/resolver/controller/html/.htaccess b/application/shipsimu/classes/resolver/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/resolver/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/ships/.htaccess b/application/shipsimu/classes/ships/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/ships/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/ships/passenger/.htaccess b/application/shipsimu/classes/ships/passenger/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/ships/passenger/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/.htaccess b/application/shipsimu/classes/structures/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/.htaccess b/application/shipsimu/classes/structures/extended/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/cabines/.htaccess b/application/shipsimu/classes/structures/extended/cabines/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/cabines/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess b/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/cabines/ship/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/decks/.htaccess b/application/shipsimu/classes/structures/extended/decks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/decks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess b/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/decks/cargo/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/lower/.htaccess b/application/shipsimu/classes/structures/extended/lower/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/lower/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/structures/extended/upper/.htaccess b/application/shipsimu/classes/structures/extended/upper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/structures/extended/upper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/user/.htaccess b/application/shipsimu/classes/user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/user/extended/.htaccess b/application/shipsimu/classes/user/extended/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/user/extended/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/classes/wrapper/.htaccess b/application/shipsimu/classes/wrapper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/classes/wrapper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/exceptions/.htaccess b/application/shipsimu/exceptions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/exceptions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/interfaces/.htaccess b/application/shipsimu/interfaces/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/interfaces/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/language/.htaccess b/application/shipsimu/language/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/language/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/.htaccess b/application/shipsimu/templates/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/.htaccess b/application/shipsimu/templates/de/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/emails/.htaccess b/application/shipsimu/templates/de/emails/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/emails/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/html/.htaccess b/application/shipsimu/templates/de/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/de/menu/.htaccess b/application/shipsimu/templates/de/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/de/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/.htaccess b/application/shipsimu/templates/game/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/building/.htaccess b/application/shipsimu/templates/game/building/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/building/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/chemicals/.htaccess b/application/shipsimu/templates/game/chemicals/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/chemicals/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/company/.htaccess b/application/shipsimu/templates/game/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/container/.htaccess b/application/shipsimu/templates/game/container/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/container/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/contract/.htaccess b/application/shipsimu/templates/game/contract/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/contract/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/drink/.htaccess b/application/shipsimu/templates/game/drink/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/drink/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/electronic/.htaccess b/application/shipsimu/templates/game/electronic/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/electronic/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/engine/.htaccess b/application/shipsimu/templates/game/engine/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/engine/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/farmer/.htaccess b/application/shipsimu/templates/game/farmer/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/farmer/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/fruit/.htaccess b/application/shipsimu/templates/game/fruit/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/fruit/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/fuel/.htaccess b/application/shipsimu/templates/game/fuel/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/fuel/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/grain/.htaccess b/application/shipsimu/templates/game/grain/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/grain/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/lifestock/.htaccess b/application/shipsimu/templates/game/lifestock/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/lifestock/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/merchant/.htaccess b/application/shipsimu/templates/game/merchant/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/merchant/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/mineral/.htaccess b/application/shipsimu/templates/game/mineral/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/mineral/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/produce/.htaccess b/application/shipsimu/templates/game/produce/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/produce/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/research/.htaccess b/application/shipsimu/templates/game/research/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/research/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/resource/.htaccess b/application/shipsimu/templates/game/resource/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/resource/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/ship/.htaccess b/application/shipsimu/templates/game/ship/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/ship/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/tank/.htaccess b/application/shipsimu/templates/game/tank/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/tank/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/technology/.htaccess b/application/shipsimu/templates/game/technology/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/technology/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/types/.htaccess b/application/shipsimu/templates/game/types/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/types/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/shipsimu/templates/game/vegetable/.htaccess b/application/shipsimu/templates/game/vegetable/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/shipsimu/templates/game/vegetable/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/.htaccess b/db/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/company/.gitkeep b/db/company/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/company/.htaccess b/db/company/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/company/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/company_user/.htaccess b/db/company_user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/company_user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/gov_user/.gitkeep b/db/gov_user/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/gov_user/.htaccess b/db/gov_user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/gov_user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/news/.gitkeep b/db/news/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/news/.htaccess b/db/news/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/news/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/payments/.gitkeep b/db/payments/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/payments/.htaccess b/db/payments/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/payments/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/user/.gitkeep b/db/user/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/user/.htaccess b/db/user/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/user/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/db/user_points/.gitkeep b/db/user_points/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/db/user_points/.htaccess b/db/user_points/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/db/user_points/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all -- 2.39.2 From cbe7653681e623a256aac9906322ef4e840c21e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 18 Feb 2023 03:11:29 +0100 Subject: [PATCH 06/11] Continued: - removed already deprecated files - updated 'core' framework --- application/shipsimu/data.php | 2 -- application/shipsimu/init.php | 2 -- application/shipsimu/loader.php | 2 -- application/shipsimu/starter.php | 2 -- core | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 application/shipsimu/data.php delete mode 100644 application/shipsimu/init.php delete mode 100644 application/shipsimu/loader.php delete mode 100644 application/shipsimu/starter.php diff --git a/application/shipsimu/data.php b/application/shipsimu/data.php deleted file mode 100644 index 7d6dcee..0000000 --- a/application/shipsimu/data.php +++ /dev/null @@ -1,2 +0,0 @@ - Date: Sun, 19 Feb 2023 00:02:28 +0100 Subject: [PATCH 07/11] Continued: - fixed some config entries, some are named after protocol being used - added missing directory (.gitkeep) - updated 'core' framework --- application/selector/config.php | 4 ++-- application/shipsimu/config.php | 12 ++++++------ application/shipsimu/language/.gitkeep | 0 core | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 application/shipsimu/language/.gitkeep diff --git a/application/selector/config.php b/application/selector/config.php index b5a704b..54610f2 100644 --- a/application/selector/config.php +++ b/application/selector/config.php @@ -28,8 +28,8 @@ $cfg = FrameworkConfiguration::getSelfInstance(); // CFG: HEADER-CHARSET $cfg->setConfigEntry('header_charset', 'utf-8'); -// CFG: DEFAULT-SELECTOR-HTML-COMMAND -$cfg->setConfigEntry('default_selector_html_command', 'home'); +// CFG: DEFAULT-SELECTOR-HTTP-COMMAND +$cfg->setConfigEntry('default_selector_http_command', 'home'); // CFG: FORM-ACTION $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form'); diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php index 266c54c..60a4e37 100644 --- a/application/shipsimu/config.php +++ b/application/shipsimu/config.php @@ -31,11 +31,11 @@ $cfg = FrameworkBootstrap::getConfigurationInstance(); // CFG: HEADER-CHARSET $cfg->setConfigEntry('header_charset', 'utf-8'); -// CFG: DEFAULT-SHIP-SIMU-HTML-COMMAND -$cfg->setConfigEntry('default_ship_simu_html_command', 'home'); +// CFG: DEFAULT-SHIPSIMU-HTTP-COMMAND +$cfg->setConfigEntry('default_shipsimu_http_command', 'home'); -// CFG: DEFAULT-HTML-COMMAND -$cfg->setConfigEntry('default_html_command', 'home'); +// CFG: DEFAULT-HTTP-COMMAND +$cfg->setConfigEntry('default_http_command', 'home'); // CFG: FORM-ACTION $cfg->setConfigEntry('form_action', 'index.php?app={?app_short_name?}&command=do_form'); @@ -448,8 +448,8 @@ $cfg->setConfigEntry('refill_page_active', 'Y'); // CFG: REFILL-PAGE-MIN-CURRENCY-AMOUNT $cfg->setConfigEntry('refill_page_min_currency_amount', 1000); -// CFG: SHIP-SIMU-LOGIN-FILL-PAYMENT-DISCOVERY -$cfg->setConfigEntry('ship_simu_login_refill_payment_discovery', 'LocalPaymentDiscovery'); +// CFG: SHIPSIMU-LOGIN-FILL-PAYMENT-DISCOVERY +$cfg->setConfigEntry('shipsimu_login_refill_payment_discovery', 'LocalPaymentDiscovery'); // CFG: GOVERNMENT-STARTUP-HELP-LIMIT $cfg->setConfigEntry('government_startup_help_limit', 3); diff --git a/application/shipsimu/language/.gitkeep b/application/shipsimu/language/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/core b/core index 1287590..280798f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1287590bb4dff94252b1c45f320d93ce65eb5495 +Subproject commit 280798f3e8db2f8d5f6d0330081ec63e04414330 -- 2.39.2 From eced67894499e4d839906e94676eee83ffe2325c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Feb 2023 00:53:41 +0100 Subject: [PATCH 08/11] Continued: - exit; means normal exit which isn't the case here - updated 'core' framework --- application/shipsimu/exceptions.php | 14 +++++++++++--- core | 2 +- index.php | 15 ++++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/application/shipsimu/exceptions.php b/application/shipsimu/exceptions.php index 28c8fea..b8d33d8 100644 --- a/application/shipsimu/exceptions.php +++ b/application/shipsimu/exceptions.php @@ -34,6 +34,9 @@ function shipsimu_exception_handler ($exceptionInstance) { // Init variable $backTrace = ''; + // Generate exception code + $exceptionCode = ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())); + // Get all call levels from backtrace foreach ($exceptionInstance->getTrace() as $idx => $traceArray) { // Init argument string @@ -84,7 +87,7 @@ Backtrace: --------------------------------------------------------------------------------\n", trim(html_entity_decode(strip_tags(get_class($exceptionInstance)))), trim(html_entity_decode(strip_tags($exceptionInstance->getMessage()))), - ($exceptionInstance instanceof FrameworkException ? $exceptionInstance->getHexCode() : '0x' . bin2hex($exceptionInstance->getCode())), + $exceptionCode, $exceptionInstance->getFile(), $exceptionInstance->getLine(), trim($backTrace) @@ -92,16 +95,21 @@ Backtrace: // Output the message print($message); + + // Exit with code + exit(hexdec($exceptionCode)); } elseif (is_object($exceptionInstance)) { // Output more details printf('exceptionInstance=%s', print_r($exceptionInstance, true)); + exit(255); } else { /* * Invalid exception instance detected! Do *only* throw exceptions that * extends our own exception 'FrameworkException' to get such nice * outputs like above. */ - printf('exceptionInstance[]=%s is invalid! Please inform the core developer team.' . PHP_EOL, gettype($exceptionInstance)); + printf('exceptionInstance[]=%s is invalid! Please inform the shipsimu developer team.' . PHP_EOL, gettype($exceptionInstance)); + exit(255); } } @@ -127,7 +135,7 @@ function shipsimu_assert_handler (string $file, int $line, int $code) { } // Create message - $message = sprintf('File: %s, Line: %d, Code: %d', + $message = sprintf('File: %s, Line: %s, Code: %s', basename($file), $line, $code diff --git a/core b/core index 280798f..f861d6b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 280798f3e8db2f8d5f6d0330081ec63e04414330 +Subproject commit f861d6bc00f8a3ecf6b057f2aa93129572643896 diff --git a/index.php b/index.php index 51a9f47..94177e3 100644 --- a/index.php +++ b/index.php @@ -62,7 +62,8 @@ final class ApplicationEntryPoint { // Is this method already called? if (isset($GLOBALS['app_die_called'])) { // Then output the text directly - exit($message); + print $message . PHP_EOL; + exit(255); } // This method shall not be called twice @@ -80,7 +81,7 @@ final class ApplicationEntryPoint { // Do we have debug installation? if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { // Abort here - exit; + exit(255); } // Get some instances @@ -173,16 +174,16 @@ final class ApplicationEntryPoint { $responseInstance->flushBuffer(); } catch (FileNotFoundException $e) { // Even the template 'emergency_exit' wasn't found so output both message - exit($message . ', exception: ' . $e->getMessage()); + print ($message . ', exception: ' . $e->getMessage() . PHP_EOL); + exit($e->getCode()); } // Good bye... - exit; + exit(255); } else { // Output message and die - die(sprintf('[Main:] Emergency exit reached: %s', - $message - )); + printf('[Main:] Emergency exit reached: %s', $message); + exit(255); } } -- 2.39.2 From 859058a3bb0ad1dedf262d18f39cd41646652446 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Feb 2023 05:48:41 +0100 Subject: [PATCH 09/11] Continued: - added some more debug lines (updated index.php) - updated 'core' framework --- core | 2 +- index.php | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/core b/core index f861d6b..ba76f13 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f861d6bc00f8a3ecf6b057f2aa93129572643896 +Subproject commit ba76f1380ebef3021b78d122cbabd6fe3173cd47 diff --git a/index.php b/index.php index 94177e3..37fa261 100644 --- a/index.php +++ b/index.php @@ -60,6 +60,7 @@ final class ApplicationEntryPoint { */ public static final function exitApplication (string $message = '', int $code = -1, string $extraData = '', bool $silentMode = false) { // Is this method already called? + //* NOISY-DEBUG: */ printf('[%s:%d]: message=%s,code=%d,extraData=%s,silentMode=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message, $code, $extraData, intval($silentMode)); if (isset($GLOBALS['app_die_called'])) { // Then output the text directly print $message . PHP_EOL; @@ -81,6 +82,7 @@ final class ApplicationEntryPoint { // Do we have debug installation? if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) { // Abort here + //* NOISY-DEBUG: */ printf('[%s:%d]: product_install_mode=%d,silentMode=%d - EXIT!' . PHP_EOL, __METHOD__, __LINE__, $configInstance->getConfigEntry('product_install_mode'), intval($silentMode)); exit(255); } @@ -185,6 +187,9 @@ final class ApplicationEntryPoint { printf('[Main:] Emergency exit reached: %s', $message); exit(255); } + + // Trace message + //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); } /** @@ -197,16 +202,19 @@ final class ApplicationEntryPoint { */ public static final function detectFrameworkPath () { // Is it not set? + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); if (empty(self::$frameworkPath)) { // Auto-detect core path (first application-common) - foreach (array('core', __DIR__, '/usr/local/share/php/core', '/usr/share/php/core') as $possiblePath) { + foreach (['core', self::getRootPath(), '/usr/local/share/php/core', '/usr/share/php/core'] as $possiblePath) { // Create full path for testing + //* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s' . PHP_EOL, __METHOD__, __LINE__, $possiblePath); $realPath = realpath($possiblePath); // Is it false? //* NOISY-DEBUG: */ printf('[%s:%d]: realPath[%s]=%s' . PHP_EOL, __METHOD__, __LINE__, gettype($realPath), $realPath); if ($realPath === false) { // Then, not found. + //* NOISY-DEBUG: */ printf('[%s:%d]: possiblePath=%s was not found. - SKIPPED!' . PHP_EOL, __METHOD__, __LINE__, $possiblePath); continue; } @@ -214,6 +222,7 @@ final class ApplicationEntryPoint { $frameworkPath = sprintf('%s%sframework%s', $realPath, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR); // First create full-qualified file name (FQFN) to framework/config-global.php + //* NOISY-DEBUG: */ printf('[%s:%d]: frameworkPath=%s' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath); $configFile = $frameworkPath . 'config-global.php'; // Is it readable? @@ -223,11 +232,13 @@ final class ApplicationEntryPoint { self::$frameworkPath = $frameworkPath; // Abort here + //* NOISY-DEBUG: */ printf('[%s:%d]: Setting self::frameworkPath=%s - BREAK!' . PHP_EOL, __METHOD__, __LINE__, $frameworkPath); break; } } // Able to find? + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - Checking ...' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); if (!is_dir(self::$frameworkPath)) { // Is no directory throw new Exception('Cannot find framework.'); @@ -235,6 +246,7 @@ final class ApplicationEntryPoint { } // Return it + //* NOISY-DEBUG: */ printf('[%s:%d]: self::frameworkPath=%s - EXIT!' . PHP_EOL, __METHOD__, __LINE__, self::$frameworkPath); return self::$frameworkPath; } @@ -258,6 +270,7 @@ final class ApplicationEntryPoint { */ public static final function main () { // Load bootstrap file + //* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__); require sprintf('%sbootstrap%sbootstrap.inc.php', self::detectFrameworkPath(), DIRECTORY_SEPARATOR); /* @@ -274,13 +287,14 @@ final class ApplicationEntryPoint { * register the application instance in registry. */ FrameworkBootstrap::startApplication(); + + // Trace message + //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); } } // Log all exceptions (only debug! This option can create large error logs) //define('LOG_EXCEPTIONS', true); -//xdebug_start_trace(); - // Call above main() method ApplicationEntryPoint::main(); -- 2.39.2 From 4dcdc446d626eaa5fcc7ac705067d9656a82c18e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Feb 2023 14:23:55 +0100 Subject: [PATCH 10/11] Continued: - updated a bit old ways (lesser monolithic) - udpated 'core' framework --- .../selector/class_ApplicationHelper.php | 6 ++--- .../selector/class_ApplicationSelector.php | 4 ++-- application/selector/exceptions.php | 2 +- .../classes/bank/money/class_MoneyBank.php | 6 ++--- .../web/class_WebShipsimuProfileCommand.php | 2 +- ...lass_WebGovernmentFailedStartupCommand.php | 2 +- ...ass_WebGovernmentFailedTrainingCommand.php | 2 +- .../companies/class_ShippingCompany.php | 24 +++++++++---------- ...hipSimuGovernmentPaysStartupHelpFilter.php | 2 +- ...s_ShipSimuGovernmentPaysTrainingFilter.php | 2 +- .../filter/page/class_RefillPageFilter.php | 2 +- .../class_RefillRequestValidatorFilter.php | 2 +- .../class_ShipSimuUserStatusGuestFilter.php | 2 +- .../government/class_SimplifiedGovernment.php | 4 ++-- .../login/class_ShipSimuGuestLogin.php | 4 ++-- .../classes/login/class_ShipSimuUserLogin.php | 4 ++-- .../helper/class_ShipSimuLoginHelper.php | 2 +- .../personell/class_SimulatorPersonell.php | 8 +++---- .../company/class_CompanyEmployee.php | 2 +- .../class_ShipSimuRegistration.php | 4 ++-- .../class_ShipSimuHtmlControllerResolver.php | 2 +- .../shipsimu/classes/ships/class_BaseShip.php | 4 ++-- .../ships/passenger/class_PassengerShip.php | 8 +++---- .../classes/user/class_ShipSimuBaseUser.php | 6 ++--- .../user/extended/class_ShipSimuGuest.php | 2 +- .../user/extended/class_ShipSimuMember.php | 10 ++++---- .../wrapper/class_CompanyDatabaseWrapper.php | 4 ++-- .../class_NoShipyardsConstructedException.php | 2 +- .../code/action_ship_simu_login_company.ctp | 2 +- ...hip_simu_login_government_startup_help.ctp | 2 +- ...on_ship_simu_login_government_training.ctp | 2 +- .../code/action_ship_simu_login_profile.ctp | 24 +++++++++---------- .../de/code/action_ship_simu_login_refill.ctp | 2 +- .../de/code/government_failed_main.ctp | 2 +- .../shipsimu/templates/de/code/login_form.ctp | 4 ++-- .../shipsimu/templates/de/code/login_main.ctp | 2 +- .../templates/de/code/register_form.ctp | 24 +++++++++---------- core | 2 +- 38 files changed, 95 insertions(+), 95 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index c3b74da..dd4ee5c 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -78,7 +78,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Is the instance there? if (is_null(self::$selfInstance)) { self::$selfInstance = new ApplicationHelper(); - } // END - if + } // Return the instance return self::$selfInstance; @@ -167,7 +167,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Then use it $response = strtolower($requestInstance->getRequestElement('request')); $responseType = $response; - } // END - if + } // ... and a new response object $responseClass = sprintf('%sResponse', self::convertToClassName($response)); @@ -186,7 +186,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } // Get a controller resolver $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 381dd56..1a7aa40 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -112,7 +112,7 @@ class ApplicationSelector extends BaseFrameworkSystem { // Add the current instance to the list $this->foundApps->append($app); - } // END - if ((is_file(... + } ((is_file(... } /** @@ -175,7 +175,7 @@ class ApplicationSelector extends BaseFrameworkSystem { // Load the application's data.php script and append the // application to the ArrayObject $this->loadApplicationData($appData, $appName); - } // END - if + } } // END - while // Close directory pointer diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php index d653e5e..510f7d5 100644 --- a/application/selector/exceptions.php +++ b/application/selector/exceptions.php @@ -63,7 +63,7 @@ function __assertHandler ($file, $line, $code) { // Empty code? if (empty($code)) { $code = 'Unknown'; - } // END - if + } // Create message $message = sprintf('File: %s, Line: %s, Code: %s', diff --git a/application/shipsimu/classes/bank/money/class_MoneyBank.php b/application/shipsimu/classes/bank/money/class_MoneyBank.php index f35e756..67029da 100644 --- a/application/shipsimu/classes/bank/money/class_MoneyBank.php +++ b/application/shipsimu/classes/bank/money/class_MoneyBank.php @@ -55,7 +55,7 @@ class MoneyBank extends BaseBank implements Registerable { * @return $lendsMoreMoney Wether this bank lends more money to the user */ public function ifBankLendsMoreMoney () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } /** @@ -64,7 +64,7 @@ class MoneyBank extends BaseBank implements Registerable { * @return $hasMaximumCredits Wether the user has maximum allowed credits */ public function ifUserHasMaxCredits () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } /** @@ -83,7 +83,7 @@ class MoneyBank extends BaseBank implements Registerable { // Then we simply "ask" the opening time instance if the user asks within the opening time $hasOpened = $openingInstance->ifWithinOpeningTimes(); - } // END - if + } // Return status return $hasOpened; diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php index 37d2c5e..1a2134a 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php @@ -107,7 +107,7 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { unset($this->allowedData); // Unfinished! - $this->partialStub("Unfinished work."); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished work.'); $this->debugBackTrace(); } diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php index 52824c4..ccf4a3e 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php @@ -66,7 +66,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $appInstance = $this->getResolverInstance()->getApplicationInstance(); diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php index 4a6bf01..db2afe8 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php @@ -66,7 +66,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $appInstance = $this->getResolverInstance()->getApplicationInstance(); diff --git a/application/shipsimu/classes/companies/class_ShippingCompany.php b/application/shipsimu/classes/companies/class_ShippingCompany.php index 7263f0b..9601126 100644 --- a/application/shipsimu/classes/companies/class_ShippingCompany.php +++ b/application/shipsimu/classes/companies/class_ShippingCompany.php @@ -92,7 +92,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Then do some nasty caching here but don't throw an exception // because then you will hurt our web helpers... :/ $companyInstance->partialStub("Don't throw exceptions here."); - } // END - if + } // Init all lists $companyInstance->initCompanyLists(); @@ -124,7 +124,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($resultInstance instanceof SearchableResult) { // Set the result instance $this->setResultInstance($resultInstance); - } // END - if + } // Return result return $participates; @@ -146,8 +146,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Is it set? if ($resultInstance instanceof SearchableResult) { // Result found so analyse it - $this->partialStub("Check if user is company founder."); - } // END - if + DebugMiddleware::getSelfInstance()->partialStub('Check if user is company founder.'); + } // Return result return $isFounder; @@ -169,8 +169,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner // Is it set? if ($resultInstance instanceof SearchableResult) { // Result found so analyse it - $this->partialStub("Check if user is company owner."); - } // END - if + DebugMiddleware::getSelfInstance()->partialStub('heck if user is company owner.'); + } // Return result return $isOwner; @@ -192,7 +192,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($resultInstance instanceof SearchableResult) { // Result found so he is employee $isEmployee = true; - } // END - if + } // Return result return $isEmployee; @@ -240,7 +240,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $dummy = explode(" ", $this->getCompanyName()); foreach ($dummy as $part) { $this->shortName .= substr($part, 0, 1); - } // END - if + } } // Reedereien Werften bauen lassen @@ -304,7 +304,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($totalUnemployed < $amount) { // Reichte nicht aus! throw new ToMuchEmployeesException(array($amount, $personellInstance->getAllUnemployed()), self::EXCEPTION_NOT_ENOUGTH_UNEMPLOYEES); - } // END - if + } // Get list for all unemployed people $list = $personellInstance->getSpecialPersonellList(false); // Should be cached @@ -328,7 +328,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($iterator->valid() === false) { // Should normally not happen... :( throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS); - } // END - if + } // Get current element $employee = $iterator->current(); @@ -392,7 +392,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($shipyardIter->valid() === false) { // Rewind to first position $shipyardIter->seek(0); - } // END - if + } // Get Shipyard object $shipyard = $shipyardIter->current(); @@ -603,7 +603,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner if ($partnerInstance->isContractPartner($contractInstance) === false) { // Invalid contract partner! throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID); - } // END - if + } // Determine if company "signs" own contract (must be done) or with an other party if ($this->equals($partnerInstance)) { diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index f02219d..98e1e23 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -70,6 +70,6 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme // Stop processing here exit; - } // END - if + } } } diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index f90d1b9..c6117fb 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -70,6 +70,6 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements // Stop processing here exit; - } // END - if + } } } diff --git a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php index b114ca0..9badacd 100644 --- a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php +++ b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php @@ -67,6 +67,6 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { // Abort here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } } } diff --git a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php index 351c643..042fdc5 100644 --- a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php @@ -68,6 +68,6 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera // Abort here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } } } diff --git a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php index 06e0996..eb4315d 100644 --- a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php +++ b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php @@ -71,6 +71,6 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter // Stop processing here exit; - } // END - if + } } } diff --git a/application/shipsimu/classes/government/class_SimplifiedGovernment.php b/application/shipsimu/classes/government/class_SimplifiedGovernment.php index 89d4a51..5e44b32 100644 --- a/application/shipsimu/classes/government/class_SimplifiedGovernment.php +++ b/application/shipsimu/classes/government/class_SimplifiedGovernment.php @@ -87,7 +87,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { // Entry was found so the government can no more pay a training $alreadyPayed = true; - } // END - if + } // Return the result return $alreadyPayed; @@ -126,7 +126,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { // Entry found, so lets have a look if this government wants to again... $maximumPayed = true; - } // END - if + } // Return the result return $maximumPayed; diff --git a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php index 802749b..a30c272 100644 --- a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php @@ -72,7 +72,7 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R if ($userInstance->ifPasswordHashMatches($requestInstance) === false) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // Now do the real login. This can be cookie- or session-based login // which depends on the admins setting then on the user's taste. @@ -120,6 +120,6 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R // Store the hash back in request $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } diff --git a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php index 43e7c20..a70bbaf 100644 --- a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php @@ -75,7 +75,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re if ($userInstance->ifPasswordHashMatches($requestInstance) === false) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // ToDo place @@ -125,6 +125,6 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re // Store the hash back in request $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } diff --git a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php index 3a7c66d..26e10ed 100644 --- a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php +++ b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php @@ -67,7 +67,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { if (!$userInstance instanceof ManageableAccount) { // Thrown an exception here throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE); - } // END - if + } // Set default login method from config $helperInstance->setDefaultAuthMethod(); diff --git a/application/shipsimu/classes/personell/class_SimulatorPersonell.php b/application/shipsimu/classes/personell/class_SimulatorPersonell.php index a0d0206..27b6202 100644 --- a/application/shipsimu/classes/personell/class_SimulatorPersonell.php +++ b/application/shipsimu/classes/personell/class_SimulatorPersonell.php @@ -129,10 +129,10 @@ class SimulatorPersonell extends BasePersonell { if ($this->personelllList instanceof FrameworkArrayObject) { // Throw an exception throw new PersonellListAlreadyCreatedException($this, self::EXCEPTION_DIMENSION_ARRAY_INVALID); - } // END - if + } // Initialize the array - $this->personellList = new FrameworkArrayObject("FakedPersonellList"); + $this->personellList = new FrameworkArrayObject('FakedPersonellList'); } // Remove the personell list @@ -171,7 +171,7 @@ class SimulatorPersonell extends BasePersonell { * * @return $cacheList A list of cached personells */ - function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = "") { + function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = '') { // Serialize the conditions for checking if we can take the cache $serialized = serialize(array($isEmployed, $isMarried, $hasGender)); @@ -295,7 +295,7 @@ class SimulatorPersonell extends BasePersonell { // Set typical family name parent::setFamily("Smith"); - } // END - if + } // Return surname return $surname; diff --git a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php index a376c00..300c936 100644 --- a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php +++ b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php @@ -50,7 +50,7 @@ class CompanyEmployee extends SimulatorPersonell { if ($personellInstance->isDateValid($year, $month, $day) === false) { // Something is wrong ... throw new BirthdayInvalidException(array($year, $month, $day), self::EXCEPTION_BIRTH_DATE_IS_INVALID); - } // END - if + } // Set birthday $personellInstance->setBirthday($year, $month, $day); diff --git a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php index 64c34d5..aa13a2b 100644 --- a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php +++ b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php @@ -166,7 +166,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { if ($this->getConfigInstance()->getConfigEntry('confirm_email_enabled') === 'N') { // No confirmation of email needed $configEntry = 'user_status_confirmed'; - } // END - if + } // Add a lot elements to the dataset criteria foreach ($this->criteriaElements as $alias => $element) { @@ -189,7 +189,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { if ((($element == 'username') || ($alias == 'username')) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) { // Yes, then set the config entry to guest status $configEntry = 'user_status_guest'; - } // END - if + } } // END - foreach // Mark the username as unique key diff --git a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php index 6e4d3b9..24a7a3b 100644 --- a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php +++ b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php @@ -90,7 +90,7 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) { // This command has an invalid instance! throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); - } // END - if + } // Set last controller $this->setResolvedInstance($controllerInstance); diff --git a/application/shipsimu/classes/ships/class_BaseShip.php b/application/shipsimu/classes/ships/class_BaseShip.php index 73ab63d..796d9dc 100644 --- a/application/shipsimu/classes/ships/class_BaseShip.php +++ b/application/shipsimu/classes/ships/class_BaseShip.php @@ -69,7 +69,7 @@ class BaseShip extends BaseSimulator { if (!class_exists($partClass)) { // Nicht vorhanden, dann Ausnahme werfen! throw new NoClassException($partClass, self::EXCEPTION_CLASS_NOT_FOUND); - } // END - if + } // Get an instance back from our object factory $partInstance = ObjectFactory::createObjectByName($partClass); @@ -134,7 +134,7 @@ class BaseShip extends BaseSimulator { // STUB: Getter-Methode Anzahl Betten public function calcTotalBeds () { - $this->partialStub("Please implement this stub in your ship!"); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this stub in your ship!'); } // Setter-Methode fuer Schiffsnamen diff --git a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php index a1e3d5b..da9b0b6 100644 --- a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php +++ b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php @@ -49,7 +49,7 @@ class PassengerShip extends BaseShip implements ConstructableShip { if (is_null($struct)) { // Empty structures list! throw new EmptyStructuresListException($this, self::EXCEPTION_EMPTY_STRUCTURES_ARRAY); - } // END - if + } // Anzahl Betten auf 0 setzen $numBeds = 0; @@ -73,9 +73,9 @@ class PassengerShip extends BaseShip implements ConstructableShip { if (!is_null($cab)) { // Kabinenbeschreibung holen $cabType = $cab->getObjectDescription(); - } // END - if - } // END - if - } // END - if + } + } + } } // END - for // Anzahl zurueckliefern diff --git a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php index 6795a87..d6764ee 100644 --- a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php +++ b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php @@ -57,7 +57,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // Store it in registry Registry::getRegistry()->addInstance('money_bank', $bankInstance); - } // END - if + } // Return the instance return $bankInstance; @@ -87,7 +87,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // Store it in registry Registry::getRegistry()->addInstance('government', $governmentInstance); - } // END - if + } // Return the prepared instance return $governmentInstance; @@ -148,7 +148,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { // And store it in registry Registry::getRegistry()->addInstance('points', $pointsInstance); - } // END - if + } // Just forward this request to the user points class $hasRequired = $pointsInstance->ifUserHasRequiredPoints($action); diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php index ca2d531..dc09b0a 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php @@ -58,7 +58,7 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { if ($userInstance->ifUsernameExists() === false) { // Throw an exception here throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND); - } // END - if + } // Return the instance return $userInstance; diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php index 0f425fa..64a5afa 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php @@ -66,7 +66,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka if ($userInstance->ifUsernameExists() === false) { // Throw an exception here throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND); - } // END - if + } // Return the instance return $userInstance; @@ -132,7 +132,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // If there is no action use the default on if (is_null($lastAction)) { $lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action'); - } // END - if + } // Get a critieria instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); @@ -184,7 +184,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // And store it in registry Registry::getRegistry()->addInstance('points', $pointsInstance); - } // END - if + } // Get the amount $amount = $requestInstance->getRequestElement('amount'); @@ -203,7 +203,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka if (!$this->getResultInstance() instanceof SearchableResult) { // Abort here return; - } // END - if + } // Do we have data to update? if ($this->getResultInstance()->ifDataNeedsFlush()) { @@ -212,6 +212,6 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka // Yes, then send the whole result to the database layer $wrapperInstance->doUpdateByResult($this->getResultInstance()); - } // END - if + } } } diff --git a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php index 28257b1..a9f9065 100644 --- a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php @@ -61,7 +61,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { // Set the company instance if not null if (!is_null($companyInstance)) { $wrapperInstance->setCompanyInstance($companyInstance); - } // END - if + } // Return the instance return $wrapperInstance; @@ -97,7 +97,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { // Entry found for further analysis/processing $participates = true; - } // END - if + } // Return the result return $participates; diff --git a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php index b767993..0449ea6 100644 --- a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php @@ -30,7 +30,7 @@ class NoShipyardsConstructedException extends FrameworkException { $message = sprintf("[%s:] Keine Werften gefunden!", $class->__toString() ); - } // END - if + } // Call parent constructor parent::__construct($message, $code); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp index ebe2fbd..c907595 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp @@ -34,7 +34,7 @@ if ($linkInstance->getValueInstance()->ifUserHasRequiredPoints('write_applicatio // Display link to government for startup help $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government'); - } // END - if + } } elseif ($linkInstance->getValueInstance()->ifGovernmentPaysStartupHelp()) { // Display link to government for startup help $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government'); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp index 99c68f7..2f77d1a 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp @@ -29,7 +29,7 @@ $helperInstance->addInputPasswordField('password'); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung von Starthilfe ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du die Starthilfe beantragen kannst."); $helperInstance->addCaptcha(); -} // END - if +} // Final notices $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!"); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp index 555c036..9c41efd 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp @@ -29,7 +29,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_prof if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen."); $helperInstance->addCaptcha(); -} // END - if +} // Final notices $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!"); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp index e4ec93c..083dd30 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp @@ -29,12 +29,12 @@ if ($helperInstance->ifEmailChangeAllowed()) { if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if + } if ($helperInstance->ifEmailChangeRequireConfirmation()) { $helperInstance->addFormNote('confirm', "Es wird ein Bestätigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann möglichst schnell an."); - } // END - if -} // END - if + } +} // Add form group for user profile $helperInstance->addFormGroup('profile', "Hier kannst du deine Profildaten ändern."); @@ -59,8 +59,8 @@ if ($helperInstance->ifRegisterIncludesPersonaData()) { $helperInstance->addInputTextField('birth_month'); $helperInstance->addFieldText('birth_day', "."); $helperInstance->addInputTextField('birth_year'); - } // END - if -} // END - if + } +} // Add sub group for zip code $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?"); @@ -74,35 +74,35 @@ $helperInstance->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern if ($helperInstance->ifChatEnabled('icq')) { $helperInstance->addFieldText('icq', "ICQ-Nummer:"); $helperInstance->addInputTextFieldWithDefault('icq'); -} // END - if +} // Add Jabber chat? if ($helperInstance->ifChatEnabled('jabber')) { $helperInstance->addFieldText('jabber', "Jabber:"); $helperInstance->addInputTextFieldWithDefault('jabber'); -} // END - if +} // Add Yahoo! chat? if ($helperInstance->ifChatEnabled('yahoo')) { $helperInstance->addFieldText('yahoo', "Yahoo!:"); $helperInstance->addInputTextFieldWithDefault('yahoo'); -} // END - if +} // Add AOL chat? if ($helperInstance->ifChatEnabled('aol')) { $helperInstance->addFieldText('aol', "AOL-Screenname:"); $helperInstance->addInputTextFieldWithDefault('aol'); -} // END - if +} // Add MSN chat? if ($helperInstance->ifChatEnabled('msn')) { $helperInstance->addFieldText('msn', "MSN:"); $helperInstance->addInputTextFieldWithDefault('msn'); -} // END - if +} if (!$helperInstance->ifRegisterRequiresEmailVerification()) { $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per Email sind im Loginbereich verfeinerbar, welche du genau haben willst."); -} // END - if +} // Rules already accepted? if ($helperInstance->ifRulesHaveChanged()) { @@ -118,7 +118,7 @@ if ($helperInstance->ifRulesHaveChanged()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Das Ändern von Profildaten ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit deine Änderungen gespeichert werden können."); $helperInstance->addCaptcha(); -} // END - if +} // Ask again for current account password $helperInstance->addFormGroup('pass_old', "Bitte gebe zur Bestätigung der Änderungen dein derzeitiges Passwort ein."); diff --git a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp index 0481264..3dd4548 100644 --- a/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp +++ b/application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp @@ -40,7 +40,7 @@ $helperInstance->addInputPasswordField('pass_old'); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_refill', "Bitte wiederhole den angezeigten Code:"); $helperInstance->addCaptcha(); -} // END - if +} // Submit button $helperInstance->addFormGroup('buttons_refill', "Mit Absenden des Formulars wird deine Nachbestellung verbindlich!"); diff --git a/application/shipsimu/templates/de/code/government_failed_main.ctp b/application/shipsimu/templates/de/code/government_failed_main.ctp index 6411bfb..078f035 100644 --- a/application/shipsimu/templates/de/code/government_failed_main.ctp +++ b/application/shipsimu/templates/de/code/government_failed_main.ctp @@ -17,7 +17,7 @@ $blockInstance->assignFieldWithFilter('user_status', "user_status_translator"); if ($blockInstance->ifIncludeRegistrationStamp()) { // Then assign it as well! $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp'); -} // END - if +} // Flush the content out to a template variable $blockInstance->flushContent(); diff --git a/application/shipsimu/templates/de/code/login_form.ctp b/application/shipsimu/templates/de/code/login_form.ctp index b8a52e2..4f48dbd 100644 --- a/application/shipsimu/templates/de/code/login_form.ctp +++ b/application/shipsimu/templates/de/code/login_form.ctp @@ -36,7 +36,7 @@ if ($helperInstance->ifLoginIsEnabled()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst."); $helperInstance->addCaptcha(); - } // END - if + } // Submit buttons $helperInstance->addFormGroup('buttons_user', "Alles richtig eingegeben?"); @@ -62,7 +62,7 @@ if ($helperInstance->ifGuestLoginAllowed()) { if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA geschützt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst."); $helperInstance->addCaptcha(); - } // END - if + } // Submit button $helperInstance->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschränkt. Mehr dazu unter "Gastlogin"."); diff --git a/application/shipsimu/templates/de/code/login_main.ctp b/application/shipsimu/templates/de/code/login_main.ctp index 8c17459..efff9d9 100644 --- a/application/shipsimu/templates/de/code/login_main.ctp +++ b/application/shipsimu/templates/de/code/login_main.ctp @@ -18,7 +18,7 @@ $blockInstance->assignFieldWithFilter('points', 'format_number'); if ($blockInstance->ifIncludeRegistrationStamp()) { // Then assign it as well! $blockInstance->assignFieldWithFilter('registered', 'format_timestamp'); -} // END - if +} // Flush the content out to a template variable $blockInstance->flushContent(); diff --git a/application/shipsimu/templates/de/code/register_form.ctp b/application/shipsimu/templates/de/code/register_form.ctp index 738b3b8..86812b8 100644 --- a/application/shipsimu/templates/de/code/register_form.ctp +++ b/application/shipsimu/templates/de/code/register_form.ctp @@ -26,8 +26,8 @@ if ($helperInstance->ifRegisterRequiresEmailVerification()) { // Must the email address be unique in this system? if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if -} // END - if + } +} // Shall we also ask some personal data to complete the profile? if ($helperInstance->ifRegisterIncludesProfile()) { @@ -41,8 +41,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) { // Must the email address be unique in this system? if ($helperInstance->ifEmailMustBeUnique()) { $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein."); - } // END - if - } // END - if + } + } // Persoenliche Daten mit in der Anmeldung abfragen? if ($helperInstance->ifRegisterIncludesPersonaData()) { @@ -64,8 +64,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) { $helperInstance->addInputTextField('birth_month'); $helperInstance->addFieldText('birth_day', "."); $helperInstance->addInputTextField('birth_year'); - } // END - if - } // END - if + } + } $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?"); $helperInstance->addFieldText('zip', "Postleitzahl:"); @@ -76,27 +76,27 @@ if ($helperInstance->ifRegisterIncludesProfile()) { if ($helperInstance->ifChatEnabled('icq')) { $helperInstance->addFieldText('icq', "ICQ-Nummer:"); $helperInstance->addInputTextField('icq'); - } // END - if + } if ($helperInstance->ifChatEnabled('jabber')) { $helperInstance->addFieldText('jabber', "Jabber:"); $helperInstance->addInputTextField('jabber'); - } // END - if + } if ($helperInstance->ifChatEnabled('yahoo')) { $helperInstance->addFieldText('yahoo', "Yahoo!:"); $helperInstance->addInputTextField('yahoo'); - } // END - if + } if ($helperInstance->ifChatEnabled('aol')) { $helperInstance->addFieldText('aol', "AOL-Screenname:"); $helperInstance->addInputTextField('aol'); - } // END - if + } if ($helperInstance->ifChatEnabled('msn')) { $helperInstance->addFieldText('msn', "MSN:"); $helperInstance->addInputTextField('msn'); - } // END - if + } if (!$helperInstance->ifRegisterRequiresEmailVerification()) { $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst."); @@ -113,7 +113,7 @@ $helperInstance->addInputCheckboxField('rules', false); if ($helperInstance->ifFormSecuredWithCaptcha()) { $helperInstance->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann."); $helperInstance->addCaptcha(); -} // END - if +} // Final note and submit buttons $helperInstance->addFormGroup('buttons', "Wenn du alle benötigten Felder korrekt ausgefüt hast, kannst du die Anmeldung abschliessen."); diff --git a/core b/core index ba76f13..3e492b8 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ba76f1380ebef3021b78d122cbabd6fe3173cd47 +Subproject commit 3e492b83a49b96805aff4f46882773f2bcf1fad9 -- 2.39.2 From 2b43c6a61cec7703c563df3cfe90402367719bbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 12 May 2023 01:47:39 +0200 Subject: [PATCH 11/11] Continued: - updated 'core' --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 3e492b8..c3f1d30 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3e492b83a49b96805aff4f46882773f2bcf1fad9 +Subproject commit c3f1d30c20e25c1ddadd8aeba8f2636713b6cd63 -- 2.39.2