diff --git a/emailMarketing/emailMarketing.py b/emailMarketing/emailMarketing.py index 701a4a24b..7d0a88548 100755 --- a/emailMarketing/emailMarketing.py +++ b/emailMarketing/emailMarketing.py @@ -5,13 +5,12 @@ import time import csv import re import plogical.CyberCPLogFileWriter as logging -from .emailMarketing.models import EmailMarketing, EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts +from .models import EmailMarketing, EmailLists, EmailsInList, EmailTemplate, EmailJobs, SMTPHosts from websiteFunctions.models import Websites import threading as multi import socket, smtplib import DNS from random import randint -import subprocess, shlex from plogical.processUtilities import ProcessUtilities class emailMarketing(multi.Thread): diff --git a/install/install.py b/install/install.py index 818a6da4f..5eb8b4070 100755 --- a/install/install.py +++ b/install/install.py @@ -1931,48 +1931,6 @@ milter_default_action = accept command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel" preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR) - ## - - #command = "pip3.6 install virtualenv" - #preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR) - - #### - - command = "python3.6 -m venv --system-site-packages /usr/local/CyberCP" - preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR) - - ## - - env_path = '/usr/local/CyberCP' - subprocess.call(['virtualenv', env_path]) - activate_this = os.path.join(env_path, 'bin', 'activate_this.py') - exec(compile(open(activate_this, "rb").read(), activate_this, 'exec'), dict(__file__=activate_this)) - - ## - - install_file = '/usr/local/CyberCP/requirments.txt' - if distro == ubuntu and get_Ubuntu_release() < 18.04: - install_file_new = '/usr/local/CyberCP/requirements.txt' - fd = open(install_file, 'r') - fd_new = open(install_file_new, 'w') - lines = fd.readlines() - for line in lines: - if line[:6] != 'pycurl' and line[:7] != 'pygpgme': - fd_new.write(line) - fd.close() - fd_new.close() - preFlightsChecks.stdOut("Install updated " + install_file_new, 1) - install_file = install_file_new - - command = "pip3.6 install --ignore-installed -r " + install_file - preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR) - - command = "python3.6 -m venv /usr/local/CyberCP" - preFlightsChecks.call(command, distro, command, command, 1, 0, os.EX_OSERR) - - command = "ln -s /usr/local/CyberCP/bin/python /usr/local/CyberCP/bin/python2" - preFlightsChecks.call(command, distro, command, command, 1, 0, os.EX_OSERR) - except OSError as msg: logging.InstallLog.writeToFile('[ERROR] ' + str(msg) + " [setupVirtualEnv]") return 0 diff --git a/install/lscp.tar.gz b/install/lscp.tar.gz index 374600cd0..fc59b3081 100644 Binary files a/install/lscp.tar.gz and b/install/lscp.tar.gz differ diff --git a/managePHP/views.py b/managePHP/views.py index e145b10bf..08a4391e4 100755 --- a/managePHP/views.py +++ b/managePHP/views.py @@ -4,7 +4,6 @@ import sys import importlib importlib.reload(sys) -sys.setdefaultencoding("utf-8") from django.shortcuts import render, redirect from loginSystem.views import loadLoginPage from .models import PHP, installedPackages, ApachePHP, installedPackagesApache diff --git a/requirments.txt b/requirments.txt index 1e3353fed..f047f9c59 100755 --- a/requirments.txt +++ b/requirments.txt @@ -1,22 +1,25 @@ acme==0.21.1 asn1crypto==0.24.0 Babel==0.9.6 -bcrypt==3.1.7 backports.ssl-match-hostname==3.5.0.1 +bcrypt==3.1.7 boto3==1.9.64 botocore==1.12.64 certbot==0.21.1 certifi==2018.4.16 cffi==1.11.5 chardet==3.0.4 +ConfigArgParse==0.15.2 +configobj==5.0.6 cryptography==2.8 decorator==3.4.0 +Django==1.11 docker==3.6.0 docker-pycreds==0.4.0 -Django==1.11 docutils==0.14 enum34==1.1.6 funcsigs==1.0.2 +future==0.18.2 idna==2.6 ipaddress==1.0.16 IPy==0.75 @@ -26,21 +29,22 @@ josepy==1.1.0 jsonpatch==1.2 jsonpointer==1.9 MarkupSafe==0.11 -mysqlclient==1.4.6 mock==2.0.0 +mysqlclient==1.4.6 +paramiko==2.6.0 parsedatetime==2.4 pbr==4.0.4 pexpect==4.4.0 prettytable==0.7.2 psutil==5.4.3 ptyprocess==0.6.0 +py3dns==3.2.1 pycparser==2.18 pygpgme==0.3 +PyNaCl==1.3.0 pyOpenSSL==17.5.0 pyRFC3339==1.1 -pyserial==2.6 -paramiko==2.6.0 -SimpleWebSocketServer==0.1.1 +pyserial-py3k==2.6 python-dateutil==2.7.5 pytz==2018.4 pyudev==0.15 @@ -49,9 +53,11 @@ PyYAML==3.10 requests==2.18.4 requests-file==1.4.3 s3transfer==0.1.13 -six==1.9.0 +SimpleWebSocketServer==0.1.1 +six==1.13.0 tldextract==2.2.0 urllib3==1.22 +websocket-client==0.56.0 zope.component==4.4.1 zope.event==4.3.0 zope.interface==4.5.0 \ No newline at end of file diff --git a/serverLogs/views.py b/serverLogs/views.py index ca171fe6e..70acc2847 100755 --- a/serverLogs/views.py +++ b/serverLogs/views.py @@ -136,7 +136,7 @@ def getLogsFromFile(request): else: fileName = "/var/log/mail.log" elif type == "ftp": - if ProcessUtilities.decideDistro() == ProcessUtilities.centos: + if ProcessUtilities.decideDistro() == ProcessUtilities.centos: fileName = "/var/log/messages" else: fileName = "/var/log/syslog"