Merge branch 'stable' into v1.9.4

cyberpanel.sh

@@ -1168,7 +1168,7 @@ systemctl restart lscpd
 systemctl restart lsws
 echo "/usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password \$@" > /usr/bin/adminPass
 echo "systemctl restart lscpd" >> /usr/bin/adminPass
-chmod +x /usr/bin/adminPass
+chmod 700 /usr/bin/adminPass
 if [[ $VERSION = "OLS" ]] ; then
 	WORD="OpenLiteSpeed"
 #	sed -i 's|maxConnections               10000|maxConnections               100000|g' /usr/local/lsws/conf/httpd_config.conf

ftp/ftpManager.py

@@ -180,7 +180,9 @@ class FTPManager:
             admin = Administrator.objects.get(pk=userID)
             ftp = Users.objects.get(user=ftpUserName)
 
-            if ftp.domain.admin != admin:
+            if ACLManager.checkOwnership(ftp.domain.domain, admin, currentACL) == 1:
+                pass
+            else:
                 return ACLManager.loadErrorJson()
 
             FTPUtilities.submitFTPDeletion(ftpUserName)

preUpgrade.sh

@@ -98,6 +98,8 @@ cd wsgi-lsapi-1.4
 make
 cp lswsgi /usr/local/CyberCP/bin/
 
+chmod 700 /usr/bin/adminPass
+
 ##
 systemctl restart lscpd