Fixed SSL option on website

Equotix · Jul 30, 2016 · d927b12 · d927b12
1 parent a64f9e0
commit d927b12
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/upload/admin/controller/system/setting.php b/upload/admin/controller/system/setting.php
@@ -93,7 +93,7 @@ public function index() {
         $this->data['config_recurring_default_status'] = $this->build->data('config_recurring_default_status', $this->request->post, $setting);
         $this->data['config_mail'] = $this->build->data('config_mail', $this->request->post, $setting);
         $this->data['config_mail_alert'] = $this->build->data('config_mail_alert', $this->request->post, $setting);
-        $this->data['config_ssl'] = $this->build->data('config_ssl', $this->request->post, $setting);
+        $this->data['config_secure'] = $this->build->data('config_secure', $this->request->post, $setting);
         $this->data['config_seo_url'] = $this->build->data('config_seo_url', $this->request->post, $setting);
         $this->data['config_maintenance'] = $this->build->data('config_maintenance', $this->request->post, $setting);
         $this->data['config_compression'] = $this->build->data('config_compression', $this->request->post, $setting);

diff --git a/upload/admin/language/en-gb/system/setting.php b/upload/admin/language/en-gb/system/setting.php
@@ -51,7 +51,7 @@
 $_['entry_smtp_password']					= 'SMTP Password';
 $_['entry_smtp_port']						= 'SMTP Port';
 $_['entry_smtp_timeout']					= 'SMTP Timeout';
-$_['entry_ssl']								= 'Use SSL';
+$_['entry_secure']							= 'Use SSL';
 $_['entry_seo_url']							= 'Use SEO URLs';
 $_['entry_maintenance']						= 'Maintenance Mode';
 $_['entry_compression']						= 'Output Compression Level';

diff --git a/upload/admin/view/template/system/setting.tpl b/upload/admin/view/template/system/setting.tpl
@@ -433,10 +433,10 @@
         </div>
         <div class="tab-pane" id="tab-server">
           <div class="form-group">
-            <label class="col-sm-2 control-label" for="input-ssl"><?php echo $entry_ssl; ?></label>
-            <div class="col-sm-10"><select name="config_ssl" id="input-ssl" class="form-control">
-                <option value="1"<?php echo $config_ssl ? ' selected="selected"' : ''; ?>><?php echo $text_yes; ?></option>
-                <option value="0"<?php echo $config_ssl ? '' : ' selected="selected"'; ?>><?php echo $text_no; ?></option>
+            <label class="col-sm-2 control-label" for="input-secure"><?php echo $entry_secure; ?></label>
+            <div class="col-sm-10"><select name="config_secure" id="input-secure" class="form-control">
+                <option value="1"<?php echo $config_secure ? ' selected="selected"' : ''; ?>><?php echo $text_yes; ?></option>
+                <option value="0"<?php echo $config_secure ? '' : ' selected="selected"'; ?>><?php echo $text_no; ?></option>
               </select>
             </div>
           </div>

diff --git a/upload/index.php b/upload/index.php
@@ -54,7 +54,7 @@
 $registry->set('load', $loader);
 
 // Url
-$url = new Url($config->get('config_url'), $config->get('config_use_ssl') ? $config->get('config_ssl') : $config->get('config_url'));
+$url = new Url($config->get('config_url'), $config->get('config_secure') ? $config->get('config_ssl') : $config->get('config_url'));
 $registry->set('url', $url);
 
 // Log 

diff --git a/upload/install/logic_invoice.sql b/upload/install/logic_invoice.sql
@@ -697,7 +697,7 @@ INSERT INTO `li_setting` (`setting_id`, `group`, `key`, `value`, `serialized`) V
 (260, 'config', 'config_error_display', '0', 0),
 (259, 'config', 'config_cache', 'file', 0),
 (258, 'config', 'config_compression', '0', 0),
-(255, 'config', 'config_ssl', '0', 0),
+(255, 'config', 'config_secure', '0', 0),
 (44, 'cheque', 'cheque_details', '{"1":"Please send cheque to\\r\\n\\r\\n1 Test Street\\r\\nSingapore 123456"}', 1),
 (45, 'cheque', 'cheque_payable', 'My Company Ltd', 0),
 (46, 'tax', 'tax_status', '1', 0),