mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 17:21:39 +09:00
Fix erroneous detection of SSL configration when importing very old XE configuration file
This commit is contained in:
parent
41f4eada9d
commit
777a62af35
1 changed files with 10 additions and 1 deletions
|
|
@ -198,7 +198,16 @@ class ConfigParser
|
|||
$config['url']['default'] = $default_url ?: (\RX_SSL ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . \RX_BASEURL;
|
||||
$config['url']['http_port'] = $db_info->http_port ?: null;
|
||||
$config['url']['https_port'] = $db_info->https_port ?: null;
|
||||
$config['url']['ssl'] = ($db_info->use_ssl === 'none') ? 'none' : 'always';
|
||||
|
||||
// Convert SSL configuration.
|
||||
if (isset($db_info->use_ssl) && in_array($db_info->use_ssl, ['always', 'optional']))
|
||||
{
|
||||
$config['url']['ssl'] = 'always';
|
||||
}
|
||||
else
|
||||
{
|
||||
$config['url']['ssl'] = 'none';
|
||||
}
|
||||
|
||||
// Convert session configuration.
|
||||
$config['session']['delay'] = $db_info->delay_session === 'Y' ? true : false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue