beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Change protocol to HTTPS

Browse source
This commit is contained in:
Jakub Vrana 2015-09-08 11:41:29 -07:00
parent 69ff979ee7
commit a248f8b008
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/include/functions.inc.php
View file

@ -1137,7 +1137,7 @@ function select_value($val, $link, $field, $text_length) {
if ($protocol = is_url($val)) { if ($protocol = is_url($val)) {
$link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009 $link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009
? $val // HTTP links from HTTPS pages don't receive Referer automatically ? $val // HTTP links from HTTPS pages don't receive Referer automatically
: "$protocol://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer : "https://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer
); );
} }
} }

4
adminer/static/functions.js
View file

@ -37,7 +37,7 @@ function cookie(assign, days) {
function verifyVersion(current) { function verifyVersion(current) {
cookie('adminer_version=0', 1); cookie('adminer_version=0', 1);
var iframe = document.createElement('iframe'); var iframe = document.createElement('iframe');
iframe.src = location.protocol + '//www.adminer.org/version/?current=' + current; iframe.src = 'https://www.adminer.org/version/?current=' + current;
iframe.frameBorder = 0; iframe.frameBorder = 0;
iframe.marginHeight = 0; iframe.marginHeight = 0;
iframe.scrolling = 'no'; iframe.scrolling = 'no';
@ -46,7 +46,7 @@ function verifyVersion(current) {
if (window.postMessage && window.addEventListener) { if (window.postMessage && window.addEventListener) {
iframe.style.display = 'none'; iframe.style.display = 'none';
addEventListener('message', function (event) { addEventListener('message', function (event) {
if (event.origin == location.protocol + '//www.adminer.org') { if (event.origin == 'https://www.adminer.org') {
var match = /version=(.+)/.exec(event.data); var match = /version=(.+)/.exec(event.data);
if (match) { if (match) {
cookie('adminer_version=' + match[1], 1); cookie('adminer_version=' + match[1], 1);