diff --git a/filemanager/static/filemanager/js/codeMirror.js b/filemanager/static/filemanager/js/codeMirror.js index 9127fd04d..fce0aefa6 100755 --- a/filemanager/static/filemanager/js/codeMirror.js +++ b/filemanager/static/filemanager/js/codeMirror.js @@ -88,8 +88,7 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) { cm.setValue(response.data.fileContents); cm.setSize(null, 800); cm.on("keyup", function (cm, event) { - if (!cm.state.completionActive && - event.keyCode != 13) { + if (!cm.state.completionActive && event.keyCode === 9) { CodeMirror.commands.autocomplete(cm, null, {completeSingle: false}); } }); diff --git a/install/install.py b/install/install.py index f666e2b09..315049893 100755 --- a/install/install.py +++ b/install/install.py @@ -759,12 +759,14 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; if self.distro == centos: command = 'yum install --enablerepo=gf-plus -y postfix3 postfix3-ldap postfix3-mysql postfix3-pcre' + elif self.distro == cent8: command = 'dnf --nogpg install -y https://mirror.ghettoforge.org/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm' preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) command = 'dnf install --enablerepo=gf-plus postfix3 postfix3-mysql -y' + else: command = 'apt-get -y debconf-utils' preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) diff --git a/plogical/cPanelImporter.py b/plogical/cPanelImporter.py index 10389019e..c1c56d882 100644 --- a/plogical/cPanelImporter.py +++ b/plogical/cPanelImporter.py @@ -81,7 +81,7 @@ class cPanelImporter: def PHPDecider(self): if self.PHPVersion == 'inherit': - self.PHPVersion = 'PHP 7.2' + self.PHPVersion = 'PHP 7.4' if self.PHPVersion.find('53') > -1: self.PHPVersion = 'PHP 5.3' elif self.PHPVersion.find('54') > -1: diff --git a/plogical/upgrade.py b/plogical/upgrade.py index a30ad69dc..b30aacbc3 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -101,9 +101,10 @@ class Upgrade: @staticmethod def executioner(command, component, do_exit=0): try: + FNULL = open(os.devnull, 'w') count = 0 while True: - res = subprocess.call(shlex.split(command)) + res = subprocess.call(shlex.split(command), stdout=FNULL, stderr=subprocess.STDOUT) if res != 0: count = count + 1 Upgrade.stdOut(component + ' failed, trying again, try number: ' + str(count), 0) diff --git a/static/filemanager/js/codeMirror.js b/static/filemanager/js/codeMirror.js index 9127fd04d..fce0aefa6 100644 --- a/static/filemanager/js/codeMirror.js +++ b/static/filemanager/js/codeMirror.js @@ -88,8 +88,7 @@ fileManager.controller('editFileCtrl', function ($scope, $http, $window) { cm.setValue(response.data.fileContents); cm.setSize(null, 800); cm.on("keyup", function (cm, event) { - if (!cm.state.completionActive && - event.keyCode != 13) { + if (!cm.state.completionActive && event.keyCode === 9) { CodeMirror.commands.autocomplete(cm, null, {completeSingle: false}); } }); diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index c8d19ef3b..6a86b3fc6 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -738,8 +738,6 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) { type: 'error' }); } - - } function cantLoadInitialDatas(response) {