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

bug fix: improve size for smtphost

Browse Source
This commit is contained in:
Usman Nasir
2020-09-15 09:35:55 +05:00
parent 6e076aac5e
commit 935293621f
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cloudAPI/cloudManager.py
View File

@@ -62,13 +62,30 @@ class CloudManager:
try:
try:
selectedACL = ACL.objects.get(name='user')
UserAccountName = self.data['UserAccountName']
UserPassword = self.data['UserPassword']
FullName = self.data['FullName']
token = hashPassword.generateToken(UserAccountName, UserPassword)
password = hashPassword.hash_password(UserPassword)
try:
initWebsitesLimit = int(self.data['websitesLimit'])
except:
initWebsitesLimit = 10
try:
acl = self.data['acl']
selectedACL = ACL.objects.get(name=acl)
except:
selectedACL = ACL.objects.get(name='user')
try:
apiAccess = int(self.data['api'])
except:
apiAccess = 10
try:
newAdmin = Administrator(firstName=FullName,
lastName="",
@@ -76,10 +93,11 @@ class CloudManager:
type=3,
userName=UserAccountName,
password=password,
initWebsitesLimit=10,
initWebsitesLimit=initWebsitesLimit,
owner=1,
acl=selectedACL,
token=token
token=token,
api=apiAccess
)
newAdmin.save()
except BaseException as msg:

4
emailMarketing/models.py
View File

@@ -29,8 +29,8 @@ class SMTPHosts(models.Model):
owner = models.ForeignKey(Administrator, on_delete=models.CASCADE)
host = models.CharField(max_length=150, unique= True)
port = models.CharField(max_length=10)
userName = models.CharField(max_length=50)
password = models.CharField(max_length=50)
userName = models.CharField(max_length=200)
password = models.CharField(max_length=200)
class EmailTemplate(models.Model):
owner = models.ForeignKey(Administrator, on_delete=models.CASCADE)

10
plogical/upgrade.py
View File

@@ -622,6 +622,16 @@ imap_folder_list_limit = 0
except:
pass
try:
cursor.execute("ALTER TABLE emailMarketing_smtphosts MODIFY userName varchar(200)")
except:
pass
try:
cursor.execute("ALTER TABLE emailMarketing_smtphosts MODIFY password varchar(200)")
except:
pass
try:
cursor.execute("ALTER TABLE websiteFunctions_backups MODIFY fileName varchar(200)")
except:

19
userManagment/views.py
View File

@@ -438,12 +438,31 @@ def submitUserDeletion(request):
accountUsername = data['accountUsername']
try:
force = data['force']
except:
force = 0
currentACL = ACLManager.loadedACL(userID)
currentUser = Administrator.objects.get(pk=userID)
userInQuestion = Administrator.objects.get(userName=accountUsername)
if ACLManager.checkUserOwnerShip(currentACL, currentUser, userInQuestion):
if force:
userACL = ACLManager.loadedACL(userInQuestion.pk)
websitesName = ACLManager.findAllSites(userACL, userInQuestion.pk)
from websiteFunctions.website import WebsiteManager
wm = WebsiteManager()
for website in websitesName:
wm.submitWebsiteDeletion(userID, {'websiteName': website})
user = Administrator.objects.get(userName=accountUsername)
childUsers = Administrator.objects.filter(owner=user.pk)