From d78201cf50f6530c60c6a0abcc0392b461c81ec7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:23:41 +0100 Subject: [PATCH 1/4] make sure all config done with the installer is represented in the emergency backup template as well --- htconfig.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htconfig.php b/htconfig.php index f98e9efc06..3dd2f34a71 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; +// Default system language + +$a->config['system']['language'] = 'en'; + // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -60,9 +64,16 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; +// 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 +// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated + +$a->config['system']['rino_encrypt'] = 2; + // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozerosmoothly'; // default system theme From bf7314e46ec7d1b698b01a64a3e1da26d5ef34bd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:24:51 +0100 Subject: [PATCH 2/4] Revert "make sure all config done with the installer is represented in the emergency backup template as well" This reverts commit d78201cf50f6530c60c6a0abcc0392b461c81ec7. --- htconfig.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/htconfig.php b/htconfig.php index 3dd2f34a71..f98e9efc06 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,10 +26,6 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; -// Default system language - -$a->config['system']['language'] = 'en'; - // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -64,16 +60,9 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; -// 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 -// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated - -$a->config['system']['rino_encrypt'] = 2; - // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozerosmoothly'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; // default system theme From a9b3c6d9d7d114d6f257a5b1c3d2ac50177630cf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:26:22 +0100 Subject: [PATCH 3/4] make sure all config done with the installer is represented in the emergency backup template as well --- htconfig.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htconfig.php b/htconfig.php index f98e9efc06..222be83839 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; +// Default system language + +$a->config['system']['language'] = 'en'; + // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -60,9 +64,16 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; +// 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 +// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated + +$a->config['system']['rino_encrypt'] = 2; + // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly'; // default system theme From 94694aae86d38a8a609dc99e3eb9dc6170a0c350 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:45:13 +0100 Subject: [PATCH 4/4] RInO is not true / false anymore --- htconfig.php | 6 +++--- view/templates/htconfig.tpl | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htconfig.php b/htconfig.php index 222be83839..41317c4608 100644 --- a/htconfig.php +++ b/htconfig.php @@ -65,9 +65,9 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; // 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 -// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = 2; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 7c90ee0de4..78a2e47df2 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -80,8 +80,9 @@ $a->config['system']['maximagesize'] = 800000; $a->config['system']['huburl'] = '[internal]'; // 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 +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = {{$rino}};