aboutsummaryrefslogtreecommitdiffstats
path: root/view/en-gb
diff options
context:
space:
mode:
Diffstat (limited to 'view/en-gb')
-rw-r--r--view/en-gb/htconfig.tpl34
-rw-r--r--view/en-gb/strings.php60
2 files changed, 52 insertions, 42 deletions
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index c3bef0de3..ead987fcc 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/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,10 +32,17 @@ $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}}';
+
+// These lines set additional security headers to be sent with all responses
+// You may wish to set transport_security_header to 0 if your server already sends
+// this header. content_security_policy may need to be disabled if you wish to
+// run the piwik analytics plugin or include other offsite resources on a page
+App::$config['system']['transport_security_header'] = 1;
+App::$config['system']['content_security_policy'] = 1;
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
// Be certain to create your own personal account before setting
@@ -41,9 +51,9 @@ $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}}';
// Site access restrictions. By default we will create private sites.
@@ -56,22 +66,22 @@ $a->config['system']['admin_email'] = '{{$adminmail}}';
// paid, tiered, or free determines how these listings will be presented.
-$a->config['system']['access_policy'] = ACCESS_PRIVATE;
+App::$config['system']['access_policy'] = ACCESS_PRIVATE;
// If you operate a public site, you might wish that people are directed
// to a "sellpage" where you can describe for features or policies or service plans in depth.
// This must be an absolute URL beginning with http:// or https:// .
-$a->config['system']['sellpage'] = '';
+App::$config['system']['sellpage'] = '';
// Maximum size of an imported message, 0 is unlimited
// FIXME - NOT currently implemented.
-$a->config['system']['max_import_size'] = 200000;
+App::$config['system']['max_import_size'] = 200000;
// 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
@@ -79,11 +89,11 @@ $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';
// PHP error logging setup
diff --git a/view/en-gb/strings.php b/view/en-gb/strings.php
index 1cac5673e..e856c1af9 100644
--- a/view/en-gb/strings.php
+++ b/view/en-gb/strings.php
@@ -1,31 +1,31 @@
<?php
-$a->strings["Set shadow color, default #000"] = "Set shadow colour, default #000";
-$a->strings["Set background color"] = "Set background colour";
-$a->strings["Set section background color"] = "Set section background colour";
-$a->strings["Set color of items - use hex"] = "Set colour of items - use hex";
-$a->strings["Set color of links - use hex"] = "Set colour of links - use hex";
-$a->strings["Set color of fonts - use hex"] = "Set colour of fonts - use hex";
-$a->strings["Navigation bar background color"] = "Navigation bar background colour";
-$a->strings["Navigation bar gradient top color"] = "Navigation bar gradient top colour";
-$a->strings["Navigation bar gradient bottom color"] = "Navigation bar gradient bottom colour";
-$a->strings["Navigation active button gradient top color"] = "Navigation active button gradient top colour";
-$a->strings["Navigation active button gradient bottom color"] = "Navigation active button gradient bottom colour";
-$a->strings["Navigation bar border color "] = "Navigation bar border colour ";
-$a->strings["Navigation bar icon color "] = "Navigation bar icon colour ";
-$a->strings["Navigation bar active icon color "] = "Navigation bar active icon colour ";
-$a->strings["link color"] = "link colour";
-$a->strings["Set font-color for banner"] = "Set font-colour for banner";
-$a->strings["Set the background color"] = "Set the background colour";
-$a->strings["Set the background color of items"] = "Set the background colour of items";
-$a->strings["Set the background color of comments"] = "Set the background colour of comments";
-$a->strings["Set the border color of comments"] = "Set the border colour of comments";
-$a->strings["Set the basic color for item icons"] = "Set the basic colour for item icons";
-$a->strings["Set the hover color for item icons"] = "Set the hover colour for item icons";
-$a->strings["Set font-color for posts and comments"] = "Set font-colour for posts and comments";
-$a->strings["Authorize application connection"] = "Authorise application connection";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Do you want to authorise this application to access your posts and contacts, and/or create new posts for you?";
-$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.";
-$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites.";
-$a->strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool.";
-$a->strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i";
+App::$strings["Set shadow color, default #000"] = "Set shadow colour, default #000";
+App::$strings["Set background color"] = "Set background colour";
+App::$strings["Set section background color"] = "Set section background colour";
+App::$strings["Set color of items - use hex"] = "Set colour of items - use hex";
+App::$strings["Set color of links - use hex"] = "Set colour of links - use hex";
+App::$strings["Set color of fonts - use hex"] = "Set colour of fonts - use hex";
+App::$strings["Navigation bar background color"] = "Navigation bar background colour";
+App::$strings["Navigation bar gradient top color"] = "Navigation bar gradient top colour";
+App::$strings["Navigation bar gradient bottom color"] = "Navigation bar gradient bottom colour";
+App::$strings["Navigation active button gradient top color"] = "Navigation active button gradient top colour";
+App::$strings["Navigation active button gradient bottom color"] = "Navigation active button gradient bottom colour";
+App::$strings["Navigation bar border color "] = "Navigation bar border colour ";
+App::$strings["Navigation bar icon color "] = "Navigation bar icon colour ";
+App::$strings["Navigation bar active icon color "] = "Navigation bar active icon colour ";
+App::$strings["link color"] = "link colour";
+App::$strings["Set font-color for banner"] = "Set font-colour for banner";
+App::$strings["Set the background color"] = "Set the background colour";
+App::$strings["Set the background color of items"] = "Set the background colour of items";
+App::$strings["Set the background color of comments"] = "Set the background colour of comments";
+App::$strings["Set the border color of comments"] = "Set the border colour of comments";
+App::$strings["Set the basic color for item icons"] = "Set the basic colour for item icons";
+App::$strings["Set the hover color for item icons"] = "Set the hover colour for item icons";
+App::$strings["Set font-color for posts and comments"] = "Set font-colour for posts and comments";
+App::$strings["Authorize application connection"] = "Authorise application connection";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Do you want to authorise this application to access your posts and contacts, and/or create new posts for you?";
+App::$strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.";
+App::$strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites.";
+App::$strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool.";
+App::$strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i";
+App::$strings["D, d M Y - g:i A"] = "D, d M Y - G:i";