Continued:

[core.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index 4545f461191be6b112d7febef2b7a696308c34c5..e4ce10cd572905e76d5469b81c838e791b01d410 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -1,4 +1,8 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\EntryPoint\ApplicationEntryPoint;
+
 /**
  * General configuration. Do not touch this file! If you need different settings
  * create a config-local.php in this directory at and set your changed
@@ -6,7 +10,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -48,6 +52,7 @@ $cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/')
 $cfg->setDefaultTimezone('Europe/Berlin');
 
 // CFG: MAGIC-QUOTES-RUNTIME
+// @DEPRECATED As PHP is deprecating this
 $cfg->setMagicQuotesRuntime(FALSE);
 
 // CFG: CLASS-PREFIX
@@ -65,9 +70,6 @@ $cfg->setConfigEntry('code_template_extension', '.ctp');
 // CFG: SELECTOR-PATH
 $cfg->setConfigEntry('selector_path', 'selector');
 
-// CFG: APPLICATION-HELPER-CLASS
-$cfg->setConfigEntry('app_helper_class', 'ApplicationHelper');
-
 // CFG: LAUNCH-METHOD
 $cfg->setConfigEntry('entry_method', 'entryPoint');
 
@@ -90,7 +92,7 @@ $cfg->setConfigEntry('application_path', $cfg->getConfigEntry('base_path') . $cf
 $cfg->setConfigEntry('compile_output_path', 'templates/_compiled/');
 
 // CFG: HTML-TEMPLATE-CLASS
-$cfg->setConfigEntry('html_template_class', 'HtmlTemplateEngine');
+$cfg->setConfigEntry('html_template_class', 'CoreFramework\Template\Engine\HtmlTemplateEngine');
 
 // CFG: DECO-XML-REWRITER-TEMPLATE-CLASS
 $cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDecorator');
@@ -99,7 +101,7 @@ $cfg->setConfigEntry('deco_xml_rewriter_template_class', 'XmlRewriterTemplateDec
 $cfg->setConfigEntry('debug_html_class', 'DebugWebOutput');
 
 // CFG: DEBUG-CONSOLE-CLASS
-$cfg->setConfigEntry('debug_console_class', 'DebugConsoleOutput');
+$cfg->setConfigEntry('debug_console_class', 'CoreFramework\Debug\Output\DebugConsoleOutput');
 
 // CFG: DEFAULT-LANGUAGE
 $cfg->setConfigEntry('default_lang', 'de'); // A two-char language string: de for german, en for english and so on
@@ -123,7 +125,7 @@ $cfg->setConfigEntry('image_template_type', 'image');
 $cfg->setConfigEntry('menu_template_type', 'menu');
 
 // CFG: OUTPUT-CLASS
-$cfg->setConfigEntry('output_class', 'WebOutput');
+$cfg->setConfigEntry('output_class', 'CoreFramework\Output\WebOutput');
 
 // CFG: LANGUAGE-SYSTEM-CLASS
 $cfg->setConfigEntry('language_system_class', 'LanguageSystem');
@@ -177,7 +179,7 @@ $cfg->setConfigEntry('dataset_criteria_class', 'DataSetCriteria');
 $cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
 
 // CFG: FILE-IO-CLASS
-$cfg->setConfigEntry('file_io_class', 'FileIoHandler');
+$cfg->setConfigEntry('file_io_class', 'CoreFramework\Handler\Filesystem\FileIoHandler');
 
 // CFG: DATABASE-RESULT-CLASS
 $cfg->setConfigEntry('database_result_class', 'CachedDatabaseResult');
@@ -186,10 +188,10 @@ $cfg->setConfigEntry('database_result_class', 'CachedDatabaseResult');
 $cfg->setConfigEntry('filter_chain_class', 'FilterChain');
 
 // CFG: FILE-INPUT-CLASS
-$cfg->setConfigEntry('file_input_class', 'FileIoStream');
+$cfg->setConfigEntry('file_input_class', 'CoreFramework\Stream\Filesystem\FileIoStream');
 
 // CFG: FILE-OUTPUT-CLASS
-$cfg->setConfigEntry('file_output_class', 'FileIoStream');
+$cfg->setConfigEntry('file_output_class', 'CoreFramework\Stream\Filesystem\FileIoStream');
 
 // CFG: EMAIL-VALIDATOR-FILTER
 $cfg->setConfigEntry('email_validator_filter', 'EmailValidatorFilter');
@@ -282,10 +284,10 @@ $cfg->setConfigEntry('salt_length', 10);
 $cfg->setConfigEntry('rnd_str_length', 128);
 
 // CFG: HASH-EXTRA-MASK
-$cfg->setConfigEntry('hash_extra_mask', "%1s:%2s:%3s"); // 1=salt, 2=extra salt, 3=plain password/string
+$cfg->setConfigEntry('hash_extra_mask', '%1s:%2s:%3s'); // 1=salt, 2=extra salt, 3=plain password/string
 
 // CFG: HASH-NORMAL-MASK
-$cfg->setConfigEntry('hash_normal_mask', "%1s:%2s"); // 1=salt, 2=plain password/string
+$cfg->setConfigEntry('hash_normal_mask', '%1s:%2s'); // 1=salt, 2=plain password/string
 
 // CFG: IS-SINGLE-SERVER
 $cfg->setConfigEntry('is_single_server', 'Y');
@@ -455,5 +457,20 @@ $cfg->setConfigEntry('menu_template_class', 'MenuTemplateEngine');
 // CFG: MENU-TEMPLATE-EXTENSION
 $cfg->setConfigEntry('menu_template_extension', '.xml');
 
-// [EOF]
-?>
+// CFG: FEATURE-FUSE-CLASS
+$cfg->setConfigEntry('feature_fuse_class', 'FuseFeature');
+
+// CFG: TEMP-FILE-PATH
+$cfg->setConfigEntry('temp_file_path', sys_get_temp_dir());
+
+// CFG: IPC-SOCKET-FILE-NAME
+$cfg->setConfigEntry('ipc_socket_file_name', 'php_ipc_socket');
+
+// CFG: EXTENSION-SCRYPT-LOADED (By default scrypt is assumed absent and later tested being there)
+$cfg->setConfigEntry('extension_scrypt_loaded', FALSE);
+
+// CFG: EXTENSION-UUID-LOADED (By default uuid is assumed absent and later tested being there)
+$cfg->setConfigEntry('extension_uuid_loaded', FALSE);
+
+// Remove config from this name-space. Don't worry, no configuration is cleared.
+unset($cfg);