From 1611d3310143829c4dc2d26f01e4a74779dcbd7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 27 Feb 2023 11:47:39 +0100 Subject: [PATCH] Continued: - more references to the deprecated 'selector' application removed --- framework/config-global.php | 45 +++++-------------- .../frontend/class_BaseDatabaseFrontend.php | 3 +- .../class_ManageableApplication.php | 1 - .../database/class_DatabaseConnection.php | 2 +- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/framework/config-global.php b/framework/config-global.php index ccd83da0..6d8608de 100644 --- a/framework/config-global.php +++ b/framework/config-global.php @@ -61,9 +61,6 @@ $cfg->setConfigEntry('raw_template_extension', '.tpl'); // CFG: CODE-TEMPLATE-EXTENSION $cfg->setConfigEntry('code_template_extension', '.ctp'); -// CFG: SELECTOR-PATH -$cfg->setConfigEntry('selector_path', 'selector'); - // CFG: TEMPLATE-BASE-PATH $cfg->setConfigEntry('tpl_base_path', 'templates/'); @@ -118,9 +115,6 @@ $cfg->setConfigEntry('output_class', 'Org\Mxchange\CoreFramework\Output\WebOutpu // CFG: LANGUAGE-SYSTEM-CLASS $cfg->setConfigEntry('language_system_class', 'Org\Mxchange\CoreFramework\Localization\LanguageSystem'); -// CFG: SELECTOR-TEMPLATE-PREFIX -$cfg->setConfigEntry('tpl_selector_prefix', 'selector'); - // CFG: WEB-CONTENT-TYPE $cfg->setConfigEntry('web_content_type', 'text/html'); @@ -139,21 +133,6 @@ $cfg->setConfigEntry('meta_keywords', 'test,test,test'); // CFG: META-DESCRIPTION $cfg->setConfigEntry('meta_description', 'A description for your website'); -// CFG: SELECTOR-MAIN-TEMPLATE -$cfg->setConfigEntry('selector_main_tpl', 'selector_main'); - -// CFG: SELECTOR-APPS-TEMPLATE -$cfg->setConfigEntry('selector_apps_tpl', 'selector_apps'); - -// CFG: SELECTOR-NAME -$cfg->setConfigEntry('selector_name', 'selector'); - -// CFG: DEFAULT-APPLICATION -$cfg->setConfigEntry('default_application', 'selector'); - -// CFG: VERBOSE-LEVEL -$cfg->setConfigEntry('verbose_level', 0); - // CFG: CACHE-CLASS $cfg->setConfigEntry('cache_class', 'Org\Mxchange\CoreFramework\Cache\Memory\MemoryCache'); @@ -322,12 +301,6 @@ $cfg->setConfigEntry('local_file_database_class', 'Org\Mxchange\CoreFramework\Da // CFG: COMPRESSOR-CHANNEL-CLASS $cfg->setConfigEntry('compressor_channel_class', 'Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel'); -// CFG: IS-DEBUG-HTML-OUTPUT-TIMINGS-ENABLED -$cfg->setConfigEntry('is_debug_html_output_timings_enabled', false); - -// CFG: IS-DEBUG-CONSOLE-OUTPUT-TIMINGS-ENABLED -$cfg->setConfigEntry('is_debug_console_output_timings_enabled', true); - // CFG: PROXY-HOST $cfg->setConfigEntry('proxy_host', ''); @@ -343,9 +316,6 @@ $cfg->setConfigEntry('proxy_password', ''); // CFG: HOSTNAME-FILE $cfg->setConfigEntry('hostname_file', '/etc/hostname'); -// CFG: DATABASE-CACHE-ENABLED -$cfg->setConfigEntry('database_cache_enabled', false); - // CFG: DIRECTORY-CLASS $cfg->setConfigEntry('directory_class', 'Org\Mxchange\CoreFramework\Filesytem\Pointer\FrameworkDirectoryPointer'); @@ -460,9 +430,6 @@ $cfg->setConfigEntry('crypto_openssl_stream_class', 'Org\Mxchange\CoreFramework\ // CFG: CRYPTO-NULL-STREAM-CLASS $cfg->setConfigEntry('crypto_null_stream_class', 'Org\Mxchange\CoreFramework\Stream\Crypto\Null\NullCryptoStream'); -// CFG: IS-DEVELOPER-MODE-ENABLED -$cfg->setConfigEntry('is_developer_mode_enabled', true); - // CFG: CRYPTO-HASH-FUNCTION-NAME $cfg->setConfigEntry('crypto_hash_function_name', 'sha256'); @@ -472,6 +439,18 @@ $cfg->setConfigEntry('crypto_hash_function_name', 'sha256'); * ------------------------------------------------------------- */ +// CFG: IS-DEVELOPER-MODE-ENABLED +$cfg->setConfigEntry('is_developer_mode_enabled', true); + +// CFG: IS-DATABASE-CACHE-ENABLED +$cfg->setConfigEntry('is_database_cache_enabled', false); + +// CFG: IS-DEBUG-HTML-OUTPUT-TIMINGS-ENABLED +$cfg->setConfigEntry('is_debug_html_output_timings_enabled', false); + +// CFG: IS-DEBUG-CONSOLE-OUTPUT-TIMINGS-ENABLED +$cfg->setConfigEntry('is_debug_console_output_timings_enabled', true); + // CFG: IS-REGISTER-EMAIL-UNIQUE-ENABLED $cfg->setConfigEntry('is_register_email_unique_enabled', true); diff --git a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php index 07f8a313..78665d33 100644 --- a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php +++ b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php @@ -50,6 +50,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem { * "Cached" value 'database_cache_enabled' from configuration */ private $databaseCacheEnabled = false; + /** * Protected constructor * @@ -76,7 +77,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem { private final function initCacheInstance () { // Set "cache" attributes //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('BASE-DATABASE-FRONTEND: CALLED!'); - $this->databaseCacheEnabled = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled'); + $this->databaseCacheEnabled = FrameworkBootstrap::getConfigurationInstance()->isEnabled('database_cache'); // Is the cache enabled? //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('BASE-DATABASE-FRONTEND: this->databaseCacheEnabled=%d', intval($this->databaseCacheEnabled))); diff --git a/framework/main/interfaces/application/class_ManageableApplication.php b/framework/main/interfaces/application/class_ManageableApplication.php index 8622cf42..3dc60b45 100644 --- a/framework/main/interfaces/application/class_ManageableApplication.php +++ b/framework/main/interfaces/application/class_ManageableApplication.php @@ -10,7 +10,6 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * An interface for managing applications. This can be a lot. E.g.: * * - Un-/locking applications - * - Creating selectors for the selector-mode * - Usage statistics * - And many more... * diff --git a/framework/main/middleware/database/class_DatabaseConnection.php b/framework/main/middleware/database/class_DatabaseConnection.php index 5dadd46e..b64d5189 100644 --- a/framework/main/middleware/database/class_DatabaseConnection.php +++ b/framework/main/middleware/database/class_DatabaseConnection.php @@ -18,7 +18,7 @@ use \OutOfBoundsException; use \UnexpectedValueException; /** - * Database selector class + * Database connectivity class * * @author Roland Haeder * @version 0.0.0 -- 2.39.5