Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 22:06:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: joomla install

Browse Source
This commit is contained in:
Usman Nasir
2020-02-02 16:11:09 +05:00
parent 26261ce422
commit 8b99e35872
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plogical/applicationInstaller.py
View File

@@ -897,7 +897,7 @@ class ApplicationInstaller(multi.Thread):
VALUES (LAST_INSERT_ID(),'8');""" % (prefix, username, password, prefix)
out, err = proc.communicate(
file(finalPath + 'installation/sql/mysql/joomlaInstall.sql').read() + "\n" + usercreation)
open(finalPath + 'installation/sql/mysql/joomlaInstall.sql', 'rb').read() + ("\n" + usercreation).encode('utf-8'))
shutil.rmtree(finalPath + "installation")

2
websiteFunctions/website.py
View File

@@ -1963,7 +1963,7 @@ class WebsiteManager:
## Installation
salt = randomPassword.generate_pass(32)
# return salt
password_hash = hashlib.md5(password + salt).hexdigest()
password_hash = hashlib.md5((password + salt).encode('utf-8')).hexdigest()
password = password_hash + ":" + salt
statusFile = open(tempStatusPath, 'w')