Compare commits

..

7 Commits

Author SHA1 Message Date
FreddleSpl0it
a835419168 fix imapsync 2022-06-23 18:36:54 +02:00
Niklas Meyer
4ce16d1ea4 Merge pull request #4644 from mailcow/feature/update-composev2
Added auto correction of composev1 Binds in compose.yml
2022-06-23 15:43:49 +02:00
DerLinkman
c1c7167ace Added auto correction of composev1 Binds in compose.yml 2022-06-23 15:41:48 +02:00
Niklas Meyer
3d538d4f14 Merge pull request #4643 from mailcow/staging
2022-06a | IMAPSync Hardening + Docker-Compose v2 now needed
2022-06-23 15:04:46 +02:00
Niklas Meyer
7969e7116d Merge branch 'feature/imapsync' into staging 2022-06-23 11:26:07 +02:00
Niklas Meyer
4f58f2caee Merge branch 'feature/update-composev2' into staging 2022-06-23 11:25:58 +02:00
milkmaker
af9c3a8565 [Web] Updated lang.es.json [CI SKIP] (#4638)
Co-authored-by: Daniel Castellanos <decacis@gmail.com>

Co-authored-by: Daniel Castellanos <decacis@gmail.com>
2022-06-19 22:23:35 +02:00
3 changed files with 9 additions and 2 deletions

View File

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

View File

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

View File

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