Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-24 08:19:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.4.2' into v2.4.3

Browse Source
This commit is contained in:
usmannasir
2025-07-05 14:08:03 +05:00
parent f94df27dfb dd0d9f73c8
commit dbcbe5687d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plogical/processUtilities.py
View File

@@ -278,7 +278,7 @@ class ProcessUtilities(multi.Thread):
if len(currentData) == 0 or currentData == None:
break
try:
data = data + currentData.decode(errors = 'ignore')
data = data + currentData.decode('utf-8', errors='replace')
except BaseException as msg:
logging.writeToFile('Some data could not be decoded to str, error message: %s' % str(msg))
@@ -326,18 +326,19 @@ class ProcessUtilities(multi.Thread):
command = f'sudo -u {user} {command}'
# Ensure UTF-8 environment for proper character handling
env = os.environ.copy()
env['LC_ALL'] = 'en_US.UTF-8'
env['LANG'] = 'en_US.UTF-8'
env['LC_ALL'] = 'C.UTF-8'
env['LANG'] = 'C.UTF-8'
env['PYTHONIOENCODING'] = 'utf-8'
if shell == None or shell == True:
p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, encoding='utf-8', errors='replace')
else:
p = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
p = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, encoding='utf-8', errors='replace')
if retRequired:
return 1, p.communicate()[0].decode("utf-8")
return 1, p.communicate()[0]
else:
return p.communicate()[0].decode("utf-8")
return p.communicate()[0]
if type(command) == list:
command = " ".join(command)