From bb145d234a17800f8e43545899c8df9b363391a5 Mon Sep 17 00:00:00 2001 From: Cameron McDonald Date: Mon, 15 Dec 2014 10:49:37 -0600 Subject: [PATCH 001/271] Cut blank lines when counting domains for IP addresses to prevent reporting 1 for an IP that has zero. --- bin/v-update-sys-ip-counters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-update-sys-ip-counters b/bin/v-update-sys-ip-counters index dd51f9e9..13f7a7c3 100755 --- a/bin/v-update-sys-ip-counters +++ b/bin/v-update-sys-ip-counters @@ -45,7 +45,7 @@ for ip in $ip_list; do # Calculate usage ip_usage=$(grep -H $ip $VESTA/data/users/*/web.conf) - web_domains=$(echo "$ip_usage"| wc -l) + web_domains=$(echo "$ip_usage" | sed '/^$/' | wc -l) sys_users=$(echo "$ip_usage" | cut -f7 -d/ | sort -u |\ tr '\n' ',' | sed "s/,$//g") From ea1a9b23c482335ce9ab2453ea6b4f24eb683007 Mon Sep 17 00:00:00 2001 From: Cameron McDonald Date: Mon, 15 Dec 2014 10:57:55 -0600 Subject: [PATCH 002/271] added critical missing "d" from sed command. doh! --- bin/v-update-sys-ip-counters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-update-sys-ip-counters b/bin/v-update-sys-ip-counters index 13f7a7c3..bafeed13 100755 --- a/bin/v-update-sys-ip-counters +++ b/bin/v-update-sys-ip-counters @@ -45,7 +45,7 @@ for ip in $ip_list; do # Calculate usage ip_usage=$(grep -H $ip $VESTA/data/users/*/web.conf) - web_domains=$(echo "$ip_usage" | sed '/^$/' | wc -l) + web_domains=$(echo "$ip_usage" | sed '/^$/d' | wc -l) sys_users=$(echo "$ip_usage" | cut -f7 -d/ | sort -u |\ tr '\n' ',' | sed "s/,$//g") From c426be582a111062beab5a013024238a08564c98 Mon Sep 17 00:00:00 2001 From: Leonid Suprun Date: Mon, 26 Jan 2015 11:59:09 +0300 Subject: [PATCH 003/271] apt-get, not yum --- install/vst-install-debian.sh | 4 ++-- install/vst-install-ubuntu.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index a188c065..c4e4620b 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -26,7 +26,7 @@ help() { -f, --force Force installation -i, --disable-iptables Disable iptables support -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run yum update command + -n, --noupdate Do not run apt-get upgrade command -s, --hostname Set server hostname -e, --email Set email address -p, --password Set admin password instead of generating it @@ -78,7 +78,7 @@ while getopts "hfibdnqe:m:p:s:" Option; do f) force='yes' ;; # Force install i) disable_iptables='yes' ;; # Disable iptables b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable yum update + n) noupdate='yes' ;; # Disable apt-get upgrade s) servername=$OPTARG ;; # Server hostname e) email=$OPTARG ;; # Set email p) vpass=$OPTARG ;; # Admin password diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 7f05f58d..dfc64ff7 100644 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -25,7 +25,7 @@ help() { -f, --force Force installation -i, --disable-iptables Disable iptables support -b, --disable-fail2ban Disable fail2ban protection - -n, --noupdate Do not run yum update command + -n, --noupdate Do not run apt-get upgrade command -s, --hostname Set server hostname -e, --email Set email address -p, --password Set admin password instead of generating it @@ -77,7 +77,7 @@ while getopts "hfibdnqe:m:p:s:" Option; do f) force='yes' ;; # Force install i) disable_iptables='yes' ;; # Disable iptables b) disable_fail2ban='yes' ;; # Disable fail2ban - n) noupdate='yes' ;; # Disable yum update + n) noupdate='yes' ;; # Disable apt-get upgrade s) servername=$OPTARG ;; # Server hostname e) email=$OPTARG ;; # Set email p) vpass=$OPTARG ;; # Admin password From c1195d1f30f8e50b62be677d765be1dd4d7d3972 Mon Sep 17 00:00:00 2001 From: Leonid Suprun Date: Mon, 26 Jan 2015 12:32:37 +0300 Subject: [PATCH 004/271] Clarify "user admin exists" message --- install/vst-install-debian.sh | 6 +++--- install/vst-install-rhel.sh | 6 +++--- install/vst-install-ubuntu.sh | 6 +++--- install/vst-install.sh | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index c4e4620b..d5e8110a 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -126,11 +126,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index ab1692a8..218c0840 100644 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -124,11 +124,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index dfc64ff7..6d131956 100644 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -123,11 +123,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" != 'yes' ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" != 'yes' ]; then - echo "Error: user admin exists" + echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 diff --git a/install/vst-install.sh b/install/vst-install.sh index 864b671d..9c064ab0 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -27,11 +27,11 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$1" ]; then exit 1 fi -# Check admin user account +# Check admin group if [ ! -z "$(grep ^admin: /etc/group)" ] && [ -z "$1" ]; then echo "Error: group admin exists" echo - echo 'Please remove admin user account before proceeding.' + echo 'Please remove admin group before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo "Example: bash $0 --force" exit 1 From 58a75cbde42308bf9c3c11dd6a60fe04b830d18b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 16 Feb 2015 17:27:25 +0200 Subject: [PATCH 005/271] transparent nginx integration for CloudFlare --- install/debian/nginx.conf | 22 ++++++++++++++++++++++ install/rhel/nginx.conf | 22 ++++++++++++++++++++++ install/ubuntu/nginx.conf | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/install/debian/nginx.conf b/install/debian/nginx.conf index aec6246d..19e4a754 100644 --- a/install/debian/nginx.conf +++ b/install/debian/nginx.conf @@ -68,6 +68,28 @@ http { proxy_buffers 32 4k; + # Cloudflare + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 2400:cb00::/32; + set_real_ip_from 2606:4700::/32; + set_real_ip_from 2803:f800::/32; + set_real_ip_from 2405:b500::/32; + set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + # SSL PCI Compliance ssl_session_cache shared:SSL:10m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; diff --git a/install/rhel/nginx.conf b/install/rhel/nginx.conf index 0316de7a..fa5ff117 100644 --- a/install/rhel/nginx.conf +++ b/install/rhel/nginx.conf @@ -68,6 +68,28 @@ http { proxy_buffers 32 4k; + # Cloudflare + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 2400:cb00::/32; + set_real_ip_from 2606:4700::/32; + set_real_ip_from 2803:f800::/32; + set_real_ip_from 2405:b500::/32; + set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + # SSL PCI Compliance ssl_session_cache shared:SSL:10m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; diff --git a/install/ubuntu/nginx.conf b/install/ubuntu/nginx.conf index e2e72c47..6767e8ca 100644 --- a/install/ubuntu/nginx.conf +++ b/install/ubuntu/nginx.conf @@ -68,6 +68,28 @@ http { proxy_buffers 32 4k; + # Cloudflare + set_real_ip_from 199.27.128.0/21; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 103.21.244.0/22; + set_real_ip_from 103.22.200.0/22; + set_real_ip_from 103.31.4.0/22; + set_real_ip_from 141.101.64.0/18; + set_real_ip_from 108.162.192.0/18; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; + set_real_ip_from 162.158.0.0/15; + set_real_ip_from 104.16.0.0/12; + set_real_ip_from 2400:cb00::/32; + set_real_ip_from 2606:4700::/32; + set_real_ip_from 2803:f800::/32; + set_real_ip_from 2405:b500::/32; + set_real_ip_from 2405:8100::/32; + real_ip_header CF-Connecting-IP; + + # SSL PCI Compliance ssl_session_cache shared:SSL:10m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; From 8e0416cd744962f7dc8d5908dd6785c273fef6f4 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 16 Feb 2015 18:25:42 +0200 Subject: [PATCH 006/271] CloudFlare IP pool reference --- install/debian/nginx.conf | 2 +- install/rhel/nginx.conf | 2 +- install/ubuntu/nginx.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/debian/nginx.conf b/install/debian/nginx.conf index 19e4a754..cd2c70df 100644 --- a/install/debian/nginx.conf +++ b/install/debian/nginx.conf @@ -68,7 +68,7 @@ http { proxy_buffers 32 4k; - # Cloudflare + # Cloudflare https://www.cloudflare.com/ips set_real_ip_from 199.27.128.0/21; set_real_ip_from 173.245.48.0/20; set_real_ip_from 103.21.244.0/22; diff --git a/install/rhel/nginx.conf b/install/rhel/nginx.conf index fa5ff117..10a556ea 100644 --- a/install/rhel/nginx.conf +++ b/install/rhel/nginx.conf @@ -68,7 +68,7 @@ http { proxy_buffers 32 4k; - # Cloudflare + # Cloudflare https://www.cloudflare.com/ips set_real_ip_from 199.27.128.0/21; set_real_ip_from 173.245.48.0/20; set_real_ip_from 103.21.244.0/22; diff --git a/install/ubuntu/nginx.conf b/install/ubuntu/nginx.conf index 6767e8ca..5d5bd901 100644 --- a/install/ubuntu/nginx.conf +++ b/install/ubuntu/nginx.conf @@ -68,7 +68,7 @@ http { proxy_buffers 32 4k; - # Cloudflare + # Cloudflare https://www.cloudflare.com/ips set_real_ip_from 199.27.128.0/21; set_real_ip_from 173.245.48.0/20; set_real_ip_from 103.21.244.0/22; From fd964610a14c896e049e48cd7ce16b8089fb44d7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 16 Feb 2015 23:23:41 +0200 Subject: [PATCH 007/271] Passive FTP port ranges --- install/debian/firewall/rules.conf | 2 +- install/rhel/firewall/rules.conf | 2 +- install/ubuntu/firewall/rules.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/debian/firewall/rules.conf b/install/debian/firewall/rules.conf index cfa7d868..956c2e1d 100644 --- a/install/debian/firewall/rules.conf +++ b/install/debian/firewall/rules.conf @@ -5,6 +5,6 @@ RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='I RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/rhel/firewall/rules.conf b/install/rhel/firewall/rules.conf index cfa7d868..956c2e1d 100644 --- a/install/rhel/firewall/rules.conf +++ b/install/rhel/firewall/rules.conf @@ -5,6 +5,6 @@ RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='I RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/firewall/rules.conf b/install/ubuntu/firewall/rules.conf index cfa7d868..956c2e1d 100644 --- a/install/ubuntu/firewall/rules.conf +++ b/install/ubuntu/firewall/rules.conf @@ -5,6 +5,6 @@ RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='I RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='7' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' +RULE='8' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' From 61288a23551f7458da88ec527e28bc9279763541 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 17 Feb 2015 18:25:50 +0200 Subject: [PATCH 008/271] unlimitted hosting packages --- bin/v-add-user-package | 43 ++++++++++++---- bin/v-change-user-package | 68 +++++++++++++++++++++----- bin/v-list-user-packages | 4 +- func/main.sh | 4 +- web/js/app.js | 4 +- web/templates/admin/list_packages.html | 26 +++++----- 6 files changed, 108 insertions(+), 41 deletions(-) diff --git a/bin/v-add-user-package b/bin/v-add-user-package index e4f7883b..ea82411c 100755 --- a/bin/v-add-user-package +++ b/bin/v-add-user-package @@ -29,16 +29,39 @@ is_package_new() { is_package_consistent() { source $pkg_dir/$package.pkg - validate_format_int $WEB_DOMAINS 'WEB_DOMAINS' - validate_format_int $WEB_ALIASES 'WEB_ALIASES' - validate_format_int $DNS_DOMAINS 'DNS_DOMAINS' - validate_format_int $DNS_RECORDS 'DNS_RECORDS' - validate_format_int $MAIL_DOMAINS 'MAIL_DOMAINS' - validate_format_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS' - validate_format_int $DATABASES 'DATABASES' - validate_format_int $CRON_JOBS 'CRON_JOBS' - validate_format_int $DISK_QUOTA 'DISK_QUOTA' - validate_format_int $BACKUPS 'BACKUPS' + if [ "$WEB_DOMAINS" != 'unlimited' ]; then + validate_format_int $WEB_DOMAINS 'WEB_DOMAINS' + fi + if [ "$WEB_ALIASES" != 'unlimited' ]; then + validate_format_int $WEB_ALIASES 'WEB_ALIASES' + fi + if [ "$DNS_DOMAINS" != 'unlimited' ]; then + validate_format_int $DNS_DOMAINS 'DNS_DOMAINS' + fi + if [ "$DNS_RECORDS" != 'unlimited' ]; then + validate_format_int $DNS_RECORDS 'DNS_RECORDS' + fi + if [ "$MAIL_DOMAINS" != 'unlimited' ]; then + validate_format_int $MAIL_DOMAINS 'MAIL_DOMAINS' + fi + if [ "$MAIL_ACCOUNTS" != 'unlimited' ]; then + validate_format_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS' + fi + if [ "$DATABASES" != 'unlimited' ]; then + validate_format_int $DATABASES 'DATABASES' + fi + if [ "$CRON_JOBS" != 'unlimited' ]; then + validate_format_int $CRON_JOBS 'CRON_JOBS' + fi + if [ "$DISK_QUOTA" != 'unlimited' ]; then + validate_format_int $DISK_QUOTA 'DISK_QUOTA' + fi + if [ "$BANDWIDTH" != 'unlimited' ]; then + validate_format_int $BANDWIDTH 'BANDWIDTH' + fi + if [ "$BACKUPS" != 'unlimited' ]; then + validate_format_int $BACKUPS 'BACKUPS' + fi validate_format_shell $SHELL } diff --git a/bin/v-change-user-package b/bin/v-change-user-package index 1e9a046d..d9b0b756 100755 --- a/bin/v-change-user-package +++ b/bin/v-change-user-package @@ -19,7 +19,7 @@ source $VESTA/func/main.sh source $VESTA/conf/vesta.conf is_package_avalable() { - # Parsing user data + usr_data=$(cat $USER_DATA/user.conf) IFS=$'\n' for key in $usr_data; do @@ -37,17 +37,55 @@ is_package_avalable() { grep -v DATE) eval $pkg_data - # Comparing user data with package - if [[ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]] ||\ - [[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]] ||\ - [[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]] ||\ - [[ "$DATABASES" -lt "$U_DATABASES" ]] ||\ - [[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]] ||\ - [[ "$DISK_QUOTA" -lt "$U_DISK" ]] ||\ - [[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]]; then - echo "Error: Package not cover current usage" - log_event "$E_LIMIT" "$EVENT" - exit $E_LIMIT + # Checking usage agains package limits + if [ "$WEB_DOMAINS" != 'unlimited' ]; then + if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]; then + echo "Error: Package doesn't cover WEB_DOMAIN usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$DNS_DOMAINS" ! = 'unlimited' ]; then + if [ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]; then + echo "Error: Package doesn't cover DNS_DOMAIN usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$MAIL_DOMAINS" != 'unlimited' ]; then + if [ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]; then + echo "Error: Package doesn't cover MAIL_DOMAIN usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$DATABASES" != 'unlimited' ]; then + if [ "$DATABASES" -lt "$U_DATABASES" ]; then + echo "Error: Package doesn't cover DATABASE usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$CRON_JOBS" != 'unlimited' ]; then + if [ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]; then + echo "Error: Package doesn't cover CRON usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$DISK_QUOTA" != 'unlimited' ]; then + if [ "$DISK_QUOTA" -lt "$U_DISK" ]; then + echo "Error: Package doesn't cover DISK usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi + fi + if [ "$BANDWIDTH" != 'unlimited' ]; then + if [ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then + echo "Error: Package doesn't cover BANDWIDTH usage" + log_event "$E_LIMIT" "$EVENT" + exit $E_LIMIT + fi fi } @@ -145,6 +183,12 @@ if [ -x "$VESTA/data/packages/$package.sh" ]; then $VESTA/data/packages/$package.sh "$user" "$CONTACT" "$FNAME" "$LNAME" fi +# Update disk quota +source $VESTA/conf/vesta.conf +if [ "$DISK_QUOTA" = 'yes' ]; then + $BIN/v-update-user-quota $user +fi + #----------------------------------------------------------# # Vesta # diff --git a/bin/v-list-user-packages b/bin/v-list-user-packages index 17f7a1c3..eefac443 100755 --- a/bin/v-list-user-packages +++ b/bin/v-list-user-packages @@ -19,7 +19,7 @@ source $VESTA/func/main.sh json_list_pkgs() { echo '{' fileds_count=$(echo "$fields" | wc -w) - for package in $(ls -t $VESTA/data/packages); do + for package in $(ls -t $VESTA/data/packages |grep .pkg); do PACKAGE=${package/.pkg/} pkg_data=$(cat $VESTA/data/packages/$package) eval $pkg_data @@ -51,7 +51,7 @@ json_list_pkgs() { # Shell fnction shell_list_pkgs() { - for package in $(ls -t $VESTA/data/packages); do + for package in $(ls -t $VESTA/data/packages |grep .pkg); do PACKAGE=${package/.pkg/} pkg_descr=$(cat $VESTA/data/packages/$package) eval $pkg_descr diff --git a/func/main.sh b/func/main.sh index 8d309f36..9cfdc608 100644 --- a/func/main.sh +++ b/func/main.sh @@ -113,8 +113,8 @@ is_package_full() { CRON_JOBS) used=$(wc -l $USER_DATA/cron.conf |cut -f1 -d \ );; esac limit=$(grep "^$1=" $USER_DATA/user.conf | cut -f 2 -d \' ) - if [ "$used" -ge "$limit" ]; then - echo "Error: Limit reached / Upgrade package" + if [ "$limit" != 'unlimited' ] && [ "$used" -ge "$limit" ]; then + echo "Error: Limit is reached, please upgrade hosting package" log_event "$E_LIMIT" "$EVENT" exit $E_LIMIT fi diff --git a/web/js/app.js b/web/js/app.js index 4b4dfa18..3d95304e 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -710,8 +710,8 @@ var App = { Core: {}, // CONSTANT VALUES Constants: { - UNLIM_VALUE: 'Unlim', - UNLIM_TRANSLATED_VALUE: 'Unlim' + UNLIM_VALUE: 'unlimited', + UNLIM_TRANSLATED_VALUE: 'unlimited' }, // Actions. More widly used funcs Actions: { diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 05ca162b..512d03d0 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -69,27 +69,27 @@ - + - + - + - + - + - +
:
:
:
:
:
:
@@ -97,34 +97,34 @@ - + - + - + - + - + - +
:
:
:
:
:
:
- + From 6c4a08cf1e278a4bed1022a406e2f6ccb2223cee Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 17 Feb 2015 22:10:41 +0200 Subject: [PATCH 009/271] fix for top panel --- web/edit/user/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 9121f9cf..5b886af5 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -156,7 +156,11 @@ if (!empty($_POST['save'])) { } // Panel -top_panel($user,$TAB); +if (!empty($_SESSION['look'])) { + top_panel($user,$TAB); +} else { + top_panel($_SESSION['user'],$TAB); +} // Display body if ($_SESSION['user'] == 'admin') { From a2f012c7af2c7c91a55386371fa1589410fa4cb9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 18 Feb 2015 02:29:00 +0200 Subject: [PATCH 010/271] create default imap folders --- install/debian/roundcube-main.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/install/debian/roundcube-main.conf b/install/debian/roundcube-main.conf index a6e1fc2e..8e03f5dd 100644 --- a/install/debian/roundcube-main.conf +++ b/install/debian/roundcube-main.conf @@ -437,6 +437,7 @@ $rcmail_config['trash_mbox'] = 'Trash'; // these folders will also be displayed with localized names // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); +$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); // automatically create the above listed default folders on first login $rcmail_config['create_default_folders'] = true; From f7236d034e1341fead7b76dc44c3871db02097a8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 18 Feb 2015 02:33:49 +0200 Subject: [PATCH 011/271] Fix for Nginx-less setup --- web/add/package/index.php | 34 ++++++++++++++------------ web/add/web/index.php | 4 +-- web/edit/package/index.php | 8 +++--- web/edit/web/index.php | 22 +++++++++-------- web/templates/admin/add_package.html | 3 ++- web/templates/admin/add_web.html | 2 ++ web/templates/admin/edit_package.html | 4 +-- web/templates/admin/edit_web.html | 4 ++- web/templates/admin/list_packages.html | 2 ++ web/templates/admin/list_web.html | 19 +++++++------- 10 files changed, 58 insertions(+), 44 deletions(-) diff --git a/web/add/package/index.php b/web/add/package/index.php index 7feb8218..29ef5355 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -19,7 +19,9 @@ if (!empty($_POST['ok'])) { // Check empty fields if (empty($_POST['v_package'])) $errors[] = __('package'); if (empty($_POST['v_web_template'])) $errors[] = __('web template'); - if (empty($_POST['v_proxy_template'])) $errors[] = __('proxy template'); + if (!empty($_SESSION['PROXY_SYSTEM'])) { + if (empty($_POST['v_proxy_template'])) $errors[] = __('proxy template'); + } if (empty($_POST['v_dns_template'])) $errors[] = __('dns template'); if (empty($_POST['v_shell'])) $errrors[] = __('shell'); if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains'); @@ -140,9 +142,11 @@ $web_templates = json_decode(implode('', $output), true); unset($output); // List web templates for proxy -exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); -$proxy_templates = json_decode(implode('', $output), true); -unset($output); +if (!empty($_SESSION['PROXY_SYSTEM'])) { + exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); + $proxy_templates = json_decode(implode('', $output), true); + unset($output); +} // List DNS templates exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); @@ -159,17 +163,17 @@ if (empty($v_web_template)) $v_web_template = 'default'; if (empty($v_proxy_template)) $v_proxy_template = 'default'; if (empty($v_dns_template)) $v_dns_template = 'default'; if (empty($v_shell)) $v_shell = 'nologin'; -if (empty($v_web_domains)) $v_web_domains = "'0'"; -if (empty($v_web_aliases)) $v_web_aliases = "'0'"; -if (empty($v_dns_domains)) $v_dns_domains = "'0'"; -if (empty($v_dns_records)) $v_dns_records = "'0'"; -if (empty($v_mail_domains)) $v_mail_domains = "'0'"; -if (empty($v_mail_accounts)) $v_mail_accounts = "'0'"; -if (empty($v_databases)) $v_databases = "'0'"; -if (empty($v_cron_jobs)) $v_cron_jobs = "'0'"; -if (empty($v_backups)) $v_backups = "'0'"; -if (empty($v_disk_quota)) $v_disk_quota = "'0'"; -if (empty($v_bandwidth)) $v_bandwidth = "'0'"; +if (empty($v_web_domains)) $v_web_domains = "'1'"; +if (empty($v_web_aliases)) $v_web_aliases = "'1'"; +if (empty($v_dns_domains)) $v_dns_domains = "'1'"; +if (empty($v_dns_records)) $v_dns_records = "'1'"; +if (empty($v_mail_domains)) $v_mail_domains = "'1'"; +if (empty($v_mail_accounts)) $v_mail_accounts = "'1'"; +if (empty($v_databases)) $v_databases = "'1'"; +if (empty($v_cron_jobs)) $v_cron_jobs = "'1'"; +if (empty($v_backups)) $v_backups = "'1'"; +if (empty($v_disk_quota)) $v_disk_quota = "'1000'"; +if (empty($v_bandwidth)) $v_bandwidth = "'1000'"; if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd'; if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd'; diff --git a/web/add/web/index.php b/web/add/web/index.php index 48c996e5..5050cc5d 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -141,7 +141,7 @@ if (!empty($_POST['ok'])) { } // Add proxy support - if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) { $ext = str_replace(' ', '', $v_proxy_ext); $ext = escapeshellarg($ext); exec (VESTA_CMD."v-add-web-domain-proxy ".$user." ".$v_domain." '' ".$ext." 'no'", $output, $return_var); @@ -217,7 +217,7 @@ if (!empty($_POST['ok'])) { } // Restart proxy server - if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) { exec (VESTA_CMD."v-restart-proxy", $output, $return_var); check_return_code($return_var,$output); unset($output); diff --git a/web/edit/package/index.php b/web/edit/package/index.php index 41b3640b..5cca03da 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -60,9 +60,11 @@ $web_templates = json_decode(implode('', $output), true); unset($output); // List proxy templates -exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); -$proxy_templates = json_decode(implode('', $output), true); -unset($output); +if (!empty($_SESSION['PROXY_SYSTEM'])) { + exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); + $proxy_templates = json_decode(implode('', $output), true); + unset($output); +} // List dns templates exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 54e65aaa..1c1b8850 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -76,9 +76,11 @@ $templates = json_decode(implode('', $output), true); unset($output); // List proxy templates -exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); -$proxy_templates = json_decode(implode('', $output), true); -unset($output); +if (!empty($_SESSION['PROXY_SYSTEM'])) { + exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var); + $proxy_templates = json_decode(implode('', $output), true); + unset($output); +} // List web stat engines exec (VESTA_CMD."v-list-web-stats json", $output, $return_var); @@ -189,7 +191,7 @@ if (!empty($_POST['save'])) { } // Delete proxy support - if ((!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); @@ -198,13 +200,13 @@ if (!empty($_POST['save'])) { } // Change proxy template / Update extention list - if ((!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']); $ext = preg_replace("/,/", " ", $ext); $ext = preg_replace('/\s+/', ' ',$ext); $ext = trim($ext); $ext = str_replace(' ', ", ", $ext); - if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) { + if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) { $ext = str_replace(', ', ",", $ext); if (!empty($_POST['v_proxy_template'])) $v_proxy_template = $_POST['v_proxy_template']; exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var); @@ -216,7 +218,7 @@ if (!empty($_POST['save'])) { } // Add proxy support - if ((empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && (empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { $v_proxy_template = $_POST['v_proxy_template']; if (!empty($_POST['v_proxy_ext'])) { $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']); @@ -280,7 +282,7 @@ if (!empty($_POST['save'])) { $v_ssl_crt = $_POST['v_ssl_crt']; $v_ssl_key = $_POST['v_ssl_key']; $v_ssl_ca = $_POST['v_ssl_ca']; - + // Cleanup certificate tempfiles if (!empty($_POST['v_ssl_crt'])) { unlink($tmpdir."/".$_POST['v_domain'].".crt"); @@ -347,7 +349,7 @@ if (!empty($_POST['save'])) { $v_ssl_key = $_POST['v_ssl_key']; $v_ssl_ca = $_POST['v_ssl_ca']; $v_ssl_home = $_POST['v_ssl_home']; - + // Cleanup certificate tempfiles if (!empty($_POST['v_ssl_crt'])) { unlink($tmpdir."/".$_POST['v_domain'].".crt"); @@ -584,7 +586,7 @@ if (!empty($_POST['save'])) { } // Restart proxy server - if (!empty($restart_proxy) && (empty($_SESSION['error_msg']))) { + if ((!empty($_SESSION['PROXY_SYSTEM'])) && !empty($restart_proxy) && (empty($_SESSION['error_msg']))) { exec (VESTA_CMD."v-restart-proxy", $output, $return_var); check_return_code($return_var,$output); unset($output); diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 632b9e51..9b8e12a4 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -67,6 +67,7 @@ + + diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 9945c17b..0858d2c4 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -133,6 +133,7 @@ +
:
:
@@ -90,6 +91,7 @@
@@ -232,7 +234,6 @@
@@ -154,6 +155,7 @@
+ / diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 7de885f7..23de6585 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -73,6 +73,7 @@ + @@ -96,6 +97,7 @@ + @@ -206,7 +208,6 @@ - @@ -239,7 +240,6 @@ diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index b500414a..4a5527af 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -140,6 +140,7 @@ + @@ -185,9 +186,10 @@ + - / + / diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 512d03d0..787ae941 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -71,10 +71,12 @@ : + : + : diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 938f0c85..c8b970cd 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -174,6 +174,7 @@ + @@ -182,33 +183,31 @@ - - - - - -
 
