Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-20 07:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

during installation choose the highest RINO version possible

Browse source
This commit is contained in:
Tobias Diekershoff 2016-04-20 14:17:48 +02:00 committed by Roland Haeder
parent bdd55638ce
commit cc0b4ff0f9
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mod/install.php
View file

@ -79,6 +79,14 @@ function install_post(&$a) {
$timezone = notags(trim($_POST['timezone'])); $timezone = notags(trim($_POST['timezone']));
$language = notags(trim($_POST['language'])); $language = notags(trim($_POST['language']));
$adminmail = notags(trim($_POST['adminmail'])); $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 // connect to db
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@ -93,7 +101,8 @@ function install_post(&$a) {
'$language' => $language, '$language' => $language,
'$urlpath' => $urlpath, '$urlpath' => $urlpath,
'$phpath' => $phpath, '$phpath' => $phpath,
'$adminmail' => $adminmail '$adminmail' => $adminmail,
'$rino' => $rino
)); ));
@ -449,7 +458,7 @@ function check_funcs(&$checks) {
if ($ck_funcs[5]['status']) { if ($ck_funcs[5]['status']) {
if (function_exists('mcrypt_create_iv')) { if (function_exists('mcrypt_create_iv')) {
$__status = true; $__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 { } else {
$__status = false; $__status = false;
$__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.'); $__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');

2
view/templates/htconfig.tpl
View file

@ -59,7 +59,7 @@ $a->config['system']['huburl'] = '[internal]';
// Encryption will only be provided if this setting is true and the // Encryption will only be provided if this setting is true and the
// PHP mcrypt extension is installed on both systems // PHP mcrypt extension is installed on both systems
$a->config['system']['rino_encrypt'] = true; $a->config['system']['rino_encrypt'] = {{$rino}};
// default system theme // default system theme