Skip to content

Commit b26ad92

Browse files
committed
bug fix to cPanel Importer: DNS
1 parent 438f167 commit b26ad92

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

plogical/cPanelImporter.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,10 +539,18 @@ def CreateDNSRecords(self):
539539
RecordsData[4] = ipAddress
540540

541541
if RecordsData[0].find(topLevelDomain) > -1:
542-
DNS.createDNSRecord(zone, RecordsData[0].replace('.', ''), RecordsData[3], RecordsData[4], 0, RecordsData[1])
542+
if RecordsData[3] == 'MX':
543+
DNS.createDNSRecord(zone, RecordsData[0].rstrip('.'), RecordsData[3],RecordsData[5].rstrip('.').rstrip('.\n'), int(RecordsData[4]), RecordsData[1])
544+
else:
545+
DNS.createDNSRecord(zone, RecordsData[0].rstrip('.'), RecordsData[3], RecordsData[4].rstrip('.').rstrip('.\n'), 0, RecordsData[1])
543546
else:
544-
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain , RecordsData[3], RecordsData[4], 0,
545-
RecordsData[1])
547+
if RecordsData[3] == 'MX':
548+
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain, RecordsData[3],
549+
RecordsData[5].rstrip('.').rstrip('.\n'), RecordsData[4],
550+
RecordsData[1])
551+
else:
552+
DNS.createDNSRecord(zone, RecordsData[0] + '.' + topLevelDomain , RecordsData[3], RecordsData[4].rstrip('.').rstrip('.\n'), 0,
553+
RecordsData[1])
546554
except BaseException, msg:
547555
message = 'Failed while creating DNS entry for %s, error message: %s.' % (topLevelDomain, str(msg))
548556
logging.statusWriter(self.logFile, message, 1)

websiteFunctions/templates/websiteFunctions/listWebsites.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h2 style="display: inline; color: #414C59;" ng-bind="web.domain"></h2>
7878

7979
<div class="col-md-4 content-box-header">
8080
<i class="p fa fa-hdd-o btn-icon text-muted" data-toggle="tooltip" data-placement="right"
81-
title="Email">&emsp;</i>
81+
title="Disk Usage">&emsp;</i>
8282
<span ng-bind="web.diskUsed" style="text-transform: none"></span>
8383
</div>
8484

websiteFunctions/website.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,8 +2049,11 @@ def searchWebsitesJson(self, currentlACL, userID, searchTerm):
20492049
state = "Suspended"
20502050
else:
20512051
state = "Active"
2052+
2053+
diskUsed = "%sMB" % str(
2054+
virtualHostUtilities.getDiskUsage("/home/" + items.domain, items.package.diskSpace)[0])
20522055
dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress,
2053-
'admin': items.admin.userName, 'package': items.package.packageName, 'state': state}
2056+
'admin': items.admin.userName, 'package': items.package.packageName, 'state': state, 'diskUsed': diskUsed}
20542057

20552058
if checker == 0:
20562059
json_data = json_data + json.dumps(dic)

0 commit comments

Comments
 (0)