diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/sv/htconfig.tpl | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/sv/htconfig.tpl')
| -rw-r--r-- | view/sv/htconfig.tpl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index cc4087f96..97155ea42 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -8,6 +8,9 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres + +define( 'UNO', {{$uno}} ); /* * Notice: Many of the following settings will be available in the admin panel @@ -29,9 +32,9 @@ $default_timezone = '{{$timezone}}'; // What is your site name? -$a->config['system']['baseurl'] = '{{$siteurl}}'; -$a->config['system']['sitename'] = "Hubzilla"; -$a->config['system']['location_hash'] = '{{$site_id}}'; +App::$config['system']['baseurl'] = '{{$siteurl}}'; +App::$config['system']['sitename'] = "Hubzilla"; +App::$config['system']['location_hash'] = '{{$site_id}}'; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -40,21 +43,21 @@ $a->config['system']['location_hash'] = '{{$site_id}}'; // 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['system']['register_text'] = ''; -$a->config['system']['admin_email'] = '{{$adminmail}}'; +App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_text'] = ''; +App::$config['system']['admin_email'] = '{{$adminmail}}'; // Maximum size of an imported message, 0 is unlimited -$a->config['system']['max_import_size'] = 200000; +App::$config['system']['max_import_size'] = 200000; // maximum size of uploaded photos -$a->config['system']['maximagesize'] = 8000000; +App::$config['system']['maximagesize'] = 8000000; // Location of PHP command line processor -$a->config['system']['php_path'] = '{{$phpath}}'; +App::$config['system']['php_path'] = '{{$phpath}}'; // Configure how we communicate with directory servers. // DIRECTORY_MODE_NORMAL = directory client, we will find a directory @@ -62,9 +65,9 @@ $a->config['system']['php_path'] = '{{$phpath}}'; // DIRECTORY_MODE_PRIMARY = main directory server // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services -$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; +App::$config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; // default system theme -$a->config['system']['theme'] = 'redbasic'; +App::$config['system']['theme'] = 'redbasic'; |