[FEATURE] Template Markers: Replace configuration values

[jirafeau_mojo42.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index 6a5c1babada2672941538f0177b034b8023e60fb..cd39bb38ed41aded097993e0dca0f6b453e55f85 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -24,7 +24,6 @@
  * To overwrite these settings copy the file,
  * rename it to »config.local.php« and adapt the parameters.
  **/
-global $cfg;
 
 /* URL of installation, with traling slash (eg. »https://exmaple.com/jirafeau/«)
  */
@@ -44,6 +43,14 @@ $cfg['lang'] = 'auto';
  */
 $cfg['style'] = 'courgette';
 
+/* Name the organisation running this installation, eg. 'ACME'
+ */
+$cfg['organisation'] = 'ACME';
+
+/* Provide a contact person for this installation, eg. 'John Doe <doe@example.com>'
+ */
+$cfg['contactperson'] = '';
+
 /* Propose a preview link if file type is previewable
  */
 $cfg['preview'] = true;
@@ -133,11 +140,4 @@ $cfg['proxy_ip'] = array();
  */
 $cfg['installation_done'] = false;
 
-/* Try to include user's local configuration. */
-if ((basename (__FILE__) != 'config.local.php')
-    && file_exists (JIRAFEAU_ROOT.'lib/config.local.php'))
-{
-    require (JIRAFEAU_ROOT.'lib/config.local.php');
-}
-
-?>
+?>
\ No newline at end of file