diff --git a/install/classes/datas.php b/install/classes/datas.php index b24625298..a5b3cf59c 100644 --- a/install/classes/datas.php +++ b/install/classes/datas.php @@ -151,10 +151,10 @@ class Datas 'default' => 1, 'help' => 'Get news from QloApps', ), - 'ssl' => array( + 'enable_ssl' => array( 'name' => 'ssl', - 'default' => '', - 'help' => 'Enable SSL: --ssl=1 or --ssl=true to enable, --ssl=0 or --ssl=false to disable', + 'default' => 0, + 'help' => 'Enable SSL for QloApps', ), ); diff --git a/install/controllers/console/process.php b/install/controllers/console/process.php index e32e525aa..ffa033860 100644 --- a/install/controllers/console/process.php +++ b/install/controllers/console/process.php @@ -122,16 +122,6 @@ class InstallControllerConsoleProcess extends InstallControllerConsole if (!$this->processConfigureShop()) { $this->printErrors(); } - if ($this->datas->ssl !== false && $this->datas->ssl !== '') { - $ssl_raw = strtolower(trim((string)$this->datas->ssl)); - if (!in_array($ssl_raw, array('0', '1', 'true', 'false'), true)) { - echo 'Invalid value for --ssl. Accepted values: 1, 0, true, false.'."\n"; - die; - } - $ssl_value = (int) filter_var($ssl_raw, FILTER_VALIDATE_BOOLEAN); - Configuration::updateValue('PS_SSL_ENABLED', $ssl_value); - Configuration::updateValue('PS_SSL_ENABLED_EVERYWHERE', $ssl_value); - } } if (in_array('fixtures', $steps)) { @@ -248,6 +238,7 @@ class InstallControllerConsoleProcess extends InstallControllerConsole 'admin_lastname' => $this->datas->admin_lastname, 'admin_password' => $this->datas->admin_password, 'admin_email' => $this->datas->admin_email, + 'enable_ssl' => $this->datas->enable_ssl, 'marketing_consent' => $this->datas->marketing_consent, 'configuration_agrement' => true, 'send_informations' => true,