Merge branch '7.8RC'7.8

2 files changed, 51 insertions, 11 deletions

diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php
index a20ede547..351c89383 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -2928,7 +2928,6 @@ App::$strings["Social authentication settings saved."] = "Настройки Soc
 App::$strings["Recent Channel/Profile Viewers"] = "Последние просмотры канала / профиля";
 App::$strings["No entries."] = "Нет записей.";
 App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s перестанет работать через несколько дней.";
-App::$strings["Your $Productname test account is about to expire."] = "�аша тестовая учётная запись в $Productname близка к окончанию срока действия";
 App::$strings["Post to Twitter"] = "Опубликовать в Twitter";
 App::$strings["Submit Settings"] = "Отправить настройки";
 App::$strings["Twitter settings updated."] = "Настройки Twitter обновлены";
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');