From ef29e0349143cdf967249216fe3342a63a1339ec Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 10 Dec 2016 07:04:39 +0100 Subject: [PATCH 1/3] make vier also the default from the emergency htconfig file --- htconfig.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htconfig.php b/htconfig.php index ce418fa75..f98e9efc0 100644 --- a/htconfig.php +++ b/htconfig.php @@ -66,7 +66,7 @@ $a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; // default system theme -$a->config['system']['theme'] = 'duepuntozero'; +$a->config['system']['theme'] = 'vier'; // By default allow pseudonyms @@ -80,4 +80,4 @@ $a->config['system']['no_regfullname'] = true; $a->config['system']['directory'] = 'http://dir.friendi.ca'; // Allowed protocols in link URLs; HTTP protocols always are accepted -$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher'); \ No newline at end of file +$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher'); From 89caa18fe0293765bbf030264496fbaa7146a824 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 10 Dec 2016 07:05:35 +0100 Subject: [PATCH 2/3] add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up --- view/templates/htconfig.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index df793197c..316f9bc01 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -95,3 +95,6 @@ $a->config['system']['no_regfullname'] = true; // Location of the global directory $a->config['system']['directory'] = 'http://dir.friendi.ca'; + +// Allowed protocols in link URLs; HTTP protocols always are accepted +$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher'); From 132477990dcd72d7138789782a7c2e94c30028e7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 10 Dec 2016 07:16:16 +0100 Subject: [PATCH 3/3] move that option up, as the admin panel has no control over it ATM --- view/templates/htconfig.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 316f9bc01..2420aa953 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -35,6 +35,9 @@ $a->config['php_path'] = '{{$phpath}}'; $a->path = '{{$urlpath}}'; +// Allowed protocols in link URLs; HTTP protocols always are accepted +$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher'); + /* ********************************************************************* * The configuration below will be overruled by the admin panel. * Changes made below will only have an effect if the database does @@ -95,6 +98,3 @@ $a->config['system']['no_regfullname'] = true; // Location of the global directory $a->config['system']['directory'] = 'http://dir.friendi.ca'; - -// Allowed protocols in link URLs; HTTP protocols always are accepted -$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');