update htconfig.tpl

11 files changed, 297 insertions, 121 deletions

diff --git a/view/de-de/htconfig.tpl b/view/de-de/htconfig.tpl
index 46bf0de14..10068a66b 100644
--- a/view/de-de/htconfig.tpl
+++ b/view/de-de/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -44,8 +44,8 @@ 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 
+// 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.
@@ -54,7 +54,7 @@ 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 
+// 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;
@@ -64,10 +64,10 @@ App::$config['system']['verify_email'] = 1;
 // 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.  
+// 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;
@@ -79,7 +79,7 @@ App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 App::$config['system']['sellpage'] = '';
 
 // Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented. 
+// FIXME - NOT currently implemented.
 
 App::$config['system']['max_import_size'] = 200000;
 
@@ -106,7 +106,7 @@ App::$config['system']['theme'] = 'redbasic';
 // 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_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//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
index cefcba727..d84a14e79 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -44,8 +44,8 @@ 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 
+// 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.
@@ -59,10 +59,10 @@ App::$config['system']['admin_email'] = '{{$adminmail}}';
 // 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.  
+// 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;
@@ -74,7 +74,7 @@ App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 App::$config['system']['sellpage'] = '';
 
 // Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented. 
+// FIXME - NOT currently implemented.
 
 App::$config['system']['max_import_size'] = 200000;
 
@@ -101,7 +101,7 @@ App::$config['system']['theme'] = 'redbasic';
 // 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_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//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
index ea458d664..4cf2eab6e 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -43,8 +43,8 @@ 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 
+// 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.
@@ -58,10 +58,10 @@ App::$config['system']['admin_email'] = '{{$adminmail}}';
 // 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.  
+// 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;
@@ -73,7 +73,7 @@ App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 App::$config['system']['sellpage'] = '';
 
 // Maximum size of an imported message, 0 is unlimited
-// FIXME - NOT currently implemented. 
+// FIXME - NOT currently implemented.
 
 App::$config['system']['max_import_size'] = 200000;
 
@@ -100,7 +100,7 @@ App::$config['system']['theme'] = 'redbasic';
 // 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_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//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 8159b6d44..6fa86d9ac 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -44,8 +44,8 @@ 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 
+// 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.
@@ -54,7 +54,7 @@ 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 
+// 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;
@@ -64,10 +64,10 @@ App::$config['system']['verify_email'] = 1;
 // 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.  
+// 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;
@@ -105,7 +105,7 @@ App::$config['system']['theme'] = 'redbasic';
 // 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_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//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/fr/htconfig.tpl b/view/fr/htconfig.tpl
index 563877247..d33a955f0 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -105,7 +105,7 @@ App::$config['system']['theme'] = 'redbasic';
 // ou changez le nom (ci-dessous) pour un fichier/chemin où cela est autorisé.
 // Décommentez les 4 lignes suivantes pour activer la journalisation des erreurs PHP.
 
-//error_reporting(E_ERROR | E_WARNING | E_PARSE ) ;
+//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/it/htconfig.tpl b/view/it/htconfig.tpl
index 5acb0ebe2..6fa86d9ac 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -1,6 +1,6 @@
 <?php
 
-// Set the following for your MySQL installation
+// Set the following for your database installation
 // Copy or rename this file to .htconfig.php
 
 $db_host = '{{$dbhost}}';
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 App::$config['system']['timezone'] = '{{$timezone}}';
 
-// What is your site name?
+// What is your site url? DO NOT ADD A TRAILING SLASH!
 
 App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
@@ -41,11 +41,11 @@ App::$config['system']['location_hash'] = '{{$site_id}}';
 
 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 
+// 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.
@@ -54,13 +54,33 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Maximum size of an imported message, 0 is unlimited
+// 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']['max_import_size'] = 200000;
+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;
 
-// maximum size of uploaded photos
+// 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']['maximagesize'] = 8000000;
+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
 
