From 5790a0c58a5d044c9c0cba8496db07fa7d0bc0b6 Mon Sep 17 00:00:00 2001
From: Jeroen De Meerleer <me@jeroened.be>
Date: Wed, 18 Jul 2018 23:30:34 +0200
Subject: [PATCH] Added warning for special characters in docs and template
 (#5402)

---
 doc/Config.md                |  1 +
 view/templates/local.ini.tpl | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/Config.md b/doc/Config.md
index ba6e674fc6..788c1cd0b6 100644
--- a/doc/Config.md
+++ b/doc/Config.md
@@ -8,6 +8,7 @@ Database config values overwrite the same file config values.
 
 ## File configuration
 
+WARNING: some characters `?{}|&~![()^"` should not be used in the keys or values. If one of those character is required put the value between double quotes (eg. password = "let&me&in")
 The configuration format for file configuration is an INI string returned from a PHP file.
 This prevents your webserver from displaying your private configuration it interprets the configuration files and displays nothing.
 
diff --git a/view/templates/local.ini.tpl b/view/templates/local.ini.tpl
index 109a732301..85df0734d0 100644
--- a/view/templates/local.ini.tpl
+++ b/view/templates/local.ini.tpl
@@ -4,10 +4,10 @@
 ; documentation of their data type and behavior.
 
 [database]
-hostname = {{$dbhost}}
-username = {{$dbuser}}
-password = {{$dbpass}}
-database = {{$dbdata}}
+hostname = "{{$dbhost}}"
+username = "{{$dbuser}}"
+password = "{{$dbpass}}"
+database = "{{$dbdata}}"
 charset = utf8mb4
 
 ; ****************************************************************
@@ -15,9 +15,9 @@ charset = utf8mb4
 ; ****************************************************************
 
 [config]
-php_path = {{$phpath}}
+php_path = "{{$phpath}}"
 
-admin_email = {{$adminmail}}
+admin_email = "{{$adminmail}}"
 
 sitename = Friendica Social Network
 
@@ -27,11 +27,11 @@ register_text =
 max_import_size = 200000
 
 [system]
-urlpath = {{$urlpath}}
+urlpath = "{{$urlpath}}"
 
-default_timezone = {{$timezone}}
+default_timezone = "{{$timezone}}"
 
-language = {{$language}}
+language = "{{$language}}"
 
 allowed_themes = vier,quattro,duepuntozero,smoothly,frio
 theme = vier