X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fconfig.php;h=3d68249aec9572bde3d78e6999e32eeecdd8b5fd;hp=2b3623907597e162036097e13ad5ae9bb5bfcfac;hb=73bb9000fb82cfb51d3e55f0d1f7f6d09974368e;hpb=d639afcf89c396fd4ffea9a2b833509679fb3d34

diff --git a/inc/config.php b/inc/config.php
index 2b362390..3d68249a 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -42,7 +42,7 @@ $cfg->setConfigEntry('base_url', $cfg->detectBaseUrl());
 $cfg->setConfigEntry('db_type', 'local');
 
 // CFG: LOCAL-DB-PATH
-$cfg->setConfigEntry('local_db_path', $cfg->readConfig('base_path') . 'db/');
+$cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/');
 
 // CFG: TIME-ZONE
 $cfg->setDefaultTimezone('Europe/Berlin');
@@ -65,7 +65,7 @@ $cfg->setConfigEntry('code_template_extension', '.ctp');
 // CFG: SELECTOR-PATH
 $cfg->setConfigEntry('selector_path', 'selector');
 
-// CFG: APPLICATION-HELPER
+// CFG: APPLICATION-HELPER-CLASS
 $cfg->setConfigEntry('app_helper_class', 'ApplicationHelper');
 
 // CFG: LAUNCH-METHOD
@@ -84,15 +84,15 @@ $cfg->setConfigEntry('compressor_base_path', 'inc/classes/main/compressor/');
 $cfg->setConfigEntry('application_base_path', 'application/');
 
 // CFG: APPLICATION-PATH
-$cfg->setConfigEntry('application_path', $cfg->readConfig('base_path') . $cfg->readConfig('application_base_path'));
+$cfg->setConfigEntry('application_path', $cfg->getConfigEntry('base_path') . $cfg->getConfigEntry('application_base_path'));
 
 // CFG: COMPILE-OUTPUT-PATH
 $cfg->setConfigEntry('compile_output_path', 'templates/_compiled/');
 
-// CFG: TEMPLATE-ENGINE
+// CFG: TEMPLATE-CLASS
 $cfg->setConfigEntry('template_class', 'WebTemplateEngine');
 
-// CFG: DEBUG-ENGINE
+// CFG: DEBUG-CLASS
 $cfg->setConfigEntry('debug_class', 'DebugWebOutput');
 
 // CFG: DEFAULT-LANGUAGE
@@ -107,7 +107,10 @@ $cfg->setConfigEntry('email_template_type', 'emails');
 // CFG: CODE-TEMPLATE-TYPE
 $cfg->setConfigEntry('code_template_type', 'code');
 
-// CFG: WEB-ENGINE
+// CFG: IMAGE-TEMPLATE-TYPE
+$cfg->setConfigEntry('image_template_type', 'image');
+
+// CFG: OUTPUT-CLASS
 $cfg->setConfigEntry('output_class', 'WebOutput');
 
 // CFG: SELECTOR-TEMPLATE-PREFIX
@@ -146,28 +149,28 @@ $cfg->setConfigEntry('default_application', 'selector');
 // CFG: VERBOSE-LEVEL
 $cfg->setConfigEntry('verbose_level', 0);
 
-// CFG: CACHE-TYPE
+// CFG: CACHE-CLASS
 $cfg->setConfigEntry('cache_class', 'MemoryCache');
 
-// CFG: SEARCH-CRITERIA
+// CFG: SEARCH-CRITERIA-CLASS
 $cfg->setConfigEntry('search_criteria_class', 'SearchCriteria');
 
-// CFG: DATASET-CRITERIA
+// CFG: DATASET-CRITERIA-CLASS
 $cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria');
 
-// CFG: UPDATE-CRITERIA
+// CFG: UPDATE-CRITERIA-CLASS
 $cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
 
-// CFG: FILE-IO-HANDLER
+// CFG: FILE-IO-CLASS
 $cfg->setConfigEntry('file_io_class', 'FileIoHandler');
 
-// CFG: FILTER-CHAIN
+// CFG: FILTER-CHAIN-CLASS
 $cfg->setConfigEntry('filter_chain_class', 'FilterChain');
 
-// CFG: FILE-INPUT-STREAM
+// CFG: FILE-INPUT-CLASS
 $cfg->setConfigEntry('file_input_class', 'FileIoStream');
 
-// CFG: FILE-OUTPUT-STREAM
+// CFG: FILE-OUTPUT-CLASS
 $cfg->setConfigEntry('file_output_class', 'FileIoStream');
 
 // CFG: EMAIL-VALIDATOR-FILTER
@@ -254,7 +257,7 @@ $cfg->setConfigEntry('hash_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=pla
 // CFG: IS-SINGLE-SERVER
 $cfg->setConfigEntry('is_single_server', 'Y');
 
-// CFG: POST-REGISTRATION-ACTION
+// CFG: POST-REGISTRATION-CLASS
 $cfg->setConfigEntry('post_registration_class', 'LoginAfterRegistrationAction');
 
 // CFG: USER-CLASS
@@ -273,7 +276,7 @@ $cfg->setConfigEntry('cookie_path', $cfg->detectScriptPath() . '/');
 $cfg->setConfigEntry('cookie_domain', $cfg->detectDomain()); // Is mostly the same...
 
 // CFG: COOKIE-SSL
-$cfg->setConfigEntry('cookie_ssl', (isset($_SERVER['HTTPS'])));
+$cfg->setConfigEntry('cookie_ssl', $cfg->isHttpSecured());
 
 // CFG: CRYPT-FIXED-SALT
 $cfg->setConfigEntry('crypt_fixed_salt', 'N');