@@ -69,7 +89,7 @@ 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_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;
@@ -78,3 +98,14 @@ App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 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
index 5acb0ebe2..6fa86d9ac 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -1,6 +1,6 @@
 <?php
 
-// Set the following for your MySQL installation
+// Set the following for your database installation
 // Copy or rename this file to .htconfig.php
 
 $db_host = '{{$dbhost}}';
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 App::$config['system']['timezone'] = '{{$timezone}}';
 
-// What is your site name?
+// What is your site url? DO NOT ADD A TRAILING SLASH!
 
 App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
@@ -41,11 +41,11 @@ App::$config['system']['location_hash'] = '{{$site_id}}';
 
 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 
+// 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.
@@ -54,13 +54,33 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Maximum size of an imported message, 0 is unlimited
+// 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']['max_import_size'] = 200000;
+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;
 
-// maximum size of uploaded photos
+// 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']['maximagesize'] = 8000000;
+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
 
@@ -69,7 +89,7 @@ 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_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;
@@ -78,3 +98,14 @@ App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 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 f9d4600e7..4a0289fad 100644
--- a/view/pl/htconfig.tpl
+++ b/view/pl/htconfig.tpl
@@ -20,7 +20,7 @@ $db_type = '{{$dbtype}}'; // liczba całkowita. 0 lub nieustawienie dla mysql, 1
  * ustawiać elementy bazy danych, jeśli z jakiegoś powodu panel administracyjny
  * nie jest dostępny a ustawienia systemowe wymagają modyfikacji.
  *
- */ 
+ */
 
 // Wybierz legalną domyślną strefę czasową. Dla obszaru Polski jest to „Europe/Warsaw”.
 // Można to zmienić później i ma to związek tylko z sygnaturami czasowymi dla
@@ -68,7 +68,7 @@ App::$config['system']['verify_email'] = 1;
 // wyświetlany jako witryna z otwartą resjestracją.
 // Używamy polityki dostępu do systemu (poniżej) aby określić, czy portal ma być
 // umieszczony w katalogu jako portal otwarty, w którym każdy może tworzyć konta.
-// Twój inny wybór to: paid, tiered lub free.  
+// Twój inny wybór to: paid, tiered lub free.
 
 App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 
@@ -105,7 +105,7 @@ App::$config['system']['theme'] = 'redbasic';
 // lub zmień nazwę (poniżej) na plik lub ścieżkę, jeśli jest to dozwolone.
 
 // Odkomentuj te 4 linie, aby włączyć rejestrowanie błędów PHP.
-//error_reporting(E_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//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/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index 5acb0ebe2..10068a66b 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -44,8 +44,8 @@ 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 
+// 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.
@@ -54,13 +54,34 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Maximum size of an imported message, 0 is unlimited
+// 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']['max_import_size'] = 200000;
+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;
 
-// maximum size of uploaded photos
+// 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']['maximagesize'] = 8000000;
+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
 
@@ -78,3 +99,14 @@ App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 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
index 58a18fbd0..10068a66b 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -34,9 +34,18 @@ 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 
+// 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.
@@ -45,13 +54,34 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Maximum size of an imported message, 0 is unlimited
+// 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']['max_import_size'] = 200000;
 
-// maximum size of uploaded photos
+App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 
-App::$config['system']['maximagesize'] = 8000000;
+// 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
 
@@ -69,3 +99,14 @@ App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 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
index 58a18fbd0..10068a66b 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -11,16 +11,16 @@ $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 
+ * 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 
+ * 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. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -34,9 +34,18 @@ 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 
+// 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.
@@ -45,13 +54,34 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Maximum size of an imported message, 0 is unlimited
+// 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']['max_import_size'] = 200000;
 
-// maximum size of uploaded photos
+App::$config['system']['access_policy'] = ACCESS_PRIVATE;
 
-App::$config['system']['maximagesize'] = 8000000;
+// 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
 
@@ -69,3 +99,14 @@ App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 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');