From eb5842b74a9237dd0d8a2ed58972a7e9d1ed507b Mon Sep 17 00:00:00 2001 From: markjcrane Date: Sat, 16 Jan 2016 09:44:15 -0700 Subject: [PATCH] Fix a problem with the provision url path which was caused by a pull request in the last 12 hours. --- app/devices/device_edit.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 8bf8d1c9d5..de92aec84d 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -553,7 +553,14 @@ require_once "resources/require.php"; else { $domain_name = $_SESSION['domain_name']; } - echo " window.location = '".$_SERVER['REQUEST_SCHEME']."://".$domain_name."/app/provision?mac=$device_mac_address&file=' + d + '&content_type=application/octet-stream';\n"; + + if (!isset($_SERVER['HTTP_PROTOCOL'])) { + $_SERVER['HTTP_PROTOCOL'] = 'http'; + if (isset($_SERVER['REQUEST_SCHEME'])) { $_SERVER['HTTP_PROTOCOL'] = $_SERVER['REQUEST_SCHEME']; } + if ($_SERVER['HTTPS'] = 'on') { $_SERVER['HTTP_PROTOCOL'] = 'https'; } + if ($_SERVER['SERVER_PORT'] = '443') { $_SERVER['HTTP_PROTOCOL'] = 'https'; } + } + echo " window.location = '".$_SERVER['HTTP_PROTOCOL']."://".$domain_name."/app/provision?mac=".$device_mac_address."&file=' + d + '&content_type=application/octet-stream';\n"; echo " }\n"; echo "\n";