mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-06 08:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #735 from limetech/feat-vnc-popup-detect

Browse Source 
New VM: Detect VNC popup blocker
This commit is contained in:
tom mortensen
2020-07-25 17:05:55 -07:00
committed by GitHub
parent a3b8cf3156 6a766d0244
commit 290dac4fc5
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/dynamix.vm.manager/templates/Custom.form.php
View File

@@ -101,8 +101,8 @@
'target' => ''
]
]
];
$hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaration
];
$hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaration
// Merge in any default values from the VM template
if ($arrAllTemplates[$strSelectedTemplate] && $arrAllTemplates[$strSelectedTemplate]['overrides']) {
@@ -121,18 +121,17 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
}
} else {
// form view
if ($lv->domain_new($_POST)){
if ($lv->domain_new($_POST)) {
// Fire off the vnc popup if available
$dom = $lv->get_domain_by_name($_POST['domain']['name']);
$vncport = $lv->domain_get_vnc_port($dom);
$wsport = $lv->domain_get_ws_port($dom);
if ($vncport > 0) {
$vnc = '/plugins/dynamix.vm.manager/vnc.html?autoconnect=true&host='.$_SERVER['HTTP_HOST'].'&port='.$wsport.'&path=';
$reply['vncurl'] = $vnc;
}
$reply = ['success' => true];
} else {
$reply = ['error' => $lv->get_last_error()];
if ($vncport > 0) {
$reply['vncurl'] = '/plugins/dynamix.vm.manager/vnc.html?autoconnect=true&host='.$_SERVER['HTTP_HOST'].'&port=&path=/wsproxy/'.$wsport.'/';
}
} else {
$reply = ['error' => $lv->get_last_error()];
}
}
echo json_encode($reply);
@@ -1511,7 +1510,13 @@ $(function() {
$.post("/plugins/dynamix.vm.manager/templates/Custom.form.php", postdata, function( data ) {
if (data.success) {
if (data.vncurl) {
window.open(data.vncurl, '_blank', 'scrollbars=yes,resizable=yes');
var vnc_window=window.open(data.vncurl, '_blank', 'scrollbars=yes,resizable=yes');
try {
vnc_window.focus();
} catch (e) {
swal({title:"_(Browser error)_",text:"_(Pop-up Blocker is enabled! Please add this site to your exception list)_",type:"warning",confirmButtonText:"_(Ok)_"},function(){ done() });
return;
}
}
done();
}