From b3da16d5cf5bc7d1b95a1682ec35413e00875c62 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Mon, 9 Dec 2019 21:59:49 +0500
Subject: [PATCH] bug fix: install and SpamAssassin

---
 WebTerminal/CPWebSocket.py |  2 +-
 emailPremium/views.py      | 17 ++++++++---------
 install/install.py         |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/WebTerminal/CPWebSocket.py b/WebTerminal/CPWebSocket.py
index b378f959e..c5630561b 100644
--- a/WebTerminal/CPWebSocket.py
+++ b/WebTerminal/CPWebSocket.py
@@ -79,7 +79,7 @@ class SSHServer(multi.Thread):
                                 else:
                                     self.websocket.sendMessage(self.shell.recv(9000).decode("utf-8"))
                             else:
-                                time.sleep(0.01)
+                                pass
                 else:
                     return 0
             except BaseException, msg:
diff --git a/emailPremium/views.py b/emailPremium/views.py
index 4fc057156..1ba9a7ab7 100755
--- a/emailPremium/views.py
+++ b/emailPremium/views.py
@@ -827,12 +827,18 @@ def installStatusSpamAssassin(request):
 
                 if installStatus.find("[200]")>-1:
 
-                    execPath = "/usr/local/CyberCP/bin/python2 " + virtualHostUtilities.cyberPanel + "/plogical/mailUtilities.py"
+                    execPath = "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin  && /usr/local/CyberCP/bin/python2 " + virtualHostUtilities.cyberPanel + "/plogical/mailUtilities.py"
                     execPath = execPath + " configureSpamAssassin"
                     output = ProcessUtilities.outputExecutioner(execPath)
 
                     if output.find("1,None") > -1:
-                        pass
+                        final_json = json.dumps({
+                            'error_message': "None",
+                            'requestStatus': installStatus,
+                            'abort': 1,
+                            'installed': 1,
+                        })
+                        return HttpResponse(final_json)
                     else:
                         final_json = json.dumps({
                             'error_message': "Failed to install SpamAssassin configurations.",
@@ -842,13 +848,6 @@ def installStatusSpamAssassin(request):
                         })
                         return HttpResponse(final_json)
 
-                    final_json = json.dumps({
-                                             'error_message': "None",
-                                             'requestStatus': installStatus,
-                                             'abort':1,
-                                             'installed': 1,
-                                             })
-                    return HttpResponse(final_json)
                 elif installStatus.find("[404]") > -1:
 
                     final_json = json.dumps({
diff --git a/install/install.py b/install/install.py
index 293f7012b..ccbbabe0c 100755
--- a/install/install.py
+++ b/install/install.py
@@ -2240,8 +2240,8 @@ def main():
     checks = preFlightsChecks("/usr/local/lsws/", args.publicip, "/usr/local", cwd, "/usr/local/CyberCP", distro)
     checks.mountTemp()
 
-    if distro == ubuntu:
-        os.chdir("/etc/cyberpanel")
+#    if distro == ubuntu:
+#        os.chdir("/etc/cyberpanel")
 
     if args.port == None:
         port = "8090"