Merge pull request #375 from abhishek-webkul/gli-684

Added Enable SSL & improve install demo data configuration in installation process

Author: rohit053

Diff for: config/defines.inc.php

@@ -26,7 +26,7 @@
 
 /* Debug only */
 if (!defined('_PS_MODE_DEV_')) {
-define('_PS_MODE_DEV_', false);
+    define('_PS_MODE_DEV_', false);
 }
 /* Compatibility warning */
 define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false);

Diff for: install/controllers/http/configure.php

@@ -43,6 +43,7 @@ public function processNextStep()
             $this->session->install_type = Tools::getValue('db_mode');
             $this->session->shop_country = Tools::getValue('shop_country');
             $this->session->shop_timezone = Tools::getValue('shop_timezone');
+            $this->session->enable_ssl = Tools::getValue('enable_ssl');
 
             // Save admin configuration
             $this->session->admin_firstname = trim(Tools::getValue('admin_firstname'));
@@ -306,6 +307,11 @@ public function display()
         // Install type
         $this->install_type = ($this->session->install_type) ? $this->session->install_type : 'full';
 
+        // Detect SSL mode
+        if (!isset($this->session->enable_ssl)) {
+            $this->session->enable_ssl = Tools::usingSecureMode() ? '1' : '0';
+        }
+
         $this->displayTemplate('configure');
     }
 

Diff for: install/controllers/http/process.php

@@ -198,6 +198,7 @@ public function processConfigureShop()
             'shop_activity' => $this->session->shop_activity,
             'shop_country' => $this->session->shop_country,
             'shop_timezone' => $this->session->shop_timezone,
+            'enable_ssl' => $this->session->enable_ssl,
             'admin_firstname' => $this->session->admin_firstname,
             'admin_lastname' => $this->session->admin_lastname,
             'admin_password' => $this->session->admin_password,

Diff for: install/models/install.php

@@ -443,6 +443,7 @@ public function configureShop(array $data = array())
             'shop_activity' => '',
             'shop_country' => 'us',
             'shop_timezone' => 'US/Eastern',
+            'enable_ssl' => false,
             'use_smtp' => false,
             'smtp_encryption' => 'off',
             'smtp_port' => 25,
@@ -477,6 +478,10 @@ public function configureShop(array $data = array())
         Configuration::updateGlobalValue('PS_TIMEZONE',                $data['shop_timezone']);
         Configuration::updateGlobalValue('PS_CONFIGURATION_AGREMENT',        (int)$data['configuration_agrement']);
 
+        // Set SSL configuration
+        Configuration::updateGlobalValue('PS_SSL_ENABLED', (int) $data['enable_ssl']);
+        Configuration::updateGlobalValue('PS_SSL_ENABLED_EVERYWHERE', (int) $data['enable_ssl']);
+
         // Set mails configuration
         Configuration::updateGlobalValue('PS_MAIL_METHOD',            ($data['use_smtp']) ? 2 : 1);
         Configuration::updateGlobalValue('PS_MAIL_SMTP_ENCRYPTION',    $data['smtp_encryption']);

Diff for: install/theme/views/configure.phtml

@@ -36,10 +36,9 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 	</div>
 	*/ ?>
 
-	<?php if (_PS_MODE_DEV_): ?>
 	<!-- Install type (with fixtures or not) -->
 	<div class="field clearfix">
-		<label class="aligned"><?php echo $this->l('Install demo products') ?></label>
+		<label class="aligned"><?php echo $this->l('Install demo data') ?></label>
 		<div class="contentinput">
 			<label>
 				<input value="full" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> autocomplete="off" />
@@ -50,11 +49,8 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 				<?php echo $this->l('No'); ?>
 			</label>
 		</div>
-		<p class="userInfos aligned"><?php echo $this->l('Demo data are a good way to learn how to use QloApps. You should install them if you are not familiar with it.') ?></p>
+		<p class="userInfos aligned"><?php echo $this->l('Installing demo data is a good way to learn how to use QloApps if you have not used it before. This demo data can later be erased using module QloApps Data Cleaner which comes pre-installed with this installation.') ?></p>
 	</div>
-	<?php else: ?>
-		<input value="full" name="db_mode" type="hidden" />
-	<?php endif; ?>
 
 	<!-- Country list -->
 	<div class="field clearfix">
@@ -86,6 +82,21 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<?php echo $this->displayError('shop_timezone') ?>
 	</div>
 
+	<!-- Enable SSL -->
+	<div class="field clearfix">
+		<label class="aligned"><?php echo $this->l('Enable SSL') ?></label>
+		<div class="contentinput">
+			<label>
+				<input value="1" type="radio" name="enable_ssl" style="vertical-align: middle;" <?php if ($this->session->enable_ssl == '1'): ?>checked="checked"<?php endif; ?> autocomplete="off" />
+				<?php echo $this->l('Yes') ?>
+			</label>
+			<label>
+				<input value="0" type="radio" name="enable_ssl" style="vertical-align: middle;" <?php if ($this->session->enable_ssl == '0'): ?>checked="checked"<?php endif; ?> autocomplete="off" />
+				<?php echo $this->l('No'); ?>
+			</label>
+		</div>
+	</div>
+
 	<!-- Shop logo
 	<div class="field clearfix">
 		<label for="uploadedImage" class="aligned logo"><?php echo $this->l('Shop logo') ?></label>