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 diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index e21eafd01..067739616 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"; }); @@ -861,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; @@ -921,6 +933,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; @@ -1356,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 3ef955cd1..0e8f78ca2 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" %}
@@ -372,7 +372,7 @@
- + {% trans "File will be created in your current directory, if it already exists it will not overwirte." %}
@@ -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 e21eafd01..067739616 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"; }); @@ -861,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; @@ -921,6 +933,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; @@ -1356,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/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index c02d78505..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; @@ -4950,11 +4961,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 f39abf516..ee016d01d 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -3141,6 +3141,9 @@ app.controller('manageCronController', function ($scope, $http) { app.controller('manageAliasController', function ($scope, $http, $timeout, $window) { + $('form').submit(function (e) { + e.preventDefault(); + }); var masterDomain = ""; @@ -3153,6 +3156,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; @@ -5268,11 +5279,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/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 @@
- +
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 @@
- +