Small bug fix in determining http/https

avm99963 · Jun 27, 2016 · 81d00a5 · 81d00a5
1 parent 119640f
commit 81d00a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/addsecuritykey.php b/addsecuritykey.php
@@ -199,7 +199,7 @@
         <?php
         echo "var req = " . json_encode($req) . ";";
         echo "var sigs = " . json_encode($sigs) . ";";
-        echo "var host = '" . $_SERVER['REQUEST_SCHEME']."://".$_SERVER['HTTP_HOST'] . "';";
+        echo "var host = '" . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? "https" : "http")."://".$_SERVER['HTTP_HOST'] . "';";
         ?>
         </script>
         <script src="js/u2f-api.js"></script>

diff --git a/secondfactor.php b/secondfactor.php
@@ -229,7 +229,7 @@
                                 $reqs_nojson = $u2f->getAuthenticateData($row);
                                 $challenge = $reqs_nojson[0]->challenge;
                                 $reqs = json_encode($reqs_nojson);
-                                echo "<script>var req = $reqs, host = '".$_SERVER['REQUEST_SCHEME']."://".$_SERVER['HTTP_HOST']."', challenge = '".$challenge."';</script>";
+                                echo "<script>var req = $reqs, host = '".((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? "https" : "http")."://".$_SERVER['HTTP_HOST']."', challenge = '".$challenge."';</script>";
                             } catch( Exception $e ) {
                                 echo "Error: ".$e->getMessage();
                             }