: :
:
:
+ + + + + + - - - - + +
 
:
:
:
:
From 0b1abcfe04d86edacc3457e6d6dcbabc66e3412a Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 19 Feb 2015 01:06:17 +0200 Subject: [PATCH 012/271] Fix for firewall.tar.gz issue --- install/vst-install-debian.sh | 1 + install/vst-install-ubuntu.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index a188c065..9ea10160 100644 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -788,6 +788,7 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql $VESTA/bin/v-update-sys-ip # Firewall configuartion +cd $VESTA/data wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz tar -xzf firewall.tar.gz rm -f firewall.tar.gz diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh index 7f05f58d..04762832 100644 --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -805,6 +805,7 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql $VESTA/bin/v-update-sys-ip # Firewall configuartion +cd $VESTA/data wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz tar -xzf firewall.tar.gz rm -f firewall.tar.gz From 40b23f0873ad39cb21be3fa6e20b7c6290ac19d7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 19 Feb 2015 02:02:02 +0200 Subject: [PATCH 013/271] fix for i18n counters --- web/templates/user/panel.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html index 06770872..52e7bc2e 100644 --- a/web/templates/user/panel.html +++ b/web/templates/user/panel.html @@ -22,9 +22,9 @@ -

From 253e28ede27d628b94075bd2fc74244461b7f339 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 19 Feb 2015 02:02:19 +0200 Subject: [PATCH 014/271] Nginx-less user templates --- web/templates/user/edit_web.html | 5 +++-- web/templates/user/list_web.html | 19 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index ad969f1b..676b809e 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -118,6 +118,7 @@ + @@ -139,6 +140,7 @@ + / @@ -329,7 +331,6 @@ - @@ -350,7 +351,7 @@ - + \ No newline at end of file diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index a81415c8..11416b31 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -1,29 +1,36 @@ - - - - - - +
+
+
+ + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?>
+
+ +
+ +
+ + +
+
+ diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 05e14267..c6cd71dd 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -1,29 +1,38 @@ - - - - - - +
+
+
+ + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?>
+
+ +
+ + + +
+ + +
+ + diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index bec90e90..2f98b126 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -1,29 +1,36 @@ +
+
+
+ → ".htmlentities($_SESSION['error_msg']).""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; } - ?> - - - - - + } + ?>
- +
+ +
+ +
+ + +
+ + + +
+

+
+ + + - - - - - -
">
- - - - - - - - - - - - + + + + - if ($data[$key]['KEY'] == 'RECORD') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'SUSPEND_RECORD_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'ACCOUNT') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'SUSPEND_USER_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'JOB') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'SUSPEND_CRON_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'DATABASE') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; - $cnfrm = 'SUSPEND_DATABASE_CONFIRMATION'; - } - if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; - $cnfrm = 'SUSPEND_DOMAIN_CONFIRMATION'; - } - ?> - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - -
- - - - -
- -
-
- - - - - -
- : - - -
-
- - - - - -
- : - - -
-
- - - - - - -
- + +
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ + + + + + +
+
+
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + + + + +
+
+
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index 2f1e16f9..f1648c70 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -1,200 +1,213 @@ - - - - - +
+
+
+ + + + + + +
+ + + +
+ +
+ +
+ +
+
-
- - - - - + + + +
+ + + +
- $value) { - ++$i; - if ($data[$key]['STATE'] == 'running') { - $status = 'active'; - $action = 'stop'; - } else { - $status = 'suspended'; - $action = 'start'; - } - - $cpu = $data[$key]['CPU'] / 10; - $cpu = number_format($cpu, 1); - if ($cpu == '0.0') $cpu = 0; - ?> - -
- - - - - -
- - - -
-
- - - - - - - - - - - - - - - - - -
- -
- - - + - -
- - - - () - -
-
- - - - - -
- : - - -
-
- - - - - -
- : - - -
-
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - - -
- : - - % -
-
- - - - - -
- : - - -
-
- - - - - -
- : - - -
-
-
- +
+
+
+ + +
+ +
+
+ +
+ +
+
+ + +
+
suspended
+ +
+ +
+
+ +
+ + +
+ + + + + + + + +
+
+
+ + +
+
()
+
+
+
+
:
+
+
+
+
+
:
+
+
+
+
+ +
+ +
+ +
+ + + + + + + + + $value) { + ++$i; + if ($data[$key]['STATE'] == 'running') { + $status = 'active'; + $action = 'stop'; + } else { + $status = 'suspended'; + $action = 'start'; + } + + $cpu = $data[$key]['CPU'] / 10; + $cpu = number_format($cpu, 1); + if ($cpu == '0.0') $cpu = 0; + ?> + + +
+
+
+ + +
+ +
+
+ + +
+ +
+ +
+ + +
+ +
+ +
+
+ +
+ + +
+ + + + + + + + +
+
+
+
+
+
+
+
:
+
: +
+
+
+
+
:
+
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+
+
+
+
diff --git a/web/templates/admin/list_ssl.html b/web/templates/admin/list_ssl.html index 8f583b09..aa2addf9 100644 --- a/web/templates/admin/list_ssl.html +++ b/web/templates/admin/list_ssl.html @@ -1,29 +1,36 @@ - - - - - - +
+
+
+ + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?>
+
+ +
+ +
+ + +
+
+
@@ -69,7 +76,7 @@
- +
@@ -77,3 +84,4 @@
+
\ No newline at end of file diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index 5dc52347..61fc0677 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -1,207 +1,269 @@ - - - - - +
+
+
+ + + + + + + +
+ + +
+ +
+ +
+ +
+
-
- + - $value) { - ++$i; - ?> + - - - - + + - +
+ -
- - -
-
-
- - - - - - - - - -
- -
- - - - - - - - - - -
- : -
-
-
-
- : -
-
-
-
- - - - - - - - - -
- : - - : -
- : - - : -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
-
- - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
-
-
-
- +
+ $value) { + ++$i; + ?> + + +
+
+
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+
+
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html index 06006482..bd13c6e2 100644 --- a/web/templates/admin/list_updates.html +++ b/web/templates/admin/list_updates.html @@ -1,127 +1,148 @@ - - - - - - +
+
+
+ + + + + + + + +
+ + + + : + +
+ +
+ +
+ +
+ "> '.__('disable autoupdate').''; + } else { + echo ''.__('enable autoupdate').''; + } ?> +
-
- + - $value) { - ++$i; - if ($data[$key]['UPDATED'] == 'yes') { - $status = 'active'; - $upd_status = __('updated'); - } else { - $status = 'suspended'; - $upd_status = __('outdated'); - } - ?> + - - - - +
+ - -
- - - -
-
- - - - - - - - -
+ + - - - - - - - - - -
- -
- - - - -
- -
-
- - - - - -
- : - - () -
-
- - - - - -
- : - - -
-
-
- + +
+ $value) { + ++$i; + + if ($data[$key]['UPDATED'] == 'yes') { + $status = 'active'; + $upd_status = __('updated'); + } else { + $status = 'suspended'; + $upd_status = __('outdated'); + } + + ?> + + + + +
+
+
+ + +
+ +
+ '; + } + ?> +
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+ + + +
+ + + + + + + + +
+
+
+
+
+
+
+
+
:
+
+ () +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index d2dabbf1..49d7bcbd 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -1,254 +1,354 @@ - - - - - +
+
+ '; + } else { + echo ''; + } + ?> +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
-
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ; + + + + + + + +
+ + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ; + } + ?> + +
+
+
+ + +
+ +
+
+ + + + -
-

-
- - - - - - - - - -
- - - - - - - -
-
- - - - - - - - - - - - -
- : -
-
-
-
: -
-
-
-
- - - - - - - - - -
- : - - : -
- : - - - : -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
: /
: /
: /
: /
: /
: /
-
- - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:',$data[$key]['NS']) ?>
-
- - - - - - -
- + }); + }); + +
+

+
+ + + + + +
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+
+
+
+
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ / +
+
+
+
+ +
+
:
+
+ / +
+
+
+
+
:
+
+ ',$data[$key]['NS'])?> +
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 5c61c81e..cb8af735 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -1,34 +1,63 @@ - - - - - +
+
+ + +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ + +
+
-
- + + + + + + + +
+ + + + + + + +
$value) { ++$i; @@ -83,156 +112,193 @@ $proxy_ext_title = ''; $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']); } - ?> -
- - - - -
- - - - -
">
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + ?> - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - -
- -
- : -
-
-
-
- : -
-
-
-
-
- - - - - - - - - - - - - - -
 
:
:
:
-
- - - - - - - - - - - - - - - - - - - - - - -
 
:
:
:
:
-
-
- +
+
+
+ + +
+ +
+
+ + + + + + + -
-
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/admin/list_weblog.html b/web/templates/admin/list_weblog.html index 7aa7de68..0b0b8170 100644 --- a/web/templates/admin/list_weblog.html +++ b/web/templates/admin/list_weblog.html @@ -1,29 +1,40 @@ - - + + - - Web Log Manager - - + + + Vesta - <?=__('Web Log Manager')?> + + + + + + + -
- + + + + + + +
+
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index b5c5475f..f739bc85 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -1,120 +1,103 @@
-    
-
-
- - - - - - - - - - - - - - - - -
- +
+ +
+ \ No newline at end of file diff --git a/web/templates/file_manager/main.php b/web/templates/file_manager/main.php new file mode 100644 index 00000000..c2cfe315 --- /dev/null +++ b/web/templates/file_manager/main.php @@ -0,0 +1,377 @@ + + + +Filemanager + + + + + + + + + + + + +
+
+
+ '.$dir.''; + } ?> */ ?> +
+ + + +
    + 1){ + echo '
  • + + .. +
  • '; + } + + foreach($listing['dirs'] as $dir){ + echo '
  • + '.$dir['name'].' + '.$dir['atime_human'].' + '.$dir['adate_human'].' +   +   + '.$dir['owner'].'/'.$dir['group'].' + '.$dir['mode']['owner'].''.$dir['mode']['group'].''.$dir['mode']['other'].' +
  • '; + } + + foreach($listing['files'] as $item){ + echo '
  • + '.$item['name'].' + '.$item['atime_human'].' + '.$item['adate_human'].' +   + '.$item['size'].' + '.$item['owner'].'/'.$item['group'].' + '.$item['mode']['owner'].''.$item['mode']['group'].''.$item['mode']['other'].' +
  • '; + }*/ ?> + + +
+
+ + +
+ + + + +
    + +
+
+
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/templates/file_manager/tab_menu.php b/web/templates/file_manager/tab_menu.php new file mode 100644 index 00000000..8ae1d08f --- /dev/null +++ b/web/templates/file_manager/tab_menu.php @@ -0,0 +1,17 @@ + + + + + UPLOAD + + + +
CREATE FILE
+
CREATE DIR
+
DELETE
+
RENAME
+ +
COPY
+ +
DOWNLOAD
+
SORT BYtype
diff --git a/web/templates/footer.html b/web/templates/footer.html index cb4d14f9..91b9b38b 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -1,34 +1,58 @@ -
-
- - - + $(document).ready(function() { + $('.l-sort__create-btn').hover(function(){ + $(".l-sort__create-btn").append("
"); + $(".l-sort__create-btn").append("
"+$('.l-sort__create-btn').attr('title').replace(' ',' ')+"
"); + }, function(){ + $("#add-icon").remove(); + $("#tooltip").remove(); + }); - - - - - - - + if (this.first){ + this.right.css({'-webkit-transform': 'rotate('+this.degr+'deg)'}); + this.right.css({'transform': 'rotate('+this.degr+'deg)'}); + } + else{ + this.left.css({'-webkit-transform': 'rotate('+this.degr+'deg)'}); + this.left.css({'transform': 'rotate('+this.degr+'deg)'}); + } + } + } + + + + + + + diff --git a/web/templates/login.html b/web/templates/login.html index d6c838bc..d02127bd 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -5,13 +5,13 @@
- Vesta Control Panel + Vesta Control Panel
- @@ -24,7 +24,7 @@ diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html index 291ecba8..b48f3706 100644 --- a/web/templates/reset_1.html +++ b/web/templates/reset_1.html @@ -28,7 +28,7 @@
- +
diff --git a/web/templates/reset_2.html b/web/templates/reset_2.html index 917bb0ff..d4b62a7c 100644 --- a/web/templates/reset_2.html +++ b/web/templates/reset_2.html @@ -28,7 +28,7 @@ - + diff --git a/web/templates/reset_3.html b/web/templates/reset_3.html index fdd0192e..95b31df0 100644 --- a/web/templates/reset_3.html +++ b/web/templates/reset_3.html @@ -36,7 +36,7 @@ - + diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html index 29494e50..aa7d6811 100644 --- a/web/templates/user/edit_dns.html +++ b/web/templates/user/edit_dns.html @@ -1,29 +1,36 @@ +
+
+
+ → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; } - ?> - - - - - + } + ?>
- +
+ +
+ +
+ + +
+ + + + + + + + +
@@ -46,7 +53,7 @@
- - () +
- + $value) { + echo "\t\t\t\t\n"; + } + ?> + +
+ () +
+ - +
- \ No newline at end of file + +
\ No newline at end of file diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index bd5ef6a7..40710c02 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -1,29 +1,36 @@ +
+
+
+ → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; } - ?> - - - - - + } + ?>
-
+
+ +
+ +
+ + +
+ + + + diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index 1b510683..8234cfee 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -1,155 +1,166 @@ - - - - - +
+
+ +
+ + + + + + + + +
+ + + + : + +
+ +
+ +
+ +
+   + '.__('turn off notifications').''; + } else { + echo ''.__('turn on notifications').''; + } + ?> +
-
- + - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend'; - $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend'; - $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ; - } - ?> + - - - - + + + +
+ + + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend'; + $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend'; + $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ; + } + ?> + + +
+
+
+ + +
+ +
+
- - - - -
">
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
- -
-
-
- -
-
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+

+

+

+

+

