mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-05 17:20:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add button to manually open if popup blocked

Browse Source
This commit is contained in:
Squidly271
2025-05-26 12:51:33 -04:00
parent 2ddeadbe09
commit 0de80b959a
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
emhttp/plugins/dynamix/Terminal.page
View File

@@ -15,23 +15,34 @@ Icon="terminal"
?>
<script>
$(function(){
newTerminalOpen();
});
function newTerminalOpen() {
var d = new Date();
try {
openTerminal('ttyd', 'Web Terminal ' + d.getTime(), '');
} catch (e) {
console.error('Failed to open terminal:', e);
window.location.href = '/';
$('#popupFailed').show();
return;
}
// Give time for terminal to open then go back to the previous page
var referer = '<?= htmlspecialchars($_SERVER['HTTP_REFERER'] ?? '', ENT_QUOTES) ?>';
setTimeout(function(){
// Only redirect to same origin or fallback to home
if (referer && referer.indexOf(window.location.origin) === 0) {
if (referer && referer.indexOf(window.location.origin) === 0 && basename(referer) != "Terminal") {
window.location.href = referer;
} else {
window.location.href = '/';
}
}, 5000);
});
</script>
}
function basename(path) {
return path.replace(/.*\//, '');
}
</script>
<span id='popupFailed' style='display:none;'>
_(Terminal failed to automatically open - Popup blocked. Either enable popups in your browser or click this:)_
<input type='button' onclick='newTerminalOpen();' value='_(Open Terminal)_'></input>
</span>

4
emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php
View File

@@ -163,6 +163,10 @@ function openTerminal(tag,name,more) {
// open terminal window (run in background)
name = name.replace(/[ #]/g,"_");
tty_window = makeWindow(name+(more=='.log'?more:''),Math.min(screen.availHeight,800),Math.min(screen.availWidth,1200));
if ( tty_window === null ) {
throw new Error('Failed to open terminal window');
return;
}
var socket = ['ttyd','syslog'].includes(tag) ? '/webterminal/'+tag+'/' : '/logterminal/'+name+(more=='.log'?more:'')+'/';
$.get('/webGui/include/OpenTerminal.php',{tag:tag,name:name,more:more},function(){setTimeout(function(){tty_window.location=socket; tty_window.focus();},200);});
}