Merge branch 'main' into release

jaapmarcus · jaapmarcus · commit b81dd0a60904 · 2021-07-28T10:18:08.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.9] - Service release 
+
+### Bugfixes
+
+- Updated jQuery and jQuery UI to the latest version due to a vulnerability in jQuery. @dependabot
+- Fixed bug in /etc/dovecot/conf.d/10-ssl.conf for new installs
+- Fixed bug with notifications
+- Fixed translation string @myrevery 
+
 ## [1.4.8] - Service release 
 
 ### Features
diff --git a/install/deb/dovecot/conf.d/10-ssl.conf b/install/deb/dovecot/conf.d/10-ssl.conf
@@ -1,6 +1,6 @@
 ssl = yes
 # See #2012 for TLSv1.1 to 1.2 upgrade
-ssl_min_protocols = TLSv1.1
+ssl_min_protocol = TLSv1.1
 ssl_prefer_server_ciphers = yes
 ssl_cipher_list = ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
 
diff --git a/install/hst-install-debian.sh b/install/hst-install-debian.sh
@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.8'
+HESTIA_INSTALL_VER='1.4.9'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
@@ -1619,7 +1619,7 @@ if [ "$dovecot" = 'yes' ]; then
       echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"	
       sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
       sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
-      sed -i 's|ssl_min_protocols = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
+      sed -i 's|ssl_min_protocol = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
     fi
     
     update-rc.d dovecot defaults
diff --git a/install/hst-install-ubuntu.sh b/install/hst-install-ubuntu.sh
@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.8'
+HESTIA_INSTALL_VER='1.4.9'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
@@ -1658,7 +1658,7 @@ if [ "$dovecot" = 'yes' ]; then
       echo "[ * ] Downgrade dovecot config to sync with 2.2 settings"	
       sed -i 's|#ssl_dh_parameters_length = 4096|ssl_dh_parameters_length = 4096|g' /etc/dovecot/conf.d/10-ssl.conf
       sed -i 's|ssl_dh = </etc/ssl/dhparam.pem|#ssl_dh = </etc/ssl/dhparam.pem|g' /etc/dovecot/conf.d/10-ssl.conf
-      sed -i 's|ssl_min_protocols = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
+      sed -i 's|ssl_min_protocol = TLSv1.1|ssl_protocols = !SSLv3 !TLSv1|g' /etc/dovecot/conf.d/10-ssl.conf
     fi
     
     update-rc.d dovecot defaults
diff --git a/install/upgrade/versions/1.4.9.sh b/install/upgrade/versions/1.4.9.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.4.9
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
diff --git a/src/deb/hestia/control b/src/deb/hestia/control
@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.8
+Version: 1.4.9
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/web/edit/server/index.php b/web/edit/server/index.php
@@ -698,7 +698,7 @@
     if (empty($_SESSION['error_msg'])) {
         if ($_POST['v_inactive_session_timeout'] != $_SESSION['INACTIVE_SESSION_TIMEOUT']) {
             if($_POST['v_inactive_session_timeout'] < 1){
-               $_SESSION['error_msg'] = _('Inactive session timeout can not lower then 1 minute');
+               $_SESSION['error_msg'] = _('Inactive session timeout can not lower than 1 minute');
             }else{
                exec (HESTIA_CMD."v-change-sys-config-value INACTIVE_SESSION_TIMEOUT ".escapeshellarg($_POST['v_inactive_session_timeout']), $output, $return_var);
                check_return_code($return_var,$output);
diff --git a/web/inc/main.php b/web/inc/main.php
@@ -319,7 +319,6 @@ function send_email($to, $subject, $mailtext, $from, $from_name) {
 
     $mail->Subject = $subject;
     $content = $mailtext;
-    $mail->AltBody($content);
     $content = nl2br($content);
     $mail->MsgHTML($content);
     $mail->Send();
diff --git a/web/locale/en/LC_MESSAGES/hestiacp.mo b/web/locale/en/LC_MESSAGES/hestiacp.mo
diff --git a/web/locale/languages.json b/web/locale/languages.json
@@ -1 +1 @@
-{"hy_locale":["\u0540\u0561\u0575\u0565\u0580\u0565\u0576"],"hy":["Armenian"],"he":["Herbrew"],"he_locale":["\u05e2\u05b4\u05d1\u05e8\u05b4\u05d9\u05ea"],"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u6b63\u9ad4\u4e2d\u6587"],"zh-tw":["Traditional Chinese (Taiwan)"],"zh-cn_locale":["\u5927\u9646\u7b80\u4f53\u4e2d\u6587"],"zh-cn":["Simplified Chinese (China)"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas (Brasil)"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}
+{"hy_locale":["\u0540\u0561\u0575\u0565\u0580\u0565\u0576"],"hy":["Armenian"],"he":["Herbrew"],"he_locale":["\u05e2\u05b4\u05d1\u05e8\u05b4\u05d9\u05ea"],"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u6b63\u9ad4\u4e2d\u6587"],"zh-tw":["Traditional Chinese (Taiwan)"],"zh-cn_locale":["\u5927\u9646\u7b80\u4f53\u4e2d\u6587"],"zh-cn":["Simplified Chinese (China)"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas brasileiro"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}
diff --git a/web/locale/nl/LC_MESSAGES/hestiacp.mo b/web/locale/nl/LC_MESSAGES/hestiacp.mo
diff --git a/web/templates/includes/css.html b/web/templates/includes/css.html
@@ -23,5 +23,5 @@
     }
 ?>
 <link href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
-<link href="/css/dependencies/jquery-ui.structure.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
+<link href="/css/dependencies/jquery-ui.custom.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
 <link href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"hy_locale":["\u0540\u0561\u0575\u0565\u0580\u0565\u0576"],"hy":["Armenian"],"he":["Herbrew"],"he_locale":["\u05e2\u05b4\u05d1\u05e8\u05b4\u05d9\u05ea"],"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u6b63\u9ad4\u4e2d\u6587"],"zh-tw":["Traditional Chinese (Taiwan)"],"zh-cn_locale":["\u5927\u9646\u7b80\u4f53\u4e2d\u6587"],"zh-cn":["Simplified Chinese (China)"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas (Brasil)"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}
	`1`	+{"hy_locale":["\u0540\u0561\u0575\u0565\u0580\u0565\u0576"],"hy":["Armenian"],"he":["Herbrew"],"he_locale":["\u05e2\u05b4\u05d1\u05e8\u05b4\u05d9\u05ea"],"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u6b63\u9ad4\u4e2d\u6587"],"zh-tw":["Traditional Chinese (Taiwan)"],"zh-cn_locale":["\u5927\u9646\u7b80\u4f53\u4e2d\u6587"],"zh-cn":["Simplified Chinese (China)"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas brasileiro"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}