+
+ +
+
+ + +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index fb4c67fc..eda37723 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -1,161 +1,209 @@ - - - - - +
+
+ + +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
+
-
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ; - } - if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; - if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; - if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/"; - if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL']; - if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; - if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/"; - if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL']; - ?> - - - - - -
- - - - -
">
-
- - - - - " /> - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - -
- : -
-
-
-
-
- - - - - - - - - -
- : - - -
- : - - -
-
- - - - - - - - - -
- : - - -
- : - - -
-
-
- +
+ + + + +
+ +
+ + + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ; + } + if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; + if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; + if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpmyadmin/"; + if (($data[$key]['TYPE'] == 'mysql') && (!empty($_SESSION['DB_PMA_URL']))) $db_admin_link = $_SESSION['DB_PMA_URL']; + if ($data[$key]['TYPE'] == 'pgsql') $db_admin = "phpPgAdmin"; + if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phppgadmin/"; + if (($data[$key]['TYPE'] == 'pgsql') && (!empty($_SESSION['DB_PGA_URL']))) $db_admin_link = $_SESSION['DB_PGA_URL']; + ?> + + +
+
+
+ + +
+ +
+
+ + + + + -
-
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ + + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index d1638ee1..9f8baa96 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -1,141 +1,185 @@ - - - - - +
+
+ +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
-
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ; - } - ?> - - - - - -
- - - - -
">
-
- - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - -
- - -
- - - - - - - + -
- -
-
- - - - - - - - - -
:
:
-
- - - - - -
:
-
-
- + +
-
- +
+ + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ; + } + ?> + +
+
+
+ + +
+ +
+ + +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ ⇢ ".$data[$key]['SRC']."";?> +
+
+ +
+ + +
+ + + + + + + + + +
+
+
+
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+ +
+ +
+ + + +
+ + + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html index 19014a77..052a75cf 100644 --- a/web/templates/user/list_dns_rec.html +++ b/web/templates/user/list_dns_rec.html @@ -1,99 +1,140 @@ - - - - - +
+
+ +
+ + + + + + +
+ + + +
+ +
+ +
+ +
-
- - - - -
- -
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; - } - ?> - - - - - -
- - - -
-
- - - - - - - - - - - - - - - - - - - - - -
-
- +
+ + + + +
+ + +
+ + + + + +
+ +
+
+
+ +
+ + + $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; + } + ?> + + +
+
+
+ + +
+ +
+
+ + -
-
+ +
+
+ + +
+
suspended
+
+ +
+
+
+
+
 
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html index d7e79287..cbe15546 100644 --- a/web/templates/user/list_mail.html +++ b/web/templates/user/list_mail.html @@ -1,172 +1,222 @@ - - - - - +
+
+ + +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
+
-
- - + + + + + + +
+ + + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; + } + if (empty($data[$key]['CATCHALL'])) { + $data[$key]['CATCHALL'] = '/dev/null'; + } + ?> + + +
+
+
+ + +
+ +
+
+ + + + + + - foreach ($data as $key => $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ; - } - if (empty($data[$key]['CATCHALL'])) { - $data[$key]['CATCHALL'] = '/dev/null'; - } - ?> -
- - - - -
- - - - -
" >
">
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - -
- : -
-
-
-
-
- - - - - - - - - -
- : - - -
- : - - -
-
- - - - - - - - - -
- : - - -
- : - - -
-
-
- -
-
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ + + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 28a38cb2..ba7d6764 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -1,148 +1,201 @@ - - - - - +
+
+ +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
+
-
- - - - -
- -
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend'; - $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; - } - ?> + - - - - - -
- - - - -
">
-
- - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - -
- : -
-
-
-
-
- - - - - - - - - -
- : - - -
- : - - -
-
- - - - - -
- : - - -
-
-
- + -
- + +
+ +
+ + + + +
+
+
+
+ +
+ + + + $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend'; + $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; + } + ?> + + +
+
+
+ + +
+ +
+ + +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+ +
+ +
+
:
+
+ +
+
+ +
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html index c13e1ac4..8d3cf372 100644 --- a/web/templates/user/list_search.html +++ b/web/templates/user/list_search.html @@ -1,182 +1,261 @@ - - - - - +
+
+ +
+ + + + + + +
+ : +
+
-
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - } else { - $status = 'active'; - $spnd_action = 'suspend'; - } - if ($data[$key]['TYPE'] == 'db') { - $object = 'database'; - } else { - $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']); - } + + + + + +
+ + + + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + } else { + $status = 'active'; + $spnd_action = 'suspend'; + } + if ($data[$key]['TYPE'] == 'db') { + $object = 'database'; + } else { + $object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']); + } + ?> + + +
+
+ + +
+
+ + + + + +
+

+
+ + + -
- - - - -
- - - -
">
-
- - - - - - - - - - + + + + - if ($data[$key]['KEY'] == 'RECORD') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'RECORD_ACTION_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'ACCOUNT') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'USER_ACTION_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'JOB') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - $cnfrm = 'CRON_ACTION_CONFIRMATION'; - } - if ($data[$key]['KEY'] == 'DATABASE') { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; - $cnfrm = 'DATABASE_ACTION_CONFIRMATION'; - } - if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) { - $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; - $cnfrm = 'DOMAIN_ACTION_CONFIRMATION'; - } - ?> - - - - - - - + + - - - - - - - -
- - - - -
- -
-
- - - - - -
- : - - -
-
- - - - - -
- : - - -
-
-
- - -
- + +
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ + + + + + +
+
+
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html index f1d3ac38..968df964 100644 --- a/web/templates/user/list_stats.html +++ b/web/templates/user/list_stats.html @@ -1,191 +1,269 @@ - - - - - +
+
+
+ + + + + + + +
+ + +
+ +
+ +
+ +
+
-
- + - $value) { - ++$i; - ?> + - - - - + + - +
+ -
- - -
-
-
- - - - - - - - - -
- -
- - - - - - - - - - -
- : -
-
-
-
- : -
-
-
-
- - - - - - - - - -
- : - - : -
- : - - : -
-
-
- - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
-
- - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
-
-
-
- +
+ $value) { + ++$i; + ?> + + +
+
+
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+
+
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html index 2d3686b3..c1e99797 100644 --- a/web/templates/user/list_user.html +++ b/web/templates/user/list_user.html @@ -1,179 +1,354 @@ - - - - - +
+
+ '; + } else { + echo ''; + } + ?> +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ +
-
- - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ; + + + + + + + +
+ + + +
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ; + } + ?> + +
+
+
+ + +
+ +
+
+ + + + +
+

