mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2026-06-18 12:30:36 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a835419168 | |||
| 4ce16d1ea4 | |||
| c1c7167ace |
@@ -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(
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user