use a single language config until all the new options are in place

9 files changed, 41 insertions, 544 deletions

diff --git a/boot.php b/boot.php
index 7f5dd06df..16872eff9 100644
--- a/boot.php
+++ b/boot.php
@@ -393,12 +393,15 @@ function startup() {
 if(! class_exists('App')) {
 	class App {
 
+		
 		public  $account = null;            // account record
 
 		private $channel = null;            // channel record
 		private $observer = null;           // xchan record
 		private $widgets = array();         // widgets for this page
-		
+
+
+
 		public  $language;
 		public  $module_loaded = false;
 		public  $query_string;
@@ -419,7 +422,6 @@ if(! class_exists('App')) {
 		public  $module;
 		public  $pager;
 		public  $strings;
-		public  $path;
 		public  $hooks;
 		public  $timezone;
 		public  $interactive = true;
@@ -449,6 +451,8 @@ if(! class_exists('App')) {
 		private $scheme;
 		private $hostname;
 		private $baseurl;
+		private $path;
+
 		private $db;
 
 		private $curl_code;
@@ -473,25 +477,16 @@ if(! class_exists('App')) {
 
 			startup();
 
-			$this->scheme = 'http';
-			if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
-				$this->scheme = 'https';
-			elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
-			$this->scheme = 'https';
 
+			$this->scheme = 'http';
+            if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
+                $this->scheme = 'https';
+            elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
+            $this->scheme = 'https';
 
 			if(x($_SERVER,'SERVER_NAME')) {
 				$this->hostname = $_SERVER['SERVER_NAME'];
 
-				// See bug 437 - this didn't work so disabling it
-				//if(stristr($this->hostname,'xn--')) {
-					// PHP or webserver may have converted idn to punycode, so
-					// convert punycode back to utf-8
-				//	require_once('library/simplepie/idn/idna_convert.class.php');
-				//	$x = new idna_convert();
-				//	$this->hostname = $x->decode($_SERVER['SERVER_NAME']);
-				//}
-
 				if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
 					$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
 				/**
@@ -579,42 +574,42 @@ if(! class_exists('App')) {
 		}
 
 		function get_baseurl($ssl = false) {
+           $scheme = $this->scheme;
 
-			$scheme = $this->scheme;
-
-			if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-				if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
-					$scheme = 'https';
+            if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
+                if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
+                    $scheme = 'https';
 
-				//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
-				//	(and also the login link). Anything seen by an outsider will have it turned off.
+                //  Basically, we have $ssl = true on any links which can only be seen by a logged in user
+                //  (and also the login link). Anything seen by an outsider will have it turned off.
 
-				if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-					if($ssl)
-						$scheme = 'https';
-					else
-						$scheme = 'http';
-				}
-			}
+                if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+                    if($ssl)
+                        $scheme = 'https';
+                    else
+                        $scheme = 'http';
+                }
+            }
 
-			$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-			return $this->baseurl;
+            $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this\
+->path : '' );
+            return $this->baseurl;
 		}
 
 		function set_baseurl($url) {
-			$parsed = @parse_url($url);
+            $parsed = @parse_url($url);
 
-			$this->baseurl = $url;
+            $this->baseurl = $url;
 
-			if($parsed) {
-				$this->scheme = $parsed['scheme'];
+            if($parsed) {
+                $this->scheme = $parsed['scheme'];
 
-				$this->hostname = $parsed['host'];
-				if(x($parsed,'port'))
-					$this->hostname .= ':' . $parsed['port'];
-				if(x($parsed,'path'))
-					$this->path = trim($parsed['path'],'\\/');
-			}
+                $this->hostname = $parsed['host'];
+                if(x($parsed,'port'))
+                    $this->hostname .= ':' . $parsed['port'];
+                if(x($parsed,'path'))
+                    $this->path = trim($parsed['path'],'\\/');
+            }
 
 		}
 
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
deleted file mode 100644
index 0cb665f1f..000000000
--- a/view/ca/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "La Meva Xarxa d'Amics";
-
-// 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['php_path'] = '$phpath';
-
-// 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';
-
-// 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';
-
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
deleted file mode 100644
index 345f85683..000000000
--- a/view/cs/htconfig.tpl
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-// Nastavte následující pro Vaši instalaci MySQL
-// Zkopírujte nebo přejmenujte tento soubor na .htconfig.php
-
-$db_host = '$dbhost';
-$db_user = '$dbuser';
-$db_pass = '$dbpass';
-$db_data = '$dbdata';
-
-// Pokud používáte podadresár z vaší domény, budete zde potřebovat zadat
-// relativní cestu (od kořene vaší domény).
-// Například pokud je URL adresa vaší instance 'http://priklad.cz/adresar/podadresar',
-// nastavte $a->path na 'adresar/podadresar'. 
-
-$a->path = '$urlpath';
- 
-// Vyberte platnou defaultní časovou zónu. Pokud si nejste jistí, použijte use "Europe/Prague".
-// Toto nastavení lze změnit i později a používá se pouze pro časové značky anonymních čtenářů.
-
-$default_timezone = '$timezone';
-
-// Jak se jmenuje Váš web?
-
-$a->config['sitename'] = "Moje síť přátel";
-
-// Nastavení defaultního jazyka webu
-
-$a->config['system']['language'] = 'cs';
-
-// Vaše možnosti jsou REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Ujistěte se, že jste si vytvořili Váš osobníúčet dříve, než nastavíte 
-// REGISTER_CLOSED. 'register_text' (pokud je nastaven) se bude zobrazovat jako první text na 
-// registrační stránce. REGISTER_APPROVE vyžaduje aby byl nastaven 'admin_email'
-// na e-mailovou adresu již existující registrované osoby, která může autorizovat
-// a/nebo schvalovat/odmítat žádosti o registraci.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximální velikost importované zprávy, 0 je neomezeno
-
-$a->config['max_import_size'] = 200000;
-
-// maximální velikost nahrávaných fotografií
-
-$a->config['system']['maximagesize'] = 800000;
-
-// cesta k PHP command line processor
-
-$a->config['php_path'] = '$phpath';
-
-// URL adresy globálního adresáře.
-
-$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
-
-// PuSH - také zvaný jako  pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých
-
-$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
-
-// Server-to-server private message encryption (RINO) je defaultně povolen. 
-// Šifrování bude zajištěno pouze pokud je toto nastaveno na true a
-// PHP mcrypt extension jsou nainstalována na obou systémech 
-
-$a->config['system']['rino_encrypt'] = true;
-
-// defaultní systémové grafické téma
-
-$a->config['system']['theme'] = 'duepuntozero';
-
-
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
deleted file mode 100644
index 2624695d1..000000000
--- a/view/de/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "My Friend 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['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';
-
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';
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
deleted file mode 100644
index 52b6233ec..000000000
--- a/view/es/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "La Mia Rete di Amici";
-
-// 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['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';
-
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
deleted file mode 100644
index 2624695d1..000000000
--- a/view/fr/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "My Friend 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['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';
-
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
deleted file mode 100644
index 52b6233ec..000000000
--- a/view/it/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "La Mia Rete di Amici";
-
-// 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['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';
-
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
deleted file mode 100644
index 2624695d1..000000000
--- a/view/sv/htconfig.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = '$dbhost';
-$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.
-
-$default_timezone = '$timezone';
-
-// What is your site name?
-
-$a->config['sitename'] = "My Friend 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 
-// 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.
-
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['system']['admin_email'] = '$adminmail';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['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';
-