From d3293dfcf2e5141421b3c96b9e3dc6cba2157a22 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 20 Apr 2016 14:17:48 +0200 Subject: [PATCH 1/4] during installation choose the highest RINO version possible --- mod/install.php | 13 +++++++++++-- view/templates/htconfig.tpl | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mod/install.php b/mod/install.php index b1c2010eef..2339124469 100755 --- a/mod/install.php +++ b/mod/install.php @@ -79,6 +79,14 @@ function install_post(&$a) { $timezone = notags(trim($_POST['timezone'])); $language = notags(trim($_POST['language'])); $adminmail = notags(trim($_POST['adminmail'])); + // In step 4 of the installer, we passed the check for mcrypt + // already, so we can activate RINO, make RINO2 the default + // and only fall back if the mcrypt_create_iv function is + // not available on the system. + $rino = 2; + if (! function_exists('mcrypt_create_iv')) { + $rino = 1; + ] // connect to db $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); @@ -93,7 +101,8 @@ function install_post(&$a) { '$language' => $language, '$urlpath' => $urlpath, '$phpath' => $phpath, - '$adminmail' => $adminmail + '$adminmail' => $adminmail, + '$rino' => $rino )); @@ -449,7 +458,7 @@ function check_funcs(&$checks) { if ($ck_funcs[5]['status']) { if (function_exists('mcrypt_create_iv')) { $__status = true; - $__help = "If you are using php_cli, please make sure that mcrypt module is enabled in its config file"; + $__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file"); } else { $__status = false; $__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.'); diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 971bb50482..02ffa62c14 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -59,7 +59,7 @@ $a->config['system']['huburl'] = '[internal]'; // 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; +$a->config['system']['rino_encrypt'] = {{$rino}}; // default system theme From 7c6ebae5c0505815cc08186e0c47e5ffd96f9ea0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 20 Apr 2016 14:30:22 +0200 Subject: [PATCH 2/4] reorganize the htconfig template --- view/templates/htconfig.tpl | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 02ffa62c14..89f9bcae8a 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -1,5 +1,12 @@ config['admin_email'] = '{{$adminmail}}'; + +// Location of PHP command line processor + +$a->config['php_path'] = '{{$phpath}}'; + // 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 path to 'directory/subdirectory'. $a->path = '{{$urlpath}}'; + +/*********************************************************************** + * The configuration below will be overruled by the admin panel. + * Changes made below will only have an effect if the database does + * not contain any configuration for the friendica system. + ***********************************************************************/ // 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. @@ -37,7 +58,6 @@ $a->config['sitename'] = "My Friend Network"; $a->config['register_policy'] = REGISTER_OPEN; $a->config['register_text'] = ''; -$a->config['admin_email'] = '{{$adminmail}}'; // Maximum size of an imported message, 0 is unlimited @@ -47,10 +67,6 @@ $a->config['max_import_size'] = 200000; $a->config['system']['maximagesize'] = 800000; -// Location of PHP command line processor - -$a->config['php_path'] = '{{$phpath}}'; - // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts $a->config['system']['huburl'] = '[internal]'; From 6601582a12036f950066291880d3f54e96ffff10 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 20 Apr 2016 16:06:39 +0200 Subject: [PATCH 3/4] make doxygen a bit more happy --- view/templates/htconfig.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 89f9bcae8a..a2e9c9d8a3 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -1,11 +1,11 @@ Date: Wed, 20 Apr 2016 16:08:17 +0200 Subject: [PATCH 4/4] make doxygen a bit more happy --- view/templates/htconfig.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index a2e9c9d8a3..78ba2a9bd9 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -30,11 +30,11 @@ $a->config['php_path'] = '{{$phpath}}'; $a->path = '{{$urlpath}}'; -/*********************************************************************** +/* ********************************************************************* * The configuration below will be overruled by the admin panel. * Changes made below will only have an effect if the database does * not contain any configuration for the friendica system. - ***********************************************************************/ + * *********************************************************************/ // 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.