Merge branch 'feature/update-composev2' into hotfix

data/web/inc/functions.mailbox.inc.php

@@ -339,8 +339,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
 
           // validate custom params
           foreach (explode(' -', $custom_params) as $param){
-            if(empty($param)) continue;
-
             if (str_contains($param, ' ')) {
               // bad char
               $_SESSION['return'][] = array(
@@ -1794,8 +1792,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
 
             // validate custom params
             foreach (explode(' -', $custom_params) as $param){
-              if(empty($param)) continue;
-
               if (str_contains($param, ' ')) {
                 // bad char
                 $_SESSION['return'][] = array(

data/web/lang/lang.es.json

@@ -19,8 +19,7 @@
         "syncjobs": "Trabajos de sincronización",
         "tls_policy": "Póliza de TLS",
         "unlimited_quota": "Cuota ilimitada para buzones",
-        "app_passwds": "Gestionar las contraseñas de aplicaciones",
-        "domain_desc": "Cambiar descripción del dominio"
+        "app_passwds": "Gestionar las contraseñas de aplicaciones"
     },
     "add": {
         "activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",

update.sh

@@ -629,7 +629,7 @@ fi
 echo -e "\e[32mChecking for newer update script...\e[0m"
 SHA1_1=$(sha1sum update.sh)
 git fetch origin #${BRANCH}
-git checkout origin/${BRANCH} update.sh
+git checkout origin/${BRANCH} update.sh docker-compose.yml
 SHA1_2=$(sha1sum update.sh)
 if [[ ${SHA1_1} != ${SHA1_2} ]]; then
   echo "update.sh changed, please run this script again, exiting."
@@ -658,8 +658,6 @@ update_compose
 remove_obsolete_nginx_ports
 
 echo -e "\e[32mValidating docker-compose stack configuration...\e[0m"
-sed -i 's/HTTPS_BIND:-:/HTTPS_BIND:-/g' docker-compose.yml
-sed -i 's/HTTP_BIND:-:/HTTP_BIND:-/g' docker-compose.yml
 if ! docker-compose config -q; then
   echo -e "\e[31m\nOh no, something went wrong. Please check the error message above.\e[0m"
   exit 1