[FEATURE] Template Markers: Replace configuration values

Replace markers with configured values.

diff --git a/lib/config.original.php b/lib/config.original.php
index 30ec13495d56ba5d1670c4aa2e690b61f4eb6edb..cd39bb38ed41aded097993e0dca0f6b453e55f85 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -43,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;

diff --git a/lib/functions.php b/lib/functions.php
index a89d8b8f37184af8f11fddcefcf1a1ba6372051c..6c9c83231b079cc894a63e45c6893441f8d12349 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1373,11 +1373,13 @@ jirafeau_replace_markers ($content, $htmllinebreaks = false)
 {
     $patterns = array(
         '/###ORGANISATION###/',
-        '/###CONTACTPERSON###/'
+        '/###CONTACTPERSON###/',
+        '/###WEBROOT###/'
     );
     $replacements = array(
-        '[ORGANISATION PROVIDING THIS WEBSITE]',
-        'contact@[THIS WEBSITE]'
+        $GLOBALS['cfg']['organisation'],
+        $GLOBALS['cfg']['contactperson'],
+        $GLOBALS['cfg']['web_root']
     );
     $content = preg_replace($patterns, $replacements, $content);