Merge pull request #2682 from redochka/master

Add HTTPS support during installation
opencart · Mar 5, 2015 · a3e7117 · a3e7117
2 parents 74e2592 + 4a4b3ac
commit a3e7117
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/upload/install/index.php b/upload/install/index.php
@@ -3,8 +3,9 @@
 error_reporting(E_ALL);
 
 // HTTP
-define('HTTP_SERVER', 'http://' . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['SCRIPT_NAME']), '/.\\') . '/');
-define('HTTP_OPENCART', 'http://' . $_SERVER['HTTP_HOST'] . rtrim(rtrim(dirname($_SERVER['SCRIPT_NAME']), 'install'), '/.\\') . '/');
+$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
+define('HTTP_SERVER', $protocol . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['SCRIPT_NAME']), '/.\\') . '/');
+define('HTTP_OPENCART', $protocol . $_SERVER['HTTP_HOST'] . rtrim(rtrim(dirname($_SERVER['SCRIPT_NAME']), 'install'), '/.\\') . '/');
 
 // DIR
 define('DIR_APPLICATION', str_replace('\\', '/', realpath(dirname(__FILE__))) . '/');

diff --git a/upload/install/view/template/header.tpl b/upload/install/view/template/header.tpl
@@ -8,7 +8,7 @@
 <link href="view/javascript/bootstrap/css/bootstrap.css" rel="stylesheet" media="screen" />
 <script src="view/javascript/bootstrap/js/bootstrap.js" type="text/javascript"></script>
 <link href="view/javascript/font-awesome/css/font-awesome.min.css" type="text/css" rel="stylesheet" />
-<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,400i,300,700" rel="stylesheet" type="text/css" />
+<link href="//fonts.googleapis.com/css?family=Open+Sans:400,400i,300,700" rel="stylesheet" type="text/css" />
 <link rel="stylesheet" type="text/css" href="view/stylesheet/stylesheet.css" />
 </head>
 <body>