michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Jamie Cameron
2022-12-08 21:58:43 -08:00
parent c6a4a80e58 aaee5bedac
commit 50df0e4d02
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xterm/config
View File

@@ -1,2 +1,4 @@
xterm=xterm-256color
base_port=555
rcfile=0
locale=0

2
xterm/config.info
View File

@@ -1,3 +1,5 @@
xterm=Set <tt>TERM</tt> environmental variable to,4,xterm+256color-xterm&#45;256color,xterm+16color-xterm&#45;16color,xterm-xterm,vt102-vt102,vt100-vt100,vt52-vt52,rxvt-rxvt,nsterm-nsterm,dtterm-dtterm,ansi-ansi
base_port=Base port number for WebSockets connections,0,5
size=Terminal width and height in characters,3,Automatic,5,,,Static (80x24)
locale=Set shell character encoding,10,0-Shell default,1-<tt>en_US.UTF&#45;8</tt>,Custom
rcfile=Execute initialization commands from file,10,0-Shell default,1-Module default,Custom

16
xterm/shellserver.pl
View File

@@ -28,9 +28,23 @@ else {
&foreign_require("proc");
&clean_environment();
# Set locale
my $lang = $config{'locale'};
if ($lang) {
my @opts = ('LC_ALL', 'LANG', 'LANGUAGE');
$lang = 'en_US.UTF-8' if ($lang == 1);
foreach my $opt (@opts) {
$ENV{$opt} = &trim($lang);
}
}
# Set terminal
$ENV{'USER'} = $user;
$ENV{'TERM'} = 'xterm-256color';
my $config_xterm = $config{'xterm'};
$config_xterm = 'xterm-256color'
if (!$config_xterm);
$config_xterm =~ s/\+/-/;
$ENV{'TERM'} = $config_xterm;
$ENV{'HOME'} = $uinfo[7];
chdir($dir || $uinfo[7] || "/");
my $shellcmd = $uinfo[8];