From 2cd999490406f3a1db3995a894768cf08f2cc0fd Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 17 Oct 2012 18:53:18 -0700 Subject: use a single language config until all the new options are in place --- view/en/htconfig.tpl | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'view/en/htconfig.tpl') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 6b42f08a6..cfb7cb24d 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -8,13 +8,6 @@ $db_user = '$dbuser'; $db_pass = '$dbpass'; $db_data = '$dbdata'; -// 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 $a->path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - // 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. @@ -22,7 +15,7 @@ $default_timezone = '$timezone'; // What is your site name? -$a->config['sitename'] = "My Friend Network"; +$a->config['system']['sitename'] = "My Friend Network"; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -32,12 +25,12 @@ $a->config['sitename'] = "My Friend Network"; // and/or approve/deny the request. $a->config['system']['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; +$a->config['system']['register_text'] = ''; $a->config['system']['admin_email'] = '$adminmail'; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 200000; +$a->config['system']['max_import_size'] = 200000; // maximum size of uploaded photos @@ -45,23 +38,13 @@ $a->config['system']['maximagesize'] = 800000; // Location of PHP command line processor -$a->config['php_path'] = '$phpath'; +$a->config['system']['php_path'] = '$phpath'; // Location of global directory submission page. $a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; $a->config['system']['directory_search_url'] = 'http://dir.friendica.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'; - -// 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 - -$a->config['system']['rino_encrypt'] = true; - // default system theme $a->config['system']['theme'] = 'duepuntozero'; -- cgit v1.2.3