Merge branch 'stable' into p3

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
 

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 () {
 

filemanager/templates/filemanager/index.html

@@ -328,7 +328,7 @@
                 <form action="/">
                     <div class="form-group">
                         <label>{% trans "New Folder Name" %}</label>
-                        <input ng-model="newFolderName" type="text" class="form-control" >
+                        <input ng-keypress="createFolderEnter($event)" ng-model="newFolderName" type="text" class="form-control" >
                         <small class="form-text text-muted">{% trans "Folder will be created in your current directory" %}</small>
                     </div>
                     <button type="button" ng-click="createNewFolder()" class="btn btn-primary">{% trans "Create Folder" %}</button>
@@ -372,7 +372,7 @@
                 <form action="/">
                     <div class="form-group">
                         <label>{% trans "New File Name" %}</label>
-                        <input ng-model="newFileName" type="text" class="form-control" >
+                        <input ng-keypress="createFileEnter($event)" ng-model="newFileName" type="text" class="form-control" >
                         <small class="form-text text-muted">{% trans "File will be created in your current directory, if it already exists it will not overwirte." %}</small>
                     </div>
                     <button type="button" ng-click="createNewFile()" class="btn btn-primary">{% trans "Create File" %}</button>
@@ -578,7 +578,7 @@
                 <form>
                     <div class="form-group">
                         <label>{% trans "New Name" %}</label>
-                        <input ng-model="newFileName" type="text" class="form-control">
+                        <input ng-keypress="renameEnter($event)" ng-model="newFileName" type="text" class="form-control">
                         <small class="form-text text-muted">{% trans "Enter new name of file!" %}</small>
                     </div>
                 </form>

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 () {
 

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 () {

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 () {

websiteFunctions/templates/websiteFunctions/domainAlias.html

@@ -78,7 +78,7 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">{% trans "Alias Domain" %}</label>
                             <div class="col-sm-6">
-                                <input type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
+                                <input ng-keypress="createAliasEnter($event)" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
                             </div>
                         </div>
 

websiteFunctions/templates/websiteFunctions/setupStaging.html

@@ -36,7 +36,7 @@
                         <div ng-hide="installationDetailsForm" class="form-group">
                             <label class="col-sm-3 control-label">{% trans "Domain" %}</label>
                             <div class="col-sm-6">
-                                <input type="text" class="form-control" ng-model="domain" required>
+                                <input ng-keypress="cloneEnter($event)" type="text" class="form-control" ng-model="domain" required>
                             </div>
                         </div>