Merge branch 'develop' into rewrites/coding-convention-split2

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 469fa7af6116f0ae64cb427d6c9064b7dda71bc0..5967e79f4e1efec7ca934aea20d801c343833945 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4";
 
 $default_timezone = 'America/Los_Angeles';
 
+// Default system language
+
+$a->config['system']['language'] = 'en';
+
 // What is your site name?
 
 $a->config['sitename'] = "Friendica Social Network";
@@ -60,13 +64,19 @@ $a->config['php_path'] = 'php';
 
 $a->config['system']['huburl'] = '[internal]';
 
+// Server-to-server private message encryption (RINO) is allowed by default.
+// Encryption will only be provided if this setting is set to a non zero value
+// set to 0 to disable, 2 to enable, 1 is deprecated
+
+$a->config['system']['rino_encrypt'] = 2;
+
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
+$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
 
 // default system theme
 
-$a->config['system']['theme'] = 'duepuntozero';
+$a->config['system']['theme'] = 'vier';
 
 
 // By default allow pseudonyms
@@ -78,3 +88,6 @@ $a->config['system']['no_regfullname'] = true;
 
 // Location of the global directory
 $a->config['system']['directory'] = 'http://dir.friendi.ca';
+
+// Allowed protocols in link URLs; HTTP protocols always are accepted
+$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');