From f0dcb2bf0d0438ada17a708d0487af5ef09e3c04 Mon Sep 17 00:00:00 2001 From: Yaroslav Snisar Date: Thu, 8 Dec 2016 12:51:08 +0200 Subject: [PATCH 01/72] Laravel template It is a laravel nginx template for app based on Laravel framework. Nginx conf from: https://laravel.com/docs/5.1/installation --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..396a947cf --- /dev/null +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain%.conf*; +} From 48bc33ad8786734ffa640d53a95d932b772565db Mon Sep 17 00:00:00 2001 From: Elliot Huffman Date: Wed, 14 Dec 2016 12:42:14 -0500 Subject: [PATCH 02/72] optimize version Optimized the system that finds the version of the current running system. --- install/vst-install-ubuntu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 6e334d28f..aaa4f196a 100755 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -14,8 +14,8 @@ VESTA='/usr/local/vesta' memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) arch=$(uname -i) os='ubuntu' -release="$(lsb_release -r|awk '{print $2}')" -codename="$(lsb_release -c|awk '{print $2}')" +release="$(lsb_release -s -r)" +codename="$(lsb_release -s -c)" vestacp="http://$CHOST/$VERSION/$release" if [ "$release" = '16.04' ]; then From 2cfa4c86ce4d31e8f9f1da0d928831354151196e Mon Sep 17 00:00:00 2001 From: Ruslan Devsaider Date: Fri, 16 Dec 2016 02:50:33 +0300 Subject: [PATCH 03/72] added robots.txt which pervents indexing by search engines --- web/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 web/robots.txt diff --git a/web/robots.txt b/web/robots.txt new file mode 100644 index 000000000..77470cb39 --- /dev/null +++ b/web/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / \ No newline at end of file From 20fbf497852f18c71c3631cec8704726efa9f1a6 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 2 Mar 2017 07:52:57 +0200 Subject: [PATCH 04/72] *Fix Proxy setting becomes unset by user* --- web/edit/web/index.php | 4 ++-- web/templates/user/edit_web.html | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 11cda0ea2..e736908dd 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -230,8 +230,8 @@ if (!empty($_POST['save'])) { $restart_proxy = 'yes'; } - // Change proxy template / Update extension list - if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { + // Change proxy template / Update extension list (admin only) + if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg'])) && ($_SESSION['user'] == 'admin')) { $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']); $ext = preg_replace("/,/", " ", $ext); $ext = preg_replace('/\s+/', ' ',$ext); diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 20358b032..a7f54db03 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -85,6 +85,29 @@ + + + + + + + + + + + + + + + +
+ +
+ +
+ + + From 1bc576c4c6ed072dba923ab436ac0062a39fee6a Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 2 Mar 2017 12:02:45 +0200 Subject: [PATCH 05/72] Delete empty echo ""; --- web/templates/user/edit_web.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index a7f54db03..f26559b50 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -85,7 +85,7 @@ - + @@ -107,7 +107,7 @@ - + From c2193e1a6e3645b0ec425660b6d0e2daa7b23184 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:38:57 +0100 Subject: [PATCH 06/72] Create laravel.tpl --- .../templates/web/nginx/php5-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From a6b7d84dc0478c8a8dd43de4ec84c00988d97f7e Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:39:38 +0100 Subject: [PATCH 07/72] Create laravel.tpl --- .../templates/web/nginx/php5-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 654d7ca83ddeed90dbb30c4b0af2635311401a77 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:40:10 +0100 Subject: [PATCH 08/72] Create laravel.tpl --- .../5/templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 2204a300f2af08082ecf410737c38f710d62a178 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:40:38 +0100 Subject: [PATCH 09/72] Create laravel.tpl --- .../6/templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 1f0cb58a32db6e93a3ee2b3bc4daeb52ef7cede0 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:40:51 +0100 Subject: [PATCH 10/72] Create laravel.tpl --- .../7/templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 4dfa77eab2c7647040911057de9f512eb595705f Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:41:41 +0100 Subject: [PATCH 11/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From f5b823f8143f1a0da6a9d97127386d0bb695d9c3 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:41:59 +0100 Subject: [PATCH 12/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From b6fdc216b9cf7056a3e4eafb3628a83dfdb48870 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:42:18 +0100 Subject: [PATCH 13/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From fedf6c5ccf9df01455322e64392686220cb2012e Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:42:33 +0100 Subject: [PATCH 14/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 5890b1b28f6a71adb6788f58dc4bae10b01b7771 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:42:50 +0100 Subject: [PATCH 15/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 9483c75514ce5839cca8385c2f5fa566e9b8b1c9 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:43:03 +0100 Subject: [PATCH 16/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 0adb71c583954644755ce559ef7fbbfc5de56c89 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:43:29 +0100 Subject: [PATCH 17/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 67a33046bb9ff41e228d75ae2877fdf6f26d892a Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:43:48 +0100 Subject: [PATCH 18/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From ae71a532c10cf75d1df0ae590c6428c633758e9f Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:45:05 +0100 Subject: [PATCH 19/72] Update laravel.tpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl index 396a947cf..5ef66f987 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.tpl @@ -46,5 +46,5 @@ server { include /etc/nginx/conf.d/phppgadmin.inc*; include /etc/nginx/conf.d/webmail.inc*; - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; } From 819faa8d7c12dff9062e2787f31d880ef99670f1 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:45:30 +0100 Subject: [PATCH 20/72] Create laravel.tpl --- .../templates/web/nginx/php-fpm/laravel.tpl | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl new file mode 100644 index 000000000..5ef66f987 --- /dev/null +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.tpl @@ -0,0 +1,50 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From a7f9296271e20475961a843d764a0c927843ab29 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:46:44 +0100 Subject: [PATCH 21/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 488d5ca932223b6477602e44ee73f42705467666 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:47:07 +0100 Subject: [PATCH 22/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From f3b6589db31abfee1074a01e61224fc939d17285 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:47:26 +0100 Subject: [PATCH 23/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 4dfe08695718cd659a2a73421f7996e6b9f04e4e Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:47:55 +0100 Subject: [PATCH 24/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 20a38a33c125e7926dc8c65165f0f5c91d58df15 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:48:14 +0100 Subject: [PATCH 25/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 5faf27ee994d115bafb84e61abd68850f30c5cd5 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:48:39 +0100 Subject: [PATCH 26/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 16881adae2ac60251f7a672c17bbe54820fbbdbf Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:49:02 +0100 Subject: [PATCH 27/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 866af00588cfebab0905abd02d23895933695308 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:49:15 +0100 Subject: [PATCH 28/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From dae9596f3577bce0ca397106f644240baf2c8ccf Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:49:35 +0100 Subject: [PATCH 29/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 679bccaf7c7bd2a67260ca744eea820cb5dd7368 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:49:53 +0100 Subject: [PATCH 30/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From f3844ee344a922fc321213d8764bb4e4445c9611 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:50:09 +0100 Subject: [PATCH 31/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From b20131822d1f21cbc22d87319dce744af65f4233 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:50:23 +0100 Subject: [PATCH 32/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From dbbee61efb5079cf0b0b265e2681f8ca80c1da7c Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:50:37 +0100 Subject: [PATCH 33/72] Create laravel.stpl --- .../templates/web/nginx/php-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 58a55915e8ddd2dd54b21c6dc7df1f5c5d5bfc42 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:51:07 +0100 Subject: [PATCH 34/72] Create laravel.stpl --- .../templates/web/nginx/php5-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From f7ca96690bdf65b3949d1ec9f2681ce1d731e403 Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Thu, 2 Mar 2017 13:51:22 +0100 Subject: [PATCH 35/72] Create laravel.stpl --- .../templates/web/nginx/php5-fpm/laravel.stpl | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl new file mode 100644 index 000000000..f1ffc4c04 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl @@ -0,0 +1,56 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + root %docroot%/public; + index index.php index.html index.htm; + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + location / { + try_files $uri $uri/ /index.php?$query_string; + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; + } + + location ~ [^/]\.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + } + + error_page 403 /error/404.html; + error_page 404 /error/404.html; + error_page 500 502 503 504 /error/50x.html; + + location /error/ { + alias %home%/%user%/web/%domain%/document_errors/; + } + + location ~* "/\.(htaccess|htpasswd)$" { + deny all; + return 404; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From 8ae70316e9188b33d20c7cbc98be23c23ba4b0ff Mon Sep 17 00:00:00 2001 From: System Void Date: Sat, 4 Mar 2017 22:45:02 +0000 Subject: [PATCH 36/72] Update index.php --- web/stop/service/index.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/stop/service/index.php b/web/stop/service/index.php index a151dc6d8..fea495b06 100644 --- a/web/stop/service/index.php +++ b/web/stop/service/index.php @@ -14,10 +14,14 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-stop-service ".$v_service, $output, $return_var); } } + if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('stop'),$v_service); - $_SESSION['error_srv'] = $error; + if (empty($error)) { + $error = __('SERVICE_ACTION_FAILED', __('stop'), $v_service); + } + + $_SESSION['error_srv'] = $error; } unset($output); } From 6d88ca31c3fbbc5bfdc4753206a03ac3d4e6e04c Mon Sep 17 00:00:00 2001 From: dpeca Date: Sun, 5 Mar 2017 23:34:07 +0100 Subject: [PATCH 37/72] Making sure domain_idn is always set --- bin/v-add-dns-record | 2 ++ bin/v-add-mail-account-alias | 2 ++ bin/v-add-mail-account-autoreply | 2 ++ bin/v-add-mail-account-forward | 1 + bin/v-add-mail-account-fwd-only | 2 ++ bin/v-add-mail-domain | 1 + bin/v-add-mail-domain-antispam | 2 ++ bin/v-add-mail-domain-antivirus | 2 ++ bin/v-add-mail-domain-catchall | 1 + bin/v-add-mail-domain-dkim | 2 ++ bin/v-add-web-domain-alias | 2 ++ bin/v-add-web-domain-ftp | 2 ++ bin/v-add-web-domain-stats | 1 + bin/v-backup-user | 2 ++ bin/v-change-dns-domain-exp | 2 ++ bin/v-change-dns-domain-ip | 4 +++- bin/v-change-dns-domain-soa | 2 ++ bin/v-change-dns-domain-tpl | 1 + bin/v-change-dns-domain-ttl | 2 ++ bin/v-change-dns-record | 2 ++ bin/v-change-dns-record-id | 2 ++ bin/v-change-mail-account-password | 2 ++ bin/v-change-mail-account-quota | 2 ++ bin/v-change-mail-domain-catchall | 1 + bin/v-change-web-domain-backend-tpl | 1 + bin/v-change-web-domain-ftp-password | 2 ++ bin/v-change-web-domain-ftp-path | 2 ++ bin/v-change-web-domain-ip | 2 ++ bin/v-change-web-domain-name | 2 ++ bin/v-change-web-domain-proxy-tpl | 2 ++ bin/v-change-web-domain-sslcert | 2 ++ bin/v-change-web-domain-sslhome | 2 ++ bin/v-change-web-domain-stats | 1 + bin/v-change-web-domain-tpl | 2 ++ bin/v-delete-dns-on-web-alias | 2 ++ bin/v-delete-dns-record | 2 ++ bin/v-delete-mail-account | 1 + bin/v-delete-mail-account-alias | 1 + bin/v-delete-mail-account-autoreply | 2 ++ bin/v-delete-mail-account-forward | 1 + bin/v-delete-mail-account-fwd-only | 2 ++ bin/v-delete-mail-domain | 1 + bin/v-delete-mail-domain-antispam | 2 ++ bin/v-delete-mail-domain-antivirus | 2 ++ bin/v-delete-mail-domain-catchall | 1 + bin/v-delete-web-domain | 2 ++ bin/v-delete-web-domain-backend | 2 ++ bin/v-delete-web-domain-ftp | 2 ++ bin/v-delete-web-domain-proxy | 2 ++ bin/v-delete-web-domain-ssl | 2 ++ bin/v-delete-web-domain-stats | 1 + bin/v-get-dns-domain-value | 2 ++ bin/v-get-mail-account-value | 2 ++ bin/v-get-mail-domain-value | 2 ++ bin/v-suspend-dns-domain | 2 ++ bin/v-suspend-dns-record | 2 ++ bin/v-suspend-mail-account | 2 ++ bin/v-suspend-mail-accounts | 3 +++ bin/v-suspend-mail-domain | 2 ++ bin/v-suspend-web-domain | 2 ++ bin/v-unsuspend-dns-domain | 2 ++ bin/v-unsuspend-dns-record | 2 ++ bin/v-unsuspend-mail-account | 2 ++ bin/v-unsuspend-mail-accounts | 2 ++ bin/v-unsuspend-mail-domain | 2 ++ bin/v-unsuspend-web-domain | 2 ++ bin/v-update-mail-domain-disk | 2 ++ bin/v-update-web-domain-disk | 2 ++ bin/v-update-web-domain-ssl | 2 ++ bin/v-update-web-domain-stat | 1 + bin/v-update-web-domain-traff | 2 ++ func/domain.sh | 7 +++++++ func/main.sh | 3 +++ func/rebuild.sh | 3 +++ 74 files changed, 142 insertions(+), 1 deletion(-) diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index ec98fd72a..2b4c52ca4 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 record=$(idn -t --quiet -u "$3" ) record=$(echo "$record" | tr '[:upper:]' '[:lower:]') rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]') @@ -53,6 +54,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index 03ecaec96..7c28f88d6 100755 --- a/bin/v-add-mail-account-alias +++ b/bin/v-add-mail-account-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index f8c8f62b7..86c8cf110 100755 --- a/bin/v-add-mail-account-autoreply +++ b/bin/v-add-mail-account-autoreply @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 autoreply=$4 @@ -30,6 +31,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 6be94b224..2e25d158d 100755 --- a/bin/v-add-mail-account-forward +++ b/bin/v-add-mail-account-forward @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 forward=$4 diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only index 02704cfb3..9a62805c8 100755 --- a/bin/v-add-mail-account-fwd-only +++ b/bin/v-add-mail-account-fwd-only @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -29,6 +30,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 2676e7506..10e87032b 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 antispam=${3-yes} antivirus=${4-yes} dkim=${5-yes} diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index 4ca81f94a..eb31404fa 100755 --- a/bin/v-add-mail-domain-antispam +++ b/bin/v-add-mail-domain-antispam @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index c0acd82d1..849107566 100755 --- a/bin/v-add-mail-domain-antivirus +++ b/bin/v-add-mail-domain-antivirus @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index f827449fb..a08976413 100755 --- a/bin/v-add-mail-domain-catchall +++ b/bin/v-add-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 email="$3" # Includes diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 307fe9b55..9c643b6e9 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 dkim_size=${3-1024} # Includes @@ -29,6 +30,7 @@ fi # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 932e1ffad..e5676af4e 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 aliases=$3 restart="$4" @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? format_aliases diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 1c1187060..1a722bad6 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=${1}_${3} password=$4; HIDE=4 ftp_path=$5 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index 60caf0c16..8da1451f8 100755 --- a/bin/v-add-web-domain-stats +++ b/bin/v-add-web-domain-stats @@ -16,6 +16,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 type=$3 # Includes diff --git a/bin/v-backup-user b/bin/v-backup-user index 2cd0be551..978b4be3d 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -137,6 +137,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then mkdir -p $tmpdir/web/$domain/vesta # Get domain variables + domain_idn=$domain format_domain_idn get_domain_values 'web' @@ -286,6 +287,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log mkdir -p $tmpdir/mail/$domain/conf mkdir -p $tmpdir/mail/$domain/vesta + domain_idn=$domain format_domain_idn # Backup exim config diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index e5b0c6a95..23abb6f4d 100755 --- a/bin/v-change-dns-domain-exp +++ b/bin/v-change-dns-domain-exp @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 exp=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index fca3ecb75..69b0b0365 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -12,7 +12,8 @@ # Argument definition user=$1 domain=$2 -ip=$3 +domain_idn=$2 +p=$3 restart=$4 # Includes @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index e235a6399..8bb213708 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g') restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 63c71e417..7f4d17b1f 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -14,6 +14,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 131b7930b..c2e29553c 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ttl=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 612ffc6ca..12f2454bd 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 dvalue=$(idn -t --quiet -u "$4" ) priority=$5 @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 5dbcf2997..90ca28aee 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 newid=$4 restart=$5 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 0540ac7b5..28c8809b1 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 password=$4; HIDE=4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index edbbababe..842169494 100755 --- a/bin/v-change-mail-account-quota +++ b/bin/v-change-mail-account-quota @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 quota=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 022dbf1df..080e6a10c 100755 --- a/bin/v-change-mail-domain-catchall +++ b/bin/v-change-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 email=$3 # Includes diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index 36a150008..4259335bc 100755 --- a/bin/v-change-web-domain-backend-tpl +++ b/bin/v-change-web-domain-backend-tpl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 diff --git a/bin/v-change-web-domain-ftp-password b/bin/v-change-web-domain-ftp-password index c41fdde79..6e74fd9e9 100755 --- a/bin/v-change-web-domain-ftp-password +++ b/bin/v-change-web-domain-ftp-password @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 password=$4; HIDE=4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ftp-path b/bin/v-change-web-domain-ftp-path index 8cfefadeb..61e1aa80c 100755 --- a/bin/v-change-web-domain-ftp-path +++ b/bin/v-change-web-domain-ftp-path @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 ftp_path=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 05fde851a..17eb55d95 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ip=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-name b/bin/v-change-web-domain-name index 51215393a..6cbd1d999 100755 --- a/bin/v-change-web-domain-name +++ b/bin/v-change-web-domain-name @@ -12,6 +12,7 @@ # Argument defenition user=$1 domain=$2 +domain_idn=$2 new_domain=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index c2be52f11..4d022cb9d 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\ exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm" @@ -27,6 +28,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 444510c78..f60a4eb0f 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_dir=$3 restart=$4 @@ -24,6 +25,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index f9768e327..06b4c563a 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -8,6 +8,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_home=$3 restart=$4 @@ -19,6 +20,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index afaa7fe78..6355e4a1b 100755 --- a/bin/v-change-web-domain-stats +++ b/bin/v-change-web-domain-stats @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 type=$3 # Includes diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index ef88e7a4c..9b9623bb1 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 template=$3 restart=$4 @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index b74fc900c..87e688493 100755 --- a/bin/v-delete-dns-on-web-alias +++ b/bin/v-delete-dns-on-web-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 dom_alias=$(idn -t --quiet -u "$3" ) dom_alias=$(echo $dom_alias |sed -e 's/\.*$//g' -e 's/^\.*//g') dom_alias=$(echo $dom_alias |tr '[:upper:]' '[:lower:]') @@ -26,6 +27,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 16bb2b463..4b4555dfa 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index ffc221147..f0da423cb 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index 230d0113a..9d5f902f3 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index 2169190af..d4cb02133 100755 --- a/bin/v-delete-mail-account-autoreply +++ b/bin/v-delete-mail-account-autoreply @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 malias=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index c690e9a46..bb2096514 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 forward=$4 diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only index f5147f9b9..820164ed8 100755 --- a/bin/v-delete-mail-account-fwd-only +++ b/bin/v-delete-mail-account-fwd-only @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index f128d752a..f3541edbe 100755 --- a/bin/v-delete-mail-domain +++ b/bin/v-delete-mail-domain @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 355684344..455ed9caa 100755 --- a/bin/v-delete-mail-domain-antispam +++ b/bin/v-delete-mail-domain-antispam @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index e176a7555..312120f77 100755 --- a/bin/v-delete-mail-domain-antivirus +++ b/bin/v-delete-mail-domain-antivirus @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index f5a7ddf8b..7a30175d0 100755 --- a/bin/v-delete-mail-domain-catchall +++ b/bin/v-delete-mail-domain-catchall @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 6ef7280be..529f5d09e 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -26,6 +27,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend index 5b5480961..47c004443 100755 --- a/bin/v-delete-web-domain-backend +++ b/bin/v-delete-web-domain-backend @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 081305847..218f4d55f 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ftp_user=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index 215506cb4..73eeabb73 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 131feb239..05e8c9403 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index 005669997..33a22dca6 100755 --- a/bin/v-delete-web-domain-stats +++ b/bin/v-delete-web-domain-stats @@ -13,6 +13,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value index ec77df2f0..b530588a1 100755 --- a/bin/v-get-dns-domain-value +++ b/bin/v-get-dns-domain-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") # Includes @@ -20,6 +21,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value index f011875c6..abff06a53 100755 --- a/bin/v-get-mail-account-value +++ b/bin/v-get-mail-account-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 key=$(echo "$4"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") @@ -21,6 +22,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value index e7ad584a5..97a1a3e46 100755 --- a/bin/v-get-mail-domain-value +++ b/bin/v-get-mail-domain-value @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 key=$(echo "$3"| tr '[:lower:]' '[:upper:]' | sed "s/^/$/") # Includes @@ -20,6 +21,7 @@ source $VESTA/func/main.sh # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index d016b786f..b42e2e99d 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart="$3" # Includes @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 4de9ae408..003f8d757 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index 803594eb1..06d98a66d 100755 --- a/bin/v-suspend-mail-account +++ b/bin/v-suspend-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index bd282ca63..ab8c440fa 100755 --- a/bin/v-suspend-mail-accounts +++ b/bin/v-suspend-mail-accounts @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -19,6 +20,8 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain +format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index 66fe81522..201dc7f3d 100755 --- a/bin/v-suspend-mail-domain +++ b/bin/v-suspend-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 15dbe9c47..7bd658ceb 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -14,6 +14,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -25,6 +26,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index e845b6a83..bc8de6eec 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index c84e7744c..f1bc163f4 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 id=$3 restart=$4 @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 2e9a887fc..314c13bc0 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-mail-account @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 account=$3 # Includes @@ -22,6 +23,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index 2c651b2cd..420bcf050 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-mail-accounts @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index 9c688d6f3..935865d70 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-mail-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index b47b67f4a..91bc1e16b 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 restart=$3 # Includes @@ -23,6 +24,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index a1b6b3f4c..451dbd37d 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -20,6 +21,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 252fac3c2..ac851b922 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-ssl b/bin/v-update-web-domain-ssl index 8a3381a99..877005c40 100755 --- a/bin/v-update-web-domain-ssl +++ b/bin/v-update-web-domain-ssl @@ -15,6 +15,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 ssl_dir=$3 restart=$4 @@ -27,6 +28,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 24eba8cf7..c77b750be 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index 299bafd23..ce18707d7 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -12,6 +12,7 @@ # Argument definition user=$1 domain=$2 +domain_idn=$2 # Includes source $VESTA/func/main.sh @@ -21,6 +22,7 @@ source $VESTA/conf/vesta.conf # Additional argument formatting format_domain format_domain_idn +# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ? #----------------------------------------------------------# diff --git a/func/domain.sh b/func/domain.sh index 3ee84c8ce..fd205a2bc 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -172,6 +172,10 @@ add_web_config() { conf="$HOMEDIR/$user/conf/web/s$1.conf" fi + if [ -z "$domain_idn" ]; then + format_domain_idn + fi + cat $WEBTPL/$1/$WEB_BACKEND/$2 | \ sed -e "s|%ip%|$local_ip|g" \ -e "s|%domain%|$domain|g" \ @@ -228,6 +232,9 @@ get_web_config_lines() { check_result $E_PARSING "can't parse template $1" fi + if [ -z "$domain_idn" ]; then + format_domain_idn + fi vhost_lines=$(grep -niF "name $domain_idn" $2) vhost_lines=$(echo "$vhost_lines" |egrep "$domain_idn($| |;)") #" vhost_lines=$(echo "$vhost_lines" |cut -f 1 -d :) diff --git a/func/main.sh b/func/main.sh index b1761fd88..b9dc14c8e 100644 --- a/func/main.sh +++ b/func/main.sh @@ -864,6 +864,9 @@ format_domain() { } format_domain_idn() { + if [ -z "$domain_idn" ]; then + domain_idn=$domain + fi if [[ "$domain_idn" = *[![:ascii:]]* ]]; then domain_idn=$(idn -t --quiet -a $domain_idn) fi diff --git a/func/rebuild.sh b/func/rebuild.sh index 69331cce4..63143472f 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -227,6 +227,9 @@ rebuild_web_domain_conf() { # Adding web stats parser if [ ! -z "$STATS" ]; then + if [ -z "$domain_idn" ]; then + format_domain_idn + fi cat $WEBTPL/$STATS/$STATS.tpl |\ sed -e "s|%ip%|$local_ip|g" \ -e "s|%web_system%|$WEB_SYSTEM|g" \ From 5965b5a88ec43c26ebd01c23c9b27e4d2f0f0be3 Mon Sep 17 00:00:00 2001 From: dpeca Date: Mon, 6 Mar 2017 00:04:30 +0100 Subject: [PATCH 38/72] Accidentally deleted 'i' letter --- bin/v-change-dns-domain-ip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index 69b0b0365..175268e37 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -13,7 +13,7 @@ user=$1 domain=$2 domain_idn=$2 -p=$3 +ip=$3 restart=$4 # Includes From e4beab4df399806684674631fa77f3c6d63934d6 Mon Sep 17 00:00:00 2001 From: dpeca Date: Mon, 6 Mar 2017 13:47:09 +0100 Subject: [PATCH 39/72] Debian installer: changed 'unrar' package to 'unrar-free' --- install/vst-install-debian.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 4237f4f54..c9295c925 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -29,7 +29,7 @@ if [ "$release" -eq 8 ]; then mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl unrar" + bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl unrar-free" else software="nginx apache2 apache2-utils apache2.2-common apache2-suexec-custom libapache2-mod-ruid2 @@ -41,7 +41,7 @@ else mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect unrar" + bsdmainutils cron vesta vesta-nginx vesta-php expect unrar-free" fi # Defining help function From 19e49efac1235d251142fe6eb2262aca5568bfbc Mon Sep 17 00:00:00 2001 From: dpeca Date: Wed, 8 Mar 2017 16:01:11 +0100 Subject: [PATCH 40/72] Debian installer: roundcube config.inc.php --- install/vst-install-debian.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index c9295c925..ada457056 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1091,6 +1091,7 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then chmod 640 /etc/roundcube/debian-db-roundcube.php chmod 640 /etc/roundcube/config.inc.php chown root:www-data /etc/roundcube/debian-db-roundcube.php + chown root:www-data /etc/roundcube/config.inc.php wget $vestacp/roundcube/vesta.php -O \ /usr/share/roundcube/plugins/password/drivers/vesta.php wget $vestacp/roundcube/config.inc.php -O \ @@ -1108,6 +1109,7 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then chmod 640 /etc/roundcube/debian-db-roundcube.php chmod 640 /etc/roundcube/config.inc.php chown root:www-data /etc/roundcube/debian-db-roundcube.php + chown root:www-data /etc/roundcube/config.inc.php # RoundCube tinyMCE fix tinymceFixArchiveURL=$vestacp/roundcube/roundcube-tinymce.tar.gz tinymceParentFolder=/usr/share/roundcube/program/js From a005c3e24a2496647dcaf017621c966acc5346b6 Mon Sep 17 00:00:00 2001 From: dpeca Date: Mon, 13 Mar 2017 03:14:50 +0100 Subject: [PATCH 41/72] Added missing format_domain_idn in v-restore-user --- bin/v-restore-user | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/v-restore-user b/bin/v-restore-user index fa93482ed..69e8e10ce 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -567,6 +567,8 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then # Rebuilding mail config rebuild_mail_domain_conf + + format_domain_idn # Restoring emails if [ -e "$tmpdir/mail/$domain/accounts.tar.gz" ]; then From 887ac8a11b9b8c9e5ca195f2f520c035a611a329 Mon Sep 17 00:00:00 2001 From: dpeca Date: Tue, 14 Mar 2017 01:08:20 +0100 Subject: [PATCH 42/72] Added missing domain_idn=$domain in v-restore-user --- bin/v-restore-user | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/v-restore-user b/bin/v-restore-user index 69e8e10ce..750ae421d 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -568,6 +568,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then # Rebuilding mail config rebuild_mail_domain_conf + domain_idn=$domain format_domain_idn # Restoring emails From 56cdadbe5c9f61a0ff68c0a14a5f39fe2d7454d8 Mon Sep 17 00:00:00 2001 From: dpeca Date: Tue, 14 Mar 2017 01:56:28 +0100 Subject: [PATCH 43/72] Making sure is always reseted in possible loops --- func/domain.sh | 10 ++++------ func/rebuild.sh | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/func/domain.sh b/func/domain.sh index fd205a2bc..53f412707 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -172,9 +172,8 @@ add_web_config() { conf="$HOMEDIR/$user/conf/web/s$1.conf" fi - if [ -z "$domain_idn" ]; then - format_domain_idn - fi + domain_idn=$domain + format_domain_idn cat $WEBTPL/$1/$WEB_BACKEND/$2 | \ sed -e "s|%ip%|$local_ip|g" \ @@ -232,9 +231,8 @@ get_web_config_lines() { check_result $E_PARSING "can't parse template $1" fi - if [ -z "$domain_idn" ]; then - format_domain_idn - fi + domain_idn=$domain + format_domain_idn vhost_lines=$(grep -niF "name $domain_idn" $2) vhost_lines=$(echo "$vhost_lines" |egrep "$domain_idn($| |;)") #" vhost_lines=$(echo "$vhost_lines" |cut -f 1 -d :) diff --git a/func/rebuild.sh b/func/rebuild.sh index 63143472f..e5ab182a9 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -227,9 +227,8 @@ rebuild_web_domain_conf() { # Adding web stats parser if [ ! -z "$STATS" ]; then - if [ -z "$domain_idn" ]; then - format_domain_idn - fi + domain_idn=$domain + format_domain_idn cat $WEBTPL/$STATS/$STATS.tpl |\ sed -e "s|%ip%|$local_ip|g" \ -e "s|%web_system%|$WEB_SYSTEM|g" \ From 4276dd351976d693f41c384d1ea0f5d269dfe4a5 Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 17 Mar 2017 11:27:12 +0100 Subject: [PATCH 44/72] Missing colon in add_mail_acc.html template --- web/templates/admin/add_mail_acc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 647c0d87c..5d3fbae8b 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -170,7 +170,7 @@
- + :
From 26f48c8172c9c64161601c77f7b6a0db2b1571be Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 17 Mar 2017 11:30:24 +0100 Subject: [PATCH 45/72] Missing colon in edit_mail_acc.html template --- web/templates/admin/edit_mail_acc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index ed2db24d1..33a346a4e 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -177,7 +177,7 @@
- + :
From 2f5c7a10b7193c6176aa3c149e9872bbb4399bf7 Mon Sep 17 00:00:00 2001 From: Arinerron Date: Wed, 5 Apr 2017 16:16:01 -0700 Subject: [PATCH 46/72] Fix cryptographically insecure CSRF tokens --- web/login/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/login/index.php b/web/login/index.php index 4be64eccb..d2aacefd7 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -126,7 +126,7 @@ if (empty($_SESSION['language'])) { } // Generate CSRF token -$_SESSION['token'] = md5(uniqid(mt_rand(), true)); +$_SESSION['token'] = bin2hex(openssl_random_pseudo_bytes(16)); // generate 32-character cryptographically secure token require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); require_once('../templates/header.html'); From cb7168f5362cd2f8d5667b33e5c9a899a116961a Mon Sep 17 00:00:00 2001 From: Arinerron Date: Wed, 5 Apr 2017 16:18:44 -0700 Subject: [PATCH 47/72] Fix cryptographically insecure CSRF token bug --- web/inc/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/inc/main.php b/web/inc/main.php index 75482cd1b..1356ec35f 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -59,10 +59,10 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { exit; } +// Generate CSRF token if (isset($_SESSION['user'])) { if(!isset($_SESSION['token'])){ - $token = uniqid(mt_rand(), true); - $_SESSION['token'] = $token; + $_SESSION['token'] = bin2hex(openssl_random_pseudo_bytes(16)); } } From 6cd72e8911a71c7dbbe44157ea0e22458a9046b6 Mon Sep 17 00:00:00 2001 From: Thatphon05 Date: Thu, 6 Apr 2017 19:31:58 +0700 Subject: [PATCH 48/72] add Thai Language --- web/inc/i18n/th.php | 758 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 758 insertions(+) create mode 100644 web/inc/i18n/th.php diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php new file mode 100644 index 000000000..658c55114 --- /dev/null +++ b/web/inc/i18n/th.php @@ -0,0 +1,758 @@ + 'แพ็กเกจ', + 'IP' => 'IP', + 'Graphs' => 'กราฟการใช้งาน', + 'Statistics' => 'สถิติ', + 'Log' => 'Log', + 'Server' => 'เซิฟเวอร์', + 'Services' => 'บริการ', + 'Firewall' => 'ไฟร์วอลล์', + 'Updates' => 'อัพเดท', + 'Log in' => 'เข้าสู่ระบบ', + 'Log out' => 'ออกจากระบบ', + + 'USER' => 'ผู้ใช้', + 'WEB' => 'เว็บ', + 'DNS' => 'DNS', + 'MAIL' => 'อีเมล์', + 'DB' => 'ฐานข้อมูล', + 'CRON' => 'CRON', + 'BACKUP' => 'สำรองข้อมูล', + + 'LOGIN' => 'เข้าสู่ระบบ', + 'RESET PASSWORD' => 'รีเซ็ตรหัสผ่าน', + 'SEARCH' => 'ค้นหา', + 'PACKAGE' => 'แพ็กเกจ', + 'RRD' => 'RRD', + 'STATS' => 'STATS', + 'LOG' => 'ล็อก', + 'UPDATES' => 'อัพเดท', + 'FIREWALL' => 'ไฟร์วอลล์', + 'SERVER' => 'เซิฟเวอร์', + 'MEMORY' => 'หน่วยความจำ', + 'DISK' => 'พื้นที่จัดเก็บข้อมูล', + 'NETWORK' => 'เครือข่าย', + 'Web Log Manager' => 'ตัวจัดการ Web Log', + + 'no notifications' => 'ไม่มีการแจ้งเตือน', + + 'Add User' => 'เพิ่มผู้ใช้', + 'Add Domain' => 'เพิ่มโดเมน', + 'Add Web Domain' => 'เพิ่ม Web Domain', + 'Add DNS Domain' => 'เพิ่ม DNS Domain', + 'Add DNS Record' => 'เพิ่ม DNS Record', + 'Add Mail Domain' => 'เพิ่ม Mail Domain', + 'Add Mail Account' => 'เพิ่มบัญชีอีเมล์', + 'Add Database' => 'เพิ่มฐานข้อมูล', + 'Add Cron Job' => 'เพิ่ม Cron Job', + 'Create Backup' => 'สร้างการสำรองข้อมูล', + 'Configure' => 'ปรับแต่ง', + 'Restore All' => 'คืนค่าทั้งหมด', + 'Add Package' => 'เพิ่มแพ็กเกจ', + 'Add IP' => 'เพิ่ม IP Address', + 'Add Rule' => 'เพิ่ม Rule', + 'Ban IP Address' => 'แบน IP Address', + 'Search' => 'ค้นหา', + 'Add one more FTP Account' => 'เพิ่มอีกบัญชี', + 'Overall Statistics' => 'Overall Statistics', + 'Daily' => 'รายวัน', + 'Weekly' => 'รายสัปดาห์', + 'Monthly' => 'รายเดือน', + 'Yearly' => 'รายปี', + 'Add' => 'เพิ่ม', + 'Back' => 'กลับ', + 'Save' => 'บันทึก', + 'Submit' => 'ส่งข้อมูล', + + 'toggle all' => 'เลือกทั้งหมด', + 'apply to selected' => 'นำไปใช้กับที่เลือก', + 'rebuild' => 'สร้างใหม่', + 'rebuild web' => 'สร้างเว็บใหม่', + 'rebuild dns' => 'สร้าง DNS ใหม่', + 'rebuild mail' => 'สร้างอีเมล์ใหม่', + 'rebuild db' => 'สร้างฐานข้อมูลใหม่', + 'rebuild cron' => 'สร้าง Cron ใหม่', + 'update counters' => 'อัพเดทตัวนับ', + 'suspend' => 'ระงับการใช้งาน', + 'unsuspend' => 'เปิดการใช้งาน', + 'delete' => 'ลบ', + 'show per user' => 'แสดงต่อผู้ใช้', + 'login as' => 'เข้าสู่ระบบด้วย', + 'logout' => 'ออกจากระบบ', + 'edit' => 'แก้ไข', + 'open webstats' => 'เปิดสถิติเว็บ', + 'view logs' => 'ดู Logs', + 'list records' => 'รายการ %s records', + 'add record' => 'เพิ่ม Record', + 'list accounts' => 'รายการ %s บัญชี', + 'add account' => 'เพิ่มบัญชี', + 'open webmail' => 'เปิด Webmail', + 'list fail2ban' => 'แสดง fail2ban', + 'open %s' => 'เปิด %s', + 'download' => 'ดาวน์โหลด', + 'restore' => 'ฟื้นฟู', + 'configure restore settings' => 'กำหนดการตั้งค่าการเรียกคืนค่า', + 'stop' => 'หยุด', + 'start' => 'เริ่ม', + 'restart' => 'เริ่มต้นการทำงานใหม่', + 'update' => 'อัพเดท', + 'generate' => 'สร้าง', + 'Generate CSR' => 'สร้าง CSR', + 'reread IP' => 'อ่าน IP ใหม่', + 'enable autoupdate' => 'เปิดการอัพเดทอัตโนมัติ', + 'disable autoupdate' => 'ปิดการอัพเดทอัตโนมัติ', + 'turn on notifications' => 'เปิดใช้งานการแจ้งเตือน', + 'turn off notifications' => 'ปิดใช้งานการแจ้งเตือน', + 'configure' => 'ปรับแต่ง', + + 'Adding User' => 'เพิ่มผู้ใช้', + 'Editing User' => 'แก้ไขผู้ใช้', + 'Adding Domain' => 'เพิ่มโดนเมน', + 'Editing Domain' => 'แก้ไขโดเมน', + 'Adding DNS Domain' => 'เพิ่ม DNS Domain', + 'Editing DNS Domain' => 'แก้ไข DNS Domain', + 'Adding DNS Record' => 'เพิ่ม DNS Record', + 'Editing DNS Record' => 'แก้ไข DNS Record', + 'Adding Mail Domain' => 'เพิ่ม Mail Domain', + 'Editing Mail Domain' => 'แก้ไข Mail Domain', + 'Adding Mail Account' => 'เพิ่มบัญชีอีเมล์', + 'Editing Mail Account' => 'แก้ไขบัญชีอีเมล์', + 'Adding database' => 'เพิ่มฐานข้อมูล', + 'Editing Cron Job' => 'แก้ไข Cron Job', + 'Adding Cron Job' => 'เพิ่ม Cron Job', + 'Editing Database' => 'แก้ไขฐานข้อมูล', + 'Adding Package' => 'เพิ่มแพ็กเกจ', + 'Editing Package' => 'แก้ไขแพ็กเกจ', + 'Adding IP address' => 'เพิ่ม IP address', + 'Editing IP Address' => 'แก้ไข IP Address', + 'Editing Backup Exclusions' => 'แก้ไขการยกเว้นสำรองข้อมูล', + 'Generating CSR' => 'สร้าง CSR', + 'Listing' => 'รายการ', + 'Search Results' => 'ผลลัพธ์ของการค้นหา', + 'Adding Firewall Rule' => 'การเพิ่ม Firewall Rule', + 'Editing Firewall Rule' => 'การแก้ไข Firewall Rule', + 'Adding IP Address to Banlist' => 'การแบน IP Address', + + 'active' => 'เปิดใช้งาน', + 'spnd' => 'ยกเลิกการใช้', + 'suspended' => 'ระงับการใช้งานแล้ว', + 'running' => 'กำลังทำงาน', + 'stopped' => 'หยุดทำงานแล้ว', + 'outdated' => 'ตกรุ่น', + 'updated' => 'อัพเดท', + + 'yes' => 'ใช่', + 'no' => 'ไม่ใช่', + 'none' => 'ไม่มี', + 'pb' => 'pb', + 'tb' => 'tb', + 'gb' => 'gb', + 'mb' => 'mb', + 'minute' => 'นาที', + 'hour' => 'ชั่วโมง', + 'day' => 'วัน', + 'days' => 'วัน', + 'hours' => 'ชั่วโมง', + 'minutes' => 'นาที', + 'month' => 'เดือน', + 'package' => 'แพ็กเกจ', + 'Bandwidth' => 'แบนด์วิดธ์', + 'Disk' => 'พื้นที่จัดเก็บข้อมูล', + 'Web' => 'เว็บ', + 'Mail' => 'อีเมล์', + 'Databases' => 'ฐานข้อมูล', + 'User Directories' => 'ไดเร็กทอรี่ของผู้ใช้', + 'Template' => 'Template', + 'Web Template' => 'Template หน้าเว็บ', + 'Backend Template' => 'Template หลังบ้าน', + 'Proxy Template' =>'Proxy Template', + 'DNS Template' => 'DNS Template', + 'Web Domains' => 'Web Domains', + 'SSL Domains' => 'SSL Domains', + 'Web Aliases' => 'Web Aliases', + 'per domain' => 'ต่อ Domain', + 'DNS Domains' => 'DNS Domains', + 'DNS domains' => 'DNS domains', + 'DNS records' => 'DNS records', + 'Name Servers' => 'Name Servers', + 'Mail Domains' => 'Mail Domains', + 'Mail Accounts' => 'บัญชีอีเมล์', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'การเข้าถึง SSH', + 'IP Address' => 'IP Address', + 'IP Addresses' => 'IP Addresses', + 'Backups' => 'สำรองข้อมูล', + 'Backup System' => 'ระบบสำรองข้อมูล', + 'backup exclusions' => 'การยกเว้นการสำรองข้อมูล', + 'template' => 'template', + 'SSL Support' => 'สนับสนุน SSL', + 'SSL Home Directory' => 'หน้าแรกของ SSL', + 'Lets Encrypt Support' => 'สนับสนุน Lets Encrypt', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'ใบรับรองของคุณจะได้รับการออกโดยอัตโนมัติภายใน 5 นาที', + 'Proxy Support' => 'สนับสนุน Proxy', + 'Proxy Extensions' => 'ส่วนขยาย Proxy', + 'Web Statistics' => 'สถิติของเว็บไซต์', + 'Additional FTP Account' => 'เพิ่มบัญชี FTP', + 'Path' => 'เส้นทาง', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'หมดอายุ', + 'Records' => 'Records', + 'Serial' => 'Serial', + 'Catchall email' => 'Catchall email', + 'AntiVirus Support' => 'สนับสนุน AntiVirus', + 'AntiSpam Support' => 'สนับสนุน AntiSpam', + 'DKIM Support' => 'สนับสนุน DKIM', + 'Accounts' => 'บัญชี', + 'Quota' => 'โควตา', + 'Autoreply' => 'ตอบกลับอัตโนมัติ', + 'Forward to' => 'ส่งต่อไปยัง', + 'Do not store forwarded mail' => 'อย่าเก็บอีเมล์ที่ส่งต่อไว้', + 'IMAP hostname' => 'IMAP hostname', + 'IMAP port' => 'IMAP port', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP hostname', + 'SMTP port' => 'SMTP port', + 'SMTP security' => 'SMTP security', + 'SMTP auth method' => 'SMTP auth method', + 'STARTTLS' => 'STARTTLS', + 'Normal password' => 'รหัสผ่านธรรมดา', + 'database' => 'ฐานข้อมูล', + 'User' => 'ผู้ใช้', + 'Host' => 'โฮสต์', + 'Charset' => 'charset', + 'Min' => 'นาที', + 'Hour' => 'ชั่วโมง', + 'Day' => 'วัน', + 'Month' => 'เดือน', + 'Day of week' => 'วันในสัปดาห์', + 'local' => 'ประเทศ', + 'Run Time' => 'เวลาทำงาน', + 'Backup Size' => 'ขนาดสำรองข้อมูล', + 'SYS' => 'SYS', + 'Domains' => 'Domains', + 'Status' => 'สถานะ', + 'shared' => 'shared', + 'dedicated' => 'dedicated', + 'Owner' => 'เจ้าของ', + 'Users' => 'ผู้ใช้', + 'Load Average' => 'โหลดเฉลี่ย', + 'Memory Usage' => 'การใช้หน่วยความจำ', + 'APACHE2 Usage' => 'การใช้ APACHE2', + 'HTTPD Usage' => 'การใช้ HTTPD', + 'NGINX Usage' => 'การใช้ NGINX', + 'MySQL Usage on localhost' => 'การใช้ MySQL บน localhost', + 'PostgreSQL Usage on localhost' => 'การใช้ PostgreSQL บน localhost', + 'Bandwidth Usage eth0' => 'การใช้ แบนด์วิดธ์ ของ eth0', + 'Bandwidth Usage eth1' => 'การใช้ แบนด์วิดธ์ ของ eth1', + 'Exim Usage' => 'การใช้ Exim', + 'FTP Usage' => 'การใช้ FTP', + 'SSH Usage' => 'การใช้ SSH', + 'reverse proxy' => 'reverse proxy', + 'web server' => 'web server', + 'dns server' => 'dns server', + 'mail server' => 'mail server', + 'pop/imap server' => 'pop/imap server', + 'email antivirus' => 'email antivirus', + 'email antispam' => 'email antispam', + 'database server' => 'database server', + 'ftp server' => 'ftp server', + 'job scheduler' => 'job scheduler', + 'firewall' => 'firewall', + 'brute-force monitor' => 'ตรวจสอบการ brute-force', + 'CPU' => 'CPU', + 'Memory' => 'หน่วยความจำ', + 'Uptime' => 'เวลาทำงาน', + 'core package' => 'แพ็กเกจหลัก', + 'php interpreter' => 'ตัวแปลคำสั่ง php', + 'internal web server' => 'เว็บเซิร์ฟเวอร์ภายใน', + 'Version' => 'เวอร์ชั่น', + 'Release' => 'เวอร์ชั่นการปล่อย', + 'Architecture' => 'สถาปัตยกรรม', + 'Object' => 'วัตถุ', + 'Username' => 'ชื่อผู้ใช้', + 'Password' => 'รหัสผ่าน', + 'Email' => 'อีเมล์', + 'Package' => 'แพ็กเกจ', + 'Language' => 'ภาษา', + 'First Name' => 'ชื่อ', + 'Last Name' => 'นามสกุล', + 'Send login credentials to email address' => 'อีเมล์สำหรับส่งข้อมูลการเข้าสู่ระบบ', + 'Default Template' => 'Template มาตรฐาน', + 'Default Name Servers' => 'Name Servers มาตรฐาน', + 'Domain' => 'โดเมน', + 'DNS Support' => 'สนับสนุน DNS', + 'Mail Support' => 'สนับสนุนอีเมล์', + 'Advanced options' => 'ตัวเลือกขั้นสูง', + 'Basic options' => 'ตัวเลือกพื้นฐาน', + 'Aliases' => 'Aliases', + 'SSL Certificate' => 'SSL Certificate', + 'SSL Key' => 'SSL Key', + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', + 'SSL CSR' => 'SSL CSR', + 'optional' => 'ทางเลือกเพิ่มเติม', + 'internal' => 'ภายใน', + 'Statistics Authorization' => 'สถิติการเข้าใช้งาน', + 'Statistics Auth' => 'สถิติการเข้าสู่ระบบ', + 'Account' => 'บัญชี', + 'Prefix will be automaticaly added to username' => 'คำนำหน้า %s จะถูกเพิ่มลงในชื่อผู้ใช้โดยอัตโนมัติ', + 'Send FTP credentials to email' => 'อีเมล์สำหรับส่งข้อมูล FTP', + 'Expiration Date' => 'วันหมดอายุ', + 'YYYY-MM-DD' => 'ปี-เดือน-วัน', + 'Name servers' => 'Name servers', + 'Record' => 'Record', + 'IP or Value' => 'IP หรือ ค่า', + 'Priority' => 'ลำดับความสำคัญ', + 'Record Number' => 'ตัวเลข record', + 'in megabytes' => 'หน่วย megabytes', + 'Message' => 'ข้อความ', + 'use local-part' => 'ใช้ส่วนภายใน', + 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่อีเมล์', + 'Prefix will be automaticaly added to database name and database user' => 'คำนำหน้า %s จะถูกเพิ่มชื่อในฐานข้อมูลและฐานข้อมูลผู้ใช้โดยอัตโนมัติ', + 'Database' => 'ฐานข้อมูล', + 'Type' => 'ชนิด', + 'Minute' => 'นาที', + 'Command' => 'คำสั่ง', + 'Package Name' => 'ชื่อแพ็กเกจ', + 'Netmask' => 'Netmask', + 'Interface' => 'Interface', + 'Shared' => 'แชร์', + 'Assigned user' => 'กำหนดผู้ใช้แล้ว', + 'Assigned domain' => 'โดเมนที่กำหนด', + 'NAT IP association' => 'NAT IP association', + 'shell' => 'shell', + 'web domains' => 'web domains', + 'web aliases' => 'web aliases', + 'dns records' => 'dns records', + 'mail domains' => 'mail domains', + 'mail accounts' => 'บัญชีอีเมล์', + 'accounts' => 'บัญชี', + 'databases' => 'ฐานข้อมูล', + 'cron jobs' => 'cron jobs', + 'backups' => 'สำรองข้อมูล', + 'quota' => 'โควต้า', + 'day of week' => 'วันในสัปดาห์', + 'cmd' => 'cmd', + 'users' => 'ผู้ใช้', + 'domains' => 'โดนเมน', + 'aliases' => 'aliases', + 'records' => 'records', + 'jobs' => 'jobs', + 'username' => 'ชื่อผู้ใช้', + 'password' => 'รหัสผ่าน', + 'type' => 'ชนิด', + 'charset' => 'charset', + 'domain' => 'โดเมน', + 'ip' => 'ip', + 'ip address' => 'ip address', + 'IP address' => 'IP address', + 'netmask' => 'netmask', + 'interface' => 'interface', + 'assigned user' => 'กำหนดผู้ใช้แล้ว', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'ผู้ใช้', + 'email' => 'อีเมล์', + 'first name' => 'ชื่อ', + 'last name' => 'นามสกุล', + 'account' => 'บัญชี', + 'ssl certificate' => 'ใบอณุญาติ ssl', + 'ssl key' => 'ssl key', + 'stats user password' => 'stats user password', + 'stats username' => 'stats username', + 'stats password' => 'stats password', + 'ftp user password' => 'FTP ชื่อผู้ใช้ รหัสผ่าน', + 'ftp user' => 'ผู้ใช้ FTP', + 'Last 70 lines of %s.%s.log' => '70 บรรทัดสุดท้ายของ %s.%s.log', + 'AccessLog' => 'AccessLog', + 'ErrorLog' => 'ErrorLog', + 'Download AccessLog' => 'ดาวน์โหลด AccessLog', + 'Download ErrorLog' => 'ดาวน์โหลด ErrorLog', + 'Country' => 'ประเทศ', + '2 letter code' => 'รหัสประเทศ 2 ตัว', + 'State / Province' => 'ถนน / แขวง', + 'City / Locality' => 'เมือง / ท้องถิ่น', + 'Organization' => 'องค์กร', + 'Action' => 'การกระทำ', + 'Protocol' => 'โปรโตคอล', + 'Port' => 'Port', + 'Comment' => 'ความคิดเห็น', + 'Banlist' => 'รายชื่อที่โดนแบน', + 'ranges are acceptable' => 'ช่วงที่ยอมรับได้', + 'CIDR format is supported' => 'การสนับสนุน CIDR', + 'ACCEPT' => 'ยอมรับ', + 'DROP' => 'บล็อค', + 'TCP' => 'TCP', + 'UDP' => 'UDP', + 'ICMP' => 'ICMP', + 'SSH' => 'SSH', + 'FTP' => 'FTP', + 'VESTA' => 'VESTA', + 'Add one more Name Server' => 'เพิ่ม Name Server อีก', + + 'web domain' => 'web domain', + 'dns domain' => 'dns domain', + 'dns record' => 'dns record', + 'mail domain' => 'mail domain', + 'mail account' => 'บัญชีอีเมล์', + 'cron job' => 'cron job', + + 'cron' => 'cron', + 'user dir' => 'ไดเร็กทอรี่ของผู้ใช้', + + 'unlimited' => 'ไม่จำกัด', + '1 account' => '1 บัญชี', + '%s accounts' => '%s บัญชี', + '1 domain' => '1 โดเมน', + '%s domains' => '%s โดเมน', + '1 record' => '1 record', + '%s records' => '%s records', + '1 mail account' => '1 บัญชีอีเมล์', + '%s mail accounts' => '%s บัญชีอีเมล์', + '1 database' => '1 ฐานข้อมูล', + '%s databases' => '%s ฐานข้อมูล', + '1 cron job' => '1 cron job', + '%s cron jobs' => '%s cron jobs', + '1 archive' => '1 เก็บถาวร', + '%s archives' => '%s เก็บถาวร', + '1 item' => '1 รายการ', + '%s items' => '%s รายการ', + '1 package' => '1 แพ็กเกจ', + '%s packages' => '%s packages', + '1 IP address' => '1 IP address', + '%s IP addresses' => '%s IP addresses', + '1 month' => '1 เดือน', + '%s months' => '%s เดือน', + '1 log record' => '1 log record', + '%s log records' => '%s log record', + '1 object' => '1 วัตถุ', + '%s objects' => '%s วัตถุ', + 'no exclusions' => 'ไม่มีการยกเว้น', + '1 rule' => '1 rule', + '%s rules' => '%s rules', + 'There are no currently banned IP' => 'ไม่มี IP ที่ถูกแบน', + + 'USER_CREATED_OK' => 'สร้างผู้ใช้ %s สำเร็จแล้ว', + 'WEB_DOMAIN_CREATED_OK' => 'สร้างโดนเมน %s สำเร็จแล้ว', + 'DNS_DOMAIN_CREATED_OK' => 'สร้าง DNS domain %s สำเร็จแล้ว', + 'DNS_RECORD_CREATED_OK' => 'สร้าง Record %s.%s ได้ถูกสร้างสำเร็จแล้ว', + 'MAIL_DOMAIN_CREATED_OK' => 'สร้าง Mail domain %s สำเร็จแล้ว', + 'MAIL_ACCOUNT_CREATED_OK' => 'สร้างบัญชีอีเมล์ %s@%s สำเร็จแล้ว', + 'DATABASE_CREATED_OK' => 'สร้างฐานข้อมูล %s สำเร็จแล้ว', + 'CRON_CREATED_OK' => 'สร้าง Cron job ได้ถูกสร้างแล้ว', + 'IP_CREATED_OK' => 'สร้าง IP address %s สำเร็จแล้ว', + 'PACKAGE_CREATED_OK' => 'สร้าง Package %s สำเร็จแล้ว', + 'SSL_GENERATED_OK' => 'สร้างใบรับรองสำเร็จแล้ว', + 'RULE_CREATED_OK' => 'สร้าง Rule สำเร็จแล้ว', + 'BANLIST_CREATED_OK' => 'สร้าง IP address สำเร็จแล้ว', + 'Autoupdate has been successfully enabled' => 'เปิดใช้งาน Autoupdate สำเร็จแล้ว', + 'Autoupdate has been successfully disabled' => 'ปิดใช้งาน Autoupdate สำเร็จแล้ว', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob email reporting has been successfully enabled', + 'Cronjob email reporting has been successfully disabled' => 'Cronjob email reporting has been successfully disabled', + 'Changes has been saved.' => 'บันทึกการเปลี่ยนแปลงแล้ว', + 'Confirmation' => 'การยืนยัน', + 'DELETE_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบผู้ใช้ %s?', + 'SUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับผู้ใช้ %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานผู้ใช้ %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบโดเมน %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'แน่ใจหรือไม่ว่าคุณต้องการ ระงับโดเมน %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานโดเมน %s?', + 'DELETE_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ Record %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ Record %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน Record %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือว่าต้องการ ลบอีเมล์ %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับอีเมล์ %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานอีเมล์ %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบฐานข้อมูล %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับฐานข้อมูล %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานฐานข้อมูล %s?', + 'DELETE_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ cron job?', + 'SUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ cron job?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน cron job?', + 'DELETE_BACKUP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบการสำรองข้อมูล %s?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ %s ในการยกเว้น?', + 'DELETE_PACKAGE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบแพ็กเกจ %s?', + 'DELETE_IP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ IP address %s?', + 'DELETE_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ rule #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ rule #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน rule #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'ออกจากหน้านี้?', + 'RESTART_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการเริ่มต้นใหม่ %s?', + 'Welcome' => 'ยินดีต้อนรับ', + 'LOGGED_IN_AS' => 'เข้าสู่ระบบในฐานะผู้ใช้ %s', + 'Error' => 'เกิดข้อผิดพลาด', + 'Invalid username or password' => 'ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง', + 'Invalid username or code' => 'ชื่อผู้ใช้หรือรหัสไม่ถูกต้อง', + 'Passwords not match' => 'รหัสผ่านทั้งสองไม่ตรงกัน', + 'Please enter valid email address.' => 'กรุณาใส่อีเมล์ที่ถูกต้อง', + 'Field "%s" can not be blank.' => 'ช่อง "%s" ไม่สามารถเว้นว่างไว้', + 'Password is too short.' => 'รหัสผ่านสั้นเกินไป (ต่ำสุด 6 ตัวอักษร)', + 'Error code:' => 'รหัสข้อผิดพลาด: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" ล้มเหลว', + 'IP address is in use' => 'IP address กำลังใช้งานอยู่', + 'BACKUP_SCHEDULED' => 'มีการเพิ่มงานลงในคิวแล้ว คุณจะได้รับอีเมลแจ้งเตือนเมื่อการสำรองข้อมูลของคุณพร้อมสำหรับการดาวน์โหลด', + 'BACKUP_EXISTS' => 'มีการสำรองข้อมูลอยู่ โปรดรอให้การสำรองข้อมูลในปัจจุบันเสร็จสิ้น', + 'RESTORE_SCHEDULED' => 'มีการเพิ่มงานลงในคิวแล้ว คุณจะได้รับการแจ้งเตือนทางอีเมลเมื่อการคืนค่าเสร็จสิ้น', + 'RESTORE_EXISTS' => 'งานการบูรณะที่มีอยู่กำลังทำงานอยู่แล้ว โปรดรอให้เสร็จสิ้นก่อนเปิดตัวอีกครั้ง', + + 'WEB_EXCLUSIONS' => 'พิมพ์ชื่อโดเมนหนึ่งรายการต่อบรรทัด หากต้องการยกเว้นโดเมนทั้งหมด ให้ใช้ * หากต้องการยกเว้น "ไดเร็กทอรี่" เฉพาะให้ใช้รูปแบบดังนี้: domain.com:public_html/cache:public_html/tmp', + 'DNS_EXCLUSIONS' => 'พิมพ์ชื่อโดเมนหนึ่งรายการต่อบรรทัด หากต้องการยกเว้นโดเมนทั้งหมด ให้ใช้ *', + 'MAIL_EXCLUSIONS' => 'พิมพ์ชื่อโดเมนหนึ่งรายการต่อบรรทัด หากต้องการยกเว้นโดเมนทั้งหมด ให้ใช้ * หากต้องการยกเว้นบัญชีที่ระบุให้ใช้รูปแบบดังนี้: domain.com:info:support:postmaster', + 'DB_EXCLUSIONS' => 'พิมพ์ชื่อฐานข้อมูลทั้งหมดหนึ่งรายการต่อบรรทัด หากต้องการยกเว้นฐานข้อมูลทั้งหมด ให้ใช้ *', + 'CRON_EXCLUSIONS' => 'หากต้องการยกเว้นงานทั้งหมด ให้ใช้ *', + 'USER_EXCLUSIONS' => 'พิมพ์ชื่อไดเร็กทอรี่หนึ่งรายการต่อบรรทัด หรือเพื่อไม่ให้ใช้ไดเร็กทอรี่ทั้งหมด ให้ใช้ *', + + 'Welcome to Vesta Control Panel' => 'ยินดีต้อนรับสู่ Vesta Control Panel', + 'MAIL_FROM' => 'Vesta Control Panel ', + 'GREETINGS_GORDON_FREEMAN' => "สวัสดี, %s %s,\n", + 'GREETINGS' => "สวัสดี,\n", + 'ACCOUNT_READY' => "บัญชีของคุณได้รับการสร้างและพร้อมใช้งานแล้ว\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n", + + 'FTP login credentials' => 'ข้อมูลการเข้าสู่ระบบ FTP', + 'FTP_ACCOUNT_READY' => "มีการสร้างบัญชี FTP และพร้อมใช้งานแล้ว\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n", + + 'Database Credentials' => 'ข้อมูลของฐานข้อมูล', + 'DATABASE_READY' => "สร้างฐานข้อมูลเรียบร้อยแล้ว\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n", + + 'forgot password' => 'ลืมรหัสผ่าน', + 'Confirm' => 'ยืนยัน', + 'New Password' => 'รหัสผ่านใหม่', + 'Confirm Password' => 'ยืนยันรหัสผ่าน', + 'Reset' => 'รีเซ็ต', + 'Reset Code' => 'รหัสรีเซ็ต', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'รหัสรีเซ็ตรหัสผ่านถูกส่งไปยังที่อยู่อีเมลของคุณแล้ว
', + 'MAIL_RESET_SUBJECT' => 'ตั้งค่ารหัสผ่านใหม่ที่ %s', + 'PASSWORD_RESET_REQUEST' => "หากต้องการรีเซ็ตรหัสผ่านของแผงควบคุมโปรดไปที่ลิงก์นี้:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, คุณอาจจะไปที่ https://%s/reset/?action=code&user=%s และใส่รหัสรีเซ็ตดังต่อไปนี้:\n%s\n\nหากคุณไม่ได้ขอรหัสผ่านใหม่โปรดละเว้นข้อความนี้และยอมรับคำขอโทษของเรา\n\n--\nVesta Control Panel\n", + + 'Jan' => 'ม.ค.', + 'Feb' => 'ก.พ.', + 'Mar' => 'มี.ค.', + 'Apr' => 'เม.ย', + 'May' => 'พ.ค.', + 'Jun' => 'มิ.ย', + 'Jul' => 'ก.ค.', + 'Aug' => 'ส.ค.', + 'Sep' => 'ก.ย.', + 'Oct' => 'ต.ค.', + 'Nov' => 'พ.ย.', + 'Dec' => 'ธ.ค.', + + 'Configuring Server' => 'การกำหนดค่าเซิฟเวอร์', + 'Hostname' => 'Hostname', + 'Time Zone' => 'เขตเวลา', + 'Default Language' => 'ภาษาเริ่มต้น', + 'Proxy Server' => 'Proxy Server', + 'Web Server' => 'Web Server', + 'Backend Server' => 'Backend Server', + 'Backend Pool Mode' => 'Backend Pool Mode', + 'DNS Server' => 'DNS Server', + 'DNS Cluster' => 'DNS Cluster', + 'MAIL Server' => 'MAIL Server', + 'Antivirus' => 'Antivirus', + 'AntiSpam' => 'AntiSpam', + 'Webmail URL' => 'Webmail URL', + 'MySQL Support' => 'สนับสนุน MySQL', + 'phpMyAdmin URL' => 'ที่อยู่ของ phpMyAdmin', + 'PostgreSQL Support' => 'PostgreSQL Support', + 'phpPgAdmin URL' => 'phpPgAdmin URL', + 'Maximum Number Of Databases' => 'จำนวนฐานข้อมูลสูงสุด', + 'Current Number Of Databases' => 'จำนวนฐานข้อมูลปัจจุบัน', + 'Local backup' => 'Local backup', + 'Compression level' => 'ระดับการบีบอัด', + 'Directory' => 'ไดเร็กทอรี่', + 'Remote backup' => 'การสำรองข้อมูลระยะไกล', + 'ftp' => 'FTP', + 'sftp' => 'SFTP', + 'SFTP Chroot' => 'SFTP Chroot', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'ปลั๊กอิน Vesta Control Panel', + 'preview' => 'ดูตัวอย่าง', + 'Reseller Role' => 'บทบาท Reseller', + 'Web Config Editor' => 'เครื่องมือแก้ไขการตั้งค่าเว็บ', + 'Template Manager' => 'ตัวจัดการ Template', + 'Backup Migration Manager' => 'ตัวจัดการการย้ายข้อมูลสำรอง', + 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + + 'sort by' => 'จัดเรียงโดย', + 'Date' => 'วันที่', + 'Starred' => 'ตั้งแต่เริ่มต้น', + 'Name' => 'ชื่อ', + + 'save to favorites' => 'บันทึกในรายการโปรด', + + 'File Manager' => 'File Manager', + 'size' => 'ขนาด', + 'date' => 'วันที่', + 'name' => 'ชื่อ', + 'Initializing' => 'Initializing', + 'UPLOAD' => 'อัพโหลด', + 'NEW FILE' => 'ไฟล์ใหม่', + 'NEW DIR' => 'ไดเร็กทอรี่ใหม่', + 'DELETE' => 'ลบ', + 'RENAME' => 'เปลี่ยนชื่อ', + 'MOVE' => 'ย้าย', + 'RIGHTS' => 'RIGHTS', + 'COPY' => 'คัดลอก', + 'ARCHIVE' => 'เก็บถาวร', + 'EXTRACT' => 'แตกไฟล์', + 'DOWNLOAD' => 'ดาวน์โหลด', + 'Are you sure?' => 'คุณแน่ใจ?', + 'Hit' => 'Hit', + 'to reload the page' => 'เพื่อโหลดหน้าเว็บใหม่', + 'Directory name cannot be empty' => 'ชื่อไดเร็กทอรี่ต้องไม่ว่างเปล่า', + 'File name cannot be empty' => 'ชื่อไฟล์ต้องไม่ว่างเปล่า', + 'No file selected' => 'ไม่ได้เลือกไฟล์', + 'No file or folder selected' => 'ไม่มีไฟล์หรือโฟลเดอร์ที่เลือกไว้', + 'File type not supported' => 'ไม่สนับสนุนประเภทไฟล์', + 'Directory download not available in current version' => 'ไม่มีการดาวน์โหลดไดเร็กทอรี่ในเวอร์ชันปัจจุบัน', + 'Directory not available' => 'ไม่มีไดเร็กทอรี่', + 'Done' => 'เสร็จสิ้น', + 'Close' => 'ปิด', + 'Copy' => 'คัดลอก', + 'Cancel' => 'ยกเลิก', + 'Rename' => 'เปลี่ยนชื่อ', + 'Move' => 'ย้าย', + 'Change Rights' => 'เปลี่ยนสิทธิ์', + 'Delete' => 'ลบ', + 'Extract' => 'แตกไฟล์', + 'Create' => 'สร้าง', + 'Compress' => 'บีบอัด', + 'OK' => 'โอเค', + 'YOU ARE COPYING' => 'คุณกำลังคัดลอก', + 'YOU ARE REMOVING' => 'คุณกำลังลบ', + 'Delete items' => 'ลบรายการ', + 'Copy files' => 'คัดลอกไฟล์', + 'Move files' => 'ย้ายไฟล์', + 'Are you sure you want to copy' => 'คุณแน่ใจหรือไม่ว่าต้องการจะคัดลอก', + 'Are you sure you want to move' => 'คุณแน่ใจหรือไม่ว่าต้องการย้าย', + 'Are you sure you want to delete' => 'คุณแน่ใจหรือว่าต้องการลบ', + 'into' => 'เข้า', + 'existing files will be replaced' => 'ไฟล์ที่มีอยู่จะถูกแทนที่', + 'Original name' => 'ชื่อเดิม', + 'File' => 'ไฟล์', + 'already exists' => 'มีอยู่แล้ว', + 'Create file' => 'สร้างไฟล์', + 'Create directory' => 'สร้างไดเร็คทอรี่', + 'read by owner' => 'อ่านโดยเจ้าของ', + 'write by owner' => 'เขียนด้วยเจ้าของ', + 'execute/search by owner' => 'รัน / ค้นหาโดยเจ้าของ', + 'read by group' => 'ผ่านโดยกลุ่ม', + 'write by group' => 'เขียนโดยกลุ่ม', + 'execute/search by group' => 'รัน / ค้นหาตามกลุ่ม', + 'read by others' => 'อ่านโดยคนอื่น', + 'write by others' => 'เขียนโดยคนอื่น', + 'execute/search by others' => 'รัน / ค้นหาโดยผู้อื่น', + + 'Shortcuts' => 'ทางลัด', + 'Add New object' => 'เพิ่มข้อมูลใหม่', + 'Save Form' => 'บันทึก', + 'Cancel saving form' => 'ยกเลิกการบันทึก', + 'Go to USER list' => 'ไปที่รายการ ผู้ใช้', + 'Go to WEB list' => 'ไปที่รายการ เว็บ', + 'Go to DNS list' => 'ไปที่รายการ DNS', + 'Go to MAIL list' => 'ไปที่รายการ อีเมล์', + 'Go to DB list' => 'ไปที่รายการ ฐานข้อมูล', + 'Go to CRON list' => 'ไปที่รายการ CRON', + 'Go to BACKUP list' => 'ไปที่รายการ สำรองข้อมูล', + 'Focus on search' => 'มุ่งเน้นการค้นหา', + 'Display/Close shortcuts' => 'แสดง/ปิด shortcuts', + 'Move backward through top menu' => 'เลื่อนกลับไปที่เมนูด้านบน', + 'Move forward through top menu' => 'เลื่อนไปข้างหน้าผ่านเมนูด้านบน', + 'Enter focused element' => 'ใส่องค์ประกอบที่เน้น', + 'Move up through elements list' => 'เลื่อนขึ้นไปผ่านรายการองค์ประกอบ', + 'Move down through elements list' => 'เลื่อนลงมาผ่านรายการองค์ประกอบ', + + 'Upload' => 'อัพโหลด', + 'New File' => 'ไฟล์ใหม่', + 'New Folder' => 'โฟล์เดอร์ใหม่', + 'Download' => 'ดาวน์โหลด', + 'Archive' => 'เก็บถาวร', + 'Save File (in text editor)' => 'บันทึกไฟล์ (ในเครื่องมือแก้ไขไฟล์)', + 'Close Popup / Cancel' => 'ปิดหน้าต่าง / ยกเลิก', + 'Move Cursor Up' => 'เลื่อนเคอร์เซอร์ขึ้น', + 'Move Cursor Down' => 'เลื่อนเคอร์เซอร์ลง', + 'Switch to Left Tab' => 'สลับไปที่แท็บด้านซ้าย', + 'Switch to Right Tab' => 'สลับไปที่แท็บด้านขวา', + 'Switch Tab' => 'เปลี่ยนแท็บ', + 'Go to the Top of the File List' => 'ไปที่ด้านบนของรายการแฟ้ม', + 'Go to the Last File' => 'ไปที่ไฟล์สุดท้าย', + 'Open File / Enter Directory' => 'เปิดไฟล์ / ไปที่ไดเร็คทอรี่หลัก', + 'Edit File' => 'Edit File', + 'Go to Parent Directory' => 'ไปที่ไดเร็คทอรี่หลัก', + 'Select Current File' => 'เลือกไฟล์ปัจจุบัน', + 'Select Bunch of Files' => 'เลือกกลุ่มของไฟล์', + 'Add File to the Current Selection' => 'เพิ่มไฟล์ในการเลือกปัจจุบัน', + 'Select All Files' => 'เลือกไฟล์ทั้งหมด', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', + + 'Licence Key' => 'Licence Key', + 'Enter License Key' => 'กรอก License Key', + 'Buy Licence' => 'ซื้อ Licence', + 'Buy Lifetime License' => 'ซื้อ License แบบถาวร', + 'Disable and Cancel Licence' => 'ปิดการใช้งาน และยกเลิก Licence', + 'Licence Activated' => 'เปิดใช้งาน Licence แล้ว', + 'Licence Deactivated' => 'ปืดการใช้งาน Licence แล้ว', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่บ้านเท่านั้น', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'สิ่งนี้ไม่ใช่โมดูลฟรี, คุณจะต้องซื้อ License Key เพื่อเปิดใช้งาน', + + 'Minutes' => 'นาที', + 'Hourly' => 'รายชั่วโมง', + 'Run Command' => 'รันคำสั่ง', + 'every month' => 'ทุกเดือน', + 'every odd month' => 'ทุกเดือนคี่', + 'every even month' => 'ทุกเดือนคู่', + 'every day' => 'ทุกวัน', + 'every odd day' => 'ทุกวันคี่', + 'every even day' => 'ทุกวันคู่', + 'weekdays (5 days)' => 'วันธรรมดา (5 วัน)', + 'weekend (2 days)' => 'วัดหยุดสุดสัปดาห์ (2 วัน)', + 'Monday' => 'วันจันทร์', + 'Tuesday' => 'วันอังคาร', + 'Wednesday' => 'วันพุธ', + 'Thursday' => 'วันพฤหัสบดี', + 'Friday' => 'วันศุกร์', + 'Saturday' => 'วันเสาร์', + 'Sunday' => 'วันอาทิตย์', + 'every hour' => 'ทุกชั่วโมง', + 'every two hours' => 'ทุกสองชั่วโมง', + 'every minute' => 'ทุกนาที', + 'every two minutes' => 'ทุกสองนาที', + 'every' => 'ทุก', + 'Generate' => 'สร้าง', + + 'webalizer' => 'webalizer', + 'awstats' => 'awstats', + + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'ใช้ server hostname', + 'Use domain hostname' => 'ใช้ domain hostname', + 'Use STARTTLS' => 'ใช้ STARTTLS', + 'Use SSL' => 'ใช้ SSL', + 'No encryption' => 'ไม่มี encryption', + 'Do not use encryption' => 'ไม่ใช้ encryption', + + 'maximum characters length, including prefix' => 'ความยาว charset สูงสุด %s ตัว, รวมถึงคำนำหน้า', + +); From 8da708b4f7df9ea06c061c937a9f0b0d114291b0 Mon Sep 17 00:00:00 2001 From: Thatphon05 Date: Thu, 6 Apr 2017 19:33:13 +0700 Subject: [PATCH 49/72] add Thai Language --- web/inc/i18n/th.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index 658c55114..bc5e2667f 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -98,7 +98,7 @@ $LANG['th'] = array( 'list fail2ban' => 'แสดง fail2ban', 'open %s' => 'เปิด %s', 'download' => 'ดาวน์โหลด', - 'restore' => 'ฟื้นฟู', + 'restore' => 'เรียกคืนค่า', 'configure restore settings' => 'กำหนดการตั้งค่าการเรียกคืนค่า', 'stop' => 'หยุด', 'start' => 'เริ่ม', From 58eb46c9d9857c4427a3e3f3ca0b2a8773a0b5bb Mon Sep 17 00:00:00 2001 From: Thatphon05 Date: Fri, 7 Apr 2017 10:39:52 +0700 Subject: [PATCH 50/72] Improve Thai translation --- web/inc/i18n/th.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index bc5e2667f..cf4634370 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -62,7 +62,7 @@ $LANG['th'] = array( 'Ban IP Address' => 'แบน IP Address', 'Search' => 'ค้นหา', 'Add one more FTP Account' => 'เพิ่มอีกบัญชี', - 'Overall Statistics' => 'Overall Statistics', + 'Overall Statistics' => 'สถิติโดยรวม', 'Daily' => 'รายวัน', 'Weekly' => 'รายสัปดาห์', 'Monthly' => 'รายเดือน', @@ -95,7 +95,7 @@ $LANG['th'] = array( 'list accounts' => 'รายการ %s บัญชี', 'add account' => 'เพิ่มบัญชี', 'open webmail' => 'เปิด Webmail', - 'list fail2ban' => 'แสดง fail2ban', + 'list fail2ban' => 'รายการ fail2ban', 'open %s' => 'เปิด %s', 'download' => 'ดาวน์โหลด', 'restore' => 'เรียกคืนค่า', @@ -201,7 +201,7 @@ $LANG['th'] = array( 'Proxy Support' => 'สนับสนุน Proxy', 'Proxy Extensions' => 'ส่วนขยาย Proxy', 'Web Statistics' => 'สถิติของเว็บไซต์', - 'Additional FTP Account' => 'เพิ่มบัญชี FTP', + 'Additional FTP Account' => 'บัญชี FTP เพิ่มเติม', 'Path' => 'เส้นทาง', 'SOA' => 'SOA', 'TTL' => 'TTL', @@ -230,7 +230,7 @@ $LANG['th'] = array( 'database' => 'ฐานข้อมูล', 'User' => 'ผู้ใช้', 'Host' => 'โฮสต์', - 'Charset' => 'charset', + 'Charset' => 'Charset', 'Min' => 'นาที', 'Hour' => 'ชั่วโมง', 'Day' => 'วัน', @@ -303,7 +303,7 @@ $LANG['th'] = array( 'optional' => 'ทางเลือกเพิ่มเติม', 'internal' => 'ภายใน', 'Statistics Authorization' => 'สถิติการเข้าใช้งาน', - 'Statistics Auth' => 'สถิติการเข้าสู่ระบบ', + 'Statistics Auth' => 'รับรองความถูกต้องของสถิติ', 'Account' => 'บัญชี', 'Prefix will be automaticaly added to username' => 'คำนำหน้า %s จะถูกเพิ่มลงในชื่อผู้ใช้โดยอัตโนมัติ', 'Send FTP credentials to email' => 'อีเมล์สำหรับส่งข้อมูล FTP', @@ -564,11 +564,11 @@ $LANG['th'] = array( 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'สนับสนุน MySQL', 'phpMyAdmin URL' => 'ที่อยู่ของ phpMyAdmin', - 'PostgreSQL Support' => 'PostgreSQL Support', - 'phpPgAdmin URL' => 'phpPgAdmin URL', + 'PostgreSQL Support' => 'สนับสนุน PostgreSQL', + 'phpPgAdmin URL' => 'ที่อยู่ของ phpPgAdmin', 'Maximum Number Of Databases' => 'จำนวนฐานข้อมูลสูงสุด', 'Current Number Of Databases' => 'จำนวนฐานข้อมูลปัจจุบัน', - 'Local backup' => 'Local backup', + 'Local backup' => 'สำรองข้อมูลท้องถิ่น', 'Compression level' => 'ระดับการบีบอัด', 'Directory' => 'ไดเร็กทอรี่', 'Remote backup' => 'การสำรองข้อมูลระยะไกล', @@ -583,7 +583,7 @@ $LANG['th'] = array( 'Template Manager' => 'ตัวจัดการ Template', 'Backup Migration Manager' => 'ตัวจัดการการย้ายข้อมูลสำรอง', 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'แสดง: CPU / MEM / NET / DISK', 'sort by' => 'จัดเรียงโดย', 'Date' => 'วันที่', @@ -596,14 +596,14 @@ $LANG['th'] = array( 'size' => 'ขนาด', 'date' => 'วันที่', 'name' => 'ชื่อ', - 'Initializing' => 'Initializing', + 'Initializing' => 'กำลังเริ่มต้น', 'UPLOAD' => 'อัพโหลด', 'NEW FILE' => 'ไฟล์ใหม่', 'NEW DIR' => 'ไดเร็กทอรี่ใหม่', 'DELETE' => 'ลบ', 'RENAME' => 'เปลี่ยนชื่อ', 'MOVE' => 'ย้าย', - 'RIGHTS' => 'RIGHTS', + 'RIGHTS' => 'สิทธิ', 'COPY' => 'คัดลอก', 'ARCHIVE' => 'เก็บถาวร', 'EXTRACT' => 'แตกไฟล์', @@ -644,7 +644,7 @@ $LANG['th'] = array( 'File' => 'ไฟล์', 'already exists' => 'มีอยู่แล้ว', 'Create file' => 'สร้างไฟล์', - 'Create directory' => 'สร้างไดเร็คทอรี่', + 'Create directory' => 'สร้างไดเร็กทอรี่', 'read by owner' => 'อ่านโดยเจ้าของ', 'write by owner' => 'เขียนด้วยเจ้าของ', 'execute/search by owner' => 'รัน / ค้นหาโดยเจ้าของ', @@ -698,13 +698,13 @@ $LANG['th'] = array( 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', - 'Licence Key' => 'Licence Key', + 'Licence Key' => 'License Key', 'Enter License Key' => 'กรอก License Key', - 'Buy Licence' => 'ซื้อ Licence', + 'Buy Licence' => 'ซื้อ License', 'Buy Lifetime License' => 'ซื้อ License แบบถาวร', - 'Disable and Cancel Licence' => 'ปิดการใช้งาน และยกเลิก Licence', - 'Licence Activated' => 'เปิดใช้งาน Licence แล้ว', - 'Licence Deactivated' => 'ปืดการใช้งาน Licence แล้ว', + 'Disable and Cancel License' => 'ปิดการใช้งาน และยกเลิก License', + 'Licence Activated' => 'เปิดใช้งาน License แล้ว', + 'Licence Deactivated' => 'ปิดการใช้งาน License แล้ว', 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่บ้านเท่านั้น', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', 'This is a commercial module, you would need to purchace license key to enable it.' => 'สิ่งนี้ไม่ใช่โมดูลฟรี, คุณจะต้องซื้อ License Key เพื่อเปิดใช้งาน', From c31ddeffe556750decc03d81543dc64bab18b639 Mon Sep 17 00:00:00 2001 From: Thatphon05 Date: Fri, 7 Apr 2017 16:06:51 +0700 Subject: [PATCH 51/72] Improve Thai translation --- web/inc/i18n/th.php | 90 ++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index cf4634370..788f582ec 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -9,7 +9,7 @@ $LANG['th'] = array( 'Packages' => 'แพ็กเกจ', 'IP' => 'IP', - 'Graphs' => 'กราฟการใช้งาน', + 'Graphs' => 'กราฟ', 'Statistics' => 'สถิติ', 'Log' => 'Log', 'Server' => 'เซิฟเวอร์', @@ -22,7 +22,7 @@ $LANG['th'] = array( 'USER' => 'ผู้ใช้', 'WEB' => 'เว็บ', 'DNS' => 'DNS', - 'MAIL' => 'อีเมล์', + 'MAIL' => 'เมล์', 'DB' => 'ฐานข้อมูล', 'CRON' => 'CRON', 'BACKUP' => 'สำรองข้อมูล', @@ -50,7 +50,7 @@ $LANG['th'] = array( 'Add DNS Domain' => 'เพิ่ม DNS Domain', 'Add DNS Record' => 'เพิ่ม DNS Record', 'Add Mail Domain' => 'เพิ่ม Mail Domain', - 'Add Mail Account' => 'เพิ่มบัญชีอีเมล์', + 'Add Mail Account' => 'เพิ่มบัญชีเมล์', 'Add Database' => 'เพิ่มฐานข้อมูล', 'Add Cron Job' => 'เพิ่ม Cron Job', 'Create Backup' => 'สร้างการสำรองข้อมูล', @@ -77,12 +77,12 @@ $LANG['th'] = array( 'rebuild' => 'สร้างใหม่', 'rebuild web' => 'สร้างเว็บใหม่', 'rebuild dns' => 'สร้าง DNS ใหม่', - 'rebuild mail' => 'สร้างอีเมล์ใหม่', + 'rebuild mail' => 'สร้างเมล์ใหม่', 'rebuild db' => 'สร้างฐานข้อมูลใหม่', 'rebuild cron' => 'สร้าง Cron ใหม่', 'update counters' => 'อัพเดทตัวนับ', 'suspend' => 'ระงับการใช้งาน', - 'unsuspend' => 'เปิดการใช้งาน', + 'unsuspend' => 'เปิดใช้งาน', 'delete' => 'ลบ', 'show per user' => 'แสดงต่อผู้ใช้', 'login as' => 'เข้าสู่ระบบด้วย', @@ -99,7 +99,7 @@ $LANG['th'] = array( 'open %s' => 'เปิด %s', 'download' => 'ดาวน์โหลด', 'restore' => 'เรียกคืนค่า', - 'configure restore settings' => 'กำหนดการตั้งค่าการเรียกคืนค่า', + 'configure restore settings' => 'กำหนดการเรียกคืนค่า', 'stop' => 'หยุด', 'start' => 'เริ่ม', 'restart' => 'เริ่มต้นการทำงานใหม่', @@ -115,7 +115,7 @@ $LANG['th'] = array( 'Adding User' => 'เพิ่มผู้ใช้', 'Editing User' => 'แก้ไขผู้ใช้', - 'Adding Domain' => 'เพิ่มโดนเมน', + 'Adding Domain' => 'เพิ่มโดเมน', 'Editing Domain' => 'แก้ไขโดเมน', 'Adding DNS Domain' => 'เพิ่ม DNS Domain', 'Editing DNS Domain' => 'แก้ไข DNS Domain', @@ -123,8 +123,8 @@ $LANG['th'] = array( 'Editing DNS Record' => 'แก้ไข DNS Record', 'Adding Mail Domain' => 'เพิ่ม Mail Domain', 'Editing Mail Domain' => 'แก้ไข Mail Domain', - 'Adding Mail Account' => 'เพิ่มบัญชีอีเมล์', - 'Editing Mail Account' => 'แก้ไขบัญชีอีเมล์', + 'Adding Mail Account' => 'เพิ่มบัญชีเมล์', + 'Editing Mail Account' => 'แก้ไขบัญชีเมล์', 'Adding database' => 'เพิ่มฐานข้อมูล', 'Editing Cron Job' => 'แก้ไข Cron Job', 'Adding Cron Job' => 'เพิ่ม Cron Job', @@ -142,7 +142,7 @@ $LANG['th'] = array( 'Adding IP Address to Banlist' => 'การแบน IP Address', 'active' => 'เปิดใช้งาน', - 'spnd' => 'ยกเลิกการใช้', + 'spnd' => 'ระงับการใช้งาน', 'suspended' => 'ระงับการใช้งานแล้ว', 'running' => 'กำลังทำงาน', 'stopped' => 'หยุดทำงานแล้ว', @@ -167,12 +167,12 @@ $LANG['th'] = array( 'Bandwidth' => 'แบนด์วิดธ์', 'Disk' => 'พื้นที่จัดเก็บข้อมูล', 'Web' => 'เว็บ', - 'Mail' => 'อีเมล์', + 'Mail' => 'เมล์', 'Databases' => 'ฐานข้อมูล', 'User Directories' => 'ไดเร็กทอรี่ของผู้ใช้', 'Template' => 'Template', - 'Web Template' => 'Template หน้าเว็บ', - 'Backend Template' => 'Template หลังบ้าน', + 'Web Template' => 'Web Template', + 'Backend Template' => 'Backend Template', 'Proxy Template' =>'Proxy Template', 'DNS Template' => 'DNS Template', 'Web Domains' => 'Web Domains', @@ -184,14 +184,14 @@ $LANG['th'] = array( 'DNS records' => 'DNS records', 'Name Servers' => 'Name Servers', 'Mail Domains' => 'Mail Domains', - 'Mail Accounts' => 'บัญชีอีเมล์', + 'Mail Accounts' => 'บัญชีเมล์', 'Cron Jobs' => 'Cron Jobs', 'SSH Access' => 'การเข้าถึง SSH', 'IP Address' => 'IP Address', 'IP Addresses' => 'IP Addresses', 'Backups' => 'สำรองข้อมูล', 'Backup System' => 'ระบบสำรองข้อมูล', - 'backup exclusions' => 'การยกเว้นการสำรองข้อมูล', + 'backup exclusions' => 'ยกเว้นการสำรองข้อมูล', 'template' => 'template', 'SSL Support' => 'สนับสนุน SSL', 'SSL Home Directory' => 'หน้าแรกของ SSL', @@ -216,7 +216,7 @@ $LANG['th'] = array( 'Quota' => 'โควตา', 'Autoreply' => 'ตอบกลับอัตโนมัติ', 'Forward to' => 'ส่งต่อไปยัง', - 'Do not store forwarded mail' => 'อย่าเก็บอีเมล์ที่ส่งต่อไว้', + 'Do not store forwarded mail' => 'อย่าเก็บเมล์ที่ส่งต่อไว้', 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', 'IMAP security' => 'IMAP security', @@ -282,17 +282,17 @@ $LANG['th'] = array( 'Object' => 'วัตถุ', 'Username' => 'ชื่อผู้ใช้', 'Password' => 'รหัสผ่าน', - 'Email' => 'อีเมล์', + 'Email' => 'เมล์', 'Package' => 'แพ็กเกจ', 'Language' => 'ภาษา', 'First Name' => 'ชื่อ', 'Last Name' => 'นามสกุล', - 'Send login credentials to email address' => 'อีเมล์สำหรับส่งข้อมูลการเข้าสู่ระบบ', + 'Send login credentials to email address' => 'ชื่ออีเมล์สำหรับส่งข้อมูลการเข้าสู่ระบบ', 'Default Template' => 'Template มาตรฐาน', 'Default Name Servers' => 'Name Servers มาตรฐาน', 'Domain' => 'โดเมน', 'DNS Support' => 'สนับสนุน DNS', - 'Mail Support' => 'สนับสนุนอีเมล์', + 'Mail Support' => 'สนับสนุนเมล์', 'Advanced options' => 'ตัวเลือกขั้นสูง', 'Basic options' => 'ตัวเลือกพื้นฐาน', 'Aliases' => 'Aliases', @@ -302,11 +302,11 @@ $LANG['th'] = array( 'SSL CSR' => 'SSL CSR', 'optional' => 'ทางเลือกเพิ่มเติม', 'internal' => 'ภายใน', - 'Statistics Authorization' => 'สถิติการเข้าใช้งาน', + 'Statistics Authorization' => 'การตรวจสอบสถิติ', 'Statistics Auth' => 'รับรองความถูกต้องของสถิติ', 'Account' => 'บัญชี', 'Prefix will be automaticaly added to username' => 'คำนำหน้า %s จะถูกเพิ่มลงในชื่อผู้ใช้โดยอัตโนมัติ', - 'Send FTP credentials to email' => 'อีเมล์สำหรับส่งข้อมูล FTP', + 'Send FTP credentials to email' => 'เมล์สำหรับส่งข้อมูล FTP', 'Expiration Date' => 'วันหมดอายุ', 'YYYY-MM-DD' => 'ปี-เดือน-วัน', 'Name servers' => 'Name servers', @@ -317,7 +317,7 @@ $LANG['th'] = array( 'in megabytes' => 'หน่วย megabytes', 'Message' => 'ข้อความ', 'use local-part' => 'ใช้ส่วนภายใน', - 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่อีเมล์', + 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่เมล์', 'Prefix will be automaticaly added to database name and database user' => 'คำนำหน้า %s จะถูกเพิ่มชื่อในฐานข้อมูลและฐานข้อมูลผู้ใช้โดยอัตโนมัติ', 'Database' => 'ฐานข้อมูล', 'Type' => 'ชนิด', @@ -335,7 +335,7 @@ $LANG['th'] = array( 'web aliases' => 'web aliases', 'dns records' => 'dns records', 'mail domains' => 'mail domains', - 'mail accounts' => 'บัญชีอีเมล์', + 'mail accounts' => 'บัญชีเมล์', 'accounts' => 'บัญชี', 'databases' => 'ฐานข้อมูล', 'cron jobs' => 'cron jobs', @@ -362,7 +362,7 @@ $LANG['th'] = array( 'ns1' => 'ns1', 'ns2' => 'ns2', 'user' => 'ผู้ใช้', - 'email' => 'อีเมล์', + 'email' => 'เมล์', 'first name' => 'ชื่อ', 'last name' => 'นามสกุล', 'account' => 'บัญชี', @@ -386,7 +386,7 @@ $LANG['th'] = array( 'Action' => 'การกระทำ', 'Protocol' => 'โปรโตคอล', 'Port' => 'Port', - 'Comment' => 'ความคิดเห็น', + 'Comment' => 'หมายเหตุ', 'Banlist' => 'รายชื่อที่โดนแบน', 'ranges are acceptable' => 'ช่วงที่ยอมรับได้', 'CIDR format is supported' => 'การสนับสนุน CIDR', @@ -404,7 +404,7 @@ $LANG['th'] = array( 'dns domain' => 'dns domain', 'dns record' => 'dns record', 'mail domain' => 'mail domain', - 'mail account' => 'บัญชีอีเมล์', + 'mail account' => 'บัญชีเมล์', 'cron job' => 'cron job', 'cron' => 'cron', @@ -417,8 +417,8 @@ $LANG['th'] = array( '%s domains' => '%s โดเมน', '1 record' => '1 record', '%s records' => '%s records', - '1 mail account' => '1 บัญชีอีเมล์', - '%s mail accounts' => '%s บัญชีอีเมล์', + '1 mail account' => '1 บัญชีเมล์', + '%s mail accounts' => '%s บัญชีเมล์', '1 database' => '1 ฐานข้อมูล', '%s databases' => '%s ฐานข้อมูล', '1 cron job' => '1 cron job', @@ -447,18 +447,18 @@ $LANG['th'] = array( 'DNS_DOMAIN_CREATED_OK' => 'สร้าง DNS domain %s สำเร็จแล้ว', 'DNS_RECORD_CREATED_OK' => 'สร้าง Record %s.%s ได้ถูกสร้างสำเร็จแล้ว', 'MAIL_DOMAIN_CREATED_OK' => 'สร้าง Mail domain %s สำเร็จแล้ว', - 'MAIL_ACCOUNT_CREATED_OK' => 'สร้างบัญชีอีเมล์ %s@%s สำเร็จแล้ว', + 'MAIL_ACCOUNT_CREATED_OK' => 'สร้างบัญชีเมล์ %s@%s สำเร็จแล้ว', 'DATABASE_CREATED_OK' => 'สร้างฐานข้อมูล %s สำเร็จแล้ว', 'CRON_CREATED_OK' => 'สร้าง Cron job ได้ถูกสร้างแล้ว', 'IP_CREATED_OK' => 'สร้าง IP address %s สำเร็จแล้ว', - 'PACKAGE_CREATED_OK' => 'สร้าง Package %s สำเร็จแล้ว', + 'PACKAGE_CREATED_OK' => 'สร้างแพ็กเกจ %s สำเร็จแล้ว', 'SSL_GENERATED_OK' => 'สร้างใบรับรองสำเร็จแล้ว', 'RULE_CREATED_OK' => 'สร้าง Rule สำเร็จแล้ว', 'BANLIST_CREATED_OK' => 'สร้าง IP address สำเร็จแล้ว', - 'Autoupdate has been successfully enabled' => 'เปิดใช้งาน Autoupdate สำเร็จแล้ว', - 'Autoupdate has been successfully disabled' => 'ปิดใช้งาน Autoupdate สำเร็จแล้ว', - 'Cronjob email reporting has been successfully enabled' => 'Cronjob email reporting has been successfully enabled', - 'Cronjob email reporting has been successfully disabled' => 'Cronjob email reporting has been successfully disabled', + 'Autoupdate has been successfully enabled' => 'เปิดใช้งานการอัพเดทอัตโนมัติสำเร็จแล้ว', + 'Autoupdate has been successfully disabled' => 'ปิดใช้งานการอัพเดทอัตโนมัติสำเร็จแล้ว', + 'Cronjob email reporting has been successfully enabled' => 'การรายงานทางอีเมลของ Cronjob ได้รับการเปิดใช้งานเรียบร้อยแล้ว', + 'Cronjob email reporting has been successfully disabled' => 'การรายงานทางอีเมลของ Cronjob ได้รับการปิดใช้งานเรียบร้อยแล้ว', 'Changes has been saved.' => 'บันทึกการเปลี่ยนแปลงแล้ว', 'Confirmation' => 'การยืนยัน', 'DELETE_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบผู้ใช้ %s?', @@ -470,9 +470,9 @@ $LANG['th'] = array( 'DELETE_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ Record %s?', 'SUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ Record %s?', 'UNSUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน Record %s?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือว่าต้องการ ลบอีเมล์ %s?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับอีเมล์ %s?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานอีเมล์ %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือว่าต้องการ ลบเมล์ %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับเมล์ %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานเมล์ %s?', 'DELETE_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบฐานข้อมูล %s?', 'SUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับฐานข้อมูล %s?', 'UNSUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานฐานข้อมูล %s?', @@ -494,7 +494,7 @@ $LANG['th'] = array( 'Invalid username or password' => 'ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง', 'Invalid username or code' => 'ชื่อผู้ใช้หรือรหัสไม่ถูกต้อง', 'Passwords not match' => 'รหัสผ่านทั้งสองไม่ตรงกัน', - 'Please enter valid email address.' => 'กรุณาใส่อีเมล์ที่ถูกต้อง', + 'Please enter valid email address.' => 'กรุณาใส่เมล์ที่ถูกต้อง', 'Field "%s" can not be blank.' => 'ช่อง "%s" ไม่สามารถเว้นว่างไว้', 'Password is too short.' => 'รหัสผ่านสั้นเกินไป (ต่ำสุด 6 ตัวอักษร)', 'Error code:' => 'รหัสข้อผิดพลาด: %s', @@ -516,13 +516,13 @@ $LANG['th'] = array( 'MAIL_FROM' => 'Vesta Control Panel ', 'GREETINGS_GORDON_FREEMAN' => "สวัสดี, %s %s,\n", 'GREETINGS' => "สวัสดี,\n", - 'ACCOUNT_READY' => "บัญชีของคุณได้รับการสร้างและพร้อมใช้งานแล้ว\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n", + 'ACCOUNT_READY' => "บัญชีของคุณได้รับการสร้างและพร้อมใช้งานแล้ว\n\nhttps://%s/login/\nชื่อผู้ใช้: %s\nรหัสผ่าน: %s\n\n--\nVesta Control Panel\n", 'FTP login credentials' => 'ข้อมูลการเข้าสู่ระบบ FTP', - 'FTP_ACCOUNT_READY' => "มีการสร้างบัญชี FTP และพร้อมใช้งานแล้ว\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n", + 'FTP_ACCOUNT_READY' => "มีการสร้างบัญชี FTP และพร้อมใช้งานแล้ว\n\nโฮสต์: %s\nชื่อผู้ใช้: %s_%s\nรหัสผ่าน: %s\n\n--\nVesta Control Panel\n", 'Database Credentials' => 'ข้อมูลของฐานข้อมูล', - 'DATABASE_READY' => "สร้างฐานข้อมูลเรียบร้อยแล้ว\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n", + 'DATABASE_READY' => "สร้างฐานข้อมูลเรียบร้อยแล้ว\n\nDatabase: %s\nชื่อ: %s\nรหัสผ่าน: %s\n%s\n\n--\nVesta Control Panel\n", 'forgot password' => 'ลืมรหัสผ่าน', 'Confirm' => 'ยืนยัน', @@ -538,9 +538,9 @@ $LANG['th'] = array( 'Jan' => 'ม.ค.', 'Feb' => 'ก.พ.', 'Mar' => 'มี.ค.', - 'Apr' => 'เม.ย', + 'Apr' => 'เม.ย.', 'May' => 'พ.ค.', - 'Jun' => 'มิ.ย', + 'Jun' => 'มิ.ย.', 'Jul' => 'ก.ค.', 'Aug' => 'ส.ค.', 'Sep' => 'ก.ย.', @@ -662,7 +662,7 @@ $LANG['th'] = array( 'Go to USER list' => 'ไปที่รายการ ผู้ใช้', 'Go to WEB list' => 'ไปที่รายการ เว็บ', 'Go to DNS list' => 'ไปที่รายการ DNS', - 'Go to MAIL list' => 'ไปที่รายการ อีเมล์', + 'Go to MAIL list' => 'ไปที่รายการ เมล์', 'Go to DB list' => 'ไปที่รายการ ฐานข้อมูล', 'Go to CRON list' => 'ไปที่รายการ CRON', 'Go to BACKUP list' => 'ไปที่รายการ สำรองข้อมูล', @@ -706,7 +706,7 @@ $LANG['th'] = array( 'Licence Activated' => 'เปิดใช้งาน License แล้ว', 'Licence Deactivated' => 'ปิดการใช้งาน License แล้ว', 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่บ้านเท่านั้น', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', 'This is a commercial module, you would need to purchace license key to enable it.' => 'สิ่งนี้ไม่ใช่โมดูลฟรี, คุณจะต้องซื้อ License Key เพื่อเปิดใช้งาน', 'Minutes' => 'นาที', From 7ba26ca455d936996b0be2b5e5977d164e925d30 Mon Sep 17 00:00:00 2001 From: Thatphon05 Date: Fri, 7 Apr 2017 16:12:23 +0700 Subject: [PATCH 52/72] Improve Thai translation --- web/inc/i18n/th.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index 788f582ec..59146f556 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -282,7 +282,7 @@ $LANG['th'] = array( 'Object' => 'วัตถุ', 'Username' => 'ชื่อผู้ใช้', 'Password' => 'รหัสผ่าน', - 'Email' => 'เมล์', + 'Email' => 'อีเมล์', 'Package' => 'แพ็กเกจ', 'Language' => 'ภาษา', 'First Name' => 'ชื่อ', @@ -306,7 +306,7 @@ $LANG['th'] = array( 'Statistics Auth' => 'รับรองความถูกต้องของสถิติ', 'Account' => 'บัญชี', 'Prefix will be automaticaly added to username' => 'คำนำหน้า %s จะถูกเพิ่มลงในชื่อผู้ใช้โดยอัตโนมัติ', - 'Send FTP credentials to email' => 'เมล์สำหรับส่งข้อมูล FTP', + 'Send FTP credentials to email' => 'ชื่ออีเมล์สำหรับส่งข้อมูล FTP', 'Expiration Date' => 'วันหมดอายุ', 'YYYY-MM-DD' => 'ปี-เดือน-วัน', 'Name servers' => 'Name servers', @@ -317,7 +317,7 @@ $LANG['th'] = array( 'in megabytes' => 'หน่วย megabytes', 'Message' => 'ข้อความ', 'use local-part' => 'ใช้ส่วนภายใน', - 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่เมล์', + 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่อีเมล์', 'Prefix will be automaticaly added to database name and database user' => 'คำนำหน้า %s จะถูกเพิ่มชื่อในฐานข้อมูลและฐานข้อมูลผู้ใช้โดยอัตโนมัติ', 'Database' => 'ฐานข้อมูล', 'Type' => 'ชนิด', @@ -362,11 +362,11 @@ $LANG['th'] = array( 'ns1' => 'ns1', 'ns2' => 'ns2', 'user' => 'ผู้ใช้', - 'email' => 'เมล์', + 'email' => 'อีเมล์', 'first name' => 'ชื่อ', 'last name' => 'นามสกุล', 'account' => 'บัญชี', - 'ssl certificate' => 'ใบอณุญาติ ssl', + 'ssl certificate' => 'ssl certificate', 'ssl key' => 'ssl key', 'stats user password' => 'stats user password', 'stats username' => 'stats username', @@ -529,9 +529,9 @@ $LANG['th'] = array( 'New Password' => 'รหัสผ่านใหม่', 'Confirm Password' => 'ยืนยันรหัสผ่าน', 'Reset' => 'รีเซ็ต', - 'Reset Code' => 'รหัสรีเซ็ต', + 'Reset Code' => 'รหัสสำหรับรีเซ็ต', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'รหัสรีเซ็ตรหัสผ่านถูกส่งไปยังที่อยู่อีเมลของคุณแล้ว
', + 'RESET_CODE_SENT' => 'รหัสสำหรับรีเซ็ตรหัสผ่านถูกส่งไปยังที่อยู่อีเมลของคุณแล้ว
', 'MAIL_RESET_SUBJECT' => 'ตั้งค่ารหัสผ่านใหม่ที่ %s', 'PASSWORD_RESET_REQUEST' => "หากต้องการรีเซ็ตรหัสผ่านของแผงควบคุมโปรดไปที่ลิงก์นี้:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, คุณอาจจะไปที่ https://%s/reset/?action=code&user=%s และใส่รหัสรีเซ็ตดังต่อไปนี้:\n%s\n\nหากคุณไม่ได้ขอรหัสผ่านใหม่โปรดละเว้นข้อความนี้และยอมรับคำขอโทษของเรา\n\n--\nVesta Control Panel\n", @@ -706,7 +706,7 @@ $LANG['th'] = array( 'Licence Activated' => 'เปิดใช้งาน License แล้ว', 'Licence Deactivated' => 'ปิดการใช้งาน License แล้ว', 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่บ้านเท่านั้น', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', 'This is a commercial module, you would need to purchace license key to enable it.' => 'สิ่งนี้ไม่ใช่โมดูลฟรี, คุณจะต้องซื้อ License Key เพื่อเปิดใช้งาน', 'Minutes' => 'นาที', From 8c1deb80f72d244bf98c581ecceaf696976efb0a Mon Sep 17 00:00:00 2001 From: dpeca Date: Sun, 9 Apr 2017 02:35:13 +0200 Subject: [PATCH 53/72] Sending mail credentials to email --- web/add/mail/index.php | 20 ++++++++++++++++++++ web/inc/main.php | 2 +- web/js/pages/add_mail_acc.js | 26 ++++++++++++++++++++++++++ web/templates/admin/add_mail_acc.html | 23 +++++++++++++++++------ 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 02f765de1..8769c4638 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -94,15 +94,25 @@ if (!empty($_POST['ok_acc'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } + // Validate email + if ((!empty($_POST['v_send_email'])) && (empty($_SESSION['error_msg']))) { + if (!filter_var($_POST['v_send_email'], FILTER_VALIDATE_EMAIL)) { + $_SESSION['error_msg'] = __('Please enter valid email address.'); + } + } + // Protect input $v_domain = escapeshellarg($_POST['v_domain']); $v_domain = strtolower($v_domain); $v_account = escapeshellarg($_POST['v_account']); $v_quota = escapeshellarg($_POST['v_quota']); + $v_send_email = $_POST['v_send_email']; + $v_credentials = $_POST['v_credentials']; $v_aliases = $_POST['v_aliases']; $v_fwd = $_POST['v_fwd']; if (empty($_POST['v_quota'])) $v_quota = 0; if ((!empty($_POST['v_quota'])) || (!empty($_POST['v_aliases'])) || (!empty($_POST['v_fwd'])) ) $v_adv = 'yes'; + $v_quota = escapeshellarg($_POST['v_quota']); // Add Mail Account if (empty($_SESSION['error_msg'])) { @@ -165,6 +175,16 @@ if (!empty($_POST['ok_acc'])) { if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL']; } + // Email login credentials + if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) { + $to = $v_send_email; + $subject = __("Email Credentials"); + $hostname = exec('hostname'); + $from = __('MAIL_FROM', $hostname); + $mailtext = $v_credentials; + send_email($to, $subject, $mailtext, $from); + } + // Flush field values on success if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain])); diff --git a/web/inc/main.php b/web/inc/main.php index 75482cd1b..2ec8b5fdb 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -3,7 +3,7 @@ session_start(); define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); -define('JS_LATEST_UPDATE', '1476144160'); +define('JS_LATEST_UPDATE', '1491697866'); $i = 0; diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js index 35afca2fc..fa19a3b49 100644 --- a/web/js/pages/add_mail_acc.js +++ b/web/js/pages/add_mail_acc.js @@ -90,14 +90,37 @@ randomString = function() { $('#v_password').text(randomstring); else $('#v_password').text(Array(randomstring.length+1).join('*')); + generate_mail_credentials(); +} + +generate_mail_credentials = function() { + var div = $('.mail-infoblock').clone(); + div.find('#mail_configuration').remove(); + var pass=div.find('#v_password').text(); + if (pass=="") div.find('#v_password').html(' '); + var output = div.text(); + output=output.replace(/(?:\r\n|\r|\n|\t)/g, "|"); + output=output.replace(/ /g, ""); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/^\|+/g, ""); + output=output.replace(/\|$/, ""); + output=output.replace(/ $/, ""); + output=output.replace(/:\|/g, ": "); + output=output.replace(/\|/g, "\n"); + //console.log(output); + $('#v_credentials').val(output); } $(document).ready(function() { $('#v_account').text($('input[name=v_account]').val()); $('#v_password').text($('input[name=v_password]').val()); + generate_mail_credentials(); $('input[name=v_account]').change(function(){ $('#v_account').text($(this).val()); + generate_mail_credentials(); }); $('input[name=v_password]').change(function(){ @@ -105,6 +128,7 @@ $(document).ready(function() { $('#v_password').text($(this).val()); else $('#v_password').text(Array($(this).val().length+1).join('*')); + generate_mail_credentials(); }); $('.toggle-psw-visibility-icon').click(function(){ @@ -112,6 +136,7 @@ $(document).ready(function() { $('#v_password').text($('input[name=v_password]').val()); else $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*')); + generate_mail_credentials(); }); $('#mail_configuration').change(function(evt){ @@ -144,5 +169,6 @@ $(document).ready(function() { $('#td_smtp_encryption').html(opt.attr('no_encryption')); break; } + generate_mail_credentials(); }); }); diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 5d3fbae8b..110a7ed98 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -118,6 +118,17 @@ + + + + + + + + "> + + + @@ -185,15 +196,15 @@ - + - +
:
:
From 2bff53e881e882b755f82ef0ea244d6bd6325b26 Mon Sep 17 00:00:00 2001 From: dpeca Date: Sun, 9 Apr 2017 02:54:35 +0200 Subject: [PATCH 54/72] Minor fixes for Sending mail credentials to email --- web/add/mail/index.php | 1 - web/templates/admin/add_mail_acc.html | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 8769c4638..b260b465d 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -112,7 +112,6 @@ if (!empty($_POST['ok_acc'])) { $v_fwd = $_POST['v_fwd']; if (empty($_POST['v_quota'])) $v_quota = 0; if ((!empty($_POST['v_quota'])) || (!empty($_POST['v_aliases'])) || (!empty($_POST['v_fwd'])) ) $v_adv = 'yes'; - $v_quota = escapeshellarg($_POST['v_quota']); // Add Mail Account if (empty($_SESSION['error_msg'])) { diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 110a7ed98..f0e6e1acd 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -196,15 +196,15 @@ :
- + : - + From 835343c5426567be20c3a635d2a7917702e8154d Mon Sep 17 00:00:00 2001 From: demlasjr Date: Sun, 9 Apr 2017 23:12:05 +0200 Subject: [PATCH 55/72] Fixing duplicate of lines in 01_caching_pool.conf --- .../ubuntu/16.04/templates/web/nginx/caching.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/caching.sh b/install/ubuntu/16.04/templates/web/nginx/caching.sh index 6eb9126db..118e7b381 100755 --- a/install/ubuntu/16.04/templates/web/nginx/caching.sh +++ b/install/ubuntu/16.04/templates/web/nginx/caching.sh @@ -6,7 +6,13 @@ ip=$3 home=$4 docroot=$5 -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -echo "$str" >> /etc/nginx/conf.d/01_caching_pool.conf - +str="proxy_cache_path /var/cache/nginx/$domain levels=2" +str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" +conf='/etc/nginx/conf.d/01_caching_pool.conf' +if [ -e "$conf" ]; then + if [ -z "$(grep "=${domain}:" $conf)" ]; then + echo "$str" >> $conf + fi +else + echo "$str" >> $conf +fi From 930a2a82e3b44dab26ee23d030236b8c47ff8966 Mon Sep 17 00:00:00 2001 From: dpeca Date: Tue, 11 Apr 2017 17:52:07 +0200 Subject: [PATCH 56/72] Making v-backup-user able to send email notification doh... --- bin/v-backup-user | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/v-backup-user b/bin/v-backup-user index 978b4be3d..b96003b68 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -853,6 +853,7 @@ update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" # Send notification if [ -e "$BACKUP/$user.log" ]; then + cd $BACKUP subj="$user → backup has been completed" email=$(get_user_value '$CONTACT') cat $BACKUP/$user.log |$SENDMAIL -s "$subj" $email $notify From 9347c2aa04119e903b57dea32c7fae0926f2af5d Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 14 Apr 2017 14:50:15 +0200 Subject: [PATCH 57/72] Sending mail credentials to email [edit form] --- web/edit/mail/index.php | 19 +++++++++++++++++++ web/inc/main.php | 2 +- web/js/pages/edit_mail_acc.js | 26 ++++++++++++++++++++++++++ web/templates/admin/edit_mail_acc.html | 11 +++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index f5e1bd079..d2b37a3e3 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -179,8 +179,17 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco exit(); } + // Validate email + if ((!empty($_POST['v_send_email'])) && (empty($_SESSION['error_msg']))) { + if (!filter_var($_POST['v_send_email'], FILTER_VALIDATE_EMAIL)) { + $_SESSION['error_msg'] = __('Please enter valid email address.'); + } + } + $v_domain = escapeshellarg($_POST['v_domain']); $v_account = escapeshellarg($_POST['v_account']); + $v_send_email = $_POST['v_send_email']; + $v_credentials = $_POST['v_credentials']; // Change password if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) { @@ -297,6 +306,16 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco } } + // Email login credentials + if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) { + $to = $v_send_email; + $subject = __("Email Credentials"); + $hostname = exec('hostname'); + $from = __('MAIL_FROM', $hostname); + $mailtext = $v_credentials; + send_email($to, $subject, $mailtext, $from); + } + // Set success message if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('Changes has been saved.'); diff --git a/web/inc/main.php b/web/inc/main.php index 2ec8b5fdb..8cef2a012 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -3,7 +3,7 @@ session_start(); define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); -define('JS_LATEST_UPDATE', '1491697866'); +define('JS_LATEST_UPDATE', '1491697867'); $i = 0; diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js index 244fd834c..ab6b53c01 100644 --- a/web/js/pages/edit_mail_acc.js +++ b/web/js/pages/edit_mail_acc.js @@ -91,14 +91,37 @@ randomString = function() { $('#v_password').text(randomstring); else $('#v_password').text(Array(randomstring.length+1).join('*')); + generate_mail_credentials(); +} + +generate_mail_credentials = function() { + var div = $('.mail-infoblock').clone(); + div.find('#mail_configuration').remove(); + var pass=div.find('#v_password').text(); + if (pass=="") div.find('#v_password').html(' '); + var output = div.text(); + output=output.replace(/(?:\r\n|\r|\n|\t)/g, "|"); + output=output.replace(/ /g, ""); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/\|\|/g, "|"); + output=output.replace(/^\|+/g, ""); + output=output.replace(/\|$/, ""); + output=output.replace(/ $/, ""); + output=output.replace(/:\|/g, ": "); + output=output.replace(/\|/g, "\n"); + //console.log(output); + $('#v_credentials').val(output); } $(document).ready(function() { $('#v_account').text($('input[name=v_account]').val()); $('#v_password').text($('input[name=v_password]').val()); + generate_mail_credentials(); $('input[name=v_account]').change(function(){ $('#v_account').text($(this).val()); + generate_mail_credentials(); }); $('input[name=v_password]').change(function(){ @@ -106,6 +129,7 @@ $(document).ready(function() { $('#v_password').text($(this).val()); else $('#v_password').text(Array($(this).val().length+1).join('*')); + generate_mail_credentials(); }); $('.toggle-psw-visibility-icon').click(function(){ @@ -113,6 +137,7 @@ $(document).ready(function() { $('#v_password').text($('input[name=v_password]').val()); else $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*')); + generate_mail_credentials(); }); $('#mail_configuration').change(function(evt){ @@ -145,5 +170,6 @@ $(document).ready(function() { $('#td_smtp_encryption').html(opt.attr('no_encryption')); break; } + generate_mail_credentials(); }); }); diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index 33a346a4e..79b6e32cd 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -125,6 +125,17 @@ + + + + + + + + "> + + + From 43e03d1845494ef7ed6d9292756db2ae9e54eb9e Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 14 Apr 2017 15:40:38 +0200 Subject: [PATCH 58/72] Translation improvements for Email Credentials --- web/inc/i18n/ar.php | 3 ++- web/inc/i18n/bg.php | 3 ++- web/inc/i18n/bs.php | 3 ++- web/inc/i18n/cn.php | 3 ++- web/inc/i18n/cz.php | 3 ++- web/inc/i18n/da.php | 3 ++- web/inc/i18n/de.php | 3 ++- web/inc/i18n/el.php | 3 ++- web/inc/i18n/en.php | 4 +++- web/inc/i18n/es.php | 3 ++- web/inc/i18n/fa.php | 3 ++- web/inc/i18n/fi.php | 3 ++- web/inc/i18n/fr.php | 4 +++- web/inc/i18n/hu.php | 3 ++- web/inc/i18n/id.php | 3 ++- web/inc/i18n/it.php | 3 ++- web/inc/i18n/ja.php | 3 ++- web/inc/i18n/ka.php | 3 ++- web/inc/i18n/nl.php | 4 +++- web/inc/i18n/no.php | 3 ++- web/inc/i18n/pl.php | 3 ++- web/inc/i18n/pt-BR.php | 3 ++- web/inc/i18n/pt.php | 3 ++- web/inc/i18n/ro.php | 3 ++- web/inc/i18n/ru.php | 3 ++- web/inc/i18n/se.php | 3 ++- web/inc/i18n/th.php | 3 ++- web/inc/i18n/tr.php | 3 ++- web/inc/i18n/tw.php | 3 ++- web/inc/i18n/ua.php | 3 ++- web/inc/i18n/vi.php | 3 ++- web/inc/main.php | 2 +- web/js/pages/add_mail_acc.js | 4 ++-- web/js/pages/edit_mail_acc.js | 4 ++-- web/templates/admin/add_mail_acc.html | 2 +- web/templates/admin/edit_mail_acc.html | 2 +- 36 files changed, 72 insertions(+), 38 deletions(-) diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 6f068b222..dd28828ec 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -748,12 +748,13 @@ $LANG['ar'] = array( 'Use server hostname' => 'استخدم اسم السيرفر', 'Use domain hostname' => 'استخدم اسم الدومين', 'Use STARTTLS' => 'استخدم STARTTLS', - 'Use SSL' => 'استخدم SSL', + 'Use SSL / TLS' => 'استخدم SSL / TLS', 'No encryption' => 'بلا تشفير', 'Do not use encryption' => 'لا تستخدم التشفير', 'maximum characters length, including prefix' => 'الحد الأقصى لعدد الحروف هو %s يشمل البادئة', + 'Email Credentials' => 'Email Credentials', // Texts below doesn't exist in en.php '%s rule' => 'قواعد %s', diff --git a/web/inc/i18n/bg.php b/web/inc/i18n/bg.php index b03cf2dfc..760b88c17 100644 --- a/web/inc/i18n/bg.php +++ b/web/inc/i18n/bg.php @@ -742,11 +742,12 @@ $LANG['bg'] = array( 'Use server hostname' => 'Използвай сървърното хост име', 'Use domain hostname' => 'Използвай хост името на домейн', 'Use STARTTLS' => 'Използвай STARTTLS', - 'Use SSL' => 'Използвай SSL', + 'Use SSL / TLS' => 'Използвай SSL / TLS', 'No encryption' => 'Без криптиране', 'Do not use encryption' => 'Не използвай криптиране', 'maximum characters length, including prefix' => 'максималната дължина е %s символа, включително префикса', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 05a930839..22d997e59 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -747,10 +747,11 @@ $LANG['bs'] = array( 'Use server hostname' => 'Koristi server hostname', 'Use domain hostname' => 'Koristi hostname domena', 'Use STARTTLS' => 'Koristi STARTTLS', - 'Use SSL' => 'Koristi SSL', + 'Use SSL / TLS' => 'Koristi SSL / TLS', 'No encryption' => 'Bez enkripcije', 'Do not use encryption' => 'Nemoj koristiti enkripciju', 'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix', + 'Email Credentials' => 'Email lozinka i podešavanja', ); diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index c5216082f..86733ab19 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -750,10 +750,11 @@ $LANG['cn'] = array( 'Use server hostname' => '采用服务器主机名', 'Use domain hostname' => '采用域名', 'Use STARTTLS' => '采用 STARTTLS 加密', - 'Use SSL' => '采用 SSL 加密', + 'Use SSL / TLS' => '采用 SSL / TLS 加密', 'No encryption' => '不加密', 'Do not use encryption' => '不要使用加密', 'maximum characters length, including prefix' => '最多 %s 个字符，包含前缀', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 8502e460f..f9f291bfd 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -748,10 +748,11 @@ $LANG['cz'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index 705f5a5e6..80e78a355 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -749,10 +749,11 @@ $LANG['da'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 9de743070..04d538d54 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -747,10 +747,11 @@ $LANG['de'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index 7af6d1ec4..7e1935233 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -749,10 +749,11 @@ $LANG['el'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index a02ad7cc1..ed5c1f2e7 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -747,10 +747,12 @@ $LANG['en'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', + ); diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 6f66ff650..d9b9f5fbe 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -754,10 +754,11 @@ $LANG['es'] = array( 'Use server hostname' => 'Usar hostname del servidor', 'Use domain hostname' => 'Usar hostname del dominio', 'Use STARTTLS' => 'Usar STARTTLS', - 'Use SSL' => 'Usar SSL', + 'Use SSL / TLS' => 'Usar SSL / TLS', 'No encryption' => 'Sin encriptación', 'Do not use encryption' => 'No usar encriptación', 'maximum characters length, including prefix' => 'usar un máximo de %s caracteres, incluyendo prefijo', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 87aeaadea..878a4b691 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -720,8 +720,9 @@ $LANG['fa'] = array( 'Use server hostname' => 'استفاده از نام سرور میزبان', 'Use domain hostname' => 'استفاده از نام دامنه میزبان', 'Use STARTTLS' => 'استفاده از STARTTLS', - 'Use SSL' => 'استفاده از SSL', + 'Use SSL / TLS' => 'استفاده از SSL / TLS', 'No encryption' => 'بدون رمزگذاری', 'Do not use encryption' => 'از رمزگذاری استفاده نشود', 'maximum characters length, including prefix' => 'بیشینه %s کاراکتر طول, شامل پیشوند', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index ba858ac0e..aff1375b8 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -749,12 +749,13 @@ $LANG['fi'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 3c412000e..c57e6266f 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -747,12 +747,14 @@ $LANG['fr'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', + // Texts below doesn't exist in en.php 'disk' => 'disque', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index 1dc9c314c..af461107d 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -751,10 +751,11 @@ $LANG['hu'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index b90f638b8..ad3c18eb1 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -750,10 +750,11 @@ $LANG['id'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 204b6c6fc..ec7a83d50 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -748,10 +748,11 @@ $LANG['it'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index 4d013bad8..f2836948e 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -747,10 +747,11 @@ $LANG['ja'] = array( 'Use server hostname' => 'サーバーのホスト名を使用する', 'Use domain hostname' => 'ドメインのホスト名を使用する', 'Use STARTTLS' => 'STARTTLSを使用する', - 'Use SSL' => 'SSLを使用する', + 'Use SSL / TLS' => 'SSL/TLSを使用する', 'No encryption' => '暗号化しない', 'Do not use encryption' => '暗号化を使用しない', 'maximum characters length, including prefix' => '接頭辞込みで最大 %s 文字', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index 2f3550816..0ebf2d116 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -747,10 +747,11 @@ $LANG['ka'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 73623c40e..5b4eb19b5 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -750,9 +750,11 @@ $LANG['nl'] = array( 'Use server hostname' => 'Gebruik server hostnaam', 'Use domain hostname' => 'Gebruik domein hostname', 'Use STARTTLS' => 'Gebruik STARTTLS', - 'Use SSL' => 'Gebruik SSL', + 'Use SSL / TLS' => 'Gebruik SSL / TLS', 'No encryption' => 'Geen encryptie', 'Do not use encryption' => 'Gebruik geen encryptie', 'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix', + + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 3ae4818ea..45c23f228 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -748,10 +748,11 @@ $LANG['no'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index 9f82a63b4..23c8016cb 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -748,10 +748,11 @@ $LANG['pl'] = array( 'Use server hostname' => 'Użyj hostname serwera', 'Use domain hostname' => 'Użyj domeny serwera', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'Brak szyfrowania', 'Do not use encryption' => 'Nie korzystaj z szyfrowania', 'maximum characters length, including prefix' => 'maksymalna %s ilość znaków, łącznie z prefiksem', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index deac82ee1..6a8c4884a 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -747,10 +747,11 @@ $LANG['pt-BR'] = array( 'Use server hostname' => 'Usar hostname do servidor', 'Use domain hostname' => 'Usar hostname do domínio', 'Use STARTTLS' => 'Usar STARTTLS', - 'Use SSL' => 'Usar SSL', + 'Use SSL / TLS' => 'Usar SSL / TLS', 'No encryption' => 'Nenhuma criptografia', 'Do not use encryption' => 'Não usar criptografia', 'maximum characters length, including prefix' => 'comprimento máximo de % caracteres, incluindo o prefixo', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index f72890768..ec1eb670d 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -747,10 +747,11 @@ $LANG['pt'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index 413e5866b..0a9e93e3d 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -749,10 +749,11 @@ $LANG['ro'] = array( 'Use server hostname' => 'Utilizează nume de host server', 'Use domain hostname' => 'Utilizează nume de host domeniu', 'Use STARTTLS' => 'Utilizează STARTTLS', - 'Use SSL' => 'Utilizează SSL', + 'Use SSL / TLS' => 'Utilizează SSL / TLS', 'No encryption' => 'Fără encriptare', 'Do not use encryption' => 'Nu folosi encriptare', 'maximum characters length, including prefix' => 'maximum %s caractere, incluzând prefixul', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index da88e88c5..22a9b6455 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -750,10 +750,11 @@ $LANG['ru'] = array( 'Use server hostname' => 'Использовать серверное имя хоста', 'Use domain hostname' => 'Использовать доменное имя хоста', 'Use STARTTLS' => 'Использовать STARTTLS', - 'Use SSL' => 'Использовать SSL', + 'Use SSL / TLS' => 'Использовать SSL / TLS', 'No encryption' => 'Без шифрования', 'Do not use encryption' => 'Не использовать шифрование', 'maximum characters length, including prefix' => 'максимальное %s количество символов, включая префикс', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index 538d2db95..87bb1910f 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -747,10 +747,11 @@ $LANG['se'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index 59146f556..96f23bb5f 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -749,10 +749,11 @@ $LANG['th'] = array( 'Use server hostname' => 'ใช้ server hostname', 'Use domain hostname' => 'ใช้ domain hostname', 'Use STARTTLS' => 'ใช้ STARTTLS', - 'Use SSL' => 'ใช้ SSL', + 'Use SSL / TLS' => 'ใช้ SSL / TLS', 'No encryption' => 'ไม่มี encryption', 'Do not use encryption' => 'ไม่ใช้ encryption', 'maximum characters length, including prefix' => 'ความยาว charset สูงสุด %s ตัว, รวมถึงคำนำหน้า', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 2e93c99d0..7f2875b99 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -748,10 +748,11 @@ $LANG['tr'] = array( 'Use server hostname' => 'Use server hostname', 'Use domain hostname' => 'Use domain hostname', 'Use STARTTLS' => 'Use STARTTLS', - 'Use SSL' => 'Use SSL', + 'Use SSL / TLS' => 'Use SSL / TLS', 'No encryption' => 'No encryption', 'Do not use encryption' => 'Do not use encryption', 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index c01832ced..02b5a29aa 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -752,10 +752,11 @@ $LANG['tw'] = array( 'Use server hostname' => '使用伺服器主機名稱', 'Use domain hostname' => '使用網域主機名稱', 'Use STARTTLS' => '使用 STARTTLS', - 'Use SSL' => '使用 SSL', + 'Use SSL / TLS' => '使用 SSL / TLS', 'No encryption' => '不加密', 'Do not use encryption' => '不要使用加密', 'maximum characters length, including prefix' => '最多 %s 字元(包含前綴)', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 698f37be3..cf47496d8 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -748,10 +748,11 @@ $LANG['ua'] = array( 'Use server hostname' => "Використовувати серверне ім'я хоста", 'Use domain hostname' => "Використовувати доменне ім'я хоста", 'Use STARTTLS' => 'Використовувати STARTTLS', - 'Use SSL' => 'Використовувати SSL', + 'Use SSL / TLS' => 'Використовувати SSL / TLS', 'No encryption' => 'Без шифрування', 'Do not use encryption' => 'Не використовувати шифрування', 'maximum characters length, including prefix' => 'максимальна %s кількість символів, включаючи префікс', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index b0c468a7c..8a74126cb 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -746,10 +746,11 @@ $LANG['vi'] = array( 'Use server hostname' => 'Sử dụng hostname của máy chủ', 'Use domain hostname' => 'Sử dụng hostname của tên miền', 'Use STARTTLS' => 'Sử dụng STARTTLS', - 'Use SSL' => 'Sử dụng SSL', + 'Use SSL / TLS' => 'Sử dụng SSL / TLS', 'No encryption' => 'Sử dụng mã hóa', 'Do not use encryption' => 'Không dùng mã hóa', 'maximum characters length, including prefix' => 'tối đa %s ký tự, bao gồm tiền tố', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/main.php b/web/inc/main.php index 8cef2a012..38d478922 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -3,7 +3,7 @@ session_start(); define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); -define('JS_LATEST_UPDATE', '1491697867'); +define('JS_LATEST_UPDATE', '1491697868'); $i = 0; diff --git a/web/js/pages/add_mail_acc.js b/web/js/pages/add_mail_acc.js index fa19a3b49..3a921202d 100644 --- a/web/js/pages/add_mail_acc.js +++ b/web/js/pages/add_mail_acc.js @@ -155,9 +155,9 @@ $(document).ready(function() { break; case 'ssl': $('#td_imap_port').html('993'); - $('#td_imap_encryption').html('SSL'); + $('#td_imap_encryption').html('SSL / TLS'); $('#td_smtp_port').html('465'); - $('#td_smtp_encryption').html('SSL'); + $('#td_smtp_encryption').html('SSL / TLS'); break; case 'no_encryption': $('#td_imap_hostname').html(opt.attr('domain')); diff --git a/web/js/pages/edit_mail_acc.js b/web/js/pages/edit_mail_acc.js index ab6b53c01..f57db54f4 100644 --- a/web/js/pages/edit_mail_acc.js +++ b/web/js/pages/edit_mail_acc.js @@ -156,9 +156,9 @@ $(document).ready(function() { break; case 'ssl': $('#td_imap_port').html('993'); - $('#td_imap_encryption').html('SSL'); + $('#td_imap_encryption').html('SSL / TLS'); $('#td_smtp_port').html('465'); - $('#td_smtp_encryption').html('SSL'); + $('#td_smtp_encryption').html('SSL / TLS'); break; case 'no_encryption': $('#td_imap_hostname').html(opt.attr('domain')); diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index f0e6e1acd..0f2ea2d05 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -151,7 +151,7 @@ - + diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index 79b6e32cd..c9b7ed85b 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -158,7 +158,7 @@ - + From 6dd37ccf00e01e096ba384a63228278717ebec57 Mon Sep 17 00:00:00 2001 From: dpeca Date: Mon, 17 Apr 2017 20:59:45 +0200 Subject: [PATCH 59/72] Introducing Serbian translation --- web/inc/i18n/sr.php | 757 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 757 insertions(+) create mode 100644 web/inc/i18n/sr.php diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php new file mode 100644 index 000000000..ef11fabf0 --- /dev/null +++ b/web/inc/i18n/sr.php @@ -0,0 +1,757 @@ + 'Paketi', + 'IP' => 'IP', + 'Graphs' => 'Grafikoni', + 'Statistics' => 'Statistika', + 'Log' => 'Log', + 'Server' => 'Server', + 'Services' => 'Servisi', + 'Firewall' => 'Firewall', + 'Updates' => 'Ažuriranje', + 'Log in' => 'Ulaz', + 'Log out' => 'Izlaz', + + 'USER' => 'KORISNIK', + 'WEB' => 'WEB', + 'DNS' => 'DNS', + 'MAIL' => 'MAIL', + 'DB' => 'DB', + 'CRON' => 'CRON', + 'BACKUP' => 'BACKUP', + + 'LOGIN' => 'LOGIN', + 'RESET PASSWORD' => 'PROMENA ŠIFRE', + 'SEARCH' => 'PRETRAGA', + 'PACKAGE' => 'PAKET', + 'RRD' => 'RRD', + 'STATS' => 'STATISTIKA', + 'LOG' => 'LOG', + 'UPDATES' => 'AŽURIRANJA', + 'FIREWALL' => 'FIREWALL', + 'SERVER' => 'SERVER', + 'MEMORY' => 'MEMORIJA', + 'DISK' => 'DISK', + 'NETWORK' => 'MREŠA', + 'Web Log Manager' => 'Web Log Menadžer', + + 'no notifications' => 'nema notifikacija', + + 'Add User' => 'Dodaj korisnika', + 'Add Domain' => 'Dodaj domen', + 'Add Web Domain' => 'Dodaj WEB domen', + 'Add DNS Domain' => 'Dodaj DNS domen', + 'Add DNS Record' => 'Dodaj DNS zapis (DNS record)', + 'Add Mail Domain' => 'Dodaj mail za domen', + 'Add Mail Account' => 'Dodaj mail nalog', + 'Add Database' => 'Dodaj bazu podataka', + 'Add Cron Job' => 'Dodaj cron job', + 'Create Backup' => 'Napravi Backup', + 'Configure' => 'Konfiguriranje', + 'Restore All' => 'Vrati sve', + 'Add Package' => 'Dodaj paket', + 'Add IP' => 'Dodaj IP', + 'Add Rule' => 'Dodati pravilo', + 'Ban IP Address' => 'Blokiraj IP adresu', + 'Search' => 'Traži', + 'Add one more FTP Account' => 'Dodaj još jedan FTP nalog', + 'Overall Statistics' => 'Globalna statistika', + 'Daily' => 'Dnevno', + 'Weekly' => 'Sedmično', + 'Monthly' => 'Mesečno', + 'Yearly' => 'Godišnje', + 'Add' => 'Dodaj', + 'Back' => 'Nazad', + 'Save' => 'Sačuvaj', + 'Submit' => 'Pošalji', + + 'toggle all' => 'selektuj sve', + 'apply to selected' => 'grupna akcija', + 'rebuild' => 'popraviti', + 'rebuild web' => 'popravi web', + 'rebuild dns' => 'popravi dns', + 'rebuild mail' => 'popravi mail', + 'rebuild db' => 'popravi bazu', + 'rebuild cron' => 'popravi cron', + 'update counters' => 'ažuriraj brojače', + 'suspend' => 'suspenduj', + 'unsuspend' => 'odbsuspenduj', + 'delete' => 'obriši', + 'show per user' => 'prikaz po korisniku', + 'login as' => 'loguj se kao', + 'logout' => 'izlaz', + 'edit' => 'izmena', + 'open webstats' => 'vidi web statistiku', + 'view logs' => 'vidi logove', + 'list records' => 'izlistano %s zapisa', + 'add record' => 'dodaj zapis (record)', + 'list accounts' => 'ukupno %s naloga', + 'add account' => 'dodaj nalog', + 'open webmail' => 'otvori webmail', + 'list fail2ban' => 'fail2ban listing', + 'open %s' => 'otvori %s', + 'download' => 'preuzmi', + 'restore' => 'vrati', + 'configure restore settings' => 'vrati backup (moguće i selektivno vraćanje)', + 'stop' => 'zaustavi', + 'start' => 'pokreni', + 'restart' => 'restart', + 'update' => 'ažuriraj', + 'generate' => 'generiši', + 'Generate CSR' => 'Generiši CSR', + 'reread IP' => 'ponovo refrešuj IP', + 'enable autoupdate' => 'uključi autoumatsko ažuriranje', + 'disable autoupdate' => 'isključi autoumatsko ažuriranje', + 'turn on notifications' => 'uključi notifikacije', + 'turn off notifications' => 'isključi notifikacije', + 'configure' => 'konfiguriši', + + 'Adding User' => 'Dodavanje korisnika', + 'Editing User' => 'Izmena korisnika', + 'Adding Domain' => 'Dodavanje domena', + 'Editing Domain' => 'Izmena domena', + 'Adding DNS Domain' => 'Dodavanje DNS-a za domen', + 'Editing DNS Domain' => 'Izmena DNS-a za domen', + 'Adding DNS Record' => 'Dodavanje DNS zapisa (DNS record)', + 'Editing DNS Record' => 'Izmena DNS zapisa (DNS record)', + 'Adding Mail Domain' => 'Dodavanje Mail-a za domee', + 'Editing Mail Domain' => 'Izmena Mail-a za domen', + 'Adding Mail Account' => 'Dodavanje Mail naloga', + 'Editing Mail Account' => 'Izmena Mail naloga', + 'Adding database' => 'Dodavanje baze podataka', + 'Editing Cron Job' => 'Izmena cron job-a', + 'Adding Cron Job' => 'Dodavanje cron job-a', + 'Editing Database' => 'Izmena baze podataka', + 'Adding Package' => 'Dodavanje paketa', + 'Editing Package' => 'Izmena paketa', + 'Adding IP address' => 'Dodavanje IP adrese', + 'Editing IP Address' => 'Izmena IP adrese', + 'Editing Backup Exclusions' => 'Izmena backup izuzeća', + 'Generating CSR' => 'Generisanje CSR-a', + 'Listing' => 'Spisak', + 'Search Results' => 'Rezultati pretrage', + 'Adding Firewall Rule' => 'Dodavanje Firewall pravila', + 'Editing Firewall Rule' => 'Izmena Firewall pravila', + 'Adding IP Address to Banlist' => 'Dodavanje IP adrese', + + 'active' => 'aktivan', + 'spnd' => 'suspendovan', + 'suspended' => 'suspendovan', + 'running' => 'pokrenut', + 'stopped' => 'stopiran', + 'outdated' => 'zastarelo', + 'updated' => 'ažurirano', + + 'yes' => 'da', + 'no' => 'ne', + 'none' => 'ništa', + 'pb' => 'pb', + 'tb' => 'tb', + 'gb' => 'gb', + 'mb' => 'mb', + 'minute' => 'minut', + 'hour' => 'sat', + 'day' => 'dan', + 'days' => 'dana', + 'hours' => 'sati', + 'minutes' => 'minuta', + 'month' => 'mesec', + 'package' => 'paket', + 'Bandwidth' => 'Protok', + 'Disk' => 'Disk', + 'Web' => 'Web', + 'Mail' => 'Mail', + 'Databases' => 'Baze podataka', + 'User Directories' => 'Korisnički direktorijumi', + 'Template' => 'Šablon', + 'Web Template' => 'Web template', + 'Backend Template' => 'Backend template', + 'Proxy Template' =>'Proxy template', + 'DNS Template' => 'DNS template', + 'Web Domains' => 'Web domena', + 'SSL Domains' => 'SSL domeni', + 'Web Aliases' => 'Web aliasi', + 'per domain' => 'po domenu', + 'DNS Domains' => 'DNS Domena', + 'DNS domains' => 'DNS domeni', + 'DNS records' => 'DNS zapisi (DNS records)', + 'Name Servers' => 'Name Serveri', + 'Mail Domains' => 'Mail domena', + 'Mail Accounts' => 'Mail nalozi', + 'Cron Jobs' => 'Cron Job-ova', + 'SSH Access' => 'SSH pristup', + 'IP Address' => 'IP adresa', + 'IP Addresses' => 'IP adrese', + 'Backups' => 'Backup-ova', + 'Backup System' => 'Backup sistema', + 'backup exclusions' => 'backup izuzeci', + 'template' => 'template', + 'SSL Support' => 'SSL podrška', + 'SSL Home Directory' => 'SSL direktorijum', + 'Lets Encrypt Support' => 'Lets Encrypt podrška', + 'Lets Encrypt' => 'Lets Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => 'Vaš sertifikat će biti automatski generisan za 5 minuta', + 'Proxy Support' => 'Proxy podrška', + 'Proxy Extensions' => 'Proxy ekstenzije', + 'Web Statistics' => 'Web statistika', + 'Additional FTP Account' => 'Dodatni FTP nalog', + 'Path' => 'Putanja', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'Istek', + 'Records' => 'Records (zapisi)', + 'Serial' => 'Serijski', + 'Catchall email' => 'CatchAll email opcija', + 'AntiVirus Support' => 'AntiVirus podrška', + 'AntiSpam Support' => 'AntiSpam podrška', + 'DKIM Support' => 'DKIM podrška', + 'Accounts' => 'Nalozi', + 'Quota' => 'Dozvoljeni prostor', + 'Autoreply' => 'Automatski odgovor', + 'Forward to' => 'Forward-uj', + 'Do not store forwarded mail' => 'Nemoj čuvati forward-ovane emailove', + 'IMAP hostname' => 'IMAP hostname', + 'IMAP port' => 'IMAP port', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP hostname', + 'SMTP port' => 'SMTP port', + 'SMTP security' => 'SMTP security', + 'SMTP auth method' => 'SMTP auth method', + 'STARTTLS' => 'STARTTLS', + 'Normal password' => 'Normal password', + 'database' => 'baza podataka', + 'User' => 'Korisnik', + 'Host' => 'Host', + 'Charset' => 'Charset', + 'Min' => 'Min', + 'Hour' => 'Sat', + 'Day' => 'Dan', + 'Month' => 'Mesec', + 'Day of week' => 'Dan u nedelji', + 'local' => 'lokalno', + 'Run Time' => 'Trajanje generisanja backup-a', + 'Backup Size' => 'Veličina backup-a', + 'SYS' => 'SYS', + 'Domains' => 'Domeni', + 'Status' => 'Status', + 'shared' => 'šerovano', + 'dedicated' => 'dedicated', + 'Owner' => 'Vlasnik', + 'Users' => 'Korisnici', + 'Load Average' => 'Prosečno opterećenje', + 'Memory Usage' => 'Iskorišćenje memorije', + 'APACHE2 Usage' => 'APACHE2 upotreba', + 'HTTPD Usage' => 'HTTPD upotreba', + 'NGINX Usage' => 'NGINX upotreba', + 'MySQL Usage on localhost' => 'MySQL na localhost-u', + 'PostgreSQL Usage on localhost' => 'PostgreSQL na localhost-u', + 'Bandwidth Usage eth0' => 'Protok na eth0', + 'Bandwidth Usage eth1' => 'Protok na eth1', + 'Exim Usage' => 'Exim upotreba', + 'FTP Usage' => 'FTP upotreba', + 'SSH Usage' => 'SSH upotreba', + 'reverse proxy' => 'reverzni proxy', + 'web server' => 'web server', + 'dns server' => 'dns server', + 'mail server' => 'mail server', + 'pop/imap server' => 'pop/imap server', + 'email antivirus' => 'email antivirus', + 'email antispam' => 'email antispam', + 'database server' => 'server baze podataka', + 'ftp server' => 'ftp server', + 'job scheduler' => 'planer poslova', + 'firewall' => 'firewall', + 'brute-force monitor' => 'brute-force monitor', + 'CPU' => 'CPU', + 'Memory' => 'Memorija', + 'Uptime' => 'Koliko radi', + 'core package' => 'glavni paket', + 'php interpreter' => 'php interpreter', + 'internal web server' => 'interni web server', + 'Version' => 'Verzija', + 'Release' => 'Distribucija', + 'Architecture' => 'Arhitektura', + 'Object' => 'Predmet', + 'Username' => 'Korisničko ime', + 'Password' => 'Šifra', + 'Email' => 'Email', + 'Package' => 'Paket', + 'Language' => 'Jezik', + 'First Name' => 'Ime', + 'Last Name' => 'Prezime', + 'Send login credentials to email address' => 'Pošalji login podatke na mail adresu', + 'Default Template' => 'Osnovni template', + 'Default Name Servers' => 'Podrazumevani Name serveri', + 'Domain' => 'Domen', + 'DNS Support' => 'DNS podrška', + 'Mail Support' => 'Mail podrška', + 'Advanced options' => 'Dodatne opcije', + 'Basic options' => 'Osnovne opcije', + 'Aliases' => 'Aliasi', + 'SSL Certificate' => 'SSL sertifikat', + 'SSL Key' => 'SSL Ključ', + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', + 'SSL CSR' => 'SSL CSR', + 'optional' => 'opciono', + 'internal' => 'interno', + 'Statistics Authorization' => 'Autorizacija za statistiku', + 'Statistics Auth' => 'Autorizacija statistiku', + 'Account' => 'Nalog', + 'Prefix will be automaticaly added to username' => 'Prefiks %s će automatski biti pridodat korisničkom imenu', + 'Send FTP credentials to email' => 'Pošalji FTP login podatke na mail adresu', + 'Expiration Date' => 'Datum isteka', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'Name serveri', + 'Record' => 'Record (zapis)', + 'IP or Value' => 'IP ili vrednost', + 'Priority' => 'Prioritet', + 'Record Number' => 'Redni broj zapisa', + 'in megabytes' => 'u megabajtima', + 'Message' => 'Poruka', + 'use local-part' => 'unesi samo početni deo (bez @domen.com dela)', + 'one or more email addresses' => 'jedna ili više email adresa', + 'Prefix will be automaticaly added to database name and database user' => 'Prefiks %s se automatski dodaje na ime baze i na korisničko ime baze', + 'Database' => 'Baza podataka', + 'Type' => 'Tip', + 'Minute' => 'Minut', + 'Command' => 'Komanda', + 'Package Name' => 'Ime paketa', + 'Netmask' => 'Netmask', + 'Interface' => 'Interface', + 'Shared' => 'Šerovano', + 'Assigned user' => 'Dodejeljen korisnik', + 'Assigned domain' => 'Dodejeljen domen', + 'NAT IP association' => 'NAT IP asocijacija', + 'shell' => 'shell', + 'web domains' => 'web domeni', + 'web aliases' => 'web aliasi', + 'dns records' => 'dns zapisi (dns records)', + 'mail domains' => 'mail domeni', + 'mail accounts' => 'mail nalozi', + 'accounts' => 'naloga', + 'databases' => 'baze podataka', + 'cron jobs' => 'cron jobs', + 'backups' => 'backup-ovi', + 'quota' => 'kodeljen prostor', + 'day of week' => 'dan u nedelji', + 'cmd' => 'cmd', + 'users' => 'korisnika', + 'domains' => 'domena', + 'aliases' => 'aliasa', + 'records' => 'zapisa', + 'jobs' => 'jobs', + 'username' => 'korisničko ime', + 'password' => 'šifra', + 'type' => 'tip', + 'charset' => 'charset', + 'domain' => 'domen', + 'ip' => 'ip', + 'ip address' => 'ip adresa', + 'IP address' => 'IP adresa', + 'netmask' => 'netmask', + 'interface' => 'interfejs', + 'assigned user' => 'dodeljen korisnik', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'korisnik', + 'email' => 'email', + 'first name' => 'ime', + 'last name' => 'prezime', + 'account' => 'nalog', + 'ssl certificate' => 'ssl certifikat', + 'ssl key' => 'ssl ključ', + 'stats user password' => 'šifra za korisničku statistiku', + 'stats username' => 'stats korisničko ime', + 'stats password' => 'stats šifra', + 'ftp user password' => 'ftp šifra', + 'ftp user' => 'ftp username', + 'Last 70 lines of %s.%s.log' => 'Zadnjih 70. redova od %s.%s.log', + 'AccessLog' => 'AccessLog', + 'ErrorLog' => 'ErrorLog', + 'Download AccessLog' => 'Skini AccessLog', + 'Download ErrorLog' => 'Skini ErrorLog', + 'Country' => 'Zemlja', + '2 letter code' => 'samo 2 slova', + 'State / Province' => 'Država / Predeo', + 'City / Locality' => 'Grad / Mesto', + 'Organization' => 'Organizacija', + 'Action' => 'Akcija', + 'Protocol' => 'Protokol', + 'Port' => 'Port', + 'Comment' => 'Komentar', + 'Banlist' => 'Lista banovanih', + 'ranges are acceptable' => 'možete da koristite i format OD-DO', + 'CIDR format is supported' => 'CIDR format je podržan', + 'ACCEPT' => 'PRIHVATITI', + 'DROP' => 'IGNORISATI', + 'TCP' => 'TCP', + 'UDP' => 'UDP', + 'ICMP' => 'ICMP', + 'SSH' => 'SSH', + 'FTP' => 'FTP', + 'VESTA' => 'VESTA', + 'Add one more Name Server' => 'Dodaj još jedan Name server', + + 'web domain' => 'web domen', + 'dns domain' => 'dns za domen', + 'dns record' => 'dns zapis (DNS record)', + 'mail domain' => 'mail za domen', + 'mail account' => 'mail nalog', + 'cron job' => 'cron job', + + 'cron' => 'cron', + 'user dir' => 'korisnički direktorijum', + + 'unlimited' => 'neograničeno', + '1 account' => '1 nalog', + '%s accounts' => '%s naloga', + '1 domain' => '1 domen', + '%s domains' => '%s domena', + '1 record' => '1 zapis', + '%s records' => '%s zapisa', + '1 mail account' => '1 mail nalog', + '%s mail accounts' => '%s mail naloga', + '1 database' => '1 baza podataka', + '%s databases' => '%s baza podataka', + '1 cron job' => '1 cron job', + '%s cron jobs' => '%s cron job-ova', + '1 archive' => '1 arhiva', + '%s archives' => '%s arhiva', + '1 item' => '1 stavka', + '%s items' => '%s stavki', + '1 package' => '1 paket', + '%s packages' => '%s paketa', + '1 IP address' => '1 IP adresa', + '%s IP addresses' => '%s IP adresa', + '1 month' => '1 mesec', + '%s months' => '%s meseci', + '1 log record' => '1 log zapis', + '%s log records' => '%s log zapisa', + '1 object' => '1 objekat', + '%s objects' => '%s objekata', + 'no exclusions' => 'nema izuzetaka', + '1 rule' => '1 pravilo', + '%s rules' => '%s pravila', + 'There are no currently banned IP' => 'Nijedna IP adresa trenutno nije banovana', + + 'USER_CREATED_OK' => 'Korisnik %s je uspešno kreiran.', + 'WEB_DOMAIN_CREATED_OK' => 'Domen %s je uspešno dodat.', + 'DNS_DOMAIN_CREATED_OK' => 'DNS za domen %s je uspešno napravljen.', + 'DNS_RECORD_CREATED_OK' => 'DNS zapis (DNS record) %s.%s je uspešno napravljen.', + 'MAIL_DOMAIN_CREATED_OK' => 'Mail za domen %s je uspešno napravljen.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Mail nalog %s@%s je uspešno napravljen.', + 'DATABASE_CREATED_OK' => 'Baza podataka %s je uspešno napravljena', + 'CRON_CREATED_OK' => 'Cron job je uspešno napravljen.', + 'IP_CREATED_OK' => 'IP adrese %s su uspešno dodate.', + 'PACKAGE_CREATED_OK' => 'Paket %s je uspešno napravljen.', + 'SSL_GENERATED_OK' => 'Sertifikat je uspešno generisan.', + 'RULE_CREATED_OK' => 'Pravilo je uspešno kreirano.', + 'BANLIST_CREATED_OK' => 'IP adresa je uspešno dodata na banlist-u', + 'Autoupdate has been successfully enabled' => 'Automatsko ažuriranje uspešno aktivirano', + 'Autoupdate has been successfully disabled' => 'Automatsko ažuriranje je isključeno', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob izveštavanje je uspešno aktivirano', + 'Cronjob email reporting has been successfully disabled' => 'Cronjob izveštavanje je uspešno isključeno', + 'Changes has been saved.' => 'Izmene su uspešno sačuvane.', + 'Confirmation' => 'Potvrda', + 'DELETE_USER_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete %s?', + 'SUSPEND_USER_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'Da li ste sigurni da želite da aktivirate %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete domen %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete domen %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Da li ste sigurni da želite aktivirate domen %s?', + 'DELETE_RECORD_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete ovaj zapis %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'Da li ste sigurni da želite suspendujete ovaj zapis %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'Da li ste sigurni da želite ponovo aktivirate ovaj zapis %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Da li ste sigurni da želite ovo da obrišete %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Da li ste sigurni da želite da ponovo aktivirate %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete bazu podataka %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete bazu podataka %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Da li ste sigurni da želite da ponovo aktivirate bazu podataka %s?', + 'DELETE_CRON_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete cron job?', + 'SUSPEND_CRON_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete cron job?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Da li ste sigurni da želite da ponovo aktivirate cron job?', + 'DELETE_BACKUP_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete %s backup?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete %s izuzetke?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Da li ste sigurni da želite da obrišeti paket %s?', + 'DELETE_IP_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete IP adresu %s?', + 'DELETE_RULE_CONFIRMATION' => 'Da li ste sigurni da želite da obrišete pravilo #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'Da li ste sigurni da želite da suspendujete pravilo #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'Da li ste sigurni da želite da ponovo aktivirate pravilo #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'Napusti stranicu?', + 'RESTART_CONFIRMATION' => 'Da li ste sigurni da želite da restartujete %s?', + 'Welcome' => 'Dobrodošli', + 'LOGGED_IN_AS' => 'Ulogovani ste kao %s', + 'Error' => 'Greška', + 'Invalid username or password' => 'Pogrešani login podaci', + 'Invalid username or code' => 'Pogrešno korisničko ime ili kod', + 'Passwords not match' => 'Passwordi se ne poklapaju', + 'Please enter valid email address.' => 'Potrebno je uneti validnu email adresu.', + 'Field "%s" can not be blank.' => 'Polja "%s" ne smeju biti prazna.', + 'Password is too short.' => 'Šifra je previše kratka (najmanje 6 znakova)', + 'Error code:' => 'Greška koda: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" nije uspelo', + 'IP address is in use' => 'IP adresa se već koristi', + 'BACKUP_SCHEDULED' => 'Backup je zakazan. Uskoro ćete dobiti obaveštenje putem maila da možete preuzeti vaš backup.', + 'BACKUP_EXISTS' => 'Sačekajte da se backup dovrši, pošto je već pokrenut.', + 'RESTORE_SCHEDULED' => 'Vraćanje backup-a je zakazano. Primićete email kada backup bude vraćen.', + 'RESTORE_EXISTS' => 'Server je već u procesu vraćanja Vašeg backup-a. Sačekajte da se završi pre nego što ga ponovno pokrenete novo vraćanje backup-a.', + + 'WEB_EXCLUSIONS' => 'Unesi domen(e), po jedan u svakoj liniji. Da bi izuzeo sve domene unesi zvezdicu (*). Da bi izuzeo određene direktorijume koristi sledeći format: domain.com:public_html/cache:public_html/tmp', + 'DNS_EXCLUSIONS' => 'Unesi domen(e), po jedan u svakoj liniji. Da bi izuzeo sve domene unesi zvezdicu *', + 'MAIL_EXCLUSIONS' => 'Unesi domen(e), po jedan u svakoj liniji. Da bi izuzeo sve domene unesi zvezdicu (*). Da bi izuzeo određene naloge koristi sledeći format: domain.com:info:support:postmaster', + 'DB_EXCLUSIONS' => 'Unesi imena baza, po jednu u svakoj liniji. Da bi izuzeo sve baze unesi zvezdicu *', + 'CRON_EXCLUSIONS' => 'Da bi izuzeo sve cron-job-ove unesi zvezdicu *', + 'USER_EXCLUSIONS' => 'Unesi direktorijume, po jedan u svakoj liniji. Da bi izuzeo sve direktorijume unesi zvezdicu *', + + 'Welcome to Vesta Control Panel' => 'Dobrodošli u Vesta kontrolni panel', + 'MAIL_FROM' => 'Vesta kontrolni panel ', + 'GREETINGS_GORDON_FREEMAN' => "Poštovanje, %s %s,\n", + 'GREETINGS' => "Poštovanje,\n", + 'ACCOUNT_READY' => "Vaš hosting nalog je kreiran i spreman za korišćenje.\n\nhttps://%s/login/\nKorisničko ime: %s\nŠifra: %s\n\n--\nVesta kontrolni panel\n", + + 'FTP login credentials' => 'FTP podaci', + 'FTP_ACCOUNT_READY' => "FTP nalog je kreiran. Koristite sledeće podatke kako biste se ulogovali:\n\nHostname: %s\nKorisničko ime: %s_%s\nŠifra: %s\n\n--\nVesta kontrolni panel\n", + + 'Database Credentials' => 'Podaci baze podataka', + 'DATABASE_READY' => "Baza podataka je kreirana. Koristite sledeće podatke kako biste se ulogovali:\n\nDatabase: %s\nKorisničko ime: %s\nŠifra: %s\n%s\n\n--\nVesta kontrolni panel\n", + + 'forgot password' => 'zaboravljena šifra', + 'Confirm' => 'Potvrditi', + 'New Password' => 'Nova šifra', + 'Confirm Password' => 'Potvrdi šifru', + 'Reset' => 'Reset', + 'Reset Code' => 'Resetuj kod', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'Kod resetovane šifre je poslat na vašu email adresu
', + 'MAIL_RESET_SUBJECT' => 'Šifra je resetovana %s', + 'PASSWORD_RESET_REQUEST' => "Za resetovanje šifre sledite link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nIli, možete ići na https://%s/reset/?action=code&user=%s i uneti kod:\n%s\n\nAko niste tražili resetovanje šifre, ignorišite ovu poruku i prihvatite naše izvinjenje.\n\n--\nVesta kontrolni panel\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'Maj', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Avg', + 'Sep' => 'Sep', + 'Oct' => 'Okt', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Konfiguracija Servera', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Vremenska zona', + 'Default Language' => 'Jezik', + 'Proxy Server' => 'Proxy Server', + 'Web Server' => 'Web Server', + 'Backend Server' => 'Backend Server', + 'Backend Pool Mode' => 'Backend Pool Mode', + 'DNS Server' => 'DNS Server', + 'DNS Cluster' => 'DNS Klaster', + 'MAIL Server' => 'MAIL Server', + 'Antivirus' => 'Antivirus', + 'AntiSpam' => 'AntiSpam', + 'Webmail URL' => 'Webmail URL', + 'MySQL Support' => 'MySQL podrška', + 'phpMyAdmin URL' => 'phpMyAdmin URL', + 'PostgreSQL Support' => 'PostgreSQL podrška', + 'phpPgAdmin URL' => 'phpPgAdmin URL', + 'Maximum Number Of Databases' => 'Maksimalan broj baza', + 'Current Number Of Databases' => 'Trenutan broj baza', + 'Local backup' => 'Lokalni backup', + 'Compression level' => 'Nivo kompresije', + 'Directory' => 'Direktorijum', + 'Remote backup' => 'Remote backup', + 'ftp' => 'FTP', + 'sftp' => 'SFTP', + 'SFTP Chroot' => 'SFTP Chroot', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Plugin-ovi', + 'preview' => 'pregled', + 'Reseller Role' => 'Reseller uloga', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup migracioni menadžer', + 'FileManager' => 'FileManager', + 'show: CPU / MEM / NET / DISK' => 'prikaz: CPU / MEM / NET / DISK', + + 'sort by' => 'sortiranje po', + 'Date' => 'Datum', + 'Starred' => 'Označen zvezdicom', + 'Name' => 'Ime', + + 'save to favorites' => 'snimi u Omiljene (favorites)', + + 'File Manager' => 'Fajl menadžer', + 'size' => 'veličina', + 'date' => 'datum', + 'name' => 'ime', + 'Initializing' => 'Inicijalizacija', + 'UPLOAD' => 'UPLOAD', + 'NEW FILE' => 'NOVI FAJL', + 'NEW DIR' => 'NOVI DIREKTORIJUM', + 'DELETE' => 'OBRISATI', + 'RENAME' => 'PREIMENOVATI', + 'MOVE' => 'POMERITI', + 'RIGHTS' => 'PRIVILEGIJE', + 'COPY' => 'KOPIRATI', + 'ARCHIVE' => 'ARHIVIRATI', + 'EXTRACT' => 'RASPAKOVATI', + 'DOWNLOAD' => 'DOWNLOAD', + 'Are you sure?' => 'Da li ste sigurni?', + 'Hit' => 'Hit', + 'to reload the page' => 'da refrešujemo ovu stranicu', + 'Directory name cannot be empty' => 'Ime direktorijuma ne može biti prazno', + 'File name cannot be empty' => 'Ime fajla ne može biti prazno', + 'No file selected' => 'Niste selektovali nijedan fajl', + 'No file or folder selected' => 'Niste selektovali nijedan fajl niti direktorijum', + 'File type not supported' => 'Ovaj format fajla (file type) nije podržan', + 'Directory download not available in current version' => 'Downloadovanje direktorijuma nije moguće u trenutnoj verziji VestaCP. Zapakujte folder pa onda download-ujte tu arhivu', + 'Directory not available' => 'Direktorijum nije dostupan', + 'Done' => 'Završeno', + 'Close' => 'Zatvoriti', + 'Copy' => 'Kopirati', + 'Cancel' => 'Odustati', + 'Rename' => 'Preimenovati', + 'Move' => 'Pomeriti', + 'Change Rights' => 'Izmena privilegija', + 'Delete' => 'Obrisati', + 'Extract' => 'Raspakovati', + 'Create' => 'Kreirati', + 'Compress' => 'Kompresovati', + 'OK' => 'OK', + 'YOU ARE COPYING' => 'KOPIRAMO', + 'YOU ARE REMOVING' => 'BRIŠEMO', + 'Delete items' => 'Brisanje svih stavki', + 'Copy files' => 'Kopiranje fajlova', + 'Move files' => 'Pomeranje fajlova', + 'Are you sure you want to copy' => 'Da li ste sigurni da želite da kopirate', + 'Are you sure you want to move' => 'Da li ste sigurni da želite da pomerite', + 'Are you sure you want to delete' => 'Da li ste sigurni da želite da izbrišete', + 'into' => 'u', + 'existing files will be replaced' => 'postojeći fajlovi će biti prekopirani', + 'Original name' => 'Orginalno ime', + 'File' => 'Fajl', + 'already exists' => 'Već postoji', + 'Create file' => 'Kreirati fajl', + 'Create directory' => 'Kreirati direktorijum', + 'read by owner' => 'mogućnost čitanja (read) od strane vlasnika', + 'write by owner' => 'mogućnost pisanja (write) od strane vlasnika', + 'execute/search by owner' => 'izvršavanje/pretraživanje (execute/search) za vlasn.', + 'read by group' => 'mogućnost čitanja (read) od strane grupe', + 'write by group' => 'mogućnost pisanja (write) od strane grupe', + 'execute/search by group' => 'izvršavanje/pretraživanje (execute/search) za grupu', + 'read by others' => 'mogućnost čitanja (read) od strane svih', + 'write by others' => 'mogućnost pisanja (write) od strane svih', + 'execute/search by others' => 'izvršavanje/pretraživanje (execute/search) za sve', + + 'Shortcuts' => 'Prečice', + 'Add New object' => 'Dodati novi objekat', + 'Save Form' => 'Sačuvati formu', + 'Cancel saving form' => 'Odustani', + 'Go to USER list' => 'Idi na listu korisnika', + 'Go to WEB list' => 'Idi na listu WEB domena', + 'Go to DNS list' => 'Idi na listu DNS domena', + 'Go to MAIL list' => 'Idi na listu MAIL domena', + 'Go to DB list' => 'Idi na listu BAZA podataka', + 'Go to CRON list' => 'Idi na listu CRON job-ova', + 'Go to BACKUP list' => 'Idi na listu BACKUP-ova', + 'Focus on search' => 'Skokni na pretragu', + 'Display/Close shortcuts' => 'Prikaći/skloni prečice', + 'Move backward through top menu' => 'Pomeri se nazad u gornjem meniju', + 'Move forward through top menu' => 'Pomeri se napred u gornjem meniju', + 'Enter focused element' => 'Unesi aktivni elemenat', + 'Move up through elements list' => 'Pomeri se na gore kroz listu', + 'Move down through elements list' => 'Pomeri se na dole kroz listu', + + 'Upload' => 'Upload', + 'New File' => 'Novi fajl', + 'New Folder' => 'Novi Direktorijum', + 'Download' => 'Download', + 'Archive' => 'Zapakuj', + 'Save File (in text editor)' => 'Snimi fajl (u text editoru)', + 'Close Popup / Cancel' => 'Zatvori popup / Odustani', + 'Move Cursor Up' => 'Pomeri kurzor na gore', + 'Move Cursor Down' => 'Pomeri kurzor na dole', + 'Switch to Left Tab' => 'Skokni u levi tab', + 'Switch to Right Tab' => 'Skokni u desni tab', + 'Switch Tab' => 'Skokni u drugi tab', + 'Go to the Top of the File List' => 'Idi na vrh liste fajlova', + 'Go to the Last File' => 'Idi na poslednji fajl', + 'Open File / Enter Directory' => 'Otvori fajl / Uđi u direktorijum', + 'Edit File' => 'Izmeni fajl', + 'Go to Parent Directory' => 'Odi u direktorijum ispred ovog', + 'Select Current File' => 'Selektuj trenutno izabrani fajl', + 'Select Bunch of Files' => 'Selektuj više fajlova', + 'Add File to the Current Selection' => 'Dodaj fajl u postojeću selekciju', + 'Select All Files' => 'Selektuj sve fajlove', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'prečice su slične prečicaca u legendarnom GNU Midnight Commander fajl menadžeru', + + 'Licence Key' => 'Licencni ključ', + 'Enter License Key' => 'Unesi ključ licence', + 'Buy Licence' => 'Kupi licencu', + 'Buy Lifetime License' => 'Kupu doživotnu licencu', + 'Disable and Cancel Licence' => 'Isključi i otkaži licencu', + 'Licence Activated' => 'Licenca je aktivirana', + 'Licence Deactivated' => 'Licenca je deaktivirana', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Ograničava SSH korisnika tako da on može da pristupi samo direktorijumima unutar svog home direktorijuma.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Kopiraj, briši, uploaduj, zapakuj, otpakuj fajlove preko Fajl menadžera direktno iz svog browsera.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'Ovaj modul je komercijalan, potrebno je da kupiš licencu za ovaj modul da bi ga koristio.', + + 'Minutes' => 'Minuta', + 'Hourly' => 'Sati', + 'Run Command' => 'Pokreni komandu', + 'every month' => 'svaki mesec', + 'every odd month' => 'svaki neparan mesec', + 'every even month' => 'svaki paran mesec', + 'every day' => 'svaki dan', + 'every odd day' => 'svaki neparan dan', + 'every even day' => 'svaki paran dan', + 'weekdays (5 days)' => 'radni dani (5 dana)', + 'weekend (2 days)' => 'vikend (2 dana)', + 'Monday' => 'Ponedeljak', + 'Tuesday' => 'Utorak', + 'Wednesday' => 'Sreda', + 'Thursday' => 'Četvrtak', + 'Friday' => 'Petak', + 'Saturday' => 'Subota', + 'Sunday' => 'Nedjelja', + 'every hour' => 'svaki sat', + 'every two hours' => 'svakih dva sata', + 'every minute' => 'svake minute', + 'every two minutes' => 'svake dve minute', + 'every' => 'svakih', + 'Generate' => 'Generiši', + + 'webalizer' => 'webalizer', + 'awstats' => 'awstats', + + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', + + 'Use server hostname' => 'Koristi server hostname', + 'Use domain hostname' => 'Koristi hostname domena', + 'Use STARTTLS' => 'Koristi STARTTLS', + 'Use SSL / TLS' => 'Koristi SSL / TLS', + 'No encryption' => 'Bez enkripcije', + 'Do not use encryption' => 'Nemoj koristiti enkripciju', + + 'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix', + + 'Email Credentials' => 'Email lozinka i podešavanja', +); From 41c6dfcd1dd201d9efbd125960c505bb027ffe4e Mon Sep 17 00:00:00 2001 From: dpeca Date: Tue, 18 Apr 2017 01:00:19 +0200 Subject: [PATCH 60/72] Minor improvements for Serbian translation --- web/inc/i18n/sr.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php index ef11fabf0..4fff4649c 100644 --- a/web/inc/i18n/sr.php +++ b/web/inc/i18n/sr.php @@ -37,7 +37,7 @@ $LANG['sr'] = array( 'SERVER' => 'SERVER', 'MEMORY' => 'MEMORIJA', 'DISK' => 'DISK', - 'NETWORK' => 'MREŠA', + 'NETWORK' => 'MREŽA', 'Web Log Manager' => 'Web Log Menadžer', 'no notifications' => 'nema notifikacija', @@ -52,7 +52,7 @@ $LANG['sr'] = array( 'Add Database' => 'Dodaj bazu podataka', 'Add Cron Job' => 'Dodaj cron job', 'Create Backup' => 'Napravi Backup', - 'Configure' => 'Konfiguriranje', + 'Configure' => 'Konfigurisanje', 'Restore All' => 'Vrati sve', 'Add Package' => 'Dodaj paket', 'Add IP' => 'Dodaj IP', @@ -80,7 +80,7 @@ $LANG['sr'] = array( 'rebuild cron' => 'popravi cron', 'update counters' => 'ažuriraj brojače', 'suspend' => 'suspenduj', - 'unsuspend' => 'odbsuspenduj', + 'unsuspend' => 'odsuspenduj', 'delete' => 'obriši', 'show per user' => 'prikaz po korisniku', 'login as' => 'loguj se kao', @@ -174,21 +174,21 @@ $LANG['sr'] = array( 'Proxy Template' =>'Proxy template', 'DNS Template' => 'DNS template', 'Web Domains' => 'Web domena', - 'SSL Domains' => 'SSL domeni', - 'Web Aliases' => 'Web aliasi', + 'SSL Domains' => 'SSL domena', + 'Web Aliases' => 'Web aliasa', 'per domain' => 'po domenu', 'DNS Domains' => 'DNS Domena', - 'DNS domains' => 'DNS domeni', - 'DNS records' => 'DNS zapisi (DNS records)', + 'DNS domains' => 'DNS domena', + 'DNS records' => 'DNS zapisa (DNS records)', 'Name Servers' => 'Name Serveri', 'Mail Domains' => 'Mail domena', - 'Mail Accounts' => 'Mail nalozi', + 'Mail Accounts' => 'Mail naloga', 'Cron Jobs' => 'Cron Job-ova', 'SSH Access' => 'SSH pristup', 'IP Address' => 'IP adresa', 'IP Addresses' => 'IP adrese', 'Backups' => 'Backup-ova', - 'Backup System' => 'Backup sistema', + 'Backup System' => 'Backup sistem', 'backup exclusions' => 'backup izuzeci', 'template' => 'template', 'SSL Support' => 'SSL podrška', @@ -213,7 +213,7 @@ $LANG['sr'] = array( 'Accounts' => 'Nalozi', 'Quota' => 'Dozvoljeni prostor', 'Autoreply' => 'Automatski odgovor', - 'Forward to' => 'Forward-uj', + 'Forward to' => 'Prosledi emailove na (Forward to)', 'Do not store forwarded mail' => 'Nemoj čuvati forward-ovane emailove', 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', @@ -270,7 +270,7 @@ $LANG['sr'] = array( 'brute-force monitor' => 'brute-force monitor', 'CPU' => 'CPU', 'Memory' => 'Memorija', - 'Uptime' => 'Koliko radi', + 'Uptime' => 'Radi', 'core package' => 'glavni paket', 'php interpreter' => 'php interpreter', 'internal web server' => 'interni web server', @@ -338,7 +338,7 @@ $LANG['sr'] = array( 'databases' => 'baze podataka', 'cron jobs' => 'cron jobs', 'backups' => 'backup-ovi', - 'quota' => 'kodeljen prostor', + 'quota' => 'dodeljen prostor', 'day of week' => 'dan u nedelji', 'cmd' => 'cmd', 'users' => 'korisnika', @@ -578,7 +578,7 @@ $LANG['sr'] = array( 'preview' => 'pregled', 'Reseller Role' => 'Reseller uloga', 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', + 'Template Manager' => 'Template menadžer', 'Backup Migration Manager' => 'Backup migracioni menadžer', 'FileManager' => 'FileManager', 'show: CPU / MEM / NET / DISK' => 'prikaz: CPU / MEM / NET / DISK', @@ -688,13 +688,13 @@ $LANG['sr'] = array( 'Go to the Last File' => 'Idi na poslednji fajl', 'Open File / Enter Directory' => 'Otvori fajl / Uđi u direktorijum', 'Edit File' => 'Izmeni fajl', - 'Go to Parent Directory' => 'Odi u direktorijum ispred ovog', + 'Go to Parent Directory' => 'Idi u direktorijum ispred ovog', 'Select Current File' => 'Selektuj trenutno izabrani fajl', 'Select Bunch of Files' => 'Selektuj više fajlova', 'Add File to the Current Selection' => 'Dodaj fajl u postojeću selekciju', 'Select All Files' => 'Selektuj sve fajlove', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'prečice su slične prečicaca u legendarnom GNU Midnight Commander fajl menadžeru', + 'prečice su slične prečicama u legendarnom GNU Midnight Commander fajl menadžeru', 'Licence Key' => 'Licencni ključ', 'Enter License Key' => 'Unesi ključ licence', From 367d0b34ef1a4a2f62d33bbfbea0981bcde96dff Mon Sep 17 00:00:00 2001 From: dpeca Date: Wed, 19 Apr 2017 15:36:43 +0200 Subject: [PATCH 61/72] Making v-backup-user able to upload backup to FTP if FTP folder is not set Before this fix v-backup-user was unable to upload backup to FTP if $BPATH (FTP folder) is not set --- bin/v-backup-user | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/v-backup-user b/bin/v-backup-user index b96003b68..5d3cfaf69 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -557,6 +557,9 @@ ftp_backup() { check_result "$E_PARSING" "$error" fi + if [ -z $BPATH ]; then + BPATH="/"; + fi # Debug info echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar" From 69386014408ffe25ccd81c7ff02e7b4650b56073 Mon Sep 17 00:00:00 2001 From: dpeca Date: Wed, 19 Apr 2017 20:32:22 +0200 Subject: [PATCH 62/72] Revert "Patch insecure CSRF token crypto vulnerability" --- web/inc/main.php | 4 ++-- web/login/index.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/inc/main.php b/web/inc/main.php index 22722b32f..38d478922 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -59,10 +59,10 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) { exit; } -// Generate CSRF token if (isset($_SESSION['user'])) { if(!isset($_SESSION['token'])){ - $_SESSION['token'] = bin2hex(openssl_random_pseudo_bytes(16)); + $token = uniqid(mt_rand(), true); + $_SESSION['token'] = $token; } } diff --git a/web/login/index.php b/web/login/index.php index d2aacefd7..4be64eccb 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -126,7 +126,7 @@ if (empty($_SESSION['language'])) { } // Generate CSRF token -$_SESSION['token'] = bin2hex(openssl_random_pseudo_bytes(16)); // generate 32-character cryptographically secure token +$_SESSION['token'] = md5(uniqid(mt_rand(), true)); require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); require_once('../templates/header.html'); From b8babfbe7a4fe798786b318a768914e2a4d7ef70 Mon Sep 17 00:00:00 2001 From: dpeca Date: Wed, 19 Apr 2017 21:22:50 +0200 Subject: [PATCH 63/72] Minir improvements for Serbian translation --- web/inc/i18n/sr.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php index 4fff4649c..3fa9e5aa3 100644 --- a/web/inc/i18n/sr.php +++ b/web/inc/i18n/sr.php @@ -90,7 +90,7 @@ $LANG['sr'] = array( 'view logs' => 'vidi logove', 'list records' => 'izlistano %s zapisa', 'add record' => 'dodaj zapis (record)', - 'list accounts' => 'ukupno %s naloga', + 'list accounts' => 'izlistaj svih %s naloga', 'add account' => 'dodaj nalog', 'open webmail' => 'otvori webmail', 'list fail2ban' => 'fail2ban listing', @@ -149,7 +149,7 @@ $LANG['sr'] = array( 'yes' => 'da', 'no' => 'ne', - 'none' => 'ništa', + 'none' => 'nema', 'pb' => 'pb', 'tb' => 'tb', 'gb' => 'gb', @@ -168,7 +168,7 @@ $LANG['sr'] = array( 'Mail' => 'Mail', 'Databases' => 'Baze podataka', 'User Directories' => 'Korisnički direktorijumi', - 'Template' => 'Šablon', + 'Template' => 'Template', 'Web Template' => 'Web template', 'Backend Template' => 'Backend template', 'Proxy Template' =>'Proxy template', @@ -206,15 +206,15 @@ $LANG['sr'] = array( 'Expire' => 'Istek', 'Records' => 'Records (zapisi)', 'Serial' => 'Serijski', - 'Catchall email' => 'CatchAll email opcija', + 'Catchall email' => 'CatchAll email', 'AntiVirus Support' => 'AntiVirus podrška', 'AntiSpam Support' => 'AntiSpam podrška', 'DKIM Support' => 'DKIM podrška', 'Accounts' => 'Nalozi', 'Quota' => 'Dozvoljeni prostor', 'Autoreply' => 'Automatski odgovor', - 'Forward to' => 'Prosledi emailove na (Forward to)', - 'Do not store forwarded mail' => 'Nemoj čuvati forward-ovane emailove', + 'Forward to' => 'Prosleđuj mailove na', + 'Do not store forwarded mail' => 'Nemoj čuvati prosleđene emailove', 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', 'IMAP security' => 'IMAP security', From 5e4ee8717e99ff40d1f7f11369c7734050dddef0 Mon Sep 17 00:00:00 2001 From: myrevery Date: Thu, 20 Apr 2017 10:50:37 -0700 Subject: [PATCH 64/72] Update cn.php Add some translation and refine some details. Add feedback link. --- web/inc/i18n/cn.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 86733ab19..68fd8faca 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -1,7 +1,7 @@ 'SSL主目录', 'Lets Encrypt Support' => 'Let's Encrypt 支持', 'Lets Encrypt' => 'Let's Encrypt', - 'Your certificate will be automatically issued in 5 minutes' => '你的证书将在5分钟后自动签发完成', + 'Your certificate will be automatically issued in 5 minutes' => '你的证书将在5分钟内自动签发完成', 'Proxy Support' => '代理支持', 'Proxy Extensions' => '代理扩展名', 'Web Statistics' => '网站统计', @@ -756,5 +756,5 @@ $LANG['cn'] = array( 'maximum characters length, including prefix' => '最多 %s 个字符，包含前缀', - 'Email Credentials' => 'Email Credentials', + 'Email Credentials' => '电子邮件证书', ); From e022c6507b526681b28ddefa3ca672e9367a3e7c Mon Sep 17 00:00:00 2001 From: dpeca Date: Sat, 22 Apr 2017 02:22:23 +0200 Subject: [PATCH 65/72] Better fix for FTP backup without folder name --- bin/v-add-backup-host | 8 ++++++-- bin/v-backup-user | 30 +++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index 5dc489ea9..2ab34a0ae 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -122,8 +122,12 @@ if [ "$type" = 'ftp' ]; then fi # Checking write permissions - ftpc "mkdir $path" > /dev/null 2>&1 - ftmpdir="$path/vst.bK76A9SUkt" + if [ -z $path ]; then + ftmpdir="vst.bK76A9SUkt" + else + ftpc "mkdir $path" > /dev/null 2>&1 + ftmpdir="$path/vst.bK76A9SUkt" + fi ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir"|grep -v Trying) if [ ! -z "$ftp_result" ] ; then echo "$ftp_result" diff --git a/bin/v-backup-user b/bin/v-backup-user index 5d3cfaf69..dbe032d78 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -557,10 +557,6 @@ ftp_backup() { check_result "$E_PARSING" "$error" fi - if [ -z $BPATH ]; then - BPATH="/"; - fi - # Debug info echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$date.tar" @@ -577,8 +573,12 @@ ftp_backup() { fi # Check ftp permissions - ftpc "mkdir $BPATH" > /dev/null 2>&1 - ftmpdir="$BPATH/vst.bK76A9SUkt" + if [ -z $BPATH ]; then + ftmpdir="vst.bK76A9SUkt" + else + ftpc "mkdir $BPATH" > /dev/null 2>&1 + ftmpdir="$BPATH/vst.bK76A9SUkt" + fi ftpc "mkdir $ftmpdir" "rm $ftmpdir" ftp_result=$(ftpc "mkdir $ftmpdir" "rm $ftmpdir" |grep -v Trying) if [ ! -z "$ftp_result" ] ; then @@ -591,7 +591,11 @@ ftp_backup() { fi # Checking retention - backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") + if [ -z $BPATH ]; then + backup_list=$(ftpc "ls" |awk '{print $9}' |grep "^$user\.") + else + backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") + fi backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) @@ -599,14 +603,22 @@ ftp_backup() { backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\ tee -a $BACKUP/$user.log - ftpc "cd $BPATH" "delete $backup" + if [ -z $BPATH ]; then + ftpc "delete $backup" + else + ftpc "cd $BPATH" "delete $backup" + fi done fi # Uploading backup archive if [ "$localbackup" = 'yes' ]; then cd $BACKUP - ftpc "cd $BPATH" "put $user.$date.tar" + if [ -z $BPATH ]; then + ftpc "put $user.$date.tar" + else + ftpc "cd $BPATH" "put $user.$date.tar" + fi else cd $tmpdir tar -cf $BACKUP/$user.$date.tar . From 16f54d0e7a324b46b0f2c10eb4d5e747cb71aa18 Mon Sep 17 00:00:00 2001 From: Secretjail Date: Mon, 24 Apr 2017 00:03:02 +0430 Subject: [PATCH 66/72] Update fa.php Update fa.php and correct some spelling. --- web/inc/i18n/fa.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 878a4b691..926673cc1 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -159,7 +159,7 @@ $LANG['fa'] = array( 'Bandwidth' => 'پهنای باند', 'Disk' => 'دیسك', 'Web' => 'وب', - 'Mail' => 'میل', + 'Mail' => 'پست', 'Databases' => 'پایگاه داده', 'User Directories' => 'پوشه های كاربر', 'Template' => 'قالب', @@ -261,7 +261,7 @@ $LANG['fa'] = array( 'ftp server' => 'سرور FTP', 'job scheduler' => 'زمانبند كار', 'firewall' => 'دیوار آتشین', - 'brute-force monitor' => 'نظاره گر بروت فورس', + 'brute-force monitor' => 'نظاره گر ورود به زور', 'CPU' => 'پردازنده', 'Memory' => 'حافظه', 'Uptime' => 'زمان كاركرد', @@ -316,7 +316,7 @@ $LANG['fa'] = array( 'Minute' => 'دقیقه', 'Command' => 'دستور', 'Package Name' => 'نام بسته', - 'Netmask' => 'نت ماسك', + 'Netmask' => 'صورتک شبکه', 'Interface' => 'رابط', 'Shared' => 'اشتراكی', 'Assigned user' => 'کاربر اختصاص داده شده', @@ -348,7 +348,7 @@ $LANG['fa'] = array( 'ip' => 'آی پی', 'ip address' => 'آدرس های آی پی', 'IP address' => 'آدرس آی پی', - 'netmask' => 'نت ماسك', + 'netmask' => 'صورتک شبکه', 'interface' => 'رابط', 'assigned user' => 'کاربراختصاص یافته', 'ns1' => 'نام سرور 1', @@ -536,8 +536,8 @@ $LANG['fa'] = array( 'Proxy Server' => 'سرور پراکسی', 'Web Server' => 'وب سرور', 'Backend Server' => 'سرور باطنی', - 'Backend Pool Mode' => 'Backend Pool Mode', - 'DNS Server' => 'سرور نام دامنه', + 'Backend Pool Mode' => 'حالت استخر باطنی', + 'DNS Server' => 'سرور نام دامنه', 'DNS Cluster' => 'خوشه نام دامنه', 'MAIL Server' => 'سرور پستی', 'Antivirus' => 'ضد ویروس', @@ -638,7 +638,7 @@ $LANG['fa'] = array( 'Cancel saving form' => 'انصراف از ذخیره فرم', 'Go to USER list' => 'رفتن به فهرست کاربران', 'Go to WEB list' => 'رفتن به فهرست وب', - 'Go to DNS list' => 'رفتن به فهرست نام دامنه', + 'Go to DNS list' => 'رفتن به فهرست نام دامنه', 'Go to MAIL list' => 'رفتن به فهرست امییل', 'Go to DB list' => 'رفتن به فهرست پایگاه داده', 'Go to CRON list' => 'رفتن به فهرست کارهای خودکار', @@ -665,7 +665,7 @@ $LANG['fa'] = array( 'Go to the Top of the File List' => 'رفتن به ابتدای فهرست پرونده ها', 'Go to the Last File' => 'رفتن به آخرین پرونده', 'Open File / Enter Directory' => 'بازکردن پرونده/ورود به پوشه', - 'Edit File' => 'Edit File', + 'Edit File' => 'ویرایش پرونده', 'Go to Parent Directory' => 'رفتن به پوشه بالایی', 'Select Current File' => 'انتخاب فایل جاری', 'Select Bunch of Files' => 'انتخاب دسته ای پرونده ها', @@ -724,5 +724,5 @@ $LANG['fa'] = array( 'No encryption' => 'بدون رمزگذاری', 'Do not use encryption' => 'از رمزگذاری استفاده نشود', 'maximum characters length, including prefix' => 'بیشینه %s کاراکتر طول, شامل پیشوند', - 'Email Credentials' => 'Email Credentials', + 'Email Credentials' => 'اعتبار پست الکترونیکی', ); From 8d342eebe642a50068e793ecfa11f2e51579e0f4 Mon Sep 17 00:00:00 2001 From: myrevery Date: Tue, 25 Apr 2017 12:40:16 -0700 Subject: [PATCH 67/72] Update cn.php Add some translation and refine some details. --- web/inc/i18n/cn.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 68fd8faca..972ab4bf3 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -254,7 +254,7 @@ $LANG['cn'] = array( 'PostgreSQL Usage on localhost' => 'PostgreSQL用量 (localhost)', 'Bandwidth Usage eth0' => '网络流量 (eth0)', 'Bandwidth Usage eth1' => '网络流量 (eth1)', - 'Bandwidth Usage venet0' => '网络流量 (venet0)', //For CentOS + 'Bandwidth Usage venet0' => '网络流量 (venet0)', 'Bandwidth Usage venet1' => '网络流量 (venet1)', 'Exim Usage' => 'Exim 用量', 'FTP Usage' => 'FTP 用量', @@ -298,8 +298,8 @@ $LANG['cn'] = array( 'Basic options' => '基本选项', 'Aliases' => '别名', 'SSL Certificate' => 'SSL证书', - 'SSL Key' => 'SSL密匙', - 'SSL Certificate Authority / Intermediate' => 'SSL签发机构 / 中级', + 'SSL Key' => 'SSL密钥', + 'SSL Certificate Authority / Intermediate' => 'SSL颁发机构 / 中级', 'SSL CSR' => 'SSL CSR', 'optional' => '可选', 'internal' => '内部', @@ -368,7 +368,7 @@ $LANG['cn'] = array( 'last name' => '姓氏', 'account' => '账户', 'ssl certificate' => 'SSL证书', - 'ssl key' => 'SSL密匙', + 'ssl key' => 'SSL密钥', 'stats user password' => '统计用户账户密码', 'stats username' => '统计用户名称', 'stats password' => '统计密码', @@ -739,13 +739,13 @@ $LANG['cn'] = array( 'awstats' => 'AWStats', 'Vesta SSL' => 'Vesta SSL', - 'SUBJECT' => 'SUBJECT', - 'ALIASES' => 'ALIASES', - 'NOT_BEFORE' => 'NOT_BEFORE', - 'NOT_AFTER' => 'NOT_AFTER', - 'SIGNATURE' => 'SIGNATURE', - 'PUB_KEY' => 'PUB_KEY', - 'ISSUER' => 'ISSUER', + 'SUBJECT' => '颁发给', + 'ALIASES' => '可选名称', + 'NOT_BEFORE' => '有效期从', + 'NOT_AFTER' => '有效期到', + 'SIGNATURE' => '签名算法', + 'PUB_KEY' => '密钥位数', + 'ISSUER' => '颁发者', 'Use server hostname' => '采用服务器主机名', 'Use domain hostname' => '采用域名', From 7ef52aa32c1776c6251201425eae8a8af00da9f7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 27 Apr 2017 14:00:03 +0300 Subject: [PATCH 68/72] fix for system-base repos --- install/vst-install-rhel.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 1c4ac908a..ee7844f3a 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -607,11 +607,12 @@ fi #----------------------------------------------------------# # Installing rpm packages -if [ -z "$disable_remi" ]; then - yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta,remi*"\ +if [ "$remi" = 'yes' ]; then + yum -y --disablerepo=* \ + --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \ install $software else - yum -y --disablerepo=* --enablerepo="base,updates,nginx,epel,vesta" \ + yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \ install $software fi check_result $? "yum install failed" From 92fa0857559a55a35577034c61cd511932878979 Mon Sep 17 00:00:00 2001 From: dpeca Date: Thu, 27 Apr 2017 18:45:41 +0200 Subject: [PATCH 69/72] Minor improvements for Serbian translation --- web/inc/i18n/sr.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php index 3fa9e5aa3..50dc766d2 100644 --- a/web/inc/i18n/sr.php +++ b/web/inc/i18n/sr.php @@ -44,10 +44,10 @@ $LANG['sr'] = array( 'Add User' => 'Dodaj korisnika', 'Add Domain' => 'Dodaj domen', - 'Add Web Domain' => 'Dodaj WEB domen', - 'Add DNS Domain' => 'Dodaj DNS domen', + 'Add Web Domain' => 'Dodaj domen na hosting', + 'Add DNS Domain' => 'Kreiraj DNS za domen', 'Add DNS Record' => 'Dodaj DNS zapis (DNS record)', - 'Add Mail Domain' => 'Dodaj mail za domen', + 'Add Mail Domain' => 'Kreiraj mail servis za domen', 'Add Mail Account' => 'Dodaj mail nalog', 'Add Database' => 'Dodaj bazu podataka', 'Add Cron Job' => 'Dodaj cron job', @@ -133,7 +133,7 @@ $LANG['sr'] = array( 'Editing IP Address' => 'Izmena IP adrese', 'Editing Backup Exclusions' => 'Izmena backup izuzeća', 'Generating CSR' => 'Generisanje CSR-a', - 'Listing' => 'Spisak', + 'Listing' => 'Izlistan', 'Search Results' => 'Rezultati pretrage', 'Adding Firewall Rule' => 'Dodavanje Firewall pravila', 'Editing Firewall Rule' => 'Izmena Firewall pravila', @@ -203,9 +203,9 @@ $LANG['sr'] = array( 'Path' => 'Putanja', 'SOA' => 'SOA', 'TTL' => 'TTL', - 'Expire' => 'Istek', + 'Expire' => 'Ističe', 'Records' => 'Records (zapisi)', - 'Serial' => 'Serijski', + 'Serial' => 'Serijski br.', 'Catchall email' => 'CatchAll email', 'AntiVirus Support' => 'AntiVirus podrška', 'AntiSpam Support' => 'AntiSpam podrška', @@ -251,8 +251,8 @@ $LANG['sr'] = array( 'NGINX Usage' => 'NGINX upotreba', 'MySQL Usage on localhost' => 'MySQL na localhost-u', 'PostgreSQL Usage on localhost' => 'PostgreSQL na localhost-u', - 'Bandwidth Usage eth0' => 'Protok na eth0', - 'Bandwidth Usage eth1' => 'Protok na eth1', + 'Bandwidth Usage eth0' => 'Protok na eth0 mrežnom interfejsu', + 'Bandwidth Usage eth1' => 'Protok na eth1 mrežnom interfejsu', 'Exim Usage' => 'Exim upotreba', 'FTP Usage' => 'FTP upotreba', 'SSH Usage' => 'SSH upotreba', @@ -581,7 +581,7 @@ $LANG['sr'] = array( 'Template Manager' => 'Template menadžer', 'Backup Migration Manager' => 'Backup migracioni menadžer', 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'prikaz: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'prikaži: CPU / MEM / NET / DISK statistiku i stanje', 'sort by' => 'sortiranje po', 'Date' => 'Datum', From 4aeec46841123e54f149f2b6d34bb9a7e03dd1c4 Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 28 Apr 2017 20:37:20 +0200 Subject: [PATCH 70/72] Making SFTP backup able to work with empty folder name --- bin/v-add-backup-host | 14 +++++++++++--- bin/v-backup-user | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index 2ab34a0ae..327703a7b 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -141,9 +141,17 @@ if [ "$type" = 'sftp' ]; then if [ -z $port ]; then port=22 fi - if sftpc "mkdir $path" > /dev/null 2>&1 ; then - sftmpdir="$path/vst.bK76A9SUkt" - sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1 + if [ -z $path ]; then + sftmpdir="vst.bK76A9SUkt" + sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1 + else + if sftpc "mkdir $path" > /dev/null 2>&1 ; then + sftmpdir="$path/vst.bK76A9SUkt" + sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1 + else + sftmpdir="$path/vst.bK76A9SUkt" + sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1 + fi fi rc=$? if [[ "$rc" != 0 ]]; then diff --git a/bin/v-backup-user b/bin/v-backup-user index dbe032d78..6749f1c1a 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -70,6 +70,7 @@ done # Creating temporary directory tmpdir=$(mktemp -p $BACKUP -d) + if [ "$?" -ne 0 ]; then echo "Can't create tmp dir $tmpdir" |$SENDMAIL -s "$subj" $email $notify check_result $E_NOTEXIST "can't create tmp dir" @@ -478,7 +479,7 @@ local_backup(){ rm -f $BACKUP/$user.$date.tar # Checking retention - backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\.") + backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\." | grep ".tar") backups_count=$(echo "$backup_list" |wc -l) if [ "$BACKUPS" -le "$backups_count" ]; then backups_rm_number=$((backups_count - BACKUPS)) @@ -623,7 +624,11 @@ ftp_backup() { cd $tmpdir tar -cf $BACKUP/$user.$date.tar . cd $BACKUP/ - ftpc "cd $BPATH" "put $user.$date.tar" + if [ -z $BPATH ]; then + ftpc "put $user.$date.tar" + else + ftpc "cd $BPATH" "put $user.$date.tar" + fi rm -f $user.$date.tar fi } @@ -721,7 +726,11 @@ sftp_backup() { tee -a $BACKUP/$user.log # Checking network connection and write permissions - sftmpdir="$BPATH/vst.bK76A9SUkt" + if [ -z $BPATH ]; then + sftmpdir="vst.bK76A9SUkt" + else + sftmpdir="$BPATH/vst.bK76A9SUkt" + fi sftpc "mkdir $BPATH" > /dev/null 2>&1 sftpc "mkdir $sftmpdir" "rmdir $sftmpdir" > /dev/null 2>&1 rc=$? @@ -738,7 +747,11 @@ sftp_backup() { fi # Checking retention - backup_list=$(sftpc "cd $BPATH" "ls -l" |awk '{print $9}'|grep "^$user\.") + if [ -z $BPATH ]; then + backup_list=$(sftpc "ls -l" |awk '{print $9}'|grep "^$user\.") + else + backup_list=$(sftpc "cd $BPATH" "ls -l" |awk '{print $9}'|grep "^$user\.") + fi backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then backups_rm_number=$((backups_count - BACKUPS + 1)) @@ -746,7 +759,11 @@ sftp_backup() { backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//") echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\ tee -a $BACKUP/$user.log - sftpc "cd $BPATH" "rm $backup" > /dev/null 2>&1 + if [ -z $BPATH ]; then + sftpc "rm $backup" > /dev/null 2>&1 + else + sftpc "cd $BPATH" "rm $backup" > /dev/null 2>&1 + fi done fi @@ -754,12 +771,20 @@ sftp_backup() { echo "$(date "+%F %T") Uploading $user.$date.tar"|tee -a $BACKUP/$user.log if [ "$localbackup" = 'yes' ]; then cd $BACKUP - sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1 + if [ -z $BPATH ]; then + sftpc "put $user.$date.tar" "chmod 0600 $user.$date.tar" > /dev/null 2>&1 + else + sftpc "cd $BPATH" "put $user.$date.tar" "chmod 0600 $user.$date.tar" > /dev/null 2>&1 + fi else cd $tmpdir tar -cf $BACKUP/$user.$date.tar . cd $BACKUP/ - sftpc "cd $BPATH" "put $user.$date.tar" > /dev/null 2>&1 + if [ -z $BPATH ]; then + sftpc "put $user.$date.tar" "chmod 0600 $user.$date.tar" > /dev/null 2>&1 + else + sftpc "cd $BPATH" "put $user.$date.tar" "chmod 0600 $user.$date.tar" > /dev/null 2>&1 + fi rm -f $user.$date.tar fi } From b57c4dcd7b7559bae4131bae6bba9a64f34b98e7 Mon Sep 17 00:00:00 2001 From: dpeca Date: Thu, 4 May 2017 19:11:34 +0200 Subject: [PATCH 71/72] Allow v-restore-user to restore backup from FTP and SFTP Before this fix, sftpc() function had two 'else' blocks... so it was broken code... and script was unable to download file from SFTP --- bin/v-restore-user | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/v-restore-user b/bin/v-restore-user index 750ae421d..90aff1631 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -62,7 +62,11 @@ ftp_download() { if [ -z "$PORT" ]; then PORT='21' fi - ftpc "cd $BPATH" "get $1" + if [ -z $BPATH ]; then + ftpc "get $1" + else + ftpc "cd $BPATH" "get $1" + fi } # sftp command function @@ -99,8 +103,6 @@ sftpc() { set arg [lindex \$argv \$count] send "\$arg\r" incr count - } else { - incr count } else { send "exit\r" set output "Disconnected." @@ -131,7 +133,11 @@ sftp_download() { PORT='22' fi cd $BACKUP - sftpc "cd $BPATH" "get $1" > /dev/null 2>&1 + if [ -z $BPATH ]; then + sftpc "get $1" > /dev/null 2>&1 + else + sftpc "cd $BPATH" "get $1" > /dev/null 2>&1 + fi } From b1e16354437c9a96b8a701fae94a534ba8d6ee71 Mon Sep 17 00:00:00 2001 From: dpeca Date: Fri, 5 May 2017 15:07:44 +0200 Subject: [PATCH 72/72] Cron format validation fix -lt is 'lower than', so if you have wday=7 it will not be valid, which is wrong, because wday range is 0-7. Changed to -le which means 'lower or equal' --- func/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/main.sh b/func/main.sh index b9dc14c8e..ad03f42ae 100644 --- a/func/main.sh +++ b/func/main.sh @@ -737,7 +737,7 @@ is_cron_format_valid() { fi done fi - if [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -lt $limit ]; then + if [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -le $limit ]; then check_format='ok' fi if [ "$check_format" != 'ok' ]; then