Merge branch 'main' into feature/logging

Author: Kristan Kenney

bin/v-rebuild-web-domains

@@ -117,12 +117,14 @@ done
 # Updating user counters
 $BIN/v-update-user-counters $user
 
-# Restarting web server
-$BIN/v-restart-web $restart
-check_result $? "Web restart failed" >/dev/null
+if [ "$restart" = "yes" ]; then
+    # Restarting web server
+    $BIN/v-restart-web $restart
+    check_result $? "Web restart failed" >/dev/null
 
-$BIN/v-restart-proxy $restart
-check_result $? "Proxy restart failed" >/dev/null
+    $BIN/v-restart-proxy $restart
+    check_result $? "Proxy restart failed" >/dev/null
+fi
 
 # Logging
 $BIN/v-log-action "system" "Info" "System" "Rebuilt web domains (User: $user)."

install/upgrade/versions/1.4.0.sh

@@ -15,14 +15,11 @@ if [ -e "/etc/nginx/nginx.conf" ]; then
     fi
 fi
 
-echo '[ * ] Updating System Administrator account permissions...'
-$HESTIA/bin/v-change-user-role admin admin
-
 # Populating HELO/SMTP Banner for existing ip's
 if [ "$MAIL_SYSTEM" == "exim4" ]; then
     source $HESTIA/func/ip.sh
 
-    echo "[ * ] Populating HELO/SMTP Banner param for existing IP's..."
+    echo "[ * ] Populating HELO/SMTP Banner value for existing IP addresses..."
     > /etc/exim4/mailhelo.conf
 
     for ip in $($BIN/v-list-sys-ips plain | cut -f1); do
@@ -101,8 +98,6 @@ if [ "$MAIL_SYSTEM" == "exim4" ]; then
         line=$(expr $(sed -n '/begin transports/=' /etc/exim4/exim4.conf.template) + 2)
         sed -i "${line}i $insert" /etc/exim4/exim4.conf.template
     fi
-    
-    $HESTIA/bin/v-restart-mail
 fi
 
 # Fix PostgreSQL repo

web/delete/key/index.php

@@ -6,7 +6,9 @@
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-    $user=$_GET['user'];
+    $v_user=$_GET['user'];
+}else{
+    $v_user = $user;
 }
 
 // Check token
@@ -18,7 +20,6 @@
 if (!empty($_GET['key'])) {
     $v_key = escapeshellarg(trim($_GET['key']));
     $v_user = escapeshellarg(trim($v_user));
-    $v_key = str_replace('/','\\/', $v_key);
     exec (HESTIA_CMD."v-delete-user-ssh-key ".$v_user." ".$v_key);
     check_return_code($return_var,$output);
 }

web/locale/languages.json

@@ -1 +1 @@
-{"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u7e41\u9ad4\u5b57"],"zh-tw":["Chinese (Taiwan)"],"zh-cn_locale":["\u7b80\u4f53\u5b57"],"zh-cn":["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"]}
+{"he":["Herbrew"],"he_locale":["\u05e2\u05b4\u05d1\u05e8\u05b4\u05d9\u05ea"],"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u7e41\u9ad4\u5b57"],"zh-tw":["Chinese (Taiwan)"],"zh-cn_locale":["\u7b80\u4f53\u5b57"],"zh-cn":["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"]}