- {% trans "Websites" %}
+ {% trans "Plugins" %}
@@ -80,4 +80,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/pluginHolder/views.py b/pluginHolder/views.py
index a290bfa2b..859d48216 100644
--- a/pluginHolder/views.py
+++ b/pluginHolder/views.py
@@ -13,17 +13,18 @@ def installed(request):
pluginPath = '/home/cyberpanel/plugins'
pluginList = []
- for plugin in os.listdir(pluginPath):
- data = {}
- completePath = '/usr/local/CyberCP/' + plugin + '/meta.xml'
- pluginMetaData = ElementTree.parse(completePath)
+ if os.path.exists(pluginPath):
+ for plugin in os.listdir(pluginPath):
+ data = {}
+ completePath = '/usr/local/CyberCP/' + plugin + '/meta.xml'
+ pluginMetaData = ElementTree.parse(completePath)
- data['name'] = pluginMetaData.find('name').text
- data['type'] = pluginMetaData.find('type').text
- data['desc'] = pluginMetaData.find('description').text
- data['version'] = pluginMetaData.find('version').text
+ data['name'] = pluginMetaData.find('name').text
+ data['type'] = pluginMetaData.find('type').text
+ data['desc'] = pluginMetaData.find('description').text
+ data['version'] = pluginMetaData.find('version').text
- pluginList.append(data)
+ pluginList.append(data)
return render(request, 'pluginHolder/plugins.html',{'plugins': pluginList})
diff --git a/postfixSenderPolicy/accept_traffic.py b/postfixSenderPolicy/accept_traffic.py
index acc693693..7986fdd5e 100755
--- a/postfixSenderPolicy/accept_traffic.py
+++ b/postfixSenderPolicy/accept_traffic.py
@@ -69,9 +69,7 @@ class HandleRequest(multi.Thread):
def manageRequest(self, completeData):
try:
-
completeData = completeData.split('\n')
-
for items in completeData:
tempData = items.split('=')
if tempData[0] == 'sasl_username':
@@ -81,6 +79,9 @@ class HandleRequest(multi.Thread):
emailAddress = tempData[1]
domainName = emailAddress.split('@')[1]
elif tempData[0] == 'recipient':
+ if len(tempData[1]) == 0:
+ self.connection.sendall('action=dunno\n\n')
+ return
destination = tempData[1]
diff --git a/postfixSenderPolicy/startServer.py b/postfixSenderPolicy/startServer.py
index b7b9bd7b3..7a9ea5fb0 100755
--- a/postfixSenderPolicy/startServer.py
+++ b/postfixSenderPolicy/startServer.py
@@ -39,7 +39,6 @@ class SetupConn:
uid = pwd.getpwnam("postfix").pw_uid
gid = grp.getgrnam("postfix").gr_gid
os.chown(self.server_addr, uid, gid)
-
os.chmod(self.server_addr, 0755)
logging.writeToFile('CyberPanel Email Policy Server Successfully started!')
diff --git a/serverStatus/templates/serverStatus/services.html b/serverStatus/templates/serverStatus/services.html
index 66ae3dce5..54ed94e0f 100644
--- a/serverStatus/templates/serverStatus/services.html
+++ b/serverStatus/templates/serverStatus/services.html
@@ -35,7 +35,7 @@
-
LiteSpeed Ent
+ OpenLiteSpeed
Stopped