X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fhtconfig.tpl;h=f9771c88da79438fadc17aac3cd142632f09c645;hb=ae1227c9ca29db58cd15ef462110d752e5edfa2a;hp=971bb504824ebb8b76acc8713c3ded5859ea3f4f;hpb=0370a2e6f3149d667d4cac7510d93998aefe7d69;p=friendica.git

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 971bb50482..f9771c88da 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -1,20 +1,51 @@
 <?php
 
+/* ********************************************************************
+ *  The following configuration has to be within the .htconfig.php
+ *  file and will not be overruled by decisions made in the admin panel.
+ *
+ *  See below for variables that may be overruled by the admin panel.
+ * ********************************************************************/
+
 // Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
+//
+// If you need to specify a port for reacing the database, you can do so by
+// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
 
 $db_host = '{{$dbhost}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
+// Set the database connection charset to full Unicode (utf8mb4).
+// Changing this value will likely corrupt the special characters.
+// You have been warned.
+$a->config['system']['db_charset'] = "utf8mb4";
+
+// email adress for the system admin
+
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
 // If you are using a subdirectory of your domain you will need to put the
 // relative path (from the root of your domain) here.
 // For instance if your URL is 'http://example.com/directory/subdirectory',
 // set path to 'directory/subdirectory'.
 
 $a->path = '{{$urlpath}}';
- 
+
+// Allowed protocols in link URLs; HTTP protocols always are accepted
+$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
+
+/* *********************************************************************
+ *  The configuration below will be overruled by the admin panel.
+ *  Changes made below will only have an effect if the database does
+ *  not contain any configuration for the friendica system.
+ * *********************************************************************/
+
 // 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.
 
@@ -37,7 +68,6 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '{{$adminmail}}';
 
 // Maximum size of an imported message, 0 is unlimited
 
@@ -47,23 +77,16 @@ $a->config['max_import_size'] = 200000;
 
 $a->config['system']['maximagesize'] = 800000;
 
-// Location of PHP command line processor
-
-$a->config['php_path'] = '{{$phpath}}';
-
-// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
-
-$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 true and the
-// PHP mcrypt extension is installed on both systems
+// 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'] = true;
+$a->config['system']['rino_encrypt'] = {{$rino}};
 
 // default system theme
 
-$a->config['system']['theme'] = 'duepuntozero';
+$a->config['system']['theme'] = 'vier';
+$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly';
 
 // By default allow pseudonyms
 
@@ -73,4 +96,7 @@ $a->config['system']['no_regfullname'] = true;
 //$a->config['system']['block_local_dir'] = false;
 
 // Location of the global directory
-$a->config['system']['directory'] = 'http://dir.friendi.ca';
+$a->config['system']['directory'] = 'http://dir.friendica.social';
+
+// Authentication cookie lifetime, in days
+$a->config['system']['auth_cookie_lifetime'] = 7;