Skip to content

Commit 2584834

Browse files
meramseymeramsey
committed
Fix Dates. Improve CSF integration. Fix Typos
1 parent 99c0c5a commit 2584834

41 files changed

Lines changed: 379 additions & 108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎IncBackups/IncBackupsControl.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
pass
1313
import threading as multi
1414
from plogical.processUtilities import ProcessUtilities
15-
from IncBackups.models import IncJob, JobSnapshots
15+
from models import IncJob, JobSnapshots
1616
from websiteFunctions.models import Websites
1717
import plogical.randomPassword as randomPassword
1818
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
@@ -316,7 +316,7 @@ def prettify(elem):
316316
reparsed = minidom.parseString(rough_string)
317317
return reparsed.toprettyxml(indent=" ")
318318

319-
## /home/example.com/backup/backup-example-06-50-03-Thu-Feb-2018/meta.xml -- metaPath
319+
## /home/example.com/backup/backup-example.com-02.13.2018_10-24-52/meta.xml -- metaPath
320320

321321
metaPath = '/home/cyberpanel/%s' % (str(randint(1000, 9999)))
322322

@@ -538,4 +538,4 @@ def createBackup(self):
538538
except:
539539
pass
540540

541-
logging.statusWriter(self.statusPath, 'Completed', 1)
541+
logging.statusWriter(self.statusPath, 'Completed', 1)

‎IncBackups/static/IncBackups/IncBackups.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,4 +491,4 @@ app.controller('incrementalDestinations', function ($scope, $http) {
491491
};
492492

493493

494-
});
494+
});

‎IncBackups/templates/IncBackups/createBackup.html‎

100755100644
File mode changed.

‎backup/backupManager.py‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ def submitBackupCreation(self, userID = None, data = None):
142142

143143
## /home/example.com/backup
144144
backupPath = os.path.join("/home", backupDomain, "backup/")
145-
domainUser = website.externalApp
146-
backupName = 'backup-' + domainUser + "-" + time.strftime("%I-%M-%S-%a-%b-%Y")
145+
backupDomainName = data['websiteToBeBacked']
146+
backupName = 'backup-' + backupDomainName + "-" + time.strftime("%m.%d.%Y_%H-%M-%S")
147147

148-
## /home/example.com/backup/backup-example-06-50-03-Thu-Feb-2018
148+
## /home/example.com/backup/backup-example.com-02.13.2018_10-24-52
149149
tempStoragePath = os.path.join(backupPath, backupName)
150150

151151

‎baseTemplate/templates/baseTemplate/index.html‎

100755100644
File mode changed.

‎cli/cliLogger.py‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def writeforCLI(message, level, method):
1010
try:
1111
file = open(cliLogger.fileName, 'a')
1212
file.writelines("[" + time.strftime(
13-
"%I-%M-%S-%a-%b-%Y") + "] [" + level + ":" + method + "] " + message + "\n")
13+
"%m.%d.%Y_%H-%M-%S") + "] [" + level + ":" + method + "] " + message + "\n")
1414
file.close()
1515
file.close()
1616
except IOError:

‎emailPremium/templates/emailPremium/emailPage.html‎

100755100644
File mode changed.

‎emailPremium/templates/emailPremium/listDomains.html‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="container">
1212

1313
<div id="page-title">
14-
<h2 id="domainNamePage">{% trans "List Domains" %} - <a target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Emai Limits Docs" %}</span></a></h2>
14+
<h2 id="domainNamePage">{% trans "List Domains" %} - <a target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Email Limits Docs" %}</span></a></h2>
1515
<p>{% trans "On this page you manage emails limits for Domains/Email Addresses" %}</p>
1616
</div>
1717

‎emailPremium/templates/emailPremium/policyServer.html‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<div class="container">
1212
<div id="page-title">
13-
<h2>{% trans "Email Policy Server Configurations!" %} - <a target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Emai Limits Docs" %}</span></a> </h2>
13+
<h2>{% trans "Email Policy Server Configurations!" %} - <a target="_blank" href="http://go.cyberpanel.net/emailLimits" style="height: 23px;line-height: 21px;" class="btn btn-border btn-alt border-red btn-link font-red" title=""><span>{% trans "Email Limits Docs" %}</span></a> </h2>
1414
<p>{% trans "Turn ON Email Policy Server to use Email Limits Feature. " %}</p>
1515
</div>
1616

‎firewall/templates/firewall/index.html‎

100755100644
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,52 @@ <h3 class="content-box-header">
4343
</a>
4444
</div>
4545

46+
<div class="col-lg-5 col-md-6 btn-min-width">
47+
<a href="{% url 'csf' %}" title="{% trans 'ConfigServer Security & Firewall (CSF)' %}" class="tile-box tile-box-shortcut btn-primary">
48+
<div class="tile-header">
49+
{% trans "CSF" %}
50+
</div>
51+
<div class="tile-content-wrapper">
52+
<i class="fa fa-lock"></i>
53+
</div>
54+
</a>
55+
</div>
56+
57+
<div class="col-lg-5 col-md-6 btn-min-width">
58+
<a href="{% url 'modSecurity' %}" title="{% trans 'ModSecurity Configurations' %}" class="tile-box tile-box-shortcut btn-primary">
59+
<div class="tile-header">
60+
{% trans "ModSecurity Conf" %}
61+
</div>
62+
<div class="tile-content-wrapper">
63+
<i class="fa fa-lock"></i>
64+
</div>
65+
</a>
66+
</div>
67+
68+
<div class="col-lg-5 col-md-6 btn-min-width">
69+
<a href="{% url 'modSecRules' %}" title="{% trans 'ModSecurity Rules' %}" class="tile-box tile-box-shortcut btn-primary">
70+
<div class="tile-header">
71+
{% trans "ModSecurity Rules" %}
72+
</div>
73+
<div class="tile-content-wrapper">
74+
<i class="fa fa-lock"></i>
75+
</div>
76+
</a>
77+
</div>
78+
79+
<div class="col-lg-5 col-md-6 btn-min-width">
80+
<a href="{% url 'modSecRulesPacks' %}" title="{% trans 'ModSecurity Rules Packs' %}" class="tile-box tile-box-shortcut btn-primary">
81+
<div class="tile-header">
82+
{% trans "ModSecurity Rules Packs" %}
83+
</div>
84+
<div class="tile-content-wrapper">
85+
<i class="fa fa-lock"></i>
86+
</div>
87+
</a>
88+
</div>
89+
90+
91+
4692

4793
</div>
4894
</div>

0 commit comments

Comments
 (0)