Cache of database "queries" can now be disabled (default). Please note, that if

[core.git] / inc / config.php

diff --git a/inc/config.php b/inc/config.php
index 00d2e1f539c7b27d477b0ed13e6d25147ae840c0..868f53fd39aed93777a45997479cec348dd33d2f 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -4,11 +4,11 @@
  * create a config-local.php in this directory at and set your changed
  * configuration entries there.
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @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
@@ -48,7 +48,7 @@ $cfg->setConfigEntry('local_db_path', $cfg->getConfigEntry('base_path') . 'db/')
 $cfg->setDefaultTimezone('Europe/Berlin');
 
 // CFG: MAGIC-QUOTES-RUNTIME
-$cfg->setMagicQuotesRuntime(false);
+$cfg->setMagicQuotesRuntime(FALSE);
 
 // CFG: CLASS-PREFIX
 $cfg->setConfigEntry('class_prefix', 'class_');
@@ -170,6 +170,9 @@ $cfg->setConfigEntry('update_criteria_class', 'UpdateCriteria');
 // CFG: FILE-IO-CLASS
 $cfg->setConfigEntry('file_io_class', 'FileIoHandler');
 
+// CFG: DATABASE-RESULT-CLASS
+$cfg->setConfigEntry('database_result_class', 'DatabaseResult');
+
 // CFG: FILTER-CHAIN-CLASS
 $cfg->setConfigEntry('filter_chain_class', 'FilterChain');
 
@@ -332,5 +335,26 @@ $cfg->setConfigEntry('compressor_channel_class', 'CompressorChannel');
 // CFG: DEBUG-OUTPUT-TIMINGS
 $cfg->setConfigEntry('debug_output_timings', 'N');
 
+// CFG: PROXY-HOST
+$cfg->setConfigEntry('proxy_host', '');
+
+// CFG: PROXY-PORT
+$cfg->setConfigEntry('proxy_port', '');
+
+// CFG: PROXY-USERNAME
+$cfg->setConfigEntry('proxy_username', '');
+
+// CFG: PROXY-PASSWORD
+$cfg->setConfigEntry('proxy_password', '');
+
+// CFG: PROXY-CONNECT-METHOD
+$cfg->setConfigEntry('proxy_connect_method', 'Y');
+
+// CFG: HOSTNAME-FILE
+$cfg->setConfigEntry('hostname_file', '/etc/hostname');
+
+// CFG: DATABASE-CACHE-ENABLED
+$cfg->setConfigEntry('database_cache_enabled', FALSE);
+
 // [EOF]
 ?>