+
+ + + + + +
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+
+
+
+
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ / +
+
+
+
+
:
+
+ +
+
+
+
+
+ : +
+
+ : +
+
+
+
+
:
+
+ / +
+
+
+
+ +
+
:
+
+ / +
+
+
+
+
:
+
+ ',$data[$key]['NS'])?> +
+
+
+
+ +
+ +
+ +
+ + + +
+ +
+
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index 76a5ab5d..fba1219a 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -1,32 +1,63 @@ - - - - - +
+
+ + +
+ + + + + + + +
+ + + + : + +
+ +
+ +
+ + +
+
-
- + + + + + + + +
+ + + + + + + +
$value) { ++$i; @@ -55,14 +86,25 @@ $ftp_user='no'; if (!empty($data[$key]['FTP_USER'])) { $ftp_user=$data[$key]['FTP_USER']; + } + if (strlen($ftp_user) > 24 ) { + $ftp_user = str_replace(':', ', ', $ftp_user); + $ftp_user = substr($ftp_user, 0, 24); + $ftp_user = trim($ftp_user, ":"); + $ftp_user = str_replace(':', ', ', $ftp_user); + $ftp_user = $ftp_user.", ..."; + } else { + $ftp_user = str_replace(':', ', ', $ftp_user); + } + $proxy_support='no'; if (!empty($data[$key]['PROXY'])) { $proxy_support='yes'; } - if (strlen($data[$key]['PROXY_EXT']) > 16 ) { + if (strlen($data[$key]['PROXY_EXT']) > 24 ) { $proxy_ext_title = str_replace(',', ', ', $data[$key]['PROXY_EXT']); - $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 16); + $proxy_ext = substr($data[$key]['PROXY_EXT'], 0, 24); $proxy_ext = trim($proxy_ext, ","); $proxy_ext = str_replace(',', ', ', $proxy_ext); $proxy_ext = $proxy_ext.", ..."; @@ -70,147 +112,194 @@ $proxy_ext_title = ''; $proxy_ext = str_replace(',', ', ', $data[$key]['PROXY_EXT']); } - ?> -
- - - - -
- - - - -
">
-
- - - - - - - - - - - - - - - - - - - - + ?> - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - -
- -
- : -
-
-
-
- : -
-
-
-
-
- - - - - - - - - - - - - - -
 
:
:
:
-
- - - - - - - - - - - - - - - - - - - - - - +
+
+
+ + +
+ +
+
+ + + + + + + -
 
:
:
:
:
-
-
- -
-
+ +
+
+ + +
+
+ +
+
suspended
+
+ +
+
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
+ +
+
+
:
+
+ +
+
+
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+
+
:
+
+ +
+
+
+
+
:
+
+ +
+
+
+
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+ +
+ +
+
:
+
+ +
+
+ +
+
+ +
+ +
+ +
+ + + +
+ + +
+
+
+
+
+
+ +
+
+
+
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html index 52e7bc2e..021a7148 100644 --- a/web/templates/user/panel.html +++ b/web/templates/user/panel.html @@ -1,112 +1,97 @@ -
-
-
- - - - - - - - -
- \ No newline at end of file +
+ +
+ \ No newline at end of file diff --git a/web/upload/UploadHandler.php b/web/upload/UploadHandler.php new file mode 100755 index 00000000..fa794765 --- /dev/null +++ b/web/upload/UploadHandler.php @@ -0,0 +1,1354 @@ + 'The uploaded file exceeds the upload_max_filesize directive in php.ini', + 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', + 3 => 'The uploaded file was only partially uploaded', + 4 => 'No file was uploaded', + 6 => 'Missing a temporary folder', + 7 => 'Failed to write file to disk', + 8 => 'A PHP extension stopped the file upload', + 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', + 'max_file_size' => 'File is too big', + 'min_file_size' => 'File is too small', + 'accept_file_types' => 'Filetype not allowed', + 'max_number_of_files' => 'Maximum number of files exceeded', + 'max_width' => 'Image exceeds maximum width', + 'min_width' => 'Image requires a minimum width', + 'max_height' => 'Image exceeds maximum height', + 'min_height' => 'Image requires a minimum height', + 'abort' => 'File upload aborted', + 'image_resize' => 'Failed to resize image' + ); + + protected $image_objects = array(); + + function __construct($options = null, $initialize = true, $error_messages = null) { + $this->options = array( + 'script_url' => $this->get_full_url().'/', + 'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/', + 'upload_url' => $this->get_full_url().'/files/', + 'user_dirs' => false, + 'mkdir_mode' => 0755, + 'param_name' => 'files', + // Set the following option to 'POST', if your server does not support + // DELETE requests. This is a parameter sent to the client: + 'delete_type' => 'DELETE', + 'access_control_allow_origin' => '*', + 'access_control_allow_credentials' => false, + 'access_control_allow_methods' => array( + 'OPTIONS', + 'HEAD', + 'GET', + 'POST', + 'PUT', + 'PATCH', + 'DELETE' + ), + 'access_control_allow_headers' => array( + 'Content-Type', + 'Content-Range', + 'Content-Disposition' + ), + // Enable to provide file downloads via GET requests to the PHP script: + // 1. Set to 1 to download files via readfile method through PHP + // 2. Set to 2 to send a X-Sendfile header for lighttpd/Apache + // 3. Set to 3 to send a X-Accel-Redirect header for nginx + // If set to 2 or 3, adjust the upload_url option to the base path of + // the redirect parameter, e.g. '/files/'. + 'download_via_php' => false, + // Read files in chunks to avoid memory limits when download_via_php + // is enabled, set to 0 to disable chunked reading of files: + 'readfile_chunk_size' => 10 * 1024 * 1024, // 10 MiB + // Defines which files can be displayed inline when downloaded: + 'inline_file_types' => '/\.(gif|jpe?g|png)$/i', + // Defines which files (based on their names) are accepted for upload: + 'accept_file_types' => '/.+$/i', + // The php.ini settings upload_max_filesize and post_max_size + // take precedence over the following max_file_size setting: + 'max_file_size' => null, + 'min_file_size' => 1, + // The maximum number of files for the upload directory: + 'max_number_of_files' => null, + // Defines which files are handled as image files: + 'image_file_types' => '/\.(gif|jpe?g|png)$/i', + // Use exif_imagetype on all files to correct file extensions: + 'correct_image_extensions' => false, + // Image resolution restrictions: + 'max_width' => null, + 'max_height' => null, + 'min_width' => 1, + 'min_height' => 1, + // Set the following option to false to enable resumable uploads: + 'discard_aborted_uploads' => true, + // Set to 0 to use the GD library to scale and orient images, + // set to 1 to use imagick (if installed, falls back to GD), + // set to 2 to use the ImageMagick convert binary directly: + 'image_library' => 1, + // Uncomment the following to define an array of resource limits + // for imagick: + /* + 'imagick_resource_limits' => array( + imagick::RESOURCETYPE_MAP => 32, + imagick::RESOURCETYPE_MEMORY => 32 + ), + */ + // Command or path for to the ImageMagick convert binary: + 'convert_bin' => 'convert', + // Uncomment the following to add parameters in front of each + // ImageMagick convert call (the limit constraints seem only + // to have an effect if put in front): + /* + 'convert_params' => '-limit memory 32MiB -limit map 32MiB', + */ + // Command or path for to the ImageMagick identify binary: + 'identify_bin' => 'identify', + 'image_versions' => array( + // The empty image version key defines options for the original image: + '' => array( + // Automatically rotate images based on EXIF meta data: + 'auto_orient' => true + ), + // Uncomment the following to create medium sized images: + /* + 'medium' => array( + 'max_width' => 800, + 'max_height' => 600 + ), + */ + 'thumbnail' => array( + // Uncomment the following to use a defined directory for the thumbnails + // instead of a subdirectory based on the version identifier. + // Make sure that this directory doesn't allow execution of files if you + // don't pose any restrictions on the type of uploaded files, e.g. by + // copying the .htaccess file from the files directory for Apache: + //'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/thumb/', + //'upload_url' => $this->get_full_url().'/thumb/', + // Uncomment the following to force the max + // dimensions and e.g. create square thumbnails: + //'crop' => true, + 'max_width' => 80, + 'max_height' => 80 + ) + ) + ); + if ($options) { + $this->options = $options + $this->options; + } + if ($error_messages) { + $this->error_messages = $error_messages + $this->error_messages; + } + if ($initialize) { + $this->initialize(); + } + } + + protected function initialize() { + switch ($this->get_server_var('REQUEST_METHOD')) { + case 'OPTIONS': + case 'HEAD': + $this->head(); + break; + case 'GET': + $this->get(); + break; + case 'PATCH': + case 'PUT': + case 'POST': + $this->post(); + break; + case 'DELETE': + $this->delete(); + break; + default: + $this->header('HTTP/1.1 405 Method Not Allowed'); + } + } + + protected function get_full_url() { + $https = !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'on') === 0 || + !empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && + strcasecmp($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') === 0; + return + ($https ? 'https://' : 'http://'). + (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). + (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. + ($https && $_SERVER['SERVER_PORT'] === 443 || + $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). + substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')); + } + + protected function get_user_id() { + @session_start(); + return session_id(); + } + + protected function get_user_path() { + if ($this->options['user_dirs']) { + return $this->get_user_id().'/'; + } + return ''; + } + + protected function get_upload_path($file_name = null, $version = null) { + $relocate_directory = $_GET['dir']; + if (empty($relocate_directory)) { + $relocate_directory = '/home/admin/'; + } + if ($relocate_directory[strlen($relocate_directory) -1] != '/') { + $relocate_directory .= '/'; + } + $file_name = $file_name ? $file_name : ''; + if (empty($version)) { + $version_path = ''; + } else { + $version_dir = @$this->options['image_versions'][$version]['upload_dir']; + if ($version_dir) { + return $version_dir.$this->get_user_path().$file_name; + } + $version_path = $version.'/'; + } + //return $this->options['upload_dir'].$this->get_user_path() + // .$version_path.$file_name; + return $relocate_directory + .$version_path.$file_name; + } + + protected function get_query_separator($url) { + return strpos($url, '?') === false ? '?' : '&'; + } + + protected function get_download_url($file_name, $version = null, $direct = false) { + if (!$direct && $this->options['download_via_php']) { + $url = $this->options['script_url'] + .$this->get_query_separator($this->options['script_url']) + .$this->get_singular_param_name() + .'='.rawurlencode($file_name); + if ($version) { + $url .= '&version='.rawurlencode($version); + } + return $url.'&download=1'; + } + if (empty($version)) { + $version_path = ''; + } else { + $version_url = @$this->options['image_versions'][$version]['upload_url']; + if ($version_url) { + return $version_url.$this->get_user_path().rawurlencode($file_name); + } + $version_path = rawurlencode($version).'/'; + } + return $this->options['upload_url'].$this->get_user_path() + .$version_path.rawurlencode($file_name); + } + + protected function set_additional_file_properties($file) { + $file->deleteUrl = $this->options['script_url'] + .$this->get_query_separator($this->options['script_url']) + .$this->get_singular_param_name() + .'='.rawurlencode($file->name); + $file->deleteType = $this->options['delete_type']; + if ($file->deleteType !== 'DELETE') { + $file->deleteUrl .= '&_method=DELETE'; + } + if ($this->options['access_control_allow_credentials']) { + $file->deleteWithCredentials = true; + } + } + + // Fix for overflowing signed 32 bit integers, + // works for sizes up to 2^32-1 bytes (4 GiB - 1): + protected function fix_integer_overflow($size) { + if ($size < 0) { + $size += 2.0 * (PHP_INT_MAX + 1); + } + return $size; + } + + protected function get_file_size($file_path, $clear_stat_cache = false) { + if ($clear_stat_cache) { + if (version_compare(PHP_VERSION, '5.3.0') >= 0) { + clearstatcache(true, $file_path); + } else { + clearstatcache(); + } + } + + return $this->fix_integer_overflow(filesize($file_path)); + } + + protected function is_valid_file_object($file_name) { + $file_path = $this->get_upload_path($file_name); + if (is_file($file_path) && $file_name[0] !== '.') { + return true; + } + return false; + } + + protected function get_file_object($file_name) { + if ($this->is_valid_file_object($file_name)) { + $file = new \stdClass(); + $file->name = $file_name; + $file->size = $this->get_file_size( + $this->get_upload_path($file_name) + ); + $file->url = $this->get_download_url($file->name); + foreach($this->options['image_versions'] as $version => $options) { + if (!empty($version)) { + if (is_file($this->get_upload_path($file_name, $version))) { + $file->{$version.'Url'} = $this->get_download_url( + $file->name, + $version + ); + } + } + } + $this->set_additional_file_properties($file); + return $file; + } + return null; + } + + protected function get_file_objects($iteration_method = 'get_file_object') { + $upload_dir = $this->get_upload_path(); + if (!is_dir($upload_dir)) { + return array(); + } + return array_values(array_filter(array_map( + array($this, $iteration_method), + scandir($upload_dir) + ))); + } + + protected function count_file_objects() { + return count($this->get_file_objects('is_valid_file_object')); + } + + protected function get_error_message($error) { + return array_key_exists($error, $this->error_messages) ? + $this->error_messages[$error] : $error; + } + + function get_config_bytes($val) { + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + switch($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + return $this->fix_integer_overflow($val); + } + + protected function validate($uploaded_file, $file, $error, $index) { + if ($error) { + $file->error = $this->get_error_message($error); + return false; + } + $content_length = $this->fix_integer_overflow(intval( + $this->get_server_var('CONTENT_LENGTH') + )); + $post_max_size = $this->get_config_bytes(ini_get('post_max_size')); + if ($post_max_size && ($content_length > $post_max_size)) { + $file->error = $this->get_error_message('post_max_size'); + return false; + } + if (!preg_match($this->options['accept_file_types'], $file->name)) { + $file->error = $this->get_error_message('accept_file_types'); + return false; + } + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + $file_size = $this->get_file_size($uploaded_file); + } else { + $file_size = $content_length; + } + if ($this->options['max_file_size'] && ( + $file_size > $this->options['max_file_size'] || + $file->size > $this->options['max_file_size']) + ) { + $file->error = $this->get_error_message('max_file_size'); + return false; + } + if ($this->options['min_file_size'] && + $file_size < $this->options['min_file_size']) { + $file->error = $this->get_error_message('min_file_size'); + return false; + } + if (is_int($this->options['max_number_of_files']) && + ($this->count_file_objects() >= $this->options['max_number_of_files']) && + // Ignore additional chunks of existing files: + !is_file($this->get_upload_path($file->name))) { + $file->error = $this->get_error_message('max_number_of_files'); + return false; + } + $max_width = @$this->options['max_width']; + $max_height = @$this->options['max_height']; + $min_width = @$this->options['min_width']; + $min_height = @$this->options['min_height']; + if (($max_width || $max_height || $min_width || $min_height) + && preg_match($this->options['image_file_types'], $file->name)) { + list($img_width, $img_height) = $this->get_image_size($uploaded_file); + } + if (!empty($img_width)) { + if ($max_width && $img_width > $max_width) { + $file->error = $this->get_error_message('max_width'); + return false; + } + if ($max_height && $img_height > $max_height) { + $file->error = $this->get_error_message('max_height'); + return false; + } + if ($min_width && $img_width < $min_width) { + $file->error = $this->get_error_message('min_width'); + return false; + } + if ($min_height && $img_height < $min_height) { + $file->error = $this->get_error_message('min_height'); + return false; + } + } + return true; + } + + protected function upcount_name_callback($matches) { + $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1; + $ext = isset($matches[2]) ? $matches[2] : ''; + return ' ('.$index.')'.$ext; + } + + protected function upcount_name($name) { + return preg_replace_callback( + '/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', + array($this, 'upcount_name_callback'), + $name, + 1 + ); + } + + protected function get_unique_filename($file_path, $name, $size, $type, $error, + $index, $content_range) { + while(is_dir($this->get_upload_path($name))) { + $name = $this->upcount_name($name); + } + // Keep an existing filename if this is part of a chunked upload: + $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1])); + while(is_file($this->get_upload_path($name))) { + if ($uploaded_bytes === $this->get_file_size( + $this->get_upload_path($name))) { + break; + } + $name = $this->upcount_name($name); + } + return $name; + } + + protected function fix_file_extension($file_path, $name, $size, $type, $error, + $index, $content_range) { + // Add missing file extension for known image types: + if (strpos($name, '.') === false && + preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) { + $name .= '.'.$matches[1]; + } + if ($this->options['correct_image_extensions'] && + function_exists('exif_imagetype')) { + switch(@exif_imagetype($file_path)){ + case IMAGETYPE_JPEG: + $extensions = array('jpg', 'jpeg'); + break; + case IMAGETYPE_PNG: + $extensions = array('png'); + break; + case IMAGETYPE_GIF: + $extensions = array('gif'); + break; + } + // Adjust incorrect image file extensions: + if (!empty($extensions)) { + $parts = explode('.', $name); + $extIndex = count($parts) - 1; + $ext = strtolower(@$parts[$extIndex]); + if (!in_array($ext, $extensions)) { + $parts[$extIndex] = $extensions[0]; + $name = implode('.', $parts); + } + } + } + return $name; + } + + protected function trim_file_name($file_path, $name, $size, $type, $error, + $index, $content_range) { + // Remove path information and dots around the filename, to prevent uploading + // into different directories or replacing hidden system files. + // Also remove control characters and spaces (\x00..\x20) around the filename: + $name = trim(basename(stripslashes($name)), ".\x00..\x20"); + // Use a timestamp for empty filenames: + if (!$name) { + $name = str_replace('.', '-', microtime(true)); + } + return $name; + } + + protected function get_file_name($file_path, $name, $size, $type, $error, + $index, $content_range) { + $name = $this->trim_file_name($file_path, $name, $size, $type, $error, + $index, $content_range); + return $this->get_unique_filename( + $file_path, + $this->fix_file_extension($file_path, $name, $size, $type, $error, + $index, $content_range), + $size, + $type, + $error, + $index, + $content_range + ); + } + + protected function handle_form_data($file, $index) { + // Handle form data, e.g. $_REQUEST['description'][$index] + } + + protected function get_scaled_image_file_paths($file_name, $version) { + $file_path = $this->get_upload_path($file_name); + if (!empty($version)) { + $version_dir = $this->get_upload_path(null, $version); + if (!is_dir($version_dir)) { + mkdir($version_dir, $this->options['mkdir_mode'], true); + } + $new_file_path = $version_dir.'/'.$file_name; + } else { + $new_file_path = $file_path; + } + return array($file_path, $new_file_path); + } + + protected function gd_get_image_object($file_path, $func, $no_cache = false) { + if (empty($this->image_objects[$file_path]) || $no_cache) { + $this->gd_destroy_image_object($file_path); + $this->image_objects[$file_path] = $func($file_path); + } + return $this->image_objects[$file_path]; + } + + protected function gd_set_image_object($file_path, $image) { + $this->gd_destroy_image_object($file_path); + $this->image_objects[$file_path] = $image; + } + + protected function gd_destroy_image_object($file_path) { + $image = (isset($this->image_objects[$file_path])) ? $this->image_objects[$file_path] : null ; + return $image && imagedestroy($image); + } + + protected function gd_imageflip($image, $mode) { + if (function_exists('imageflip')) { + return imageflip($image, $mode); + } + $new_width = $src_width = imagesx($image); + $new_height = $src_height = imagesy($image); + $new_img = imagecreatetruecolor($new_width, $new_height); + $src_x = 0; + $src_y = 0; + switch ($mode) { + case '1': // flip on the horizontal axis + $src_y = $new_height - 1; + $src_height = -$new_height; + break; + case '2': // flip on the vertical axis + $src_x = $new_width - 1; + $src_width = -$new_width; + break; + case '3': // flip on both axes + $src_y = $new_height - 1; + $src_height = -$new_height; + $src_x = $new_width - 1; + $src_width = -$new_width; + break; + default: + return $image; + } + imagecopyresampled( + $new_img, + $image, + 0, + 0, + $src_x, + $src_y, + $new_width, + $new_height, + $src_width, + $src_height + ); + return $new_img; + } + + protected function gd_orient_image($file_path, $src_img) { + if (!function_exists('exif_read_data')) { + return false; + } + $exif = @exif_read_data($file_path); + if ($exif === false) { + return false; + } + $orientation = intval(@$exif['Orientation']); + if ($orientation < 2 || $orientation > 8) { + return false; + } + switch ($orientation) { + case 2: + $new_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 + ); + break; + case 3: + $new_img = imagerotate($src_img, 180, 0); + break; + case 4: + $new_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 + ); + break; + case 5: + $tmp_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_HORIZONTAL') ? IMG_FLIP_HORIZONTAL : 1 + ); + $new_img = imagerotate($tmp_img, 270, 0); + imagedestroy($tmp_img); + break; + case 6: + $new_img = imagerotate($src_img, 270, 0); + break; + case 7: + $tmp_img = $this->gd_imageflip( + $src_img, + defined('IMG_FLIP_VERTICAL') ? IMG_FLIP_VERTICAL : 2 + ); + $new_img = imagerotate($tmp_img, 270, 0); + imagedestroy($tmp_img); + break; + case 8: + $new_img = imagerotate($src_img, 90, 0); + break; + default: + return false; + } + $this->gd_set_image_object($file_path, $new_img); + return true; + } + + protected function gd_create_scaled_image($file_name, $version, $options) { + if (!function_exists('imagecreatetruecolor')) { + error_log('Function not found: imagecreatetruecolor'); + return false; + } + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $type = strtolower(substr(strrchr($file_name, '.'), 1)); + switch ($type) { + case 'jpg': + case 'jpeg': + $src_func = 'imagecreatefromjpeg'; + $write_func = 'imagejpeg'; + $image_quality = isset($options['jpeg_quality']) ? + $options['jpeg_quality'] : 75; + break; + case 'gif': + $src_func = 'imagecreatefromgif'; + $write_func = 'imagegif'; + $image_quality = null; + break; + case 'png': + $src_func = 'imagecreatefrompng'; + $write_func = 'imagepng'; + $image_quality = isset($options['png_quality']) ? + $options['png_quality'] : 9; + break; + default: + return false; + } + $src_img = $this->gd_get_image_object( + $file_path, + $src_func, + !empty($options['no_cache']) + ); + $image_oriented = false; + if (!empty($options['auto_orient']) && $this->gd_orient_image( + $file_path, + $src_img + )) { + $image_oriented = true; + $src_img = $this->gd_get_image_object( + $file_path, + $src_func + ); + } + $max_width = $img_width = imagesx($src_img); + $max_height = $img_height = imagesy($src_img); + if (!empty($options['max_width'])) { + $max_width = $options['max_width']; + } + if (!empty($options['max_height'])) { + $max_height = $options['max_height']; + } + $scale = min( + $max_width / $img_width, + $max_height / $img_height + ); + if ($scale >= 1) { + if ($image_oriented) { + return $write_func($src_img, $new_file_path, $image_quality); + } + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + if (empty($options['crop'])) { + $new_width = $img_width * $scale; + $new_height = $img_height * $scale; + $dst_x = 0; + $dst_y = 0; + $new_img = imagecreatetruecolor($new_width, $new_height); + } else { + if (($img_width / $img_height) >= ($max_width / $max_height)) { + $new_width = $img_width / ($img_height / $max_height); + $new_height = $max_height; + } else { + $new_width = $max_width; + $new_height = $img_height / ($img_width / $max_width); + } + $dst_x = 0 - ($new_width - $max_width) / 2; + $dst_y = 0 - ($new_height - $max_height) / 2; + $new_img = imagecreatetruecolor($max_width, $max_height); + } + // Handle transparency in GIF and PNG images: + switch ($type) { + case 'gif': + case 'png': + imagecolortransparent($new_img, imagecolorallocate($new_img, 0, 0, 0)); + case 'png': + imagealphablending($new_img, false); + imagesavealpha($new_img, true); + break; + } + $success = imagecopyresampled( + $new_img, + $src_img, + $dst_x, + $dst_y, + 0, + 0, + $new_width, + $new_height, + $img_width, + $img_height + ) && $write_func($new_img, $new_file_path, $image_quality); + $this->gd_set_image_object($file_path, $new_img); + return $success; + } + + protected function imagick_get_image_object($file_path, $no_cache = false) { + if (empty($this->image_objects[$file_path]) || $no_cache) { + $this->imagick_destroy_image_object($file_path); + $image = new \Imagick(); + if (!empty($this->options['imagick_resource_limits'])) { + foreach ($this->options['imagick_resource_limits'] as $type => $limit) { + $image->setResourceLimit($type, $limit); + } + } + $image->readImage($file_path); + $this->image_objects[$file_path] = $image; + } + return $this->image_objects[$file_path]; + } + + protected function imagick_set_image_object($file_path, $image) { + $this->imagick_destroy_image_object($file_path); + $this->image_objects[$file_path] = $image; + } + + protected function imagick_destroy_image_object($file_path) { + $image = (isset($this->image_objects[$file_path])) ? $this->image_objects[$file_path] : null ; + return $image && $image->destroy(); + } + + protected function imagick_orient_image($image) { + $orientation = $image->getImageOrientation(); + $background = new \ImagickPixel('none'); + switch ($orientation) { + case \imagick::ORIENTATION_TOPRIGHT: // 2 + $image->flopImage(); // horizontal flop around y-axis + break; + case \imagick::ORIENTATION_BOTTOMRIGHT: // 3 + $image->rotateImage($background, 180); + break; + case \imagick::ORIENTATION_BOTTOMLEFT: // 4 + $image->flipImage(); // vertical flip around x-axis + break; + case \imagick::ORIENTATION_LEFTTOP: // 5 + $image->flopImage(); // horizontal flop around y-axis + $image->rotateImage($background, 270); + break; + case \imagick::ORIENTATION_RIGHTTOP: // 6 + $image->rotateImage($background, 90); + break; + case \imagick::ORIENTATION_RIGHTBOTTOM: // 7 + $image->flipImage(); // vertical flip around x-axis + $image->rotateImage($background, 270); + break; + case \imagick::ORIENTATION_LEFTBOTTOM: // 8 + $image->rotateImage($background, 270); + break; + default: + return false; + } + $image->setImageOrientation(\imagick::ORIENTATION_TOPLEFT); // 1 + return true; + } + + protected function imagick_create_scaled_image($file_name, $version, $options) { + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $image = $this->imagick_get_image_object( + $file_path, + !empty($options['no_cache']) + ); + if ($image->getImageFormat() === 'GIF') { + // Handle animated GIFs: + $images = $image->coalesceImages(); + foreach ($images as $frame) { + $image = $frame; + $this->imagick_set_image_object($file_name, $image); + break; + } + } + $image_oriented = false; + if (!empty($options['auto_orient'])) { + $image_oriented = $this->imagick_orient_image($image); + } + $new_width = $max_width = $img_width = $image->getImageWidth(); + $new_height = $max_height = $img_height = $image->getImageHeight(); + if (!empty($options['max_width'])) { + $new_width = $max_width = $options['max_width']; + } + if (!empty($options['max_height'])) { + $new_height = $max_height = $options['max_height']; + } + if (!($image_oriented || $max_width < $img_width || $max_height < $img_height)) { + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + $crop = !empty($options['crop']); + if ($crop) { + $x = 0; + $y = 0; + if (($img_width / $img_height) >= ($max_width / $max_height)) { + $new_width = 0; // Enables proportional scaling based on max_height + $x = ($img_width / ($img_height / $max_height) - $max_width) / 2; + } else { + $new_height = 0; // Enables proportional scaling based on max_width + $y = ($img_height / ($img_width / $max_width) - $max_height) / 2; + } + } + $success = $image->resizeImage( + $new_width, + $new_height, + isset($options['filter']) ? $options['filter'] : \imagick::FILTER_LANCZOS, + isset($options['blur']) ? $options['blur'] : 1, + $new_width && $new_height // fit image into constraints if not to be cropped + ); + if ($success && $crop) { + $success = $image->cropImage( + $max_width, + $max_height, + $x, + $y + ); + if ($success) { + $success = $image->setImagePage($max_width, $max_height, 0, 0); + } + } + $type = strtolower(substr(strrchr($file_name, '.'), 1)); + switch ($type) { + case 'jpg': + case 'jpeg': + if (!empty($options['jpeg_quality'])) { + $image->setImageCompression(\imagick::COMPRESSION_JPEG); + $image->setImageCompressionQuality($options['jpeg_quality']); + } + break; + } + if (!empty($options['strip'])) { + $image->stripImage(); + } + return $success && $image->writeImage($new_file_path); + } + + protected function imagemagick_create_scaled_image($file_name, $version, $options) { + list($file_path, $new_file_path) = + $this->get_scaled_image_file_paths($file_name, $version); + $resize = @$options['max_width'] + .(empty($options['max_height']) ? '' : 'X'.$options['max_height']); + if (!$resize && empty($options['auto_orient'])) { + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + $cmd = $this->options['convert_bin']; + if (!empty($this->options['convert_params'])) { + $cmd .= ' '.$this->options['convert_params']; + } + $cmd .= ' '.escapeshellarg($file_path); + if (!empty($options['auto_orient'])) { + $cmd .= ' -auto-orient'; + } + if ($resize) { + // Handle animated GIFs: + $cmd .= ' -coalesce'; + if (empty($options['crop'])) { + $cmd .= ' -resize '.escapeshellarg($resize.'>'); + } else { + $cmd .= ' -resize '.escapeshellarg($resize.'^'); + $cmd .= ' -gravity center'; + $cmd .= ' -crop '.escapeshellarg($resize.'+0+0'); + } + // Make sure the page dimensions are correct (fixes offsets of animated GIFs): + $cmd .= ' +repage'; + } + if (!empty($options['convert_params'])) { + $cmd .= ' '.$options['convert_params']; + } + $cmd .= ' '.escapeshellarg($new_file_path); + exec($cmd, $output, $error); + if ($error) { + error_log(implode('\n', $output)); + return false; + } + return true; + } + + protected function get_image_size($file_path) { + if ($this->options['image_library']) { + if (extension_loaded('imagick')) { + $image = new \Imagick(); + try { + if (@$image->pingImage($file_path)) { + $dimensions = array($image->getImageWidth(), $image->getImageHeight()); + $image->destroy(); + return $dimensions; + } + return false; + } catch (Exception $e) { + error_log($e->getMessage()); + } + } + if ($this->options['image_library'] === 2) { + $cmd = $this->options['identify_bin']; + $cmd .= ' -ping '.escapeshellarg($file_path); + exec($cmd, $output, $error); + if (!$error && !empty($output)) { + // image.jpg JPEG 1920x1080 1920x1080+0+0 8-bit sRGB 465KB 0.000u 0:00.000 + $infos = preg_split('/\s+/', $output[0]); + $dimensions = preg_split('/x/', $infos[2]); + return $dimensions; + } + return false; + } + } + if (!function_exists('getimagesize')) { + error_log('Function not found: getimagesize'); + return false; + } + return @getimagesize($file_path); + } + + protected function create_scaled_image($file_name, $version, $options) { + if ($this->options['image_library'] === 2) { + return $this->imagemagick_create_scaled_image($file_name, $version, $options); + } + if ($this->options['image_library'] && extension_loaded('imagick')) { + return $this->imagick_create_scaled_image($file_name, $version, $options); + } + return $this->gd_create_scaled_image($file_name, $version, $options); + } + + protected function destroy_image_object($file_path) { + if ($this->options['image_library'] && extension_loaded('imagick')) { + return $this->imagick_destroy_image_object($file_path); + } + } + + protected function is_valid_image_file($file_path) { + if (!preg_match($this->options['image_file_types'], $file_path)) { + return false; + } + if (function_exists('exif_imagetype')) { + return @exif_imagetype($file_path); + } + $image_info = $this->get_image_size($file_path); + return $image_info && $image_info[0] && $image_info[1]; + } + + protected function handle_image_file($file_path, $file) { + $failed_versions = array(); + foreach($this->options['image_versions'] as $version => $options) { + if ($this->create_scaled_image($file->name, $version, $options)) { + if (!empty($version)) { + $file->{$version.'Url'} = $this->get_download_url( + $file->name, + $version + ); + } else { + $file->size = $this->get_file_size($file_path, true); + } + } else { + $failed_versions[] = $version ? $version : 'original'; + } + } + if (count($failed_versions)) { + $file->error = $this->get_error_message('image_resize') + .' ('.implode($failed_versions,', ').')'; + } + // Free memory: + $this->destroy_image_object($file_path); + } + + protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, + $index = null, $content_range = null) { + $file = new \stdClass(); + $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error, + $index, $content_range); + $file->size = $this->fix_integer_overflow(intval($size)); + $file->type = $type; + if ($this->validate($uploaded_file, $file, $error, $index)) { + $this->handle_form_data($file, $index); + $upload_dir = $this->get_upload_path(); + if (!is_dir($upload_dir)) { + mkdir($upload_dir, $this->options['mkdir_mode'], true); + } + $file_path = $this->get_upload_path($file->name); + $append_file = $content_range && is_file($file_path) && + $file->size > $this->get_file_size($file_path); + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + // multipart/formdata uploads (POST method uploads) + if ($append_file) { + file_put_contents( + $file_path, + fopen($uploaded_file, 'r'), + FILE_APPEND + ); + } else { + move_uploaded_file($uploaded_file, $file_path); + } + } else { + // Non-multipart uploads (PUT method support) + file_put_contents( + $file_path, + fopen('php://input', 'r'), + $append_file ? FILE_APPEND : 0 + ); + } + $file_size = $this->get_file_size($file_path, $append_file); + //var_dump($file_size);die(); + if ($file_size === $file->size) { + $file->url = $this->get_download_url($file->name); + if ($this->is_valid_image_file($file_path)) { + $this->handle_image_file($file_path, $file); + } + } else { + $file->size = $file_size; + if (!$content_range && $this->options['discard_aborted_uploads']) { + unlink($file_path); + $file->error = $this->get_error_message('abort'); + } + } + $this->set_additional_file_properties($file); + } + return $file; + } + + protected function readfile($file_path) { + $file_size = $this->get_file_size($file_path); + $chunk_size = $this->options['readfile_chunk_size']; + if ($chunk_size && $file_size > $chunk_size) { + $handle = fopen($file_path, 'rb'); + while (!feof($handle)) { + echo fread($handle, $chunk_size); + @ob_flush(); + @flush(); + } + fclose($handle); + return $file_size; + } + return readfile($file_path); + } + + protected function body($str) { + echo $str; + } + + protected function header($str) { + header($str); + } + + protected function get_server_var($id) { + return isset($_SERVER[$id]) ? $_SERVER[$id] : ''; + } + + protected function generate_response($content, $print_response = true) { + if ($print_response) { + $json = json_encode($content); + $redirect = isset($_REQUEST['redirect']) ? + stripslashes($_REQUEST['redirect']) : null; + if ($redirect) { + $this->header('Location: '.sprintf($redirect, rawurlencode($json))); + return; + } + $this->head(); + if ($this->get_server_var('HTTP_CONTENT_RANGE')) { + $files = isset($content[$this->options['param_name']]) ? + $content[$this->options['param_name']] : null; + if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) { + $this->header('Range: 0-'.( + $this->fix_integer_overflow(intval($files[0]->size)) - 1 + )); + } + } + $this->body($json); + } + return $content; + } + + protected function get_version_param() { + return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null; + } + + protected function get_singular_param_name() { + return substr($this->options['param_name'], 0, -1); + } + + protected function get_file_name_param() { + $name = $this->get_singular_param_name(); + return isset($_REQUEST[$name]) ? basename(stripslashes($_REQUEST[$name])) : null; + } + + protected function get_file_names_params() { + $params = isset($_REQUEST[$this->options['param_name']]) ? + $_REQUEST[$this->options['param_name']] : array(); + foreach ($params as $key => $value) { + $params[$key] = basename(stripslashes($value)); + } + return $params; + } + + protected function get_file_type($file_path) { + switch (strtolower(pathinfo($file_path, PATHINFO_EXTENSION))) { + case 'jpeg': + case 'jpg': + return 'image/jpeg'; + case 'png': + return 'image/png'; + case 'gif': + return 'image/gif'; + default: + return ''; + } + } + + protected function download() { + switch ($this->options['download_via_php']) { + case 1: + $redirect_header = null; + break; + case 2: + $redirect_header = 'X-Sendfile'; + break; + case 3: + $redirect_header = 'X-Accel-Redirect'; + break; + default: + return $this->header('HTTP/1.1 403 Forbidden'); + } + $file_name = $this->get_file_name_param(); + if (!$this->is_valid_file_object($file_name)) { + return $this->header('HTTP/1.1 404 Not Found'); + } + if ($redirect_header) { + return $this->header( + $redirect_header.': '.$this->get_download_url( + $file_name, + $this->get_version_param(), + true + ) + ); + } + $file_path = $this->get_upload_path($file_name, $this->get_version_param()); + // Prevent browsers from MIME-sniffing the content-type: + $this->header('X-Content-Type-Options: nosniff'); + if (!preg_match($this->options['inline_file_types'], $file_name)) { + $this->header('Content-Type: application/octet-stream'); + $this->header('Content-Disposition: attachment; filename="'.$file_name.'"'); + } else { + $this->header('Content-Type: '.$this->get_file_type($file_path)); + $this->header('Content-Disposition: inline; filename="'.$file_name.'"'); + } + $this->header('Content-Length: '.$this->get_file_size($file_path)); + $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path))); + $this->readfile($file_path); + } + + protected function send_content_type_header() { + $this->header('Vary: Accept'); + if (strpos($this->get_server_var('HTTP_ACCEPT'), 'application/json') !== false) { + $this->header('Content-type: application/json'); + } else { + $this->header('Content-type: text/plain'); + } + } + + protected function send_access_control_headers() { + $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']); + $this->header('Access-Control-Allow-Credentials: ' + .($this->options['access_control_allow_credentials'] ? 'true' : 'false')); + $this->header('Access-Control-Allow-Methods: ' + .implode(', ', $this->options['access_control_allow_methods'])); + $this->header('Access-Control-Allow-Headers: ' + .implode(', ', $this->options['access_control_allow_headers'])); + } + + public function head() { + $this->header('Pragma: no-cache'); + $this->header('Cache-Control: no-store, no-cache, must-revalidate'); + $this->header('Content-Disposition: inline; filename="files.json"'); + // Prevent Internet Explorer from MIME-sniffing the content-type: + $this->header('X-Content-Type-Options: nosniff'); + if ($this->options['access_control_allow_origin']) { + $this->send_access_control_headers(); + } + $this->send_content_type_header(); + } + + public function get($print_response = true) { + if ($print_response && isset($_GET['download'])) { + return $this->download(); + } + $file_name = $this->get_file_name_param(); + if ($file_name) { + $response = array( + $this->get_singular_param_name() => $this->get_file_object($file_name) + ); + } else { + $response = array( + $this->options['param_name'] => $this->get_file_objects() + ); + } + return $this->generate_response($response, $print_response); + } + + public function post($print_response = true) { + if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { + return $this->delete($print_response); + } + $upload = isset($_FILES[$this->options['param_name']]) ? + $_FILES[$this->options['param_name']] : null; + // Parse the Content-Disposition header, if available: + $file_name = $this->get_server_var('HTTP_CONTENT_DISPOSITION') ? + rawurldecode(preg_replace( + '/(^[^"]+")|("$)/', + '', + $this->get_server_var('HTTP_CONTENT_DISPOSITION') + )) : null; + // Parse the Content-Range header, which has the following form: + // Content-Range: bytes 0-524287/2000000 + $content_range = $this->get_server_var('HTTP_CONTENT_RANGE') ? + preg_split('/[^0-9]+/', $this->get_server_var('HTTP_CONTENT_RANGE')) : null; + $size = $content_range ? $content_range[3] : null; + $files = array(); + if ($upload && is_array($upload['tmp_name'])) { + // param_name is an array identifier like "files[]", + // $_FILES is a multi-dimensional array: + foreach ($upload['tmp_name'] as $index => $value) { + $files[] = $this->handle_file_upload( + $upload['tmp_name'][$index], + $file_name ? $file_name : $upload['name'][$index], + $size ? $size : $upload['size'][$index], + $upload['type'][$index], + $upload['error'][$index], + $index, + $content_range + ); + } + } else { + // param_name is a single object identifier like "file", + // $_FILES is a one-dimensional array: + $files[] = $this->handle_file_upload( + isset($upload['tmp_name']) ? $upload['tmp_name'] : null, + $file_name ? $file_name : (isset($upload['name']) ? + $upload['name'] : null), + $size ? $size : (isset($upload['size']) ? + $upload['size'] : $this->get_server_var('CONTENT_LENGTH')), + isset($upload['type']) ? + $upload['type'] : $this->get_server_var('CONTENT_TYPE'), + isset($upload['error']) ? $upload['error'] : null, + null, + $content_range + ); + } + return $this->generate_response( + array($this->options['param_name'] => $files), + $print_response + ); + } + + public function delete($print_response = true) { + $file_names = $this->get_file_names_params(); + if (empty($file_names)) { + $file_names = array($this->get_file_name_param()); + } + $response = array(); + foreach($file_names as $file_name) { + $file_path = $this->get_upload_path($file_name); + $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); + if ($success) { + foreach($this->options['image_versions'] as $version => $options) { + if (!empty($version)) { + $file = $this->get_upload_path($file_name, $version); + if (is_file($file)) { + unlink($file); + } + } + } + } + $response[$file_name] = $success; + } + return $this->generate_response($response, $print_response); + } + +} diff --git a/web/upload/files/.gitignore b/web/upload/files/.gitignore new file mode 100644 index 00000000..e24a60fa --- /dev/null +++ b/web/upload/files/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!.htaccess diff --git a/web/upload/files/.htaccess b/web/upload/files/.htaccess new file mode 100644 index 00000000..56689f0b --- /dev/null +++ b/web/upload/files/.htaccess @@ -0,0 +1,18 @@ +# The following directives force the content-type application/octet-stream +# and force browsers to display a download dialog for non-image files. +# This prevents the execution of script files in the context of the website: +ForceType application/octet-stream +Header set Content-Disposition attachment + + ForceType none + Header unset Content-Disposition + + +# The following directive prevents browsers from MIME-sniffing the content-type. +# This is an important complement to the ForceType directive above: +Header set X-Content-Type-Options nosniff + +# Uncomment the following lines to prevent unauthorized download of files: +#AuthName "Authorization required" +#AuthType Basic +#require valid-user diff --git a/web/upload/index.php b/web/upload/index.php new file mode 100644 index 00000000..3ae1295e --- /dev/null +++ b/web/upload/index.php @@ -0,0 +1,15 @@ + + + + + + + fotorama + + + + + +
+ +
+ + diff --git a/web/view/file/index_new.php b/web/view/file/index_new.php new file mode 100644 index 00000000..ee2349cf --- /dev/null +++ b/web/view/file/index_new.php @@ -0,0 +1,31 @@ + + + + + + + fotorama + + + + + +
+ +
+ + diff --git a/web/view/file/index_old.php b/web/view/file/index_old.php new file mode 100644 index 00000000..6fa36971 --- /dev/null +++ b/web/view/file/index_old.php @@ -0,0 +1,86 @@ + + + + + + iviewer + + + + + + + + + +

iviewer

+ +
+ + + + - + fit + orig + update + +
+
+ + From aaa841964e77034ad7de2a94ccbd2108538812e1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 02:29:08 +0300 Subject: [PATCH 073/271] shortened email translation --- web/inc/i18n/es.php | 2 +- web/inc/i18n/fi.php | 2 +- web/inc/i18n/nl.php | 2 +- web/inc/i18n/ru.php | 2 +- web/inc/i18n/ua.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 1991029a..819d38bf 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -242,7 +242,7 @@ $LANG['es'] = array( 'Owner' => 'Dueño', 'Username' => 'Nombre de Usuario', 'Password' => 'Contraseña', - 'Email' => 'Correo de Contacto', + 'Email' => 'Email', 'Package' => 'Plan', 'Language' => 'Lenguaje', 'First Name' => 'Primer Nombre', diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 155214ff..e1d902a3 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -246,7 +246,7 @@ $LANG['fi'] = array( 'Owner' => 'Omistaja', 'Username' => 'Käyttäjä', 'Password' => 'Salasana', - 'Email' => 'Sähköposti', + 'Email' => 'Email', 'Package' => 'Paketti', 'Language' => 'Kieli', 'First Name' => 'Etunimi', diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 903e3984..fc83baf9 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -243,7 +243,7 @@ $LANG['nl'] = array( 'Owner' => 'Eigenaar', 'Username' => 'Gebruikersnaam', 'Password' => 'Wachtwoord', - 'Email' => 'E-mailadres', + 'Email' => 'Email', 'Package' => 'Pakket', 'Language' => 'Taal', 'First Name' => 'Voornaam', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index acfa9aab..92516ec1 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -244,7 +244,7 @@ $LANG['ru'] = array( 'Owner' => 'Владелец', 'Username' => 'Аккаунт', 'Password' => 'Пароль', - 'Email' => 'Электронная почта', + 'Email' => 'E-mail', 'Package' => 'Пакет', 'Language' => 'Язык', 'First Name' => 'Имя', diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 59455135..3c3e6736 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -184,7 +184,7 @@ $LANG['ua'] = array( 'TTL' => 'TTL', 'Expire' => 'Спливає', 'Records' => 'Записи', - 'Catchall email' => 'Пастка пошти', + 'Catchall email' => 'E-mail', 'AntiVirus Support' => 'Підтримка антивірусу', 'AntiSpam Support' => 'Підтримка антиспаму', 'DKIM Support' => 'Підтримка DKIM', @@ -244,7 +244,7 @@ $LANG['ua'] = array( 'Owner' => 'Власник', 'Username' => 'Акаунт', 'Password' => 'Пароль', - 'Email' => 'Поштова скринька', + 'Email' => 'E-mail', 'Package' => 'Пакет', 'Language' => 'Мова', 'First Name' => 'Ім\'я', From 7281a4b5bbf347579d8c58299bc083323843ec6c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 19:48:34 +0300 Subject: [PATCH 074/271] unlimited quota support --- bin/v-add-mail-account | 14 ++++++++++++-- bin/v-change-mail-account-quota | 12 +++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 892fe9f7..814b5585 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -16,7 +16,7 @@ domain=$(echo $domain | tr '[:upper:]' '[:lower:]') domain_idn=$(idn -t --quiet -a "$domain") account=$(echo $3 | tr '[:upper:]' '[:lower:]') password=$4 -quota=${5-0} +quota=${5-unlimited} # Includes source $VESTA/func/main.sh @@ -33,7 +33,10 @@ EVENT="$DATE $TIME $SCRIPT $A1 $A2 $A3 $A4 $A5 $A6 $A7 $A8 $A9" #----------------------------------------------------------# check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD [QUOTA]' -validate_format 'user' 'domain' 'account' 'quota' +validate_format 'user' 'domain' 'account' +if [ "$quota" != 'unlimited' ]; then + validate_format 'quota' +fi is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -54,6 +57,9 @@ md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)" # Adding account info into password file if [[ "$MAIL_SYSTEM" =~ exim ]]; then + if [ "$quota" = 'unlimited' ]; then + quota='0' + fi str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota" echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd fi @@ -63,6 +69,10 @@ fi # Vesta # #----------------------------------------------------------# +if [[ "$quota" -eq '0' ]]; then + quota='unlimited' +fi + str="ACCOUNT='$account' ALIAS='' QUOTA='$quota' AUTOREPLY='no' FWD=''" str="$str FWD_ONLY='' MD5='$md5' U_DISK='0' SUSPENDED='no' TIME='$TIME'" str="$str DATE='$DATE'" diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index 84a65c26..2c9d3924 100755 --- a/bin/v-change-mail-account-quota +++ b/bin/v-change-mail-account-quota @@ -28,7 +28,10 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# check_args '4' "$#" 'USER DOMAIN ACCOUNT QUOTA' -validate_format 'user' 'domain' 'account' 'quota' +validate_format 'user' 'domain' 'account' +if [ "$quota" != 'unlimited' ]; then + validate_format 'quota' +fi is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" @@ -44,6 +47,9 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account" md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5') if [[ "$MAIL_SYSTEM" =~ exim ]]; then + if [ "$quota" = 'unlimited' ]; then + quota=0 + fi sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota" echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd @@ -54,6 +60,10 @@ fi # Vesta # #----------------------------------------------------------# +if [[ "$quota" -eq 0 ]]; then + quota='unlimited' +fi + # Update quota update_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA' "$quota" From fe5ec0428efcc22ed59d9b835475ac304214f161 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 19:49:42 +0300 Subject: [PATCH 075/271] fix for lang switcher --- web/login/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/login/index.php b/web/login/index.php index 52d49251..332f8ee6 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -57,13 +57,13 @@ if (isset($_POST['user']) && isset($_POST['password'])) { exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); $data = json_decode(implode('', $output), true); + // Define session user + $_SESSION['user'] = key($data); + $v_user = $_SESSION['user']; + // Define language if (!empty($data[$v_user]['LANGUAGE'])) $_SESSION['language'] = $data[$v_user]['LANGUAGE']; - // Define session user - reset($data); - $_SESSION['user'] = key($data); - // Redirect request to control panel interface if (!empty($_SESSION['request_uri'])) { header("Location: ".$_SESSION['request_uri']); From b729d58eea2e4339232b8d2056f0d07e91cefd7c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 19:50:02 +0300 Subject: [PATCH 076/271] missing quote --- web/inc/i18n/tr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 462675e3..14916410 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -56,7 +56,7 @@ $LANG['tr'] = array( 'toggle all' => 'hepsini seç', 'apply to selected' => 'seçimi uygula', 'rebuild' => 'yeniden oluştur', - 'rebuild web' => 'web\'i yeniden oluştur, + 'rebuild web' => 'web\'i yeniden oluştur', 'rebuild dns' => 'dns\'i yeniden oluştur', 'rebuild mail' => 'mail\'i yeniden oluştur', 'rebuild db' => 'db\'yi yeniden oluştur', From f11c778f13ba20f8a2ba5afd051968f19243f094 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 19:50:14 +0300 Subject: [PATCH 077/271] DNS Template --- web/inc/i18n/ru.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 92516ec1..835f39b7 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -156,7 +156,7 @@ $LANG['ru'] = array( 'Web Template' => 'Шаблон Web', 'Backend Template' => 'Шаблон Backend', 'Proxy Template' => 'Шаблон Proxy', - 'DNS Template' => 'DNS Template', + 'DNS Template' => 'Шаблон DNS', 'Web Domains' => 'Веб домены', 'SSL Domains' => 'SSL домены', 'Web Aliases' => 'Веб алиасы', From 60f9f276b82d5f4af2d1f528e3bd94b9afb400c0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 May 2015 19:51:24 +0300 Subject: [PATCH 078/271] UI improvements --- web/css/styles.min.css | 14 +++++++- web/edit/db/index.php | 6 ++-- web/edit/mail/index.php | 6 ++-- web/edit/user/index.php | 6 ++-- web/edit/web/index.php | 46 +++++++++++++------------- web/inc/main.php | 41 +++++++++++++++++++++++ web/list/updates/index.php | 2 +- web/templates/admin/add_package.html | 33 ++++++++++++++++-- web/templates/admin/add_web.html | 2 +- web/templates/admin/edit_cron.html | 4 +-- web/templates/admin/edit_db.html | 2 +- web/templates/admin/edit_dns.html | 4 +-- web/templates/admin/edit_dns_rec.html | 2 +- web/templates/admin/edit_firewall.html | 2 +- web/templates/admin/edit_ip.html | 2 +- web/templates/admin/edit_mail.html | 2 +- web/templates/admin/edit_mail_acc.html | 2 +- web/templates/admin/edit_package.html | 33 +++++++++++++++--- web/templates/admin/edit_user.html | 2 +- web/templates/admin/edit_web.html | 36 +++++++++++++++++--- web/templates/admin/list_backup.html | 2 +- web/templates/admin/list_cron.html | 2 +- web/templates/admin/list_db.html | 4 +-- web/templates/admin/list_dns.html | 2 +- web/templates/admin/list_dns_rec.html | 2 +- web/templates/admin/list_firewall.html | 2 +- web/templates/admin/list_ip.html | 2 +- web/templates/admin/list_mail.html | 4 +-- web/templates/admin/list_mail_acc.html | 4 +-- web/templates/admin/list_packages.html | 6 ++-- web/templates/admin/list_search.html | 2 +- web/templates/admin/list_services.html | 2 +- web/templates/admin/list_stats.html | 12 +++---- web/templates/admin/list_user.html | 16 ++++----- web/templates/admin/list_web.html | 6 ++-- web/templates/user/edit_dns.html | 2 +- web/templates/user/edit_user.html | 2 +- web/templates/user/edit_web.html | 6 ++-- web/templates/user/list_cron.html | 2 +- web/templates/user/list_db.html | 4 +-- web/templates/user/list_dns.html | 2 +- web/templates/user/list_dns_rec.html | 2 +- web/templates/user/list_mail.html | 4 +-- web/templates/user/list_mail_acc.html | 4 +-- web/templates/user/list_search.html | 2 +- web/templates/user/list_stats.html | 12 +++---- web/templates/user/list_user.html | 14 ++++---- web/templates/user/list_web.html | 6 ++-- web/templates/user/panel.html | 4 +-- 49 files changed, 256 insertions(+), 125 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index d8be836c..99787b3b 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1080,6 +1080,10 @@ div.l-content > div.l-separator:nth-of-type(4) { display: inline-block; border-style: solid none solid solid; } +.lang-ru .l-select { + width: 199px; +} + .l-select:after { pointer-events: none; background-image: url("/images/sprite.png"); @@ -1104,6 +1108,9 @@ div.l-content > div.l-separator:nth-of-type(4) { border: 0; outline: 0; } +.lang-ru .l-select select { + min-width: 215px; +} .l-select select option { padding: 7px; } @@ -1342,6 +1349,7 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__stat-col--right { float: left; + max-width: 152px; } .l-unit-toolbar__col--left { @@ -1988,7 +1996,7 @@ div.l-content > div.l-separator:nth-of-type(4) { height: 16px; overflow: hidden; padding-top: 6px; - width: 600px; + max-width: 600px; } .vst-ok a { @@ -2362,6 +2370,10 @@ td.hint { vertical-align: top; width: 500px; } + +.login a.error { + color: #BE5ABF; +} .vestacp { color: #505050; font-size: 10px; diff --git a/web/edit/db/index.php b/web/edit/db/index.php index f5f0e536..59fb84f8 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -35,7 +35,7 @@ unset($output); $v_username = $user; $v_database = $_GET['database']; $v_dbuser = $data[$v_database]['DBUSER']; -$v_password = "••••••••"; +$v_password = ""; $v_host = $data[$v_database]['HOST']; $v_type = $data[$v_database]['TYPE']; $v_charset = $data[$v_database]['CHARSET']; @@ -63,7 +63,7 @@ if (!empty($_POST['save'])) { } // Change database password - if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { + if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) { $v_password = tempnam("/tmp","vst"); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); @@ -72,7 +72,7 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); unlink($v_password); - $v_password = "••••••••"; + $v_password = escapeshellarg($_POST['v_password']); } // Set success message diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index 457a897f..e9873315 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -60,7 +60,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $v_username = $user; $v_domain = $_GET['domain']; $v_account = $_GET['account']; - $v_password = "••••••••"; + $v_password = ""; $v_aliases = str_replace(',', "\n", $data[$v_account]['ALIAS']); $valiases = explode(",", $data[$v_account]['ALIAS']); $v_fwd = str_replace(',', "\n", $data[$v_account]['FWD']); @@ -177,7 +177,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $v_account = escapeshellarg($_POST['v_account']); // Change password - if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { + if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) { $v_password = tempnam("/tmp","vst"); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); @@ -186,7 +186,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco check_return_code($return_var,$output); unset($output); unlink($v_password); - $v_password = "••••••••"; + $v_password = escapeshellarg($_POST['v_password']);; } // Change quota diff --git a/web/edit/user/index.php b/web/edit/user/index.php index e052301e..f6e07e95 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -32,7 +32,7 @@ $data = json_decode(implode('', $output), true); unset($output); // Parse user -$v_password = "••••••••"; +$v_password = ""; $v_email = $data[$v_username]['CONTACT']; $v_package = $data[$v_username]['PACKAGE']; $v_language = $data[$v_username]['LANGUAGE']; @@ -75,7 +75,7 @@ unset($output); if (!empty($_POST['save'])) { // Change password - if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) { + if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) { $v_password = tempnam("/tmp","vst"); $fp = fopen($v_password, "w"); fwrite($fp, $_POST['v_password']."\n"); @@ -84,7 +84,7 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); unlink($v_password); - $v_password = "••••••••"; + $v_password = escapeshellarg($_POST['v_password']); } // Change package (admin only) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 5c1dcb41..6a115193 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -51,9 +51,10 @@ $v_proxy_template = $data[$v_domain]['PROXY']; $v_proxy_ext = str_replace(',', ', ', $data[$v_domain]['PROXY_EXT']); $v_stats = $data[$v_domain]['STATS']; $v_stats_user = $data[$v_domain]['STATS_USER']; -if (!empty($v_stats_user)) $v_stats_password = "••••••••"; +if (!empty($v_stats_user)) $v_stats_password = ""; $v_ftp_user = $data[$v_domain]['FTP_USER']; -if (!empty($v_ftp_user)) $v_ftp_password = "••••••••"; +$v_ftp_path = $data[$v_domain]['FTP_PATH']; +if (!empty($v_ftp_user)) $v_ftp_password = ""; $v_ftp_user_prepath = $data[$v_domain]['DOCUMENT_ROOT']; $v_ftp_user_prepath = str_replace('/public_html', '', $v_ftp_user_prepath, $occurance = 1); $v_ftp_email = $panel[$user]['CONTACT']; @@ -430,7 +431,6 @@ if (!empty($_POST['save'])) { // Change web stats user or password if ((empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { if (empty($_POST['v_stats_user'])) $errors[] = __('stats username'); - if (empty($_POST['v_stats_password'])) $errors[] = __('stats password'); if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { @@ -450,14 +450,13 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); unlink($v_stats_password); - $v_stats_password = "••••••••"; + $v_stats_password = escapeshellarg($_POST['v_stats_password']); } } // Add web stats authorization if ((!empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { if (empty($_POST['v_stats_user'])) $errors[] = __('stats user'); - if (empty($_POST['v_stats_password'])) $errors[] = __('stats password'); if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { @@ -468,7 +467,7 @@ if (!empty($_POST['save'])) { } $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } - if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) { + if (($v_stats_user != $_POST['v_stats_user']) || (!empty($_POST['v_stats_password'])) && (empty($_SESSION['error_msg']))) { $v_stats_user = escapeshellarg($_POST['v_stats_user']); $v_stats_password = tempnam("/tmp","vst"); $fp = fopen($v_stats_password, "w"); @@ -478,22 +477,22 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); unlink($v_stats_password); - $v_stats_password = "••••••••"; + $v_stats_password = escapeshellarg($_POST['v_stats_password']); } } - // Change ftp accounts + // Update ftp account if (!empty($_POST['v_ftp_user'])) { $v_ftp_users_updated = array(); foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) { - if (empty($v_ftp_user_data['v_ftp_user']) && empty($v_ftp_user_data['v_ftp_password'])) { + if (empty($v_ftp_user_data['v_ftp_user'])) { continue; } + $v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']); if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) { if ((!empty($v_ftp_user_data['v_ftp_email'])) && (!filter_var($v_ftp_user_data['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = __('Please enter valid email address.'); if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user'; - if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password'; if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { @@ -505,6 +504,7 @@ if (!empty($_POST['save'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } + // Add ftp account $v_ftp_username = $v_ftp_user_data['v_ftp_user']; $v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user']; $v_ftp_user = escapeshellarg($v_ftp_username); @@ -531,7 +531,7 @@ if (!empty($_POST['save'])) { } if ($return_var == 0) { - $v_ftp_password = "••••••••"; + $v_ftp_password = ""; $v_ftp_user_data['is_new'] = 0; } else { @@ -550,7 +550,7 @@ if (!empty($_POST['save'])) { continue; } - + // Delete FTP account if ($v_ftp_user_data['delete'] == 1) { $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var); @@ -561,9 +561,7 @@ if (!empty($_POST['save'])) { } if (!empty($_POST['v_ftp'])) { - // Change FTP Account if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user'); - if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password'); if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { @@ -575,19 +573,23 @@ if (!empty($_POST['save'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } + // Change FTP account path $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); $v_ftp_username = escapeshellarg($v_ftp_username); - $v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password'])); - $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); - exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); - if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) { + //if (!empty($v_ftp_user_data['v_ftp_path'])) { + $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); + exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); + //} + + // Change FTP account password + if (!empty($v_ftp_user_data['v_ftp_password'])) { $v_ftp_password = tempnam("/tmp","vst"); $fp = fopen($v_ftp_password, "w"); fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_password'], $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var); unlink($v_ftp_password); - $v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password'])); + $to = $v_ftp_user_data['v_ftp_email']; $subject = __("FTP login credentials"); $hostname = exec('hostname'); @@ -599,12 +601,10 @@ if (!empty($_POST['save'])) { check_return_code($return_var, $output); unset($output); - $v_ftp_password = "••••••••"; - $v_ftp_users_updated[] = array( 'is_new' => 0, 'v_ftp_user' => $v_ftp_username, - 'v_ftp_password' => $v_ftp_password, + 'v_ftp_password' => $v_ftp_user_data['v_ftp_password'], 'v_ftp_path' => $v_ftp_user_data['v_ftp_path'], 'v_ftp_email' => $v_ftp_user_data['v_ftp_email'], 'v_ftp_pre_path' => $v_ftp_user_prepath diff --git a/web/inc/main.php b/web/inc/main.php index 13f12fd9..c4ac59e1 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -181,6 +181,47 @@ function humanize_usage($usage) { return $usage; } +function humanize_usage_size($usage) { + if ( $usage > 1024 ) { + $usage = $usage / 1024; + if ( $usage > 1024 ) { + $usage = $usage / 1024 ; + if ( $usage > 1024 ) { + $usage = $usage / 1024 ; + $usage = number_format($usage, 2); + } else { + $usage = number_format($usage, 2); + } + } else { + $usage = number_format($usage, 2); + } + } + + return $usage; +} + +function humanize_usage_measure($usage) { + $measure = 'kb'; + if ( $usage > 1024 ) { + $usage = $usage / 1024; + if ( $usage > 1024 ) { + $usage = $usage / 1024 ; + if ( $usage > 1024 ) { + $measure = __('pb'); + } else { + $measure = __('tb'); + } + } else { + $measure = __('gb'); + } + } else { + $measure = __('mb'); + } + + return $measure; +} + + function get_percentage($used,$total) { if (!isset($total)) $total = 0; if (!isset($used)) $used = 0; diff --git a/web/list/updates/index.php b/web/list/updates/index.php index f53f7682..394b50e2 100644 --- a/web/list/updates/index.php +++ b/web/list/updates/index.php @@ -1,6 +1,6 @@ - + " . strtoupper($_SESSION['WEB_SYSTEM']) . "" ;?> @@ -73,10 +73,37 @@ + + + + " . strtoupper($_SESSION['WEB_BACKEND']). "" ;?> + + + + + + + + + - + " .strtoupper($_SESSION['PROXY_SYSTEM']) . "" ;?> + @@ -100,7 +127,7 @@ - + " .strtoupper($_SESSION['DNS_SYSTEM']) . "" ;?> diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index edb878b8..95ebb6cd 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -373,7 +373,7 @@ diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html index aaec18cf..6c559acf 100644 --- a/web/templates/admin/edit_cron.html +++ b/web/templates/admin/edit_cron.html @@ -29,7 +29,7 @@ $back = "location.href='".$back."'"; } ?> - +
- # () + # ()
@@ -41,7 +41,7 @@ - +
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html index db748391..ed0c38f8 100644 --- a/web/templates/admin/edit_db.html +++ b/web/templates/admin/edit_db.html @@ -29,7 +29,7 @@ $back = "location.href='".$back."'"; } ?> - +
-

'. $_SESSION['error_msg'] .'

+

'. htmlentities($_SESSION['error_msg']) .'

'."\n"; unset($_SESSION['error_msg']); diff --git a/web/js/app.js b/web/js/app.js index 1099485c..f75ee780 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -710,14 +710,15 @@ var App = { Core: {}, // CONSTANT VALUES Constants: { - UNLIM_VALUE: 'unlimited', - UNLIM_TRANSLATED_VALUE: 'unlimited' + UNLIM_VALUE: 'unlimited', // overritten in i18n.js.php + UNLIM_TRANSLATED_VALUE: 'unlimited' // overritten in i18n.js.php }, // Actions. More widly used funcs Actions: { DB: {}, WEB: {}, - PACKAGE: {} + PACKAGE: {}, + MAIL_ACC:{} }, // Utilities Helpers: {}, @@ -732,7 +733,8 @@ var App = { Listeners: { DB: {}, WEB: {}, - PACKAGE: {} + PACKAGE: {}, + MAIL_ACC:{} }, View:{ HTML: { diff --git a/web/js/cheef-editor/jquery/jquery-1.8.3.min.js b/web/js/cheef-editor/jquery/jquery-1.8.3.min.js new file mode 100644 index 00000000..38837795 --- /dev/null +++ b/web/js/cheef-editor/jquery/jquery-1.8.3.min.js @@ -0,0 +1,2 @@ +/*! jQuery v1.8.3 jquery.com | jquery.org/license */ +(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t
a",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="
t
",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="
",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="

",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X
","
"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("
").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window); \ No newline at end of file diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php index 782230a9..2ac93240 100644 --- a/web/js/i18n.js.php +++ b/web/js/i18n.js.php @@ -1 +1,48 @@ -App.i18n.ARE_YOU_SURE = ''; +1) { + $args[0] = $text; + return call_user_func_array("sprintf",$args); + } else { + return $text; + } + } +} + +if (!function_exists('__')) { + function __() { + $args = func_get_args(); + array_unshift($args,$_SESSION['language']); + return call_user_func_array("_translate",$args); + } +} +?> + +App.i18n.ARE_YOU_SURE = ''; +App.Constants.UNLIM_VALUE = ''; diff --git a/web/js/jquery.arcticmodal.js b/web/js/jquery.arcticmodal.js new file mode 100644 index 00000000..a3ad1ad9 --- /dev/null +++ b/web/js/jquery.arcticmodal.js @@ -0,0 +1,429 @@ +/* + + arcticModal — jQuery plugin + Version: 0.3 + Author: Sergey Predvoditelev (sergey.predvoditelev@gmail.com) + Company: Arctic Laboratory (http://arcticlab.ru/) + + Docs & Examples: http://arcticlab.ru/arcticmodal/ + + */ +(function($) { + + + var default_options = { + + type: 'html', // ajax или html + content: '', + url: '', + ajax: {}, + ajax_request: null, + + closeOnEsc: true, + closeOnOverlayClick: true, + + clone: false, + + overlay: { + block: undefined, + tpl: '
', + css: { + backgroundColor: '#000', + opacity: .6 + } + }, + + container: { + block: undefined, + tpl: '
' + }, + + wrap: undefined, + body: undefined, + + errors: { + tpl: '
', + autoclose_delay: 2000, + ajax_unsuccessful_load: 'Error' + }, + + openEffect: { + type: 'fade', + speed: 400 + }, + closeEffect: { + type: 'fade', + speed: 400 + }, + + beforeOpen: $.noop, + afterOpen: $.noop, + beforeClose: $.noop, + afterClose: $.noop, + afterLoading: $.noop, + afterLoadingOnShow: $.noop, + errorLoading: $.noop + + }; + + + var modalID = 0; + var modals = $([]); + + + var utils = { + + + // Определяет произошло ли событие e вне блока block + isEventOut: function(blocks, e) { + var r = true; + $(blocks).each(function() { + if ($(e.target).get(0)==$(this).get(0)) r = false; + if ($(e.target).closest('HTML', $(this).get(0)).length==0) r = false; + }); + return r; + } + + + }; + + + var modal = { + + + // Возвращает элемент, которым был вызван плагин + getParentEl: function(el) { + var r = $(el); + if (r.data('arcticmodal')) return r; + r = $(el).closest('.arcticmodal-container').data('arcticmodalParentEl'); + if (r) return r; + return false; + }, + + + // Переход + transition: function(el, action, options, callback) { + callback = callback==undefined ? $.noop : callback; + switch (options.type) { + case 'fade': + action=='show' ? el.fadeIn(options.speed, callback) : el.fadeOut(options.speed, callback); + break; + case 'none': + action=='show' ? el.show() : el.hide(); + callback(); + break; + } + }, + + + // Подготвка содержимого окна + prepare_body: function(D, $this) { + + // Обработчик закрытия + $('.arcticmodal-close', D.body).unbind('click.arcticmodal').bind('click.arcticmodal', function() { + $this.arcticmodal('close'); + return false; + }); + + }, + + + // Инициализация элемента + init_el: function($this, options) { + var D = $this.data('arcticmodal'); + if (D) return; + + D = options; + modalID++; + D.modalID = modalID; + + // Overlay + D.overlay.block = $(D.overlay.tpl); + D.overlay.block.css(D.overlay.css); + + // Container + D.container.block = $(D.container.tpl); + + // BODY + D.body = $('.arcticmodal-container_i2', D.container.block); + if (options.clone) { + D.body.html($this.clone(true)); + } else { + $this.before(' \ No newline at end of file +
+ diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 7f939a42..cb35a9ac 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -4,7 +4,7 @@ → ".$_SESSION['error_msg'].""; + echo " → ".htmlentities($_SESSION['error_msg']).""; } else { if (!empty($_SESSION['ok_msg'])) { echo " → ".$_SESSION['ok_msg'].""; diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html new file mode 100644 index 00000000..e58166d0 --- /dev/null +++ b/web/templates/admin/edit_server.html @@ -0,0 +1,539 @@ +
+
+
+ + → ".htmlentities($_SESSION['error_msg']).""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+ +
+ +
+ +
+ + +
+ + +
+ + + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+
+ + + +
+ + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ + + + + +

+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +


+
+
+ + + +
+ + + + +
+ +


+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ +

+
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ + +
+ + +
+ + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+
+ + + + + + + +
+ + + +
+
+ + \ No newline at end of file diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 76d86bf1..7a293393 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -4,7 +4,7 @@ → ".$_SESSION['error_msg'].""; + echo " → ".htmlentities($_SESSION['error_msg']).""; } else { if (!empty($_SESSION['ok_msg'])) { echo " → ".$_SESSION['ok_msg'].""; diff --git a/web/templates/admin/generate_ssl.html b/web/templates/admin/generate_ssl.html index dc1cb4de..8a8ce763 100644 --- a/web/templates/admin/generate_ssl.html +++ b/web/templates/admin/generate_ssl.html @@ -4,7 +4,7 @@ → ".$_SESSION['error_msg'].""; + echo " → ".htmlentities($_SESSION['error_msg']).""; } else { if (!empty($_SESSION['ok_msg'])) { echo " → ".$_SESSION['ok_msg'].""; diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index fbcf550d..50185c99 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -4,6 +4,9 @@
+ -
+ + - -
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index 99a4337a..a4ce01b6 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -4,6 +4,16 @@
+ -
+   + '.__('turn off notifications').''; + } else { + echo ''.__('turn on notifications').''; + } + ?> + -   - '.__('turn off notifications').''; - } else { - echo ''.__('turn on notifications').''; - } - ?> -
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index 0f1d06f8..c8bb3839 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -5,7 +5,36 @@
- '; + } + if($pgsql){ + echo ''; + } + ?> + '; } if ($data[$key]['TYPE'] == 'pgsql'){ $pgsql = 1; $db_admin_link = "http://".$http_host."/phppgadmin/"; - if (!empty($_SESSION['DB_PGA_URL'])){ + if (!empty($_SESSION['DB_PGA_URL'])) $db_admin_link = $_SESSION['DB_PGA_URL']; - } - echo ''; } } + if($mysql){ + echo ''; + } + if($pgsql){ + echo ''; + } + ?>
phpMyAdminphpPgAdmin
-
:
+
:
@@ -148,7 +176,7 @@
-
:
+
:
@@ -159,7 +187,7 @@
-
:
+
:
@@ -167,7 +195,7 @@
-
:
+
:
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index 31a0f3cc..03d0b239 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -107,7 +107,7 @@
- ⇢ ".$data[$key]['SRC']."";?> + ⇢ ".$data[$key]['SRC']."    "; if($data[$key]['RECORDS']) echo '/ '.$data[$key]['RECORDS'].'';?>
@@ -143,7 +143,7 @@
-
:
+
:
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html index 9d1397eb..454583e4 100644 --- a/web/templates/admin/list_firewall.html +++ b/web/templates/admin/list_firewall.html @@ -5,7 +5,12 @@
- + -
+ '.__('list fail2ban').''; + } ?> + - '.__('list fail2ban').']'; - } ?> -
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index 4390ace9..76a2f6e4 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -5,7 +5,15 @@
- + @@ -433,7 +604,7 @@ From 6d9c53612daf39d3900daf7f201df669cc73d0b1 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 17:40:52 +0300 Subject: [PATCH 090/271] nulled error outout --- web/inc/mail-wrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/mail-wrapper.php b/web/inc/mail-wrapper.php index ae2abb49..bf1c3d9e 100755 --- a/web/inc/mail-wrapper.php +++ b/web/inc/mail-wrapper.php @@ -1,6 +1,6 @@ #!/usr/local/vesta/php/bin/php Date: Wed, 3 Jun 2015 17:41:43 +0300 Subject: [PATCH 091/271] Date translation --- web/inc/i18n/ru.php | 14 ++++++++++++++ web/inc/main.php | 5 +++++ web/templates/admin/edit_cron.html | 4 ++-- web/templates/admin/edit_db.html | 4 ++-- web/templates/admin/edit_dns.html | 4 ++-- web/templates/admin/edit_dns_rec.html | 4 ++-- web/templates/admin/edit_firewall.html | 4 ++-- web/templates/admin/edit_ip.html | 4 ++-- web/templates/admin/edit_mail.html | 4 ++-- web/templates/admin/edit_mail_acc.html | 4 ++-- web/templates/admin/edit_package.html | 4 ++-- web/templates/admin/edit_user.html | 4 ++-- web/templates/admin/edit_web.html | 4 ++-- web/templates/admin/list_backup.html | 2 +- web/templates/admin/list_cron.html | 2 +- web/templates/admin/list_db.html | 2 +- web/templates/admin/list_dns.html | 4 ++-- web/templates/admin/list_ip.html | 2 +- web/templates/admin/list_log.html | 2 +- web/templates/admin/list_mail.html | 2 +- web/templates/admin/list_mail_acc.html | 2 +- web/templates/admin/list_packages.html | 2 +- web/templates/admin/list_rrd.html | 2 +- web/templates/admin/list_search.html | 2 +- web/templates/admin/list_stats.html | 4 ++-- web/templates/admin/list_user.html | 2 +- web/templates/admin/list_web.html | 2 +- web/templates/user/edit_dns.html | 4 ++-- web/templates/user/edit_user.html | 4 ++-- web/templates/user/edit_web.html | 4 ++-- web/templates/user/list_cron.html | 2 +- web/templates/user/list_db.html | 2 +- web/templates/user/list_dns.html | 4 ++-- web/templates/user/list_mail.html | 2 +- web/templates/user/list_mail_acc.html | 2 +- web/templates/user/list_search.html | 2 +- web/templates/user/list_stats.html | 4 ++-- web/templates/user/list_user.html | 2 +- web/templates/user/list_web.html | 2 +- 39 files changed, 74 insertions(+), 55 deletions(-) diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index bac42dd8..2cc2f30d 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -470,4 +470,18 @@ $LANG['ru'] = array( 'RESET_CODE_SENT' => 'Код для восстановления пароля был выслан на ваш электронный адрес.
', 'MAIL_RESET_SUBJECT' => 'Восстановление пароля %s', 'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извинения.\n\n--\nПанель управления Vesta\n", + + 'Jan' => 'Янв', + 'Feb' => 'Фев', + 'Mar' => 'Мар', + 'Apr' => 'Апр', + 'May' => 'Май', + 'Jun' => 'Июн', + 'Jul' => 'Июл', + 'Aug' => 'Авг', + 'Sep' => 'Сен', + 'Oct' => 'Окт', + 'Nov' => 'Ноя', + 'Dec' => 'Дек', + ); diff --git a/web/inc/main.php b/web/inc/main.php index 8df32cd5..c7305a6f 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -134,6 +134,11 @@ function top_panel($user, $TAB) { } } +function translate_date($date){ + $date = strtotime($date); + return strftime("%d  ", $date).__(strftime("%b", $date)).strftime("  %Y", $date); +} + function humanize_time($usage) { if ( $usage > 60 ) { $usage = $usage / 60; diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html index ce3b4952..9fa50faf 100644 --- a/web/templates/admin/edit_cron.html +++ b/web/templates/admin/edit_cron.html @@ -37,8 +37,8 @@
+ + +
- +
+ + + + + + + + + + + + $value) { + $i++; + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $value) { + $i++; + ?> + + + + + + + + + + + + + + + + + + +
- -


+
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +



+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +

+
+ +
+ +



+
- + preview
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html index 679f84d1..1fcbe905 100644 --- a/web/templates/admin/edit_db.html +++ b/web/templates/admin/edit_db.html @@ -58,8 +58,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html index 0ed60a2a..0c20cc94 100644 --- a/web/templates/admin/edit_dns.html +++ b/web/templates/admin/edit_dns.html @@ -38,8 +38,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html index 77188f8d..a901c8b7 100644 --- a/web/templates/admin/edit_dns_rec.html +++ b/web/templates/admin/edit_dns_rec.html @@ -37,8 +37,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_firewall.html b/web/templates/admin/edit_firewall.html index c0323987..3d025188 100644 --- a/web/templates/admin/edit_firewall.html +++ b/web/templates/admin/edit_firewall.html @@ -48,8 +48,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html index dcd9d050..26a88a74 100644 --- a/web/templates/admin/edit_ip.html +++ b/web/templates/admin/edit_ip.html @@ -48,8 +48,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html index 8e3b911f..85d51440 100644 --- a/web/templates/admin/edit_mail.html +++ b/web/templates/admin/edit_mail.html @@ -37,8 +37,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index c2f088c5..7b2507f9 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -58,8 +58,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index cb35a9ac..6377a0b1 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -37,8 +37,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index 27fad589..b382f474 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -49,8 +49,8 @@
-
- +
+
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 7a293393..76655b37 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -71,8 +71,8 @@
-
- +
+
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index 50185c99..13a6e9ed 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -97,7 +97,7 @@
- +
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index a4ce01b6..5ca43c9c 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -114,7 +114,7 @@
- +
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index c8bb3839..030085be 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -139,7 +139,7 @@
- +
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index 03d0b239..259b14bc 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -100,7 +100,7 @@
- +
@@ -145,7 +145,7 @@
:
- +
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html index 6f140623..44af79aa 100644 --- a/web/templates/admin/list_ip.html +++ b/web/templates/admin/list_ip.html @@ -83,7 +83,7 @@
- +
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html index 38acb059..d0673da3 100644 --- a/web/templates/admin/list_log.html +++ b/web/templates/admin/list_log.html @@ -47,7 +47,7 @@
- +
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index 76a2f6e4..94bb2c41 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -121,7 +121,7 @@
- +
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index c739c9de..df25e625 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -118,7 +118,7 @@
- +
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index a5d800c1..4f6fdf5e 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -81,7 +81,7 @@
- +
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html index a4fd0e53..81cf8637 100644 --- a/web/templates/admin/list_rrd.html +++ b/web/templates/admin/list_rrd.html @@ -82,7 +82,7 @@
- +
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html index f9dfb580..08e17044 100644 --- a/web/templates/admin/list_search.html +++ b/web/templates/admin/list_search.html @@ -193,7 +193,7 @@
- +
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index 32462c63..f0ee1d23 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -72,13 +72,13 @@
- +
- +
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index 59b8e8ba..3d849a24 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -140,7 +140,7 @@
- +
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 5d8befa4..dc8f3764 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -158,7 +158,7 @@
- +
diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html index 1a547d99..3466228e 100644 --- a/web/templates/user/edit_dns.html +++ b/web/templates/user/edit_dns.html @@ -37,8 +37,8 @@
-
- +
+
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index 9f9038ac..aff17cab 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -49,8 +49,8 @@
-
- +
+
diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 0fc65baf..484d0c61 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -71,8 +71,8 @@
-
- +
+
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index 7565d80b..6f7fd9dc 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -114,7 +114,7 @@
- +
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html index e5ecd333..1901a2d4 100644 --- a/web/templates/user/list_db.html +++ b/web/templates/user/list_db.html @@ -140,7 +140,7 @@
- +
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index 7d7350d4..e759970e 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -100,7 +100,7 @@
- +
@@ -145,7 +145,7 @@
:
- +
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html index 58e48a97..fc5b037b 100644 --- a/web/templates/user/list_mail.html +++ b/web/templates/user/list_mail.html @@ -121,7 +121,7 @@
- +
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html index 817b2405..cf1b23c5 100644 --- a/web/templates/user/list_mail_acc.html +++ b/web/templates/user/list_mail_acc.html @@ -117,7 +117,7 @@
- +
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html index b60ea695..59495fd8 100644 --- a/web/templates/user/list_search.html +++ b/web/templates/user/list_search.html @@ -193,7 +193,7 @@
- +
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html index eb99dcb0..fe5b92a2 100644 --- a/web/templates/user/list_stats.html +++ b/web/templates/user/list_stats.html @@ -72,13 +72,13 @@
- +
- +
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html index e12c3f0a..5dd9887f 100644 --- a/web/templates/user/list_user.html +++ b/web/templates/user/list_user.html @@ -140,7 +140,7 @@
- +
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index c200f7da..e0fcd246 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -159,7 +159,7 @@
- +
From 9c30e4b8dc74368b2634a4259df329af7f6c465e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 17:42:23 +0300 Subject: [PATCH 092/271] style update --- web/css/styles.min.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index d6c9251d..dbcd86ff 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1297,6 +1297,11 @@ div.l-content > div.l-separator:nth-of-type(4) { .l-unit__name span:first-of-type { margin-left: 39px; } +.l-unit__name b { + font-weight: normal; + font-style: italic; +} + .l-unit__ip { margin-bottom: 34px; font-size: 12px; @@ -2128,6 +2133,18 @@ label { color: #333; } +a.vst-text, +a.vst-text b{ + color: #2c9491; +} +a.vst-text:hover, +a.vst-text:hover b{ + color: #ff6701; +} +a.vst-text:active, +a.vst-text:active b{ + color: #ff6701; +} .vst-textinput { background-color: #fff; From fbb49197bef76f0a9934291cf4b3b4a6c7dac789 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 18:39:42 +0300 Subject: [PATCH 093/271] Removed validation on host user --- bin/v-add-backup-host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index 77eeb082..e46c1d21 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -98,7 +98,7 @@ EOF if [ "$type" != 'local' ];then check_args '4' "$#" "TYPE HOST USERNAME PASSWORD [PATH] [PORT]" - validate_format 'host' 'user' + validate_format 'host' is_password_valid if [ "$type" = 'sftp' ]; then which expect >/dev/null 2>&1 From a5ff23de7478f619dd8d124367bb942af1be0408 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 18:39:54 +0300 Subject: [PATCH 094/271] Restore traffic pipe --- bin/v-restore-user | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/v-restore-user b/bin/v-restore-user index e24713e2..efdb21e2 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -89,7 +89,7 @@ fi disk_usage=$(df $BACKUP |tail -n1 |tr ' ' '\n' |grep % |cut -f 1 -d %) if [ "$disk_usage" -ge "$BACKUP_DISK_LIMIT" ]; then rm -rf $tmpdir - echo "Not enough disk space to run backup" | $send_mail -s "$subj" $email + echo "Not enough disk space to run restore" | $send_mail -s "$subj" $email echo "Error: Not enough disk space" sed -i "/ $user /d" $VESTA/data/queue/backup.pipe log_event "$E_DISK" "$EVENT" @@ -399,15 +399,23 @@ if [ "$web" != 'no' ]; then done + # Add user to traff queue + sed -i "/ $user /d" $VESTA/data/queue/traffic.pipe + echo "$BIN/v-update-web-domains-traff $user" >>\ + $VESTA/data/queue/traffic.pipe + # Restart WEB $BIN/v-restart-web if [ $? -ne 0 ]; then exit $E_RESTART fi - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + # Restart Proxy + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit $E_RESTART + fi fi echo From 3f12b04cfa1fc8ca67f1b601a79c71b819a689de Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 18:40:10 +0300 Subject: [PATCH 095/271] suspend/unsuspend additional ftp accounts --- bin/v-suspend-user | 5 +++++ bin/v-unsuspend-user | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bin/v-suspend-user b/bin/v-suspend-user index adbff01a..bd9ad7f9 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -38,6 +38,11 @@ fi # Adding '!' in front of the password /usr/sbin/usermod --lock $user +# Suspending ftp accounts +for ftp in $(grep ^$user_.* /etc/passwd| cut -f 1 -d : ); do + /usr/sbin/usermod --lock $ftp 2>/dev/null +done + # Suspending web domains if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $BIN/v-suspend-web-domains $user $restart diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 4222d298..df574808 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -37,6 +37,11 @@ fi # Deleting '!' in front of the password /usr/sbin/usermod --unlock $user +# Unsuspending ftp accounts +for ftp in $(grep ^$user_.* /etc/passwd| cut -f 1 -d : ); do + /usr/sbin/usermod --unlock $ftp 2>/dev/null +done + # Unsuspending web domains if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $BIN/v-unsuspend-web-domains $user $restart From d3e05ca9566441b5ed3ffc326522f9ec1f8453ab Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 18:54:46 +0300 Subject: [PATCH 096/271] 0.9.8-13 --- src/deb/vesta/control | 2 +- src/rpm/specs/vesta.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/deb/vesta/control b/src/deb/vesta/control index 32189033..b2cd77a1 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,7 +1,7 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-12 +Version: 0.9.8-13 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index c5f2ea44..a08824f8 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -1,6 +1,6 @@ Name: vesta Version: 0.9.8 -Release: 12 +Release: 14 Summary: Vesta Control Panel Group: System Environment/Base License: GPL @@ -20,7 +20,6 @@ This package contains the packages for Vesta Control Panel api. %setup -q -n %{name}-%{version} %build -gcc -lcrypt src/v-check-user-password.c -o bin/v-check-user-password %install install -d %{buildroot}%{_vestadir} @@ -60,6 +59,12 @@ fi %config(noreplace) %{_vestadir}/web/css/main.css %changelog +* Wed June 03 2015 Serghey Rodin - 0.9.8-13 +- New UI +- PHP-FPM support +- Security improvements +- Dozen bugfixes + * Wed Oct 23 2014 Serghey Rodin - 0.9.8-12 - Firewall service handler for Debian and Ubuntu - Minor i18n fix From 77f0aa6d8a238f5479bf36cf47a52b0f2c46fd5c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 19:19:30 +0300 Subject: [PATCH 097/271] bad date in %changelog --- src/rpm/specs/vesta.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index a08824f8..ad869d82 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -59,7 +59,7 @@ fi %config(noreplace) %{_vestadir}/web/css/main.css %changelog -* Wed June 03 2015 Serghey Rodin - 0.9.8-13 +* Wed Jun 03 2015 Serghey Rodin - 0.9.8-13 - New UI - PHP-FPM support - Security improvements From 26360cad995c5e60b3af57289add823d32dd1e3b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 19:34:17 +0300 Subject: [PATCH 098/271] longer salt --- bin/v-check-user-password | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-check-user-password b/bin/v-check-user-password index f3594fab..af87f77d 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -50,7 +50,7 @@ fi # Parsing user's salt salt=$(grep "^$user:" /etc/shadow |cut -f 3 -d \$) -if [[ -z "$salt" ]] || [[ "${#salt}" -gt 8 ]]; then +if [[ -z "$salt" ]] || [[ "${#salt}" -gt 12 ]]; then echo "Error: password missmatch" echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log exit 9 From 977d937c86f104f03ba987dcc4e29ed11b5c6884 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 3 Jun 2015 19:35:03 +0300 Subject: [PATCH 099/271] new conf --- src/rpm/specs/vesta.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index ad869d82..62c7ec50 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -51,12 +51,15 @@ if [ $1 -ge 2 ]; then fi %files %{_vestadir} -%config(noreplace) %{_vestadir}/web/images/logo.png +%config(noreplace) %{_vestadir}/web/images/sprite.png %config(noreplace) %{_vestadir}/web/images/favicon.ico -%config(noreplace) %{_vestadir}/web/css/csshover3.htc -%config(noreplace) %{_vestadir}/web/css/ie.css +%config(noreplace) %{_vestadir}/web/css/file_manager.css +%config(noreplace) %{_vestadir}/web/css/file_manager_editor.css +%config(noreplace) %{_vestadir}/web/css/jquery.arcticmodal.css %config(noreplace) %{_vestadir}/web/css/jquery-custom-dialogs.css -%config(noreplace) %{_vestadir}/web/css/main.css +%config(noreplace) %{_vestadir}/web/css/jquery.fileupload.css +%config(noreplace) %{_vestadir}/web/css/styles.min.css +%config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog * Wed Jun 03 2015 Serghey Rodin - 0.9.8-13 From 6bbd047e7b80e2336462e50b70fe766ab2e3c30a Mon Sep 17 00:00:00 2001 From: Olexandr Loskutov Date: Wed, 3 Jun 2015 20:04:20 +0300 Subject: [PATCH 100/271] Update ua.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Додавання скорочених назв місяців --- web/inc/i18n/ua.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 1718df8e..abb1f0da 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -470,6 +470,19 @@ $LANG['ua'] = array( 'RESET_CODE_SENT' => 'Код для відновлення паролю успішно відправлено на вашу електронну пошту.
', 'MAIL_RESET_SUBJECT' => 'Відновлення паролю %s', 'PASSWORD_RESET_REQUEST'=>"Щоб відновити пароль, будь-ласка, перейдіть за посиланням :\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nТакож ви можете відкрити сторінку https://%s/reset/?action=code&user=%s і вручну ввести код для відновлення:\n%s\n\nЯкщо ви не виконували процедуру відновлення паролю, будь ласка, проігноруйте цей лист і прийміть наші вибачення.\n\n--\nПанель керування Vesta\n", -); + 'Jan' => 'Січ', + 'Feb' => 'Лют', + 'Mar' => 'Бер', + 'Apr' => 'Квіт', + 'May' => 'Трав', + 'Jun' => 'Черв', + 'Jul' => 'Лип', + 'Aug' => 'Серп', + 'Sep' => 'Вер', + 'Oct' => 'Жовт', + 'Nov' => 'Лист', + 'Dec' => 'Груд', + +); ?> From 874317e7a84e2f9d70d0bcaa47fe938f24c4ed0d Mon Sep 17 00:00:00 2001 From: Olexandr Loskutov Date: Wed, 3 Jun 2015 20:09:43 +0300 Subject: [PATCH 101/271] Update ua.php Update UI --- web/inc/i18n/ua.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index abb1f0da..138c96f4 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -350,7 +350,7 @@ $LANG['ua'] = array( 'ranges are acceptable' => 'дозволені діапазони', 'CIDR format is supported' => 'формат CIDR підтримується', - 'unlimited' => 'unlimited', + 'unlimited' => 'безлімітний', '1 account' => ' 1 акаунт', '%s accounts' => '%s акаунтів', '1 domain' => '1 домен', From ecf96a73a1748e71c798c1a4b8a3a59ae12d1fd2 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 00:56:10 +0300 Subject: [PATCH 102/271] stop icon fix --- web/templates/admin/list_services.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index 0736b94e..1556c98f 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -146,7 +146,7 @@
- +
From 810c90b67b06251c6eef862956756242dc4f9687 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 01:08:41 +0300 Subject: [PATCH 103/271] Dates and Server management --- web/inc/i18n/ar.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/bs.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/cn.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/cz.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/de.php | 26 ++++++++++++++++++++++++++ web/inc/i18n/el.php | 29 +++++++++++++++++++++++++++-- web/inc/i18n/en.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/es.php | 30 ++++++++++++++++++++++++++++-- web/inc/i18n/fi.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/fr.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/hu.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/id.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/it.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/nl.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/no.php | 27 +++++++++++++++++++++++++++ web/inc/i18n/pt.php | 27 +++++++++++++++++++++++++++ web/inc/i18n/ro.php | 27 +++++++++++++++++++++++++++ web/inc/i18n/ru.php | 17 +++++++++++++++-- web/inc/i18n/se.php | 29 ++++++++++++++++++++++++++++- web/inc/i18n/tr.php | 27 +++++++++++++++++++++++++++ web/inc/i18n/tw.php | 27 +++++++++++++++++++++++++++ web/inc/i18n/ua.php | 15 +++++++++++++-- 22 files changed, 580 insertions(+), 20 deletions(-) diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php index 2a0074be..f2747b16 100644 --- a/web/inc/i18n/ar.php +++ b/web/inc/i18n/ar.php @@ -467,4 +467,31 @@ $LANG['ar'] = array( 'RESET_CODE_SENT' => 'لقد تم إرسال كود إعادة تعيين كلمة المرور لعنوان بريدك الإلكتروني
', 'MAIL_RESET_SUBJECT' => 'تم إعادة تعيين كلمة المرور %s', 'PASSWORD_RESET_REQUEST' => "لإعادة تعيين كلمة مرور لوحة التحكم , برجاء اتباع الرابط التالي link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, بامكانك أيضا اتباع الرابط التالي https://%s/reset/?action=code&user=%s وادخال كود إعادة التعيين التالي code:\n%s\n\n إذا لم تطلب إعادة تعيين كلمة المرور, برجاء تجاهل هذه الرسالة وتقبل اعتذارنا.\n\n--\nVesta Control Panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 66996a80..79682fa3 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -463,4 +463,31 @@ $LANG['bs'] = array( 'RESET_CODE_SENT' => 'Kod resetovane šifre je poslan na vašu mail adresu
', 'MAIL_RESET_SUBJECT' => 'Šifra je resetovan %s', 'PASSWORD_RESET_REQUEST' => "Za resetovanje šifre slijedite 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 unijeti kod:\n%s\n\nAko niste resetovali šifru, ignorišite ovu poruku i prihvatite naše izvinjenje.\n\n--\nVesta kontrolni panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 07244015..dfcacb2f 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -468,4 +468,31 @@ $LANG['cn'] = array( 'RESET_CODE_SENT' => '密码重置代码已发送到您的邮箱
', 'MAIL_RESET_SUBJECT' => '密码重置在 %s', 'PASSWORD_RESET_REQUEST' => "重置面板密码请点击链接:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 输入重置验证代码:\n%s\n\n如果您没有要求重设密码,请忽略此消息.", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index bbec6a36..b891de35 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -469,4 +469,31 @@ $LANG['cz'] = array( 'RESET_CODE_SENT' => 'Resetování hesla. Kód byl odeslán na vaši e-mailovou adresu
', 'MAIL_RESET_SUBJECT' => 'Obnovení hesla na %s', 'PASSWORD_RESET_REQUEST' => "Chcete-li obnovit heslo ovládacího panelu, prosím následujte tento odkaz:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nPřípadně, můžete se obrátit na https://%s/reset/?action=code&user=%s a zadejte následující resetovací kód:\n%s\n\nPokud jste si nevyžádali resetování hesla, prosím, tuto zprávu ignorovat a přijmout naši omluvu.\n\n--\nVesta Control Panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 1f814323..35f17f23 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -467,4 +467,30 @@ $LANG['de'] = array( 'RESET_CODE_SENT' => 'Passwort Zurücksetzen-Code wurde erfolgreich an Ihre Adresse gesandt
', 'MAIL_RESET_SUBJECT' => 'Passwort Reset für %s', 'PASSWORD_RESET_REQUEST' => "Zum Zurücksetzten Ihre Passwortes, besuchen Sie bitte folgenden Link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativ, können Sie auf https://%s/reset/?action=code&user=%s gehen und dort folgenden Reset Code eingeben:\n%s\n\nWenn Sie Ihr Passwort nicht zurücksetzen wollten, ignorieren Sie diese Nachricht und entschuldigen Sie uns die Unannehmlichkeiten.\n\n--\nVesta Control Panel\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', ); diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index dd31b183..91f622cb 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -469,6 +469,31 @@ $LANG['el'] = array( 'RESET_CODE_SENT' => 'Ο κωδικός επαναφοράς του κωδικού πρόσβασης έχει αποσταλεί στη διεύθυνση ταχυδρομείου σας
', 'MAIL_RESET_SUBJECT' => 'Επαναφορά κωδικού πρόσβασης στο %s', 'PASSWORD_RESET_REQUEST' => "Για να επαναφέρετε τον κωδικό πρόσβασης του πίνακα ελέγχου σας, παρακαλώ ακολουθήστε το link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nΕναλλακτικά, πλοηγηθείτε στη διεύθυνση https://%s/reset/?action=code&user=%s και εισάγετε τον ακόλουθο κωδικό επαναφοράς:\n%s\n\nΕάν δεν ζητήσατε επαναφορά κωδικού πρόσβασης, παρακαλούμε αγνοείστε το παρόν μήνυμα και δεχθείτε τη συγγνώμη μας.\n\n--\nVesta Control Panel\n", -); -?> + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index d71bbc5f..b39397f0 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -468,4 +468,31 @@ $LANG['en'] = array( 'RESET_CODE_SENT' => 'Password reset code has been sent to your email address
', 'MAIL_RESET_SUBJECT' => 'Password Reset at %s', 'PASSWORD_RESET_REQUEST' => "To reset your control panel password, please follow this link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you may go to https://%s/reset/?action=code&user=%s and enter the following reset code:\n%s\n\nIf you did not request password reset, please ignore this message and accept our apologies.\n\n--\nVesta Control Panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota ' => 'FileSystem Disk Quota ', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 115d47cc..a6d48f84 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -468,5 +468,31 @@ $LANG['es'] = array( 'RESET_CODE_SENT' => 'El código de cambio de contraseña fue enviado a su correo
', 'MAIL_RESET_SUBJECT' => 'Cambio de Contraseña en %s', 'PASSWORD_RESET_REQUEST' => "Para cambiar su contraseña del panel, por favor siga este link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativamente, puede dirigirse a https://%s/reset/?action=code&user=%s e ingresar el siguiente código de cambio:\n%s\n\nSi usted no ha solicitado un cambio de contraseña, por favor ignore este mensaje y acepte nuestras disculpas.\n\n--\nPanel de Control Vesta\n", -'unlimited' => 'ES test' -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 27b6fdb7..89a7b78f 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -472,4 +472,31 @@ $LANG['fi'] = array( 'RESET_CODE_SENT' => 'Salasanan nollauskoodi on lähetetty sähköpostiisi
', 'MAIL_RESET_SUBJECT' => 'Salana vaihdettiin %s', 'PASSWORD_RESET_REQUEST' => "Nollataksesi hallintapaneelin salasanan, seuraa tätä linkkiä:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nVaihtoehtoisesti voit mennä https://%s/reset/?action=code&user=%s ja syöttää nollauskoodin:\n%s\n\nJos et varta vasten pyytänyt tätä salasananvaihtoa, mene paniikkiin ja ota yhteyttä ylläpitoon.\n\n--\nVesta Hallintapaneeli\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 8a7b7a57..aee82b71 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -470,4 +470,31 @@ $LANG['fr'] = array( 'RESET_CODE_SENT' => 'Un Code de Réinitialisation de votre mot de passe a été envoyé à votre adresse email
', 'MAIL_RESET_SUBJECT' => 'Réinitialisation du mot de passe de %s', 'PASSWORD_RESET_REQUEST' => "Pour réinitialiser votre mot de passe, veuillez suivre le lien suivant :\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nSinon, vous pouvez suivre https://%s/reset/?action=code&user=%s et entrer le code de réinitialisation suivant :\n%s\n\nSi vous n'avez pas demandé la réinitialisation de votre mot de passe, veuillez ignorer ce message. Nous vous prions de nous excuser pour la gène occasionnée.\n\n--\nVesta Control Panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index af4aff3f..a69241d3 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -470,4 +470,31 @@ $LANG['hu'] = array( 'RESET_CODE_SENT' => 'A jelszó visszaállításhoz szükséges kód elküldésre került az e-mail címedre
', 'MAIL_RESET_SUBJECT' => 'Jelszó újragenerálás %s -kor', 'PASSWORD_RESET_REQUEST' => "A panel jelszavad visszaállításához kattints a következő linkre:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, vagy használd a következőt https://%s/reset/?action=code&user=%s és írd be a kódot:\n%s\n\nHa nem Te kérted a visszaállítást, kérlek hagyd figyelmen kívül ezt a levelet.\n\n--\nKezelőfelület\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 5d26f5c9..1b5d26d5 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -471,4 +471,31 @@ $LANG['id'] = array( 'RESET_CODE_SENT' => 'Kode katakunci buat me-reset udah dikirim ke email
', 'MAIL_RESET_SUBJECT' => 'Katakunci di-reset pada %s', 'PASSWORD_RESET_REQUEST' => "Kalo mau reset katakunci panel kontrol, klik aja tautan ini:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, kalo ngga ke https://%s/reset/?action=code&user=%s terus masukin kode reset-nya:\n%s\n\nKalau emang kamu ga minta reset katakunci pesan ini abaikan aja, dan maaf ya....\n\n--\nPanel Kontrol Vesta\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 4deedc61..933cc234 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -469,4 +469,31 @@ $LANG['it'] = array( 'RESET_CODE_SENT' => 'Il codice di reset per la tua password ti è stato inviato per email
', 'MAIL_RESET_SUBJECT' => 'Password Reset per %s', 'PASSWORD_RESET_REQUEST' => "Per fare il reset della password per il pannello di controllo clicca sul link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativamente puoi andare su https://%s/reset/?action=code&user=%s e inserire questo codice di reset:\n%s\n\nSe non hai richiesto il reset della tua password, ignora questa email.\n\n--\nVesta Control Panel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 0ec93ea4..479755ba 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -469,4 +469,31 @@ $LANG['nl'] = array( 'RESET_CODE_SENT' => 'Wachtwoord herstelcode is naar uw e-mailadres gestuurd
', 'MAIL_RESET_SUBJECT' => 'Wachtwoordherstel voor %s', 'PASSWORD_RESET_REQUEST' => "Om uw wachtwoord te herstellen klikt u op de link hieronder.\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nWanneer bovenstaande link niet werkt kunt u ook naar de volgende pagina gaan https://%s/reset/?action=code&user=%s en hier uw wachtwoord herstelcode invullen:\n%s\n\nAls u geen wachtwoord herstelcode heeft aangevraagd, kunt u dit bericht negeren.\n\n--\nVesta Controlepaneel\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 3f074f8c..0f7cd84b 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -469,4 +469,31 @@ $LANG['no'] = array( 'RESET_CODE_SENT' => 'Passord tilbakestillingskode er blitt sendt til din e-postadresse
', 'MAIL_RESET_SUBJECT' => 'Passord tilbakestilt %s', 'PASSWORD_RESET_REQUEST' => "For å tilbakestille kontroll panel passordet kan du følge denne linken:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternativt, kan du gå til https://%s/reset/?action=code&user=%s og oppgi følgende tilbakestillingskode:\n%s\n\nHvis du ikke har bedt om tilbakestilling av passord, kan du ignorere denne meldingen.\n\n--\nVesta Control Panel\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + ); diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 3ac4a8cf..a013e1de 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -468,4 +468,31 @@ $LANG['pt'] = array( 'RESET_CODE_SENT' => 'O código de restauração de senha foi enviado por email
', 'MAIL_RESET_SUBJECT' => 'Senha Restaurada em %s', 'PASSWORD_RESET_REQUEST' => "Para restaurar sua senha do Painel de Controle, Por favor use o seguinte link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nComo alternativa, você pode visitar https://%s/reset/?action=code&user=%s e digitar o seguinte código de restauração:\n%s\n\nSe você não solicitou uma restauração de senha, por favor ignore esse mensagem e aceite nossas desculpas.\n\n--\nPainel de Controle Vesta\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + ); diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index e7308e5b..6de5fa05 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -470,4 +470,31 @@ $LANG['ro'] = array( 'RESET_CODE_SENT' => 'Cod de resetare a fost trimis la email dvs..
', 'MAIL_RESET_SUBJECT' => 'Schimbarea parolei %s', 'PASSWORD_RESET_REQUEST'=>"Pentru a shimba parolei, vă rugăm faceți clic aici:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n\n\nDacă nu ați solicitat o procedură de resetarea parolei, vă rugăm să ignorați această scrisoare.\n\n--\nPanoul de control Vesta\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + ); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 2cc2f30d..82c4341e 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -470,7 +470,7 @@ $LANG['ru'] = array( 'RESET_CODE_SENT' => 'Код для восстановления пароля был выслан на ваш электронный адрес.
', 'MAIL_RESET_SUBJECT' => 'Восстановление пароля %s', 'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извинения.\n\n--\nПанель управления Vesta\n", - + 'Jan' => 'Янв', 'Feb' => 'Фев', 'Mar' => 'Мар', @@ -484,4 +484,17 @@ $LANG['ru'] = array( 'Nov' => 'Ноя', 'Dec' => 'Дек', -); + 'Configuring Server' => 'Настройки Сервера', + 'Hostname' => 'Имя Хоста', + 'Time Zone' => 'Часовой Пояс', + 'Default Language' => 'Язык по умолчанию', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Плагины', + 'preview' => 'превью', + 'Reseller Role' => 'Ресселер', + 'Web Config Editor' => 'Веб Редактор Конфигов', + 'Template Manager' => 'Менеджер Шаблонов', + 'Backup Migration Manager' => 'Менеджер Миграции Бэкапов', + 'FileManager' => 'Файл Менеджер', + +); \ No newline at end of file diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index 12c2cbd9..12314fab 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -466,4 +466,31 @@ $LANG['se'] = array( 'RESET_CODE_SENT' => 'Koden för lösenordsåterställning har skickats till din emailadress
', 'MAIL_RESET_SUBJECT' => 'Lösenord återställt %s', 'PASSWORD_RESET_REQUEST' => "För att återställa lösenordet till kontrollpanelen, vänligen följ denna länk:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nEller så kan du gåt till https://%s/reset/?action=code&user=%s och ange följande återställningskod:\n%s\n\nOm du inte har begärt lösenordsåterställning, var god ignorera detta meddelande och acceptera vår ödmjuka ursäkt.\n\n--\nKontrollpanelen Vesta\n", -); + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + +); \ No newline at end of file diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 891e971b..5357b31a 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -468,4 +468,31 @@ $LANG['tr'] = array( 'RESET_CODE_SENT' => 'Şifre sıfırlama kodu e-posta adresinize gönderildi.
', 'MAIL_RESET_SUBJECT' => 'Şifre Sıfırlama - %s', 'PASSWORD_RESET_REQUEST' => "Şifrenizi sıfırlamak için lütfen linki takip edin:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatif olarak https://%s/reset/?action=code&user=%s linkine tıklayıp devamında şu reset kodunuzu gerekli alana girebilirsiniz:\n%s\n\nEğer şifre sıfırlama isteğinde bulunmadıysanız lütfen bu mesajı görmezden gelin ve özrümüzü kabul edin.\n\n--\nVesta Control Panel\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 2023e6cc..03aaf3c2 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -468,4 +468,31 @@ $LANG['tw'] = array( 'RESET_CODE_SENT' => '重設密碼的驗證碼已經寄到您的電子郵件地址
', 'MAIL_RESET_SUBJECT' => '密碼重設在 %s', 'PASSWORD_RESET_REQUEST' => "要重設虛擬主機系統的密碼,請依照這個連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n另外,您可以到 https://%s/reset/?action=code&user=%s 並輸入以下的驗證碼:\n%s\n\n假如您沒有要求密碼重設,請忽略這封郵件並接受我們的道歉。\n\n--\nVesta 虛擬主機系統\n", + + 'Jan' => 'Jan', + 'Feb' => 'Feb', + 'Mar' => 'Mar', + 'Apr' => 'Apr', + 'May' => 'May', + 'Jun' => 'Jun', + 'Jul' => 'Jul', + 'Aug' => 'Aug', + 'Sep' => 'Sep', + 'Oct' => 'Oct', + 'Nov' => 'Nov', + 'Dec' => 'Dec', + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', + ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index abb1f0da..7b1ee979 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -483,6 +483,17 @@ $LANG['ua'] = array( 'Oct' => 'Жовт', 'Nov' => 'Лист', 'Dec' => 'Груд', - + + 'Configuring Server' => 'Configuring Server', + 'Hostname' => 'Hostname', + 'Time Zone' => 'Time Zone', + 'Default Language' => 'Default Language', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', + 'FileManager' => 'FileManager', ); -?> From bb2e4f5711f32f73486a2df45572206afb80d4a0 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 03:02:25 +0300 Subject: [PATCH 104/271] new set of conf files --- src/deb/vesta/conffiles | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/deb/vesta/conffiles b/src/deb/vesta/conffiles index af70e57c..a4af675a 100644 --- a/src/deb/vesta/conffiles +++ b/src/deb/vesta/conffiles @@ -1,6 +1,9 @@ -/usr/local/vesta/web/images/logo.png +/usr/local/vesta/web/images/sprite.png /usr/local/vesta/web/images/favicon.ico -/usr/local/vesta/web/css/csshover3.htc -/usr/local/vesta/web/css/ie.css +/usr/local/vesta/web/css/file_manager.css +/usr/local/vesta/web/css/file_manager_editor.css +/usr/local/vesta/web/css/jquery.arcticmodal.css /usr/local/vesta/web/css/jquery-custom-dialogs.css -/usr/local/vesta/web/css/main.css +/usr/local/vesta/web/css/jquery.fileupload.css +/usr/local/vesta/web/css/styles.min.css +/usr/local/vesta/web/css/uploadify.css From cfec39075ce4072b83d5d3864ef787b506fefc53 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 04:42:33 +0300 Subject: [PATCH 105/271] version up --- src/deb/vesta/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deb/vesta/control b/src/deb/vesta/control index b2cd77a1..795d64dc 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,7 +1,7 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-13 +Version: 0.9.8-14 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com From 5a4ba74d1b224c414bf833bef119b8df4ed6cd2e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 13:43:05 +0300 Subject: [PATCH 106/271] fix font color / dropdown list --- web/css/styles.min.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index dbcd86ff..c2224737 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -403,7 +403,7 @@ button { button, select { text-transform: none; - color: transparent !important; + /*color: transparent !important;*/ text-shadow: 0 0 0 #555 !important; } @@ -2115,7 +2115,7 @@ label { -moz-appearance:none; -webkit-appearance:none; text-shadow: 0 0 0 #555; - color: transparent !important; + /*color: transparent !important;*/ } .vst-list.long-2 { From ea241136106cde8ea4ee33a7e60bf94a5f75a40e Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 14:18:42 +0300 Subject: [PATCH 107/271] fix for md5 hashes --- bin/v-check-user-password | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/v-check-user-password b/bin/v-check-user-password index af87f77d..a9377062 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -49,7 +49,15 @@ fi #----------------------------------------------------------# # Parsing user's salt -salt=$(grep "^$user:" /etc/shadow |cut -f 3 -d \$) +shadow=$(grep "^$user:" /etc/shadow) +salt=$(echo "$shadow" |cut -f 3 -d \$) +method=$(echo "$shadow" |cut -f 2 -d \$) +if [ "$method" -eq '1' ]; then + method='md5' +else + method='sha-512' +fi + if [[ -z "$salt" ]] || [[ "${#salt}" -gt 12 ]]; then echo "Error: password missmatch" echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log @@ -57,7 +65,7 @@ if [[ -z "$salt" ]] || [[ "${#salt}" -gt 12 ]]; then fi # Generating SHA-512 -hash=$($BIN/v-generate-password-hash sha-512 $salt <<< $password) +hash=$($BIN/v-generate-password-hash $method $salt <<< $password) if [[ -z "$hash" ]]; then echo "Error: password missmatch" echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log From d3c98afa61efba829b1c54857a7dc6bade748a65 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 15:53:34 +0300 Subject: [PATCH 108/271] fix for ip selection ctr+c --- web/css/styles.min.css | 8 ++++++-- web/templates/admin/list_dns.html | 2 +- web/templates/admin/list_web.html | 4 +--- web/templates/user/list_dns.html | 2 +- web/templates/user/list_web.html | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/web/css/styles.min.css b/web/css/styles.min.css index c2224737..5de4a63b 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -553,9 +553,9 @@ th { } body { - -webkit-touch-callout: none; +/* -webkit-touch-callout: none; -webkit-text-size-adjust: none; - -webkit-user-select: none; + -webkit-user-select: none; */ } html, @@ -1307,6 +1307,10 @@ div.l-content > div.l-separator:nth-of-type(4) { font-size: 12px; letter-spacing: 1px; } +.l-unit__ip span { + padding-left: 3px; + padding-right: 3px; +} .l-unit__stats { margin-bottom: 53px; } diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index 259b14bc..ed4aa80e 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -110,7 +110,7 @@ ⇢ ".$data[$key]['SRC']."    "; if($data[$key]['RECORDS']) echo '/ '.$data[$key]['RECORDS'].'';?>
- + .', $data[$key]['IP'])?>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index dc8f3764..93fbba0b 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -41,9 +41,7 @@
-
- +
+
-
- @@ -169,7 +167,7 @@
- + .', $data[$key]['IP'])?>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html index e759970e..57394412 100644 --- a/web/templates/user/list_dns.html +++ b/web/templates/user/list_dns.html @@ -110,7 +110,7 @@ ⇢ ".$data[$key]['SRC']."    "; if($data[$key]['RECORDS']) echo '/ '.$data[$key]['RECORDS'].'';?>
- + .', $data[$key]['IP'])?>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index e0fcd246..5501a742 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -170,7 +170,7 @@
- + .', $data[$key]['IP'])?>
From c4b629bdd121f0a442ca1e80c8521ae4a2847c42 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 15:57:45 +0300 Subject: [PATCH 109/271] disable error reporting --- web/list/ip/index.php | 1 + web/list/web/index.php | 1 + 2 files changed, 2 insertions(+) diff --git a/web/list/ip/index.php b/web/list/ip/index.php index f3a4f0eb..6b6f86e6 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -1,6 +1,7 @@ Date: Thu, 4 Jun 2015 18:23:37 +0300 Subject: [PATCH 110/271] removed salt lenght check --- bin/v-check-user-password | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-check-user-password b/bin/v-check-user-password index a9377062..460d8b01 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -58,7 +58,7 @@ else method='sha-512' fi -if [[ -z "$salt" ]] || [[ "${#salt}" -gt 12 ]]; then +if [ -z "$salt" ]; then echo "Error: password missmatch" echo "$DATE $user $ip failed to login" >> $VESTA/log/auth.log exit 9 From 22e836c4d32d12b86e47a9a0bb80fb56a4c003ac Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 18:24:00 +0300 Subject: [PATCH 111/271] firewall comment field lenght --- web/templates/admin/list_firewall.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html index 454583e4..579d0ef3 100644 --- a/web/templates/admin/list_firewall.html +++ b/web/templates/admin/list_firewall.html @@ -107,7 +107,7 @@
-
+
From d45f42783da72afb3800994eb5e15d623d586b46 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 4 Jun 2015 18:42:14 +0300 Subject: [PATCH 112/271] ip list fix --- web/add/web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/add/web/index.php b/web/add/web/index.php index 9f5133f1..2606c074 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -356,7 +356,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; // List IP addresses exec (VESTA_CMD."v-list-user-ips ".$user." json", $output, $return_var); -$ips = array_unique(json_decode(implode('', $output), true)); +$ips = json_decode(implode('', $output), true); unset($output); // List web stat engines From 774b8a58351a85f1ac3e4f8b78f5dd0b94a791f6 Mon Sep 17 00:00:00 2001 From: ozgurbozkurt Date: Sun, 7 Jun 2015 18:11:46 +0300 Subject: [PATCH 113/271] Update tr.php A little update for translation --- web/inc/i18n/tr.php | 84 ++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 5357b31a..c78bdac2 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -1,7 +1,7 @@ 'Oturum aç', 'Log out' => 'Oturumu kapat', - 'USER' => 'USER', + 'USER' => 'KULLANICI', 'WEB' => 'WEB', 'DNS' => 'DNS', - 'MAIL' => 'MAIL', + 'MAIL' => 'POSTA', 'DB' => 'DB', 'CRON' => 'CRON', 'BACKUP' => 'YEDEK', @@ -79,8 +79,8 @@ $LANG['tr'] = array( 'list fail2ban' => 'fail2ban listele', 'open %s' => '%s aç', 'download' => 'indir', - 'restore' => 'restore et', - 'configure restore settings' => 'restore ayarlarını yapılandır', + 'restore' => 'onar', + 'configure restore settings' => 'onarım ayarlarını yapılandır', 'stop' => 'durdur', 'start' => 'başlat', 'restart' => 'yeniden başlat', @@ -101,10 +101,10 @@ $LANG['tr'] = array( 'Editing DNS Domain' => 'DNS Domaini Düzenleme', 'Adding DNS Record' => 'DNS Kaydı Ekleme', 'Editing DNS Record' => 'DNS Kaydı Düzenleme', - 'Adding Mail Domain' => 'Mail Domaini Ekleme', - 'Editing Mail Domain' => 'Mail Domaini Düzenleme', - 'Adding Mail Account' => 'Mail Hesabı Ekleme', - 'Editing Mail Account' => 'Mail Hesabı Düzenleme', + 'Adding Mail Domain' => 'Posta Alan Adı Ekleme', + 'Editing Mail Domain' => 'Posta Alan Adı Düzenleme', + 'Adding Mail Account' => 'Posta Hesabı Ekleme', + 'Editing Mail Account' => 'Posta Hesabı Düzenleme', 'Adding database' => 'Veritabanı ekleme', 'Editing Cron Job' => 'Zamanlanmış Görev Düzenleme', 'Adding Cron Job' => 'Zamanlanmış Görev Ekleme', @@ -147,7 +147,7 @@ $LANG['tr'] = array( 'Bandwidth' => 'Trafik', 'Disk' => 'Disk', 'Web' => 'Web', - 'Mail' => 'Mail', + 'Mail' => 'Posta', 'Databases' => 'Veritabanı', 'User Directories' => 'Kullanıcı Dizinleri', 'Template' => 'Şablon', @@ -157,14 +157,14 @@ $LANG['tr'] = array( 'DNS Template' => 'DNS Şablonu', 'Web Domains' => 'Web Alan Adları', 'SSL Domains' => 'SSL Domainleri', - 'Web Aliases' => 'Web Aliases', + 'Web Aliases' => 'Web Takma Adları (Aliases)', 'per domain' => 'domain başına', - 'DNS domains' => 'DNS Domainleri', - 'DNS domains' => 'DNS domainleri', + 'DNS domains' => 'DNS Alan Adları', + 'DNS domains' => 'DNS alan adları', 'DNS records' => 'DNS kayıtları' , 'Name Servers' => 'Alan Adı Sunucuları', - 'Mail Domains' => 'Mail Domainleri', - 'Mail Accounts' => 'Mail Accounts', + 'Mail Domains' => 'Posta Alan Adları', + 'Mail Accounts' => 'Posta Hesapları', 'Cron Jobs' => 'Zamanlanmış Görevler', 'SSH Access' => 'SSH Erişimi', 'IP Addresses' => 'IP Adresleri', @@ -180,9 +180,9 @@ $LANG['tr'] = array( 'Additional FTP Account' => 'İlave FTP Hesabı', 'SOA' => 'SOA', 'TTL' => 'TTL', - 'Expire' => 'Sona ermiş', + 'Expire' => 'Sonlanış', 'Records' => 'Kayıtlar', - 'Catchall email' => 'Kapsamlı email', + 'Catchall email' => 'Yönlendirilmemiş postaların toplanacağı adres', 'AntiVirus Support' => 'AntiVirus Desteği', 'AntiSpam Support' => 'AntiSpam Desteği', 'DKIM Support' => 'DKIM Desteği', @@ -190,7 +190,7 @@ $LANG['tr'] = array( 'Quota' => 'Kota', 'Autoreply' => 'Otomatik Cevap', 'Forward to' => 'Şuraya yönlendir', - 'Do not store forwarded mail' => 'Yönlendirilmiş mailleri depolama', + 'Do not store forwarded mail' => 'Yönlendirilmiş postaları depolama', 'database' => 'veritabanı', 'User' => 'Kullanıcı', 'Host' => 'Host', @@ -232,7 +232,7 @@ $LANG['tr'] = array( 'CPU' => 'CPU', 'Memory' => 'Hafıza', 'Uptime' => 'Uptime', - 'core package' => 'core paketi', + 'core package' => 'çekirdek paketi', 'php interpreter' => 'php yorumcusu', 'internal web server' => 'dahili web sunucusu', 'Version' => 'Sürüm', @@ -348,7 +348,7 @@ $LANG['tr'] = array( 'ranges are acceptable' => 'kabul edilebilir aralıklar', 'CIDR format is supported' => 'CIDR formatı destekleniyor', - 'unlimited' => 'unlimited', + 'unlimited' => 'sınırsız', '1 account' => '1 hesap', '%s accounts' => '%s hesap', '1 domain' => '1 alan adı', @@ -469,30 +469,30 @@ $LANG['tr'] = array( 'MAIL_RESET_SUBJECT' => 'Şifre Sıfırlama - %s', 'PASSWORD_RESET_REQUEST' => "Şifrenizi sıfırlamak için lütfen linki takip edin:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatif olarak https://%s/reset/?action=code&user=%s linkine tıklayıp devamında şu reset kodunuzu gerekli alana girebilirsiniz:\n%s\n\nEğer şifre sıfırlama isteğinde bulunmadıysanız lütfen bu mesajı görmezden gelin ve özrümüzü kabul edin.\n\n--\nVesta Control Panel\n", - 'Jan' => 'Jan', - 'Feb' => 'Feb', + 'Jan' => 'Oca', + 'Feb' => 'Şub', 'Mar' => 'Mar', - 'Apr' => 'Apr', + 'Apr' => 'Nis', 'May' => 'May', - 'Jun' => 'Jun', - 'Jul' => 'Jul', - 'Aug' => 'Aug', - 'Sep' => 'Sep', - 'Oct' => 'Oct', - 'Nov' => 'Nov', - 'Dec' => 'Dec', + 'Jun' => 'Haz', + 'Jul' => 'Tem', + 'Aug' => 'Ağu', + 'Sep' => 'Eyl', + 'Oct' => 'Eki', + 'Nov' => 'Kas', + 'Dec' => 'Ara', - 'Configuring Server' => 'Configuring Server', - 'Hostname' => 'Hostname', - 'Time Zone' => 'Time Zone', - 'Default Language' => 'Default Language', - 'FileSystem Disk Quota' => 'FileSystem Disk Quota', - 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', - 'preview' => 'preview', - 'Reseller Role' => 'Reseller Role', - 'Web Config Editor' => 'Web Config Editor', - 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Backup Migration Manager', - 'FileManager' => 'FileManager', + 'Configuring Server' => 'Sunucu Yapılandırma', + 'Hostname' => 'Hostadı', + 'Time Zone' => 'Zaman Dilimi', + 'Default Language' => 'Varsayılan Dil', + 'FileSystem Disk Quota' => 'DosyaSistemi Disk Kotası', + 'Vesta Control Panel Plugins' => 'Vesta Kontrol Paneli Eklentileri', + 'preview' => 'önizleme', + 'Reseller Role' => 'Bayi Rolü', + 'Web Config Editor' => 'Web Yapılandırma Editörü', + 'Template Manager' => 'Şablon Yöneticisi', + 'Backup Migration Manager' => 'Yedek Aktarma Yöneticisi', + 'FileManager' => 'DosyaYöneticisi', ); From 4adbb16cbeeb3121e8f56ea9424784f1511256a9 Mon Sep 17 00:00:00 2001 From: Joe M Date: Thu, 11 Jun 2015 04:19:53 -0400 Subject: [PATCH 114/271] Update list_updates.html Fix broken links --- web/templates/admin/list_updates.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html index 71b9d6b8..f86fbc40 100644 --- a/web/templates/admin/list_updates.html +++ b/web/templates/admin/list_updates.html @@ -5,9 +5,9 @@
'.__('disable autoupdate').''; + echo ''.__('disable autoupdate').''; } else { - echo ''.__('enable autoupdate').''; + echo ''.__('enable autoupdate').''; } ?> phpMyAdminphpPgAdminphpMyAdminphpPgAdmin