|
|
@ -130,7 +130,7 @@ function saveStep2() { |
|
|
|
$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL); |
|
|
|
$_SESSION['mail_login'] = filter_var(param('mail_login', ''), FILTER_VALIDATE_EMAIL); |
|
|
|
|
|
|
|
|
|
|
|
$password_plain = param('passwordPlain', false); |
|
|
|
$password_plain = param('passwordPlain', false); |
|
|
|
if ($password_plain !== false) { |
|
|
|
if ($password_plain !== false && cryptAvailable()) { |
|
|
|
if (!function_exists('password_hash')) { |
|
|
|
if (!function_exists('password_hash')) { |
|
|
|
include_once(LIB_PATH . '/password_compat.php'); |
|
|
|
include_once(LIB_PATH . '/password_compat.php'); |
|
|
|
} |
|
|
|
} |
|
|
@ -681,10 +681,10 @@ function printStep2() { |
|
|
|
} |
|
|
|
} |
|
|
|
$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : ''; |
|
|
|
$auth_type = isset($_SESSION['auth_type']) ? $_SESSION['auth_type'] : ''; |
|
|
|
?> |
|
|
|
?> |
|
|
|
<option value="form"<?php echo $auth_type === 'form' || no_auth($auth_type) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
|
|
|
|
<option value="form"<?php echo $auth_type === 'form' || (no_auth($auth_type) && cryptAvailable()) ? ' selected="selected"' : '', cryptAvailable() ? '' : ' disabled="disabled"'; ?>><?php echo _t('install.auth.form'); ?></option>
|
|
|
|
<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
|
|
|
|
<option value="persona"<?php echo $auth_type === 'persona' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.persona'); ?></option>
|
|
|
|
<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
|
|
|
|
<option value="http_auth"<?php echo $auth_type === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>><?php echo _t('install.auth.http'); ?>(REMOTE_USER = '<?php echo httpAuthUser(); ?>')</option>
|
|
|
|
<option value="none"<?php echo $auth_type === 'none' ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
|
|
|
|
<option value="none"<?php echo $auth_type === 'none' || (no_auth($auth_type) && !cryptAvailable()) ? ' selected="selected"' : ''; ?>><?php echo _t('install.auth.none'); ?></option>
|
|
|
|
</select> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|