From 735fc1fc7acc4b5f5485ddbefd7ebe06cbd19fc6 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:24:14 +0900 Subject: [PATCH 1/3] Fix #502 --- bin/v-change-user-language | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index c6e7b0cb..c8da0564 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -19,9 +19,14 @@ source $VESTA/conf/vesta.conf is_language_valid() { - if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then - echo "Error: language $language not exist" - log_event "$E_NOTEXIST $EVENT" + if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then + echo "Error: language $1 not valid" + log_event "$E_INVALID" "$EVENT" + exit $E_INVALID + fi + if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then + echo "Error: language $1 not exist" + log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi } From dbeba76fa96b5d09b4b972077edd2f825b315e75 Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:42:21 +0900 Subject: [PATCH 2/3] Improve grammar. --- bin/v-change-user-language | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index c8da0564..82e8945a 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -20,12 +20,12 @@ source $VESTA/conf/vesta.conf is_language_valid() { if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then - echo "Error: language $1 not valid" + echo "Error: language $1 is not valid" log_event "$E_INVALID" "$EVENT" exit $E_INVALID fi if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then - echo "Error: language $1 not exist" + echo "Error: language $1 doesn't exist" log_event "$E_NOTEXIST" "$EVENT" exit $E_NOTEXIST fi From 9ba1c686d56967532261f12d62350a35de32442b Mon Sep 17 00:00:00 2001 From: Flat Date: Mon, 23 Nov 2015 16:50:58 +0900 Subject: [PATCH 3/3] Use soft-tabs. --- bin/v-change-user-language | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-change-user-language b/bin/v-change-user-language index 82e8945a..800b61a8 100755 --- a/bin/v-change-user-language +++ b/bin/v-change-user-language @@ -19,7 +19,7 @@ source $VESTA/conf/vesta.conf is_language_valid() { - if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then + if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then echo "Error: language $1 is not valid" log_event "$E_INVALID" "$EVENT" exit $E_INVALID