From 7c6ebae5c0505815cc08186e0c47e5ffd96f9ea0 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 20 Apr 2016 14:30:22 +0200
Subject: [PATCH] reorganize the htconfig template

---
 view/templates/htconfig.tpl | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 02ffa62c1..89f9bcae8 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -1,5 +1,12 @@
 <?php
 
+/**********************************************************************
+ *  The following configuration has to be within the .htconfig 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
 
@@ -8,12 +15,26 @@ $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
+// 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}}';
+
+/***********************************************************************
+ *  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 +58,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,10 +67,6 @@ $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]';