changed to const syntax in config file

diff --git a/ChangeLog b/ChangeLog
index 83d2005d9f9aa897e9ce15aefa0dbf0b91cde37e..cc8ddeb739f7fa425b21073e931b087366b17ca8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ version 2.7 - Sacred Grove ()
        + Fixed some translations
        + Updated bulma css
        + Added random link page
+       + New syntax in config file. See update.txt for more details
 
 version 2.6 - Hypostyle (2021-03-21)
 

diff --git a/documentation/update.txt b/documentation/update.txt
index 10d2e6935b142a7f16c26cb2b99a908f0399e567..5b9a9ede69ccd4e6453d305b5feb586b3b48d13b 100644 (file)
--- a/documentation/update.txt
+++ b/documentation/update.txt
@@ -1,6 +1,10 @@
 If you are updating from a previous version make sure every update info from
 the version your are updating from is done.
 
+## version 2.7 Sacred Grove
++ New syntax in config file. Switched from define() to const syntax.
+  Use config.default.php as a template to update your config.
+
 ## version 2.6 - Hypostyle
 
 + Update config file with the new language setting. See config.default and

diff --git a/webroot/config.default.php b/webroot/config.default.php
index c07559143de49e2f36a2a086833bac77ca668579..43d307d9e9ffd4c1963de743773c6c4357aa9060 100644 (file)
--- a/webroot/config.default.php
+++ b/webroot/config.default.php
@@ -27,55 +27,55 @@
  */
 
 # database config
-define('DB_HOST','127.0.0.1'); # Address of the database server
-define('DB_USERNAME','user'); # Username to access the database server and database itself
-define('DB_PASSWORD','test'); # Password for username
-define('DB_NAME','insipid'); # Database name on your database server
-define('DB_PREFIX','insipid'); # a _ is added automatically as separation
+const DB_HOST = '127.0.0.1'; # Address of the database server
+const DB_USERNAME = 'user'; # Username to access the database server and database itself
+const DB_PASSWORD = 'test'; # Password for username
+const DB_NAME = 'insipid'; # Database name on your database server
+const DB_PREFIX = 'insipid'; # a _ is added automatically as separation
 
 # user config
-define('FRONTEND_USERNAME','luke');
-define('FRONTEND_PASSWORD','father');
+const FRONTEND_USERNAME = 'luke';
+const FRONTEND_PASSWORD = 'father';
 
 # absolute path of webroot
-define('ABSOLUTE_PATH', '/path/to/insipid/webroot');
+const ABSOLUTE_PATH = '/path/to/insipid/webroot';
 # relative to absolute path the name of the storage folder
-define('LOCAL_STORAGE', 'localdata');
+const LOCAL_STORAGE = 'localdata';
 
 # complete restricted access not only the private links or the edit functions
 # username and password see above
-define("USE_PAGE_AUTH",false);
+const USE_PAGE_AUTH = false;
 
 # results per page
-define("RESULTS_PER_PAGE",12);
+const RESULTS_PER_PAGE = 12;
 
 # language setting
 # default is eng
 # valid values to match the files are: https://de.wikipedia.org/wiki/ISO_639#ISO_639-3
-define('FRONTEND_LANGUAGE','eng');
+const FRONTEND_LANGUAGE = 'eng';
 
 # if the location of email-import.php needs to be in a web accessible folder
 # you can protect it by setting EMAIL_JOB_PROTECT to true
 # and EMAIL_JOB_PROTECT_SECRET to a special secret string
 # AND remove the default provided .htaccess file in the job folder
-define('EMAIL_JOB_PROTECT', false); # Default false
-define('EMAIL_JOB_PROTECT_SECRET', 'YOUR_SOME_SECRET_STRING'); # Your own secret string
+const EMAIL_JOB_PROTECT = false; # Default false
+const EMAIL_JOB_PROTECT_SECRET = 'YOUR_SOME_SECRET_STRING'; # Your own secret string
 # settings for importing from e-mail
 # SSL/TLS only
 # IMAP (reading), SMTP (sending)
-define('EMAIL_SERVER','');
-define('EMAIL_SERVER_USER','');
-define('EMAIL_SERVER_PASS','');
-define('EMAIL_SERVER_PORT_IMAP',993);
-define('EMAIL_SERVER_PORT_SMTP',465);
-define('EMAIL_SERVER_MAILBOX','INBOX'); # default INBOX
-define('EMAIL_MARKER','to-insipid- ');
-define('EMAIL_ARCHIVE_FOLDER','archive');
-define('EMAIL_REPORT_BACK',false);
-define('EMAIL_REPLY_BACK_VALID','');
-define('EMAIL_REPLY_BACK_ADDRESS','');
-define('EMAIL_REPLY_BACK_SUBJECT','Insipid email import response');
+const EMAIL_SERVER = '';
+const EMAIL_SERVER_USER = '';
+const EMAIL_SERVER_PASS = '';
+const EMAIL_SERVER_PORT_IMAP = 993;
+const EMAIL_SERVER_PORT_SMTP = 465;
+const EMAIL_SERVER_MAILBOX = 'INBOX'; # default INBOX
+const EMAIL_MARKER = 'to-insipid- ';
+const EMAIL_ARCHIVE_FOLDER = 'archive';
+const EMAIL_REPORT_BACK = false;
+const EMAIL_REPLY_BACK_VALID = '';
+const EMAIL_REPLY_BACK_ADDRESS = '';
+const EMAIL_REPLY_BACK_SUBJECT = 'Insipid email import response';
 
 # Use wkhtmltopdf to create a whole page screenshot of a given link
-define('WKHTMLTOPDF_USE',false);
-define('WKHTMLTOPDF_COMMAND','/absolute/path/to/wkhtmltoimage');
+const WKHTMLTOPDF_USE = false;
+const WKHTMLTOPDF_COMMAND = '/absolute/path/to/wkhtmltoimage';