From 909f9f862ee50ad0dcadd6667dd3c494a81dc091 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 25 Oct 2022 09:58:04 -0700
Subject: [PATCH] Fixed SSH with xterm.js (#4668)

---
 views/default.handlebars |  4 +++-
 views/ssh.handlebars     | 10 ++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/default.handlebars b/views/default.handlebars
index 4d0c96c6..4d71cd1a 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -10190,7 +10190,9 @@
                         case 'sessionerror': { p12setConsoleMsg("Session expired", 5000); break; }
                         case 'sessiontimeout': { p12setConsoleMsg("Session timeout", 5000); break; }
                     }
-                } else if (data[0] == '~') { xterm.writeUtf8(data.substring(1)); }
+                } else if (data[0] == '~') {
+                    if (xterm.writeUtf8) { xterm.writeUtf8(data.substring(1)); } else { xterm.write(data.substring(1)); }
+                }
             }
         }
 
diff --git a/views/ssh.handlebars b/views/ssh.handlebars
index 407e0489..e3924656 100644
--- a/views/ssh.handlebars
+++ b/views/ssh.handlebars
@@ -37,14 +37,12 @@
                 <div id="bigok" style="display:none;left:calc((100vh / 2))"><b>&checkmark;</b></div>
                 <div id="bigfail" style="display:none;left:calc((100vh / 2))"><b>&#10007;</b></div>
                 <div id="metadatadiv" style="padding:20px;color:lightgrey;text-align:left;display:none"></div>
-                <div id=terminal style="max-height:calc(100vh - 54px);height:calc(100vh - 54px);"></div>
+                <div id=terminal style="max-height:calc(100vh - 54px);height:calc(100vh - 54px);text-align:left"></div>
                 <div id=TermConsoleMsg style="display:none;cursor:pointer;z-index:10;position:absolute;left:30px;top:17px;color:yellow;background-color:rgba(0,0,0,0.6);padding:10px;border-radius:5px" onclick=clearConsoleMsg()></div>
             </div>
             <div id=deskarea4 class="areaHead">
-                <div class="toright2">
-                </div>
-                <div style="height:21px;max-height:21px">
-                </div>
+                <div class="toright2"></div>
+                <div style="height:21px;max-height:21px"></div>
             </div>
         </div>
         <div id=dialog class="noselect" style="display:none">
@@ -243,7 +241,7 @@
                         case 'sessiontimeout': { setDialogMode(2, "Session", 1, null, "Session timeout."); break; }
                     }
                 } else if (data.data[0] == '~') {
-                    term.writeUtf8(data.data.substring(1));
+                    if (term.writeUtf8) { term.writeUtf8(data.data.substring(1)); } else { term.write(data.data.substring(1)); }
                 }
             }
             socket.onclose = function (e) { disconnect(); }