Merge branch 'dev' into 8.2RC

12 files changed, 18 insertions, 884 deletions

diff --git a/view/de-de/htconfig.tpl b/view/de-de/htconfig.tpl
deleted file mode 100644
index 10068a66b..000000000
--- a/view/de-de/htconfig.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
deleted file mode 100644
index d84a14e79..000000000
--- a/view/en-au/htconfig.tpl
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
deleted file mode 100644
index 4cf2eab6e..000000000
--- a/view/en-gb/htconfig.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 6fa86d9ac..3973e7f9b 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -10,6 +10,12 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
+// Set this to 1 if your DB backend supports skip locked.
+// This is known to be the case for
+// postgresql > 9.5, mysql > 8.0 and mariadb > 10.6
+App::$config['system']['db_skip_locked_supported'] = 0;
+
+
 /*
  * Notice: Many of the following settings will be available in the admin panel
  * after a successful site install. Once they are set in the admin panel, they
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index d33a955f0..b9f011f73 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -11,6 +11,12 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
+// Set this to 1 if your DB backend supports skip locked.
+// This is known to be the case for
+// postgresql > 9.5, mysql > 8.0 and mariadb > 10.6
+App::$config['system']['db_skip_locked_supported'] = 0;
+
+
 /*
  * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration
  * après l'installation. Lorsque des modifications sont apportés à travers le panneau d'administration
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
deleted file mode 100644
index 6fa86d9ac..000000000
--- a/view/it/htconfig.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-// Set the following for your database installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site url? DO NOT ADD A TRAILING SLASH!
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-App::$config['system']['ssl_cookie_protection'] = 1;
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = master directory server - one per realm
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level web directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
deleted file mode 100644
index 6fa86d9ac..000000000
--- a/view/nb-no/htconfig.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-// Set the following for your database installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site url? DO NOT ADD A TRAILING SLASH!
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-App::$config['system']['ssl_cookie_protection'] = 1;
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = master directory server - one per realm
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level web directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/pl/htconfig.tpl b/view/pl/htconfig.tpl
index 4a0289fad..be6a65d92 100644
--- a/view/pl/htconfig.tpl
+++ b/view/pl/htconfig.tpl
@@ -10,6 +10,12 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // liczba całkowita. 0 lub nieustawienie dla mysql, 1 dla postgres
 
+// Set this to 1 if your DB backend supports skip locked.
+// This is known to be the case for
+// postgresql > 9.5, mysql > 8.0 and mariadb > 10.6
+App::$config['system']['db_skip_locked_supported'] = 0;
+
+
 /*
  * Uwaga: wiele z poniższych ustawień będzie dostępnych w panelu administracyjnym
  * po pomyślnej instalacji portalu. Po ustawieniu w panelu administracyjnym, opcje
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
deleted file mode 100644
index 10068a66b..000000000
--- a/view/pt-br/htconfig.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
deleted file mode 100644
index 10068a66b..000000000
--- a/view/ru/htconfig.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
deleted file mode 100644
index 10068a66b..000000000
--- a/view/sv/htconfig.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '{{$dbhost}}';
-$db_port = '{{$dbport}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
-
-/*
- * Notice: Many of the following settings will be available in the admin panel
- * after a successful site install. Once they are set in the admin panel, they
- * are stored in the DB - and the DB setting will over-ride any corresponding
- * setting in this file
- *
- * The command-line tool util/config is able to query and set the DB items
- * directly if for some reason the admin panel is not available and a system
- * setting requires modification.
- *
- */
-
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-App::$config['system']['timezone'] = '{{$timezone}}';
-
-// What is your site name?
-
-App::$config['system']['baseurl'] = '{{$siteurl}}';
-App::$config['system']['sitename'] = "Hubzilla";
-App::$config['system']['location_hash'] = '{{$site_id}}';
-
-// These lines set additional security headers to be sent with all responses
-// You may wish to set transport_security_header to 0 if your server already sends
-// this header. content_security_policy may need to be disabled if you wish to
-// run the piwik analytics plugin or include other offsite resources on a page
-
-App::$config['system']['transport_security_header'] = 1;
-App::$config['system']['content_security_policy'] = 1;
-
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-App::$config['system']['register_policy'] = REGISTER_OPEN;
-App::$config['system']['register_text'] = '';
-App::$config['system']['admin_email'] = '{{$adminmail}}';
-
-// Recommend you leave this set to 1. Set to 0 to let people register without
-// proving they own the email address they register with.
-
-App::$config['system']['verify_email'] = 1;
-
-
-// Site access restrictions. By default we will create private sites.
-// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
-// If you leave REGISTER_OPEN above, anybody may register on your
-// site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below)
-// to determine whether or not to list your site in the directory
-// as an open hub where anybody may create accounts. Your choice of
-// paid, tiered, or free determines how these listings will be presented.
-
-
-App::$config['system']['access_policy'] = ACCESS_PRIVATE;
-
-// If you operate a public site, you might wish that people are directed
-// to a "sellpage" where you can describe for features or policies or service plans in depth.
-// This must be an absolute URL beginning with http:// or https:// .
-
-App::$config['system']['sellpage'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented.
-
-App::$config['system']['max_import_size'] = 200000;
-
-// Location of PHP command line processor
-
-App::$config['system']['php_path'] = '{{$phpath}}';
-
-// Configure how we communicate with directory servers.
-// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
-// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
-// DIRECTORY_MODE_PRIMARY    = main directory server
-// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
-
-App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
-
-// default system theme
-
-App::$config['system']['theme'] = 'redbasic';
-
-
-// PHP error logging setup
-// Before doing this ensure that the webserver has permission
-// to create and write to php.out in the top level Red directory,
-// or change the name (below) to a file/path where this is allowed.
-
-// Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
-//ini_set('error_log','php.out');
-//ini_set('log_errors','1');
-//ini_set('display_errors', '0');
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 8864f5ea5..b7e08705c 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -13,7 +13,6 @@
  *   * Background_Color: rgb(254,254,254)
  */
 
-use App;
 
 function redbasic_init(&$a) {