Merge pull request #2011 from annando/1511-gcontact-addr

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 0f9222ac59d00845e24f6528a9c4f24a21d8bf50..508de9a3234932503cd6a6ea0b0e74937d1bb9d5 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -1,12 +1,12 @@
 <?php
 
-// If automatic system installation fails: 
+// If automatic system installation fails:
 
 // Copy or rename this file to .htconfig.php
 
 // Why .htconfig.php? Because it contains sensitive information which could
-// give somebody complete control of your database. Apache's default 
-// configuration denies access to and refuses to serve any file beginning 
+// give somebody complete control of your database. Apache's default
+// configuration denies access to and refuses to serve any file beginning
 // with .ht
 
 // Then set the following for your MySQL installation
@@ -23,14 +23,17 @@ $default_timezone = 'America/Los_Angeles';
 
 // What is your site name?
 
-$a->config['sitename'] = "Friendika Social Network";
+$a->config['sitename'] = "Friendica Social Network";
 
 // 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. 
+// and/or approve/deny the request.
+
+// In order to perform system administration via the admin panel, admin_email
+// must precisely match the email address of the person logged in.
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
@@ -48,35 +51,25 @@ $a->config['system']['maximagesize'] = 800000;
 
 $a->config['php_path'] = 'php';
 
-// You shouldn't need to change anything else.
-// Location of global directory submission page. 
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
-
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
-$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+$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 
+// allowed themes (change this from admin panel after installation)
 
-$a->config['system']['rino_encrypt'] = true;
+$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
 
 // default system theme
 
 $a->config['system']['theme'] = 'duepuntozero';
 
 
-// Addons or plugins are configured here.
-// This is a comma seperated list of addons to enable. Example:
-// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
-
-$a->config['system']['addon'] = 'js_upload';
+// By default allow pseudonyms
 
+$a->config['system']['no_regfullname'] = true;
 
-// Disable oembed embedding
-// This disable the conversion of [embed]$url[/embed] tag in html
-// $a->config['system']['no_oembed'] = true;
+//Deny public access to the local directory
+//$a->config['system']['block_local_dir'] = false;
 
+// Location of the global directory
+$a->config['system']['directory'] = 'http://dir.friendi.ca';