Added example local configuration file

diff --git a/.gitattributes b/.gitattributes
index c43824e70347a5a0eef2b53f7d492cefa5f9c51b..dacedbf635ab9ff3cfa1d5064b661d946d7c889b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -623,6 +623,7 @@ inc/config.php svneol=native#text/plain
 inc/config/.htaccess svneol=native#text/plain
 inc/config/class_FrameworkConfiguration.php svneol=native#text/plain
 inc/config/config-hubmaster.php svneol=native#text/plain
 inc/config/.htaccess svneol=native#text/plain
 inc/config/class_FrameworkConfiguration.php svneol=native#text/plain
 inc/config/config-hubmaster.php svneol=native#text/plain

+inc/config/config-local.php-dist -text

 inc/database.php svneol=native#text/plain
 inc/database/.htaccess svneol=native#text/plain
 inc/database/lib-local.php svneol=native#text/plain
 inc/database.php svneol=native#text/plain
 inc/database/.htaccess svneol=native#text/plain
 inc/database/lib-local.php svneol=native#text/plain

diff --git a/inc/config/config-local.php-dist b/inc/config/config-local.php-dist
new file mode 100644 (file)
index 0000000..7c1d549
--- /dev/null
+++ b/inc/config/config-local.php-dist
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Additional configurations
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+// Get the configuration instance
+$cfg = FrameworkConfiguration::getSelfInstance();
+
+// CFG: FOO-BAR
+//$cfg->setConfigEntry('foo_bar', 12345);
+
+// [EOF]
+?>

diff --git a/inc/includes.php b/inc/includes.php
index 122ce1802582fdee15f60f45eba56914b08f1b5a..201f2de37082ae4dc90c7e7e12f6fd3f8231b312 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -27,8 +27,10 @@
 // Include the class loader function
 require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
 
 // Include the class loader function
 require(FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/loader/class_ClassLoader.php');
 

-// Shall we include additional configs where you can configure some things? Then
-// Load matching config
+/*
+ * Shall we include additional configs where you can configure some things?
+ * Then load matching config file.
+ */

 ClassLoader::getSelfInstance()->loadExtraConfigs();
 
 // Register auto-load function with the SPL
 ClassLoader::getSelfInstance()->loadExtraConfigs();
 
 // Register auto-load function with the SPL

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 2de06ca2fc86abfaf9fa964aa453598b4bc84039..7c9afa937f31af5e32c55b20769e6aa18dc34791 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -396,7 +396,7 @@ class ClassLoader {
                // Prepare the list
                $includeList = '';
                foreach ($this->loadedClasses as $classFile) {
                // Prepare the list
                $includeList = '';
                foreach ($this->loadedClasses as $classFile) {

-                       $includeList .= basename($classFile)."<br />\n";
+                       $includeList .= basename($classFile) . '<br />' . PHP_EOL;

                } // END - foreach
 
                // And return it
                } // END - foreach
 
                // And return it