From 85b3578f9cebb9b7b8196791eed8af1f20892bbe Mon Sep 17 00:00:00 2001
From: Marcos <marcos@raiolanetworks.es>
Date: Mon, 21 May 2018 03:55:05 +0200
Subject: [PATCH 1/5] Fix rebuild for some user names

---
 bin/v-rebuild-web-domains | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains
index d28a943d..2094d19c 100755
--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@@ -37,7 +37,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Deleting old web configs
-sed -i "/.*\/$user\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf
+sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf
 if [ -e "$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"  ]; then
     rm $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
 fi
@@ -47,7 +47,7 @@ fi
 
 # Deleting old proxy configs
 if [ ! -z "$PROXY_SYSTEM" ]; then
-    sed -i "/.*\/$user\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf
+    sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf
 
     if [ -e "$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" ]; then
         rm $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf

From 0f48ec04f0a8432979b6319f2b7451915fd08d02 Mon Sep 17 00:00:00 2001
From: Marcos <marcos@raiolanetworks.es>
Date: Mon, 21 May 2018 03:59:55 +0200
Subject: [PATCH 2/5] Do not allow {tab} on a domain name

---
 func/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/func/main.sh b/func/main.sh
index e11ba6b3..be626702 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -532,7 +532,7 @@ is_user_format_valid() {
 is_domain_format_valid() {
     object_name=${2-domain}
     exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]"
-    if [[ $1 =~ $exclude ]] || [[ $1 =~ ^[0-9]+$ ]] || [[ $1 =~ "\.\." ]]; then
+    if [[ $1 =~ $exclude ]] || [[ $1 =~ ^[0-9]+$ ]] || [[ $1 =~ "\.\." ]] || [[ $1 =~ "$(printf '\t')" ]]; then
         check_result $E_INVALID "invalid $object_name format :: $1"
     fi
 }

From a5e093da168ec4bd2f7f59649807619f420bba90 Mon Sep 17 00:00:00 2001
From: Marcos <marcos@raiolanetworks.es>
Date: Mon, 21 May 2018 04:03:26 +0200
Subject: [PATCH 3/5] Apps translation

---
 web/inc/i18n/es.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php
index d9b9f5fb..1f2c36dd 100644
--- a/web/inc/i18n/es.php
+++ b/web/inc/i18n/es.php
@@ -21,6 +21,7 @@ $LANG['es'] = array(
     'Services'  => 'Servicios',
     'Firewall' => 'Cortafuegos',
     'Updates'  => 'Actualizaciones',
+    'Apps'  => 'Aplicaciones',
     'Log in'  => 'Iniciar Sesión',
     'Log out'  => 'Salir',
 

From ed1ad943cf84ab70ba9bf0ba1116e9a41d3e2d3d Mon Sep 17 00:00:00 2001
From: dpeca <peca@mycity.rs>
Date: Fri, 25 May 2018 17:21:03 +0200
Subject: [PATCH 4/5] Centos6 roundcube password driver typo fix

---
 install/rhel/6/roundcube/vesta.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/rhel/6/roundcube/vesta.php b/install/rhel/6/roundcube/vesta.php
index fee26078..1e9523a5 100644
--- a/install/rhel/6/roundcube/vesta.php
+++ b/install/rhel/6/roundcube/vesta.php
@@ -48,7 +48,7 @@ class rcube_vesta_password
         $context = stream_context_create();
 
         $result = stream_context_set_option($context, 'ssl', 'verify_peer', false);
-        result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
+        $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false);
         $result = stream_context_set_option($context, 'ssl', 'verify_host', false);
         $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
 

From 04a55260cae5f2eac68931f1f9f4043351f47d7a Mon Sep 17 00:00:00 2001
From: Marcos <marcos@raiolanetworks.es>
Date: Sat, 26 May 2018 20:14:47 +0200
Subject: [PATCH 5/5] Fix delete domain

---
 func/domain.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/func/domain.sh b/func/domain.sh
index c21a38a6..cc66aecb 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -269,7 +269,7 @@ replace_web_config() {
     fi
 }
 
-# Delete web configuartion
+# Delete web configuration
 del_web_config() {
     conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
     if [[ "$2" =~ stpl$ ]]; then
@@ -291,7 +291,7 @@ del_web_config() {
     # clean-up for both config styles if there is no more domains
     web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l)
     if [ "$web_domain" -eq '0' ]; then
-        sed -i "/.*\/$user\/.*/d" /etc/$1/conf.d/vesta.conf
+        sed -i "/.*\/$user\/conf\/web\//d" /etc/$1/conf.d/vesta.conf
         if [ -f "$conf" ]; then
             rm -f $conf
         fi