From 84df65fb440a18385ba95399c994cccafdf18dd4 Mon Sep 17 00:00:00 2001 From: Numeriku Date: Sun, 29 Dec 2019 18:22:50 +0800 Subject: [PATCH 1/8] Add PHP 7.4 Add PHP 7.4 to list of supported PHP. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index daa0159df..fa624628a 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Webhosting control panel that uses OpenLiteSpeed as web server. * Email Support (Rainloop). * FileManager. * PHP Managment. -* Firewall. +* Firewall (FirewallD & ConfigServer Firewall Intregration). * One click Backup and Restore. # Supported PHPs @@ -25,6 +25,7 @@ Webhosting control panel that uses OpenLiteSpeed as web server. * PHP 7.1 * PHP 7.2 * PHP 7.3 +* PHP 7.4 # Installation Instructions From 69811b634c1b78fbdebc5b4cae0bfc321ed27ba4 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 29 Dec 2019 22:35:12 +0500 Subject: [PATCH 2/8] bug fix: install lsphp73 --- install/installCyberPanel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 075989f76..3201fe8bc 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -188,6 +188,8 @@ class InstallCyberPanel: 'lsphp73-odbc lsphp73-mysqlnd lsphp73-mcrypt lsphp73-mbstring lsphp73-ldap lsphp73-intl lsphp73-imap ' \ 'lsphp73-gmp lsphp73-gd lsphp73-enchant lsphp73-dba lsphp73-common lsphp73-bcmath' + install.preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) + ## only php 74 command = 'yum install -y lsphp74 lsphp74-json lsphp74-xmlrpc lsphp74-xml lsphp74-tidy lsphp74-soap lsphp74-snmp ' \ 'lsphp74-recode lsphp74-pspell lsphp74-process lsphp74-pgsql lsphp74-pear lsphp74-pdo lsphp74-opcache ' \ From 23ce41a5dade8e5824cba48d2c315b1d68c07d1a Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 14:48:10 +0500 Subject: [PATCH 3/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 create file via enter --- filemanager/static/filemanager/js/fileManager.js | 13 +++++++++++++ filemanager/templates/filemanager/index.html | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index e21eafd01..27d971fb4 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -25,6 +25,10 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) { fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) { + $('form').submit(function(e){ + e.preventDefault(); +}); + $(document.body).click(function () { rightClickNode.style.display = "none"; }); @@ -921,6 +925,15 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFile').modal('show'); }; + $scope.createFileEnter = function($event){ + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFile(); + } + + }; + $scope.createNewFile = function () { var completePathForFile = $scope.currentPath + "/" + $scope.newFileName; diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html index 3ef955cd1..6b7dd0479 100755 --- a/filemanager/templates/filemanager/index.html +++ b/filemanager/templates/filemanager/index.html @@ -372,7 +372,7 @@
- + {% trans "File will be created in your current directory, if it already exists it will not overwirte." %}
From 81e0ea14bc424d3a8d6dfb3e06e71aa48a94e988 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 14:48:49 +0500 Subject: [PATCH 4/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 create file via enter --- static/filemanager/js/fileManager.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js index e21eafd01..27d971fb4 100644 --- a/static/filemanager/js/fileManager.js +++ b/static/filemanager/js/fileManager.js @@ -25,6 +25,10 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) { fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) { + $('form').submit(function(e){ + e.preventDefault(); +}); + $(document.body).click(function () { rightClickNode.style.display = "none"; }); @@ -921,6 +925,15 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFile').modal('show'); }; + $scope.createFileEnter = function($event){ + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFile(); + } + + }; + $scope.createNewFile = function () { var completePathForFile = $scope.currentPath + "/" + $scope.newFileName; From e701cde064b2f40392f901b8d81c8c1c2254a5ed Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 14:57:45 +0500 Subject: [PATCH 5/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 create folder via enter --- .../static/filemanager/js/fileManager.js | 28 ++++++++++++------- filemanager/templates/filemanager/index.html | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index 27d971fb4..56e8144c2 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -25,9 +25,9 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) { fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) { - $('form').submit(function(e){ - e.preventDefault(); -}); + $('form').submit(function (e) { + e.preventDefault(); + }); $(document.body).click(function () { rightClickNode.style.display = "none"; @@ -865,6 +865,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFolder').modal('show'); }; + $scope.createFolderEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFolder(); + } + }; + $scope.createNewFolder = function () { $scope.errorMessageFolder = true; @@ -925,14 +933,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFile').modal('show'); }; - $scope.createFileEnter = function($event){ - var keyCode = $event.which || $event.keyCode; - if (keyCode === 13) { - $scope.htmlEditorLoading = false; - $scope.createNewFile(); - } + $scope.createFileEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFile(); + } - }; + }; $scope.createNewFile = function () { diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html index 6b7dd0479..e5b011acb 100755 --- a/filemanager/templates/filemanager/index.html +++ b/filemanager/templates/filemanager/index.html @@ -328,7 +328,7 @@
- + {% trans "Folder will be created in your current directory" %}
From 6216299edb3789b3255f73b400508ff28e43aa0d Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 15:03:15 +0500 Subject: [PATCH 6/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 rename via enter --- .../static/filemanager/js/fileManager.js | 8 +++++ filemanager/templates/filemanager/index.html | 2 +- static/filemanager/js/fileManager.js | 36 +++++++++++++------ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index 56e8144c2..067739616 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -1377,6 +1377,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $scope.newFileName = ""; }; + $scope.renameEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.renameFile(); + } + }; + $scope.renameFile = function () { diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html index e5b011acb..0e8f78ca2 100755 --- a/filemanager/templates/filemanager/index.html +++ b/filemanager/templates/filemanager/index.html @@ -578,7 +578,7 @@
- + {% trans "Enter new name of file!" %}
diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js index 27d971fb4..067739616 100644 --- a/static/filemanager/js/fileManager.js +++ b/static/filemanager/js/fileManager.js @@ -25,9 +25,9 @@ fileManager.config(['$interpolateProvider', function ($interpolateProvider) { fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $window) { - $('form').submit(function(e){ - e.preventDefault(); -}); + $('form').submit(function (e) { + e.preventDefault(); + }); $(document.body).click(function () { rightClickNode.style.display = "none"; @@ -865,6 +865,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFolder').modal('show'); }; + $scope.createFolderEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFolder(); + } + }; + $scope.createNewFolder = function () { $scope.errorMessageFolder = true; @@ -925,14 +933,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#showCreateFile').modal('show'); }; - $scope.createFileEnter = function($event){ - var keyCode = $event.which || $event.keyCode; - if (keyCode === 13) { - $scope.htmlEditorLoading = false; - $scope.createNewFile(); - } + $scope.createFileEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.createNewFile(); + } - }; + }; $scope.createNewFile = function () { @@ -1369,6 +1377,14 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $scope.newFileName = ""; }; + $scope.renameEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.htmlEditorLoading = false; + $scope.renameFile(); + } + }; + $scope.renameFile = function () { From 5a693289c110151035faf7aa5b29a06c895d4bf0 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 15:08:23 +0500 Subject: [PATCH 7/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 clone via enter --- static/websiteFunctions/websiteFunctions.js | 12 ++++++++++++ .../static/websiteFunctions/websiteFunctions.js | 12 ++++++++++++ .../templates/websiteFunctions/setupStaging.html | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index c02d78505..356118ab7 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -4950,11 +4950,23 @@ app.controller('sshAccess', function ($scope, $http, $timeout) { /* Java script code to cloneWebsite */ app.controller('cloneWebsite', function ($scope, $http, $timeout, $window) { + $('form').submit(function (e) { + e.preventDefault(); + }); + $scope.cyberpanelLoading = true; $scope.installationDetailsForm = false; $scope.installationProgress = true; $scope.goBackDisable = true; + $scope.cloneEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.cyberpanelLoading = false; + $scope.startCloning(); + } + }; + var statusFile; $scope.startCloning = function () { diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index c02d78505..356118ab7 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -4950,11 +4950,23 @@ app.controller('sshAccess', function ($scope, $http, $timeout) { /* Java script code to cloneWebsite */ app.controller('cloneWebsite', function ($scope, $http, $timeout, $window) { + $('form').submit(function (e) { + e.preventDefault(); + }); + $scope.cyberpanelLoading = true; $scope.installationDetailsForm = false; $scope.installationProgress = true; $scope.goBackDisable = true; + $scope.cloneEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.cyberpanelLoading = false; + $scope.startCloning(); + } + }; + var statusFile; $scope.startCloning = function () { diff --git a/websiteFunctions/templates/websiteFunctions/setupStaging.html b/websiteFunctions/templates/websiteFunctions/setupStaging.html index 63eab9c1d..ee652d3ef 100755 --- a/websiteFunctions/templates/websiteFunctions/setupStaging.html +++ b/websiteFunctions/templates/websiteFunctions/setupStaging.html @@ -36,7 +36,7 @@
- +
From f89005a368dbf4e7bd4335a6254f59b8f1511769 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 30 Dec 2019 15:15:22 +0500 Subject: [PATCH 8/8] feature: ref https://github.com/usmannasir/cyberpanel/issues/189 create alias via enter --- static/websiteFunctions/websiteFunctions.js | 11 +++++++++++ .../static/websiteFunctions/websiteFunctions.js | 11 +++++++++++ .../templates/websiteFunctions/domainAlias.html | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index 356118ab7..493c88488 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -2823,6 +2823,9 @@ app.controller('manageCronController', function ($scope, $http) { app.controller('manageAliasController', function ($scope, $http, $timeout, $window) { + $('form').submit(function (e) { + e.preventDefault(); + }); var masterDomain = ""; @@ -2835,6 +2838,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind $scope.manageAliasLoading = true; $scope.operationSuccess = true; + $scope.createAliasEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.manageAliasLoading = false; + $scope.addAliasFunc(); + } + }; + $scope.showAliasForm = function (domainName) { $scope.domainAliasForm = false; diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 356118ab7..493c88488 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -2823,6 +2823,9 @@ app.controller('manageCronController', function ($scope, $http) { app.controller('manageAliasController', function ($scope, $http, $timeout, $window) { + $('form').submit(function (e) { + e.preventDefault(); + }); var masterDomain = ""; @@ -2835,6 +2838,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind $scope.manageAliasLoading = true; $scope.operationSuccess = true; + $scope.createAliasEnter = function ($event) { + var keyCode = $event.which || $event.keyCode; + if (keyCode === 13) { + $scope.manageAliasLoading = false; + $scope.addAliasFunc(); + } + }; + $scope.showAliasForm = function (domainName) { $scope.domainAliasForm = false; diff --git a/websiteFunctions/templates/websiteFunctions/domainAlias.html b/websiteFunctions/templates/websiteFunctions/domainAlias.html index 828726eb9..7c7ff33c4 100755 --- a/websiteFunctions/templates/websiteFunctions/domainAlias.html +++ b/websiteFunctions/templates/websiteFunctions/domainAlias.html @@ -78,7 +78,7 @@
- +