From 441ff3723a3b34ed6399ef4486402eb385575f18 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 29 Jan 2020 14:47:31 +0500
Subject: [PATCH] bug fix: cron email

---
 plogical/mailUtilities.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py
index 9034ef71b..598ddedad 100755
--- a/plogical/mailUtilities.py
+++ b/plogical/mailUtilities.py
@@ -13,8 +13,7 @@ import subprocess
 import argparse
 import shlex
 from plogical.processUtilities import ProcessUtilities
-import os, getpass
-import hashlib
+import os
 import bcrypt
 import getpass
 import smtplib
@@ -381,20 +380,22 @@ milter_default_action = accept
                 FNULL = open(os.devnull, 'w')
 
                 if getpass.getuser() == 'root':
-                    command = "sudo mkdir " + mailUtilities.cyberPanelHome
-                    subprocess.call(shlex.split(command), stdout=FNULL)
+                    if not os.path.exists(mailUtilities.cyberPanelHome):
+                        command = "mkdir " + mailUtilities.cyberPanelHome
+                        subprocess.call(shlex.split(command), stdout=FNULL)
 
-                    command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
-                    subprocess.call(shlex.split(command), stdout=FNULL)
+                        command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
+                        subprocess.call(shlex.split(command), stdout=FNULL)
                 else:
-                    command = "sudo mkdir " + mailUtilities.cyberPanelHome
-                    ProcessUtilities.executioner(command)
+                    if not os.path.exists(mailUtilities.cyberPanelHome):
+                        command = "mkdir " + mailUtilities.cyberPanelHome
+                        ProcessUtilities.executioner(command)
 
-                    command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
-                    ProcessUtilities.executioner(command)
+                        command = "chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
+                        ProcessUtilities.executioner(command)
             except:
                 FNULL = open(os.devnull, 'w')
-                command = "sudo chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
+                command = "chown -R cyberpanel:cyberpanel " + mailUtilities.cyberPanelHome
                 subprocess.call(shlex.split(command), stdout=FNULL)
 
         except BaseException as msg: