diff --git a/CyberCP/secMiddleware.py b/CyberCP/secMiddleware.py index 39de0f2c6..47fd6a4bd 100755 --- a/CyberCP/secMiddleware.py +++ b/CyberCP/secMiddleware.py @@ -72,7 +72,7 @@ class secMiddleware: final_json = json.dumps(final_dic) return HttpResponse(final_json) - if request.build_absolute_uri().find('api/verifyConn') > -1 or request.build_absolute_uri().find('webhook') > -1 or request.build_absolute_uri().find('saveSpamAssassinConfigurations') > -1 or request.build_absolute_uri().find('docker') > -1 or request.build_absolute_uri().find('cloudAPI') > -1 or request.build_absolute_uri().find('verifyLogin') > -1 or request.build_absolute_uri().find('submitUserCreation') > -1: + if request.build_absolute_uri().find('api/remoteTransfer') > -1 or request.build_absolute_uri().find('api/verifyConn') > -1 or request.build_absolute_uri().find('webhook') > -1 or request.build_absolute_uri().find('saveSpamAssassinConfigurations') > -1 or request.build_absolute_uri().find('docker') > -1 or request.build_absolute_uri().find('cloudAPI') > -1 or request.build_absolute_uri().find('verifyLogin') > -1 or request.build_absolute_uri().find('submitUserCreation') > -1: continue if key == 'key' or key == 'cert' or key == 'recordContentAAAA' or key == 'backupDestinations' or key == 'ports' \ or key == 'imageByPass' or key == 'passwordByPass' or key == 'cronCommand' \ diff --git a/CyberCP/settings.py b/CyberCP/settings.py index ef8b84ed8..f20c69b48 100755 --- a/CyberCP/settings.py +++ b/CyberCP/settings.py @@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = 'xr%j*p!*$0d%(-(e%@-*hyoz4$f%y77coq0u)6pwmjg4)q&19f' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['*'] diff --git a/IncBackups/IncBackupsControl.py b/IncBackups/IncBackupsControl.py index 9534734a7..9d3509384 100644 --- a/IncBackups/IncBackupsControl.py +++ b/IncBackups/IncBackupsControl.py @@ -939,6 +939,4 @@ Subject: %s except BaseException as msg: logging.statusWriter(self.statusPath, "%s [903:DeleteSnapShot][5009]" % (str(msg)), 1) - return 0 - - + return 0 \ No newline at end of file diff --git a/README.md b/README.md index cf321f2e3..c18ea068a 100755 --- a/README.md +++ b/README.md @@ -1,33 +1,34 @@ # CyberPanel -Webhosting control panel that uses OpenLiteSpeed as web server. +Web Hosting Control Panel that uses OpenLiteSpeed as the underlying Web Server. -## Features +## Features & Services -* Different Level Of users. +* Different User Access Levels (via ACLs). * Auto SSL. * FTP Server. -* Light weight DNS Server (PowerDNS). -* PHPMYAdmin. -* Email Support (Rainloop). -* FileManager. +* Light-weight DNS Server (PowerDNS). +* phpMyAdmin to manage DBs (MariaDB). +* Email Support (SnappyMail). +* File Manager. * PHP Managment. -* Firewall (FirewallD & ConfigServer Firewall Intregration). -* One click Backup and Restore. +* Firewall (FirewallD & ConfigServer Firewall Integration). +* One-click Backups and Restores. -# Supported PHPs +# Supported PHP Versions -* PHP 5.3 -* PHP 5.4 -* PHP 5.5 -* PHP 5.6 -* PHP 7.0 -* PHP 7.1 -* PHP 7.2 -* PHP 7.3 -* PHP 7.4 -* PHP 8.0 * PHP 8.1 +* PHP 8.0 +* PHP 7.4 +* PHP 7.3 +* PHP 7.2 +* PHP 7.1 +* PHP 7.0 +* PHP 5.6 +* PHP 5.5 +* PHP 5.4 +* PHP 5.3 + # Installation Instructions @@ -36,7 +37,7 @@ Webhosting control panel that uses OpenLiteSpeed as web server. sh <(curl https://cyberpanel.net/install.sh || wget -O - https://cyberpanel.net/install.sh) ``` -# Upgrading +# Upgrading CyberPanel ``` @@ -46,8 +47,10 @@ sh <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgr # Resources * [Official Site.](https://cyberpanel.net) -* [Documentation.](https://docs.cyberpanel.net) -* [Forums.](https://forums.cyberpanel.net) +* [Docs (Old).](https://docs.cyberpanel.net) +* [Docs (New).](https://community.cyberpanel.net/docs) +* [Changelog.](https://community.cyberpanel.net/t/change-logs/161) +* [Forums.](https://community.cyberpanel.net) * [Discord.](https://discord.gg/g8k8Db3) * [Facebook Group.](https://www.facebook.com/groups/cyberpanel) - +* [YouTube Channel.](https://www.youtube.com/channel/UCS6sgUWEhaFl1TO238Ck0xw) diff --git a/README.md.bak b/README.md.bak new file mode 100644 index 000000000..ff9c97e70 --- /dev/null +++ b/README.md.bak @@ -0,0 +1,52 @@ +# CyberPanel + +Webhosting control panel that uses OpenLiteSpeed as web server. + +## Features + +* Different Level Of users. +* Auto SSL. +* FTP Server. +* Light weight DNS Server (PowerDNS). +* PHPMYAdmin. +* Email Support (Rainloop). +* FileManager. +* PHP Managment. +* Firewall (FirewallD & ConfigServer Firewall Intregration). +* One click Backup and Restore. + +# Supported PHPs + +* PHP 5.3 +* PHP 5.4 +* PHP 5.5 +* PHP 5.6 +* PHP 7.0 +* PHP 7.1 +* PHP 7.2 +* PHP 7.3 +* PHP 7.4 +* PHP 8.0 + +# Installation Instructions + + +``` +sh <(curl https://cyberpanel.net/install.sh || wget -O - https://cyberpanel.net/install.sh) +``` + +# Upgrading + + +``` +sh <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preUpgrade.sh) +``` + +# Resources + +* [Official Site.](https://cyberpanel.net) +* [Documentation.](https://docs.cyberpanel.net) +* [Forums.](https://forums.cyberpanel.net) +* [Discord.](https://discord.gg/g8k8Db3) +* [Facebook Group.](https://www.facebook.com/groups/cyberpanel) + diff --git a/api/views.py b/api/views.py index 8c61fa691..257648f27 100755 --- a/api/views.py +++ b/api/views.py @@ -435,10 +435,14 @@ def remoteTransfer(request): ## Accounts to transfer is a path to file, containing accounts. + execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/remoteTransferUtilities.py" - execPath = execPath + " remoteTransfer --ipAddress " + ipAddress + " --dir " + dir + " --accountsToTransfer " + path + execPath = execPath + " remoteTransfer --ipAddress " + ipAddress.rstrip('\n') + " --dir " + dir + " --accountsToTransfer " + path ProcessUtilities.popenExecutioner(execPath) + if os.path.exists('/usr/local/CyberCP/debug'): + logging.writeToFile('Repor of %s' % repr(execPath)) + return HttpResponse(json.dumps({"transferStatus": 1, "dir": dir})) ## diff --git a/backup/backupManager.py b/backup/backupManager.py index c4bc4a788..c42a80d32 100755 --- a/backup/backupManager.py +++ b/backup/backupManager.py @@ -1163,6 +1163,10 @@ class BackupManager: r = requests.post(url, data=finalData, verify=False) + if os.path.exists('/usr/local/CyberCP/debug'): + message = 'Remote transfer initiation status: %s' % (r.text) + logging.CyberCPLogFileWriter.writeToFile(message) + data = json.loads(r.text) if data['transferStatus'] == 1: diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index b84d941e8..b7309d3f8 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -297,31 +297,31 @@