$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);
'$language' => $language,
'$urlpath' => $urlpath,
'$phpath' => $phpath,
- '$adminmail' => $adminmail
+ '$adminmail' => $adminmail,
+ '$rino' => $rino
));
$adminmail = notags(trim($_POST['adminmail']));
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
/* Installed langs */
- $lang_choices = get_avaiable_languages();
+ $lang_choices = get_available_languages();
$tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array(
check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");
-
+ check_add($ck_funcs, t('XML PHP module'), true, true, "");
+ check_add($ck_funcs, t('iconv module'), true, true, "");
if(function_exists('apache_get_modules')){
if (! in_array('mod_rewrite',apache_get_modules())) {
$ck_funcs[5]['status']= false;
$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
}
+ if(! function_exists('iconv_strlen')){
+ $ck_funcs[7]['status']= false;
+ $ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
+ }
$checks = array_merge($checks, $ck_funcs);
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.');
check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
}
+ // check for XML DOM Documents being able to be generated
+ try {
+ $xml = new DOMDocument();
+ } catch (Exception $e) {
+ $ck_funcs[6]['status'] = false;
+ $ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
+ }
/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
notice( t('Please see the file "INSTALL.txt".') . EOL);*/