bug fix: mailscanner install

emailPremium/views.py

@@ -1190,7 +1190,6 @@ def MailScanner(request):
         if mailUtilities.checkIfMailScannerInstalled() == 1:
             checkIfMailScannerInstalled = 1
 
-
         return render(request, 'emailPremium/MailScanner.html',{'checkIfMailScannerInstalled': checkIfMailScannerInstalled, 'ipAddress': ipAddress})
 
     except KeyError:
@@ -1220,4 +1219,58 @@ def installMailScanner(request):
     except KeyError:
         final_dic = {'status': 0, 'error_message': "Not Logged In, please refresh the page or login again."}
         final_json = json.dumps(final_dic)
+        return HttpResponse(final_json)
+
+def installStatusMailScanner(request):
+    try:
+        userID = request.session['userID']
+        currentACL = ACLManager.loadedACL(userID)
+
+        if currentACL['admin'] == 1:
+            pass
+        else:
+            return ACLManager.loadErrorJson()
+
+        try:
+            if request.method == 'POST':
+
+                command = "sudo cat " + mailUtilities.spamassassinInstallLogPath
+                installStatus = ProcessUtilities.outputExecutioner(command)
+
+                if installStatus.find("[200]")>-1:
+
+                    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({
+                                             'abort':1,
+                                             'installed':0,
+                                             'error_message': "None",
+                                             'requestStatus': installStatus,
+                                             })
+                    return HttpResponse(final_json)
+
+                else:
+                    final_json = json.dumps({
+                                             'abort':0,
+                                             'error_message': "None",
+                                             'requestStatus': installStatus,
+                                             })
+                    return HttpResponse(final_json)
+
+
+        except BaseException as msg:
+            final_dic = {'abort':1,'installed':0, 'error_message': str(msg)}
+            final_json = json.dumps(final_dic)
+            return HttpResponse(final_json)
+    except KeyError:
+        final_dic = {'abort':1,'installed':0, 'error_message': "Not Logged In, please refresh the page or login again."}
+        final_json = json.dumps(final_dic)
         return HttpResponse(final_json)