diff --git a/bin/v-list-sys-vesta-updates b/bin/v-list-sys-vesta-updates new file mode 100755 index 000000000..a904aa2dc --- /dev/null +++ b/bin/v-list-sys-vesta-updates @@ -0,0 +1,107 @@ +#!/bin/bash +# info: list system updates +# options: [FORMAT] +# +# The function checks available updates for vesta packages. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +format=${1-shell} + +# Includes +source $VESTA/func/main.sh + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Remove upd_flag +rm -f $VESTA/web/.update + +# Create tmp file +tmp_file=$(mktemp) + +# Check latest version +wget -q -T 1 -t 1 http://c.vestacp.com/latest.txt -O $tmp_file + +# Define rpm query format +rpm_format="VERSION='%{VERSION}'" +rpm_format="$rpm_format RELEASE='%{RELEASE}'" +rpm_format="$rpm_format ARCH='%{ARCH}'" +rpm_format="$rpm_format UTIME='%{INSTALLTIME}'\n" + +# Check vesta version +eval $(rpm --queryformat="$rpm_format" -q vesta) +DATE=$(date -d @$UTIME +%F) +TIME=$(date -d @$UTIME +%T) +latest=$(grep vesta $tmp_file) +UPDATED='yes' +if [ ! -z "$latest" ] && [ "$latest" != "vesta-$VERSION-$RELEASE" ]; then + UPDATED='no' + set_upd_flag='yes' +fi +str="NAME='vesta' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'" +str="$str UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'" + +# Check vesta-php version +eval $(rpm --queryformat="$rpm_format" -q vesta-php) +DATE=$(date -d @$UTIME +%F) +TIME=$(date -d @$UTIME +%T) +latest=$(grep php $tmp_file) +UPDATED='yes' +if [ ! -z "$latest" ] && [ "$latest" != "php-$VERSION-$RELEASE" ]; then + UPDATED='no' + set_upd_flag='yes' +fi +str="$str\nNAME='vesta-php' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'" +str="$str UPDATED='$UPDATED' DESCR='php interpreter' TIME='$TIME'" +str="$str DATE='$DATE'" + +# Check vesta-nginx version +eval $(rpm --queryformat="$rpm_format" -q vesta-nginx) +DATE=$(date -d @$UTIME +%F) +TIME=$(date -d @$UTIME +%T) +latest=$(grep nginx $tmp_file) +UPDATED='yes' +if [ ! -z "$latest" ] && [ "$latest" != "nginx-$VERSION-$RELEASE" ]; then + UPDATED='no' + set_upd_flag='yes' +fi +str="$str\nNAME='vesta-nginx' VERSION='$VERSION' RELEASE='$RELEASE'" +str="$str ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'" +str="$str TIME='$TIME' DATE='$DATE'" + +# Create flag if updates avaiable +if [ "$set_upd_flag" == 'yes' ]; then + touch $VESTA/web/.update + chmod a+r $VESTA/web/.update +fi + +# Defining config +echo -e "$str" > $tmp_file +conf=$tmp_file + +# Defining fileds to select +fields="\$NAME \$VERSION \$RELEASE \$ARCH \$UPDATED \$DESCR \$TIME \$DATE" + +# Listing services +case $format in + json) json_list ;; + plain) nohead=1; shell_list ;; + shell) fields='$NAME $VERSION $RELEASE $ARCH $UPDATED $TIME $DATE' + shell_list | column -t ;; + *) check_args '1' '0' 'USER [FORMAT]' +esac + +rm -f $tmp_file + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index 788fcf57b..3aa7e9ccc 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -1,8 +1,8 @@ #!/bin/bash -# info: update vesta after rpm update -# options: VERSION +# info: update vesta package/configs +# options: PACKAGE [VERSION] # -# The function is runs as rpm update trigger. It pulls shell script from vesta +# The function runs as rpm update trigger. It pulls shell script from vesta # server and runs it. @@ -11,8 +11,9 @@ #----------------------------------------------------------# # Argument defenition -version=$1 -updates='' +package=$1 +version=$2 +release=$3 # Importing system enviroment source /etc/profile @@ -27,79 +28,27 @@ source $VESTA/func/main.sh #----------------------------------------------------------# # Checking arg number -check_args '1' "$#" 'VERSION' +check_args '1' "$#" 'PACKAGE [VERSION] [RELEASE]' #----------------------------------------------------------# # Action # #----------------------------------------------------------# -# Compare versions -if [ "$version" != "$VERSION" ]; then - # Downloading version tree - upd_host="yum.vestacp.com" - wget -O "/tmp/versions" http://$V_UPD_HOST/upd_scripts/version_tree.txt \ - &>/dev/null +# Clean yum chache +yum -q clean all - # Checking download result - if [ "$?" -ne "0" ]; then - echo "Error: version tree update failed" +# Define yum cmd +yum="yum -q -y --noplugins --disablerepo=* --enablerepo=vesta" + +# Update vesta package +if [ -z "$version" ]; then + $yum update $package > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Error: $package update failed" log_event "$E_UPDATE" "$EVENT" exit $E_UPDATE fi - - # Deviding version - v1=$(echo "$version" |cut -f 1 -d '.') - v2=$(echo "$version" |cut -f 2 -d '.') - v3=$(echo "$version" |cut -f 3 -d '.') - V1=$(echo "$VERSION" |cut -f 1 -d '.') - V2=$(echo "$VERSION" |cut -f 2 -d '.') - V3=$(echo "$VERSION" |cut -f 3 -d '.') - - - # Checking difference between versions - # Too nested tests, sory about complexity - if [ "$V1" -lt "$v1" ]; then - for ver in $(seq $V1 $v1); do - updates="$updates $(grep "^$ver." /tmp/versions|grep ":1$"|\ - cut -f 1 -d :)" - done - else - if [ "$V2" -lt "$v2" ]; then - for ver in $(seq $V2 $v2); do - updates="$updates $(grep "^$v1.$ver." /tmp/versions |\ - grep ":1$"|cut -f 1 -d :)" - done - else - V4=$((V3 + 1)) - for ver in $(seq $V4 $v3); do - updates="$updates $(grep "^$v1.$v2.$ver" /tmp/versions |\ - grep ":1$"|cut -f 1 -d :)" - done - fi - fi - - # Executing update scripts - if [ ! -z "$updates" ]; then - mkdir $BIN/updates &>/dev/null - - for update in $updates; do - wget -O $BIN/updates/$update.sh \ - http://$V_UPD_HOST/upd_scripts/$update.sh &>/dev/null - - # Checking download result - if [ "$?" -ne "0" ]; then - echo "Error: version tree update failed" - log_event "$E_UPDATE" "$EVENT" - exit $E_UPDATE - fi - bash $BIN/updates/$update.sh - done - rm -rf $BIN/updates - fi - - # Updating config version - sed -i "s/VERSION='$VERSION'/VERSION='$version'/g" $VESTA/conf/vesta.conf fi diff --git a/web/add/cron/index.php b/web/add/cron/index.php index b2a180dcb..b3c54cb3e 100644 --- a/web/add/cron/index.php +++ b/web/add/cron/index.php @@ -1,6 +1,6 @@ ', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; unset($v_password); unset($output); } else { - $_SESSION['ok_msg'] = _("OK: cron job has been created successfully."); + $_SESSION['ok_msg'] = _('CRON_CREATED_OK'); unset($v_min); unset($v_hour); unset($v_day); diff --git a/web/add/db/index.php b/web/add/db/index.php index 4b6b272e3..16d555fed 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -23,7 +23,7 @@ if (!empty($_POST['ok'])) { if (empty($_POST['v_charset'])) $errors[] = _('charset'); // Check for errors - if (empty($errors[0])) { + if (!empty($errors[0])) { foreach ($errors as $i => $error) { if ( $i == 0 ) { $error_msg = $error; @@ -31,7 +31,7 @@ if (!empty($_POST['ok'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } // Validate email @@ -59,7 +59,7 @@ if (!empty($_POST['ok'])) { $v_charset = $_POST['v_charset']; if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; unset($v_password); unset($output); @@ -72,9 +72,7 @@ if (!empty($_POST['ok'])) { $subject = _("Database Credentials"); $hostname = exec('hostname'); $from = _('MAIL_FROM',$hostname); - $mailtext = _('DATABASE_READY',$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']); - $mailtext .= $db_admin_link."\n\n"; - $mailtext .= "--\n"._('Vesta Control Panel')."\n"; + $mailtext = _('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link); send_email($to, $subject, $mailtext, $from); } $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']); diff --git a/web/add/dns/index.php b/web/add/dns/index.php index ac0632f7d..d78c17da0 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -41,13 +41,13 @@ if (!empty($_POST['ok'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { // Add DNS exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$ns4, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -58,7 +58,7 @@ if (!empty($_POST['ok'])) { exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -70,14 +70,14 @@ if (!empty($_POST['ok'])) { exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]); + $_SESSION['ok_msg'] = _('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]); unset($v_domain); } } @@ -107,19 +107,19 @@ if (!empty($_POST['ok_rec'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { // Add DNS Record exec (VESTA_CMD."v-add-dns-domain-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var); $v_type = $_POST['v_type']; if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]); + $_SESSION['ok_msg'] = _('DNS_RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]); unset($v_domain); unset($v_rec); unset($v_val); diff --git a/web/add/ip/index.php b/web/add/ip/index.php index 087b7759d..000601dfb 100644 --- a/web/add/ip/index.php +++ b/web/add/ip/index.php @@ -46,7 +46,7 @@ if ($_SESSION['user'] == 'admin') { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { // Add IP $v_interface = escapeshellarg($_POST['v_interface']); @@ -56,7 +56,7 @@ if ($_SESSION['user'] == 'admin') { $v_interface = $_POST['v_interface']; if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; unset($v_password); unset($output); diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 8d8497b9b..4a37cc981 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -48,20 +48,20 @@ top_panel($user,$TAB); $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { // Add mail domain exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _("DOMAIN_MAIL_CREATED_OK",$_POST['v_domain'],$_POST['v_domain']); + $_SESSION['ok_msg'] = _('MAIL_DOMAIN_CREATED_OK',$_POST['v_domain'],$_POST['v_domain']); unset($v_domain); } } @@ -95,13 +95,13 @@ top_panel($user,$TAB); $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { // Add Mail Account exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } diff --git a/web/add/package/index.php b/web/add/package/index.php index 6e88cc3b8..6c5d87510 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -73,7 +73,7 @@ if ($_SESSION['user'] == 'admin') { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { exec ('mktemp -d', $output, $return_var); $tmpdir = $output[0]; @@ -107,7 +107,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); diff --git a/web/add/user/index.php b/web/add/user/index.php index 7510d598b..044f5bd7d 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -1,6 +1,5 @@ ', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); if (!empty($v_notify)) { $to = $_POST['v_notify']; - $subject = _translate($v_language,"Welcome to Vesta Control Panel"); + $subject = _translate($_POST['v_language'],"Welcome to Vesta Control Panel"); $hostname = exec('hostname'); - $from = _translate($v_language,'MAIL_FROM',$hostname); + $from = _translate($_POST['v_language'],'MAIL_FROM',$hostname); if (!empty($_POST['v_fname'])) { - $mailtext = _translate($v_language,'GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']); + $mailtext = _translate($_POST['v_language'],'GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']); } else { - $mailtext = _translate($v_language,'GREETINGS'); + $mailtext = _translate($_POST['v_language'],'GREETINGS'); } - $mailtext .= _translate($v_language,'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']); + $mailtext .= _translate($_POST['v_language'],'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']); send_email($to, $subject, $mailtext, $from); } - $_SESSION['ok_msg'] = _('ACCOUNT_CREATED_OK',$_POST[v_username],$_POST[v_username]); + $_SESSION['ok_msg'] = _('USER_CREATED_OK',$_POST[v_username],$_POST[v_username]); unset($v_username); unset($v_password); unset($v_email); diff --git a/web/add/web/index.php b/web/add/web/index.php index a5dbe7848..10195ac68 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -79,7 +79,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } if (empty($_SESSION['error_msg'])) { @@ -87,7 +87,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -97,7 +97,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -108,7 +108,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -130,7 +130,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } @@ -139,7 +139,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -154,7 +154,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-delete-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } @@ -167,7 +167,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-nginx ".$user." ".$v_domain." 'default' ".$ext." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -206,7 +206,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -218,7 +218,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -229,7 +229,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($v_stats_user); @@ -246,7 +246,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { if (!empty($v_ftp_email)) { @@ -269,7 +269,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -279,7 +279,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; exec (VESTA_CMD."v-restart-web", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index 017b86f00..309b57744 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -31,7 +31,7 @@ $v_job = escapeshellarg($_GET['job']); exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -67,14 +67,14 @@ if ($return_var != 0) { exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); $v_cmd = $_POST['v_cmd']; } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _("OK: changes has been saved."); + $_SESSION['ok_msg'] = _("Changes has been saved."); } } } diff --git a/web/edit/db/index.php b/web/edit/db/index.php index f952f9347..d41ccc7b7 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -30,7 +30,7 @@ $v_database = escapeshellarg($_GET['database']); exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -60,14 +60,14 @@ if ($return_var != 0) { exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_password = "••••••••"; unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } } diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php index ae84d1195..51262fc06 100644 --- a/web/edit/dns/index.php +++ b/web/edit/dns/index.php @@ -33,7 +33,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -70,7 +70,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_dns = 'yes'; @@ -83,7 +83,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -96,7 +96,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -109,7 +109,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -122,7 +122,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -134,13 +134,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } @@ -158,7 +158,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-list-dns-domain-records ".$user." ".$v_domain." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -190,7 +190,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { exec (VESTA_CMD."v-change-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } @@ -199,7 +199,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php index cbc29bee2..00fa176ff 100644 --- a/web/edit/ip/index.php +++ b/web/edit/ip/index.php @@ -29,7 +29,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -65,7 +65,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -75,7 +75,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -88,7 +88,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_owner = $_POST['v_owner']; @@ -101,14 +101,14 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } } diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index c3252e9ff..cfb71c988 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -33,7 +33,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -62,7 +62,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_antispam = 'no'; @@ -72,7 +72,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_antispam = 'yes'; @@ -83,7 +83,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_antivirus = 'no'; @@ -93,14 +93,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_antivirus = 'yes'; unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } // DKIM @@ -108,7 +108,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_dkim = 'no'; @@ -118,7 +118,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_dkim = 'yes'; @@ -130,7 +130,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_catchall = ''; @@ -142,7 +142,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -153,13 +153,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html'); @@ -172,7 +172,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -213,7 +213,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_password = "••••••••"; @@ -230,7 +230,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -250,7 +250,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -262,7 +262,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -283,7 +283,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -295,7 +295,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -308,7 +308,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -322,7 +322,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -330,14 +330,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { } } if (($v_autoreply == 'no') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) { - if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = "Error: field atoreply message can not be blank."; + if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = $_SESSION['error_msg'] = _('Field "%s" can not be blank.','atoreply'); if (empty($_SESSION['error_msg'])) { $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']); $v_autoreply_message = escapeshellarg($v_autoreply_message); exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -347,7 +347,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html'); diff --git a/web/edit/package/index.php b/web/edit/package/index.php index 46b0662f4..1bfc92ff6 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -29,7 +29,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -125,7 +125,7 @@ if ($_SESSION['user'] == 'admin') { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { exec ('mktemp -d', $output, $return_var); $tmpdir = $output[0]; @@ -159,7 +159,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -173,12 +173,12 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } } diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 5efacdad2..25ae2de9b 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -10,8 +10,6 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Header include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); -// Panel -top_panel($user,$TAB); $lang = 'ru_RU.utf8'; setlocale(LC_ALL, $lang); @@ -30,7 +28,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -86,7 +84,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_password = "••••••••"; @@ -99,7 +97,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-package ".$v_username." ".$v_package, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -111,8 +109,10 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; + } else { + if ($_GET['user'] == 'admin') $_SESSION['language'] = $_POST['v_language']; } unset($output); } @@ -123,7 +123,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-template ".$v_username." ".$v_template, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -135,7 +135,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-shell ".$v_username." ".$v_shell, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -151,7 +151,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } @@ -165,7 +165,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -183,16 +183,19 @@ if ($_SESSION['user'] == 'admin') { exec ($ns_cmd, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } + // Panel + top_panel($user,$TAB); + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_user.html'); unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); @@ -208,7 +211,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -250,7 +253,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_password = "••••••••"; @@ -263,8 +266,10 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; + } else { + $_SESSION['language'] = $_POST['v_language']; } unset($output); } @@ -275,7 +280,7 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -293,16 +298,19 @@ if ($_SESSION['user'] == 'admin') { exec ($ns_cmd, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } + // Panel + top_panel($user,$TAB); + include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_user.html'); unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 9f414c9db..36a313674 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -34,7 +34,7 @@ $v_domain = escapeshellarg($_GET['domain']); exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { $data = json_decode(implode('', $output), true); @@ -99,7 +99,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_web = 'yes'; @@ -109,7 +109,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_dns = 'yes'; @@ -121,7 +121,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_dns = 'yes'; @@ -136,7 +136,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -159,7 +159,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -168,7 +168,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_dns = 'yes'; @@ -185,7 +185,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -193,7 +193,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $restart_dns = 'yes'; @@ -208,7 +208,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-nginx ".$v_username." ".$v_domain." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -226,7 +226,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-nginx-tpl ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_nginx_ext = str_replace(',', ', ', $ext); @@ -247,7 +247,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-nginx ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -260,7 +260,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -299,7 +299,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -315,7 +315,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } $v_ssl_home = $_POST['v_ssl_home']; @@ -335,7 +335,7 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { exec ('mktemp -d', $mktemp_output, $return_var); $tmpdir = $mktemp_output[0]; @@ -363,7 +363,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -381,7 +381,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -392,7 +392,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -402,7 +402,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -413,7 +413,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -431,14 +431,14 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } else { $v_stats_user = escapeshellarg($_POST['v_stats_user']); $v_stats_password = escapeshellarg($_POST['v_stats_password']); exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -456,7 +456,7 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_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']))) { $v_stats_user = escapeshellarg($_POST['v_stats_user']); @@ -464,7 +464,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -477,7 +477,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -496,7 +496,7 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } if (($v_ftp_user != $_POST['v_ftp_user']) || ($_POST['v_ftp_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) { $v_ftp_user = preg_replace("/^".$user."_/", "", $_POST['v_ftp_user']); @@ -505,7 +505,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -524,7 +524,7 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } if (($v_ftp_user != $_POST['v_ftp_user']) || ($_POST['v_ftp_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) { $v_ftp_user = preg_replace("/^".$user."_/", "", $_POST['v_ftp_user']); @@ -533,7 +533,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } unset($output); @@ -555,7 +555,7 @@ if (!empty($_POST['save'])) { $error_msg = $error_msg.", ".$error; } } - $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg); + $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg); } if (empty($_SESSION['error_msg'])) { $v_ftp_user = escapeshellarg($_POST['v_ftp_user']); @@ -563,7 +563,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } else { if (!empty($_POST['v_ftp_email'])) { @@ -571,7 +571,7 @@ if (!empty($_POST['save'])) { $subject = _("FTP login credentials"); $hostname = exec('hostname'); $from = _('MAIL_FROM',$hostname); - $mailtext .= _('FTP_ACCOUNT_READY',$_GET['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']); + $mailtext .= _('FTP_ACCOUNT_READY',$_GET['domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']); send_email($to, $subject, $mailtext, $from); unset($v_ftp_email); } @@ -587,7 +587,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-restart-web", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } @@ -597,13 +597,13 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-restart-dns", $output, $return_var); if ($return_var != 0) { $error = implode('
', $output); - if (empty($error)) $error = _('Error: vesta did not return any output.'); + if (empty($error)) $error = _('Error code:',$return_var); $_SESSION['error_msg'] = $error; } } if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = _('OK: changes has been saved.'); + $_SESSION['ok_msg'] = _('Changes has been saved.'); } } diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 001dd106d..c840ab1ae 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -1,354 +1,384 @@ 'yes', - 'no' => 'no', - 'none' => 'нет', - 'Hour' => 'Hour', - 'Min' => 'Min', - 'pb' => 'pb', - 'tb' => 'tb', - 'gb' => 'gb', - 'mb' => 'mb', - 'Error' => 'Error', - 'minute' => 'minute', - 'hour' => 'hour', - 'day' => 'day', - 'days' => 'days', - 'hours' => 'hours', - 'minutes' => 'minutes', - 'month' => 'month', - 'day of week' => 'day of week', - 'cmd' => 'cmd', - 'Error: field "%s" can not be blank.' => 'Error: Field "%s" can not be blank.', - _('Error: vesta did not return any output.')=>'Error: Vesta did not return any output', - 'OK: cron job has been created successfully.' => 'Success: Cron Job has been created', - 'database' => 'database', - 'username' => 'username', - 'password' => 'password', - 'type' => 'type', - 'charset' => 'charset', - 'edit' => 'edit', - 'DATABASE_CREATED_OK' => 'Database %s has been created successfully.', - 'domain' => 'domain', - 'ip' => 'IP', - 'DOMAIN_CREATED_OK' => 'Domain %s has been created successfully.', - 'RECORD_CREATED_OK' => 'Record %s.%s has been created successfully.', - 'ip address' => 'IP-address', - 'netmask' => 'netmask', - 'Netmask' => 'Netmask', - 'interface' => 'interface', - 'Interface' => 'Interface', - 'assigned user' => 'assigned user', - 'IP_CREATED_OK' => '"IP address %s has been created successfully.', - 'DOMAIN_MAIL_CREATED_OK' => 'Mail for domain %s has been created successfully.', - 'account' => 'account', - 'Account' => 'Account', - 'MAIL_ACCOUNT_CREATED_OK' => 'Mail account %s@%s has been created successfully.', - 'package' => 'package', - 'template' => 'template', - 'shell' => 'SSH', - 'web domains' => 'web domains', - 'Web Domains' => 'Web Domains', - 'Web Aliases' => 'Web Aliases', - 'per domain' => 'per domain', - 'DNS domains' => 'DNS domains', - 'DNS records count' => 'DNS records count', - 'DNS Support' => 'DNS Support', - 'Mail Support' => 'Mail Support', - 'web aliases' => 'web aliases', - 'dns records' => 'DNS records', - 'mail domains' => 'mail domains', - 'mail accounts' => 'mail accounts', - 'Mail Domains' => 'Mail Domains', - 'Mail Accounts' => 'Mail Accounts', - 'accounts' => 'accounts', - 'databases' => 'databases', - 'Databases' => 'Databases', - 'cron jobs' => 'cron jobs', - 'Cron Jobs' => 'Cron Jobs', - 'Backups' => 'Backups', - 'backups' => 'backups', - 'quota' => 'disk quota', - 'bandwidth' => 'bandwidth', - 'Bandwidth' => 'Bandwidth', - 'ns1' => 'ns1', - 'ns2' => 'ns2', - 'PACKAGE_CREATED_OK' => 'Package %s has been created successfully.', - 'user' => 'user', - 'email' => 'email', - 'Email' => 'Email', - 'first name' => 'first name', - 'last name' => 'last name', - 'Please enter valid email address.' => 'Please enter valid email address.', - 'Welcome to Vesta Control Panel' => 'Welcome to Vesta Control Panel', - 'MAIL_FROM' => 'Vesta Control Panel ', - 'GREETINGS_GORDON_FREEMAN'=>"Hello, %s %s,\n", - 'GREETINGS'=>"Hello,\n", - 'ACCOUNT_READY'=>"You account has been created and ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n", - 'ACCOUNT_CREATED_OK' => 'User %s has been created successfully.', - 'ssl certificate' => 'SSL certificate', - 'ssl key' => 'SSL key', - 'SSL Support' => 'SSL Support', - 'SSL Home Directory' => 'SSL Home Directory', - 'SSL Certificate' => 'SSL Certificate', - 'SSL Key' => 'SSL Key', - 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', - 'stats user password' => 'stats user password', - 'stats username' => 'stats username', - 'stats password' => 'stats password', - 'ftp user password' => 'FTP user password', - 'ftp user' => 'FTP user', - 'FTP login credentials' => 'FTP login credentials', - 'FTP_ACCOUNT_READY'=>"FTP account has been created and ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n", - 'WEB_DOMAIN_CREATED_OK' => 'Web domain %s has been created successfully.', - 'OK: changes has been saved.' => 'Success: Changes have been saved.', - 'FTP login credentials' => 'FTP login credentials', - '505' => '505 — oops, internal error. Call an Ambulance!', - 'An internal error occurred' => 'An internal error occurred', - 'GO_BACK_LINK' => 'Try to go back to main page or go to previous page', - 'ERROR: Invalid username or password' => 'Error: Invalid username or password', - 'ERROR: Invalid username or code' => 'Error: Invalid username or reset code', - 'MAIL_RESET_SUBJECT' => 'Password Reset at %s', - 'PASSWORD_RESET_REQUEST'=>"You recently requested a password reset.\nTo coutinue to reset your password, visit this link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you can visit this link: 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 take out apologies.\n\n--\nVesta Control Panel\n", - 'ERROR: Passwords not match' => 'Error: Passwords did not match', - 'Adding Cron Job' => 'Adding Cron Job', - 'Minute' => 'Minute', - 'Day' => 'Day', - 'Month' => 'Month', - 'Day of week' => 'Day of week', - 'Command' => 'Command', - 'Add' => 'Add', - 'Back' => 'Back', - 'Adding database' => 'Adding database', - 'DB_PREFIX_WILL_BE_ADDED' => 'Prefix %s will be automatically added to Database and User name', - 'FTP_PREFIX_WILL_BE_ADDED' => 'Prefix %s will be automatically added to User name', - 'Database' => 'Database', - 'Username' => 'Username', - 'Password' => 'Password', - 'generate' => 'generate', - 'Type' => 'Type', - 'Charset' => 'Charset', - 'Adding DNS Domain' => 'Adding DNS Domain', - 'Domain' => 'Domain', - 'IP-Address' => 'IP-Address', - 'Advanced options' => 'Advanced options', - 'Template' => 'Template', - 'Expiration date' => 'Expiration date', - 'Expire' => 'Expire', - 'YYYY-MM-DD' => 'YYYY-MM-DD', - 'Name servers' => 'Name servers', - 'Name Servers' => 'Name Servers', - 'Powered by Vesta Control Panel' => 'Powered by Vesta Control Panel', - 'Vesta Control Panel' => 'Vesta Control Panel', - 'Translation by ZonD80' => 'Translation by ZonD80', - 'Forgot Password?' => 'Forgot Password?', - 'Log in' => 'Log in', - 'Log out' => 'Log out', - "RESET_NOTICE"=>"Please enter you username to continue.", - 'Submit' => 'Submit', - 'RESET_CODE_SENT' => 'Password reset code has been sent to your email address
Please enter the code into field located below', - 'Confirm' => 'Confirm', - 'New Password' => 'New Password', - 'Confirm Password' => 'Confirm Password', - 'Reset' => 'Reset', - 'Statistics' => 'Statistics', - 'Web Statistics' => 'Statistics', - 'History Log' => 'History Log', - 'Vesta logo' => 'Vesta logo', - 'USER' => 'USER', - 'logout' => 'logout', - 'users' => 'users', - 'Users' => 'Users', - 'spnd' => 'suspended', - 'suspended' => 'suspended', - 'WEB' => 'WEB', - 'domains' => 'domains', - 'aliases' => 'aliases', - 'Aliases' => 'Aliases', - 'DNS' => 'DNS', - 'records' => 'records', - 'Records' => 'Records', - 'MAIL' => 'MAIL', - 'DB' => 'DB', - 'CRON' => 'CRON', - 'BACKUP' => 'BACKUP', - 'Packages' => 'Packages', - 'IP Addresses' => 'IP Addresses', - 'RRD Graphics' => 'RRD Graphics', - 'jobs' => 'jobs', - 'Reset Code' => 'Reset Code', - 'disk' => 'disk', - 'Disk' => 'Disk', - 'traffic' => 'traffic', - 'Database Credentials' => 'Database Credentials', - 'DATABASE_READY'=>"Hello, %s %s,\nDatabase %s has been created successfully.\n\nDatabase: %s_%s\nUser: %s_%s\nPassword: %s\n\n", - 'Adding DNS Record' => 'Adding DNS Record', - 'Record' => 'Record / Subdomain', - 'IP or Value' => 'IP-address or Valie', - 'Priority' => 'Priority', - 'optional' => 'optional', - 'Adding IP Address' => 'Adding IP Address', - 'Shared' => 'Shared', - 'Assigned user' => 'Assigned user', - 'Assigned domain' => 'Assigned domain', - 'Adding Mail Domain' => 'Creatin Mail Domain', - 'AntiSpam Support' => 'AntiSpam Support', - 'AntiVirus Support' => 'AntiVirus Support', - 'DKIM Support' => 'DKIM Support', - 'Adding Mail Account' => 'Adding Mail Account', - 'Advanced options' => 'Advanced options', - 'Quota' => 'Quota', - 'in megabytes' => 'in megabytes', - 'use local-part' => 'use local-part', - 'Forward to' => 'Forward to', - 'one or more email addresses' => 'one or more email addresses', - 'Adding Package' => 'Adding Package', - 'Package Name' => 'Package Name', - 'Package' => 'Package', - 'Default Template' => 'Default Template', - 'SSH Access' => 'SSH Access', - 'Adding User' => 'Adding User', - 'First Name' => 'First Name', - 'Last Name' => 'Last Name', - 'SEND_CREDENTIALS_NOTICE' => 'Send login credentials to', - 'SEND_FTP_CREDENTIALS' => 'Send FTP credentials to', - 'Adding Web Domain' => 'Adding Web Domain', - 'Apache template' => 'Apache template', - 'Nginx Support' => 'Nginx Support', - 'Nginx Extentions' => 'Nginx Extentions', - 'Nginx Template' => 'Nginx Template', - 'Statistics Authorization' => 'Statistics Authorization', - 'Additional FTP Account' => 'Additional FTP Account', - 'Editing Cron Job' => 'Editing Cron Job', - 'Save' => 'Save', - 'Editing Database' => 'Editing Database', - 'Editing DNS Domain' => 'Editing DNS Domain', - 'Editing DNS Record' => 'Editing DNS Record', - 'Editing IP Address' => 'Editing IP Address', - 'Editing Mail Domain' => 'Editing Mail Domain', - 'Catchall email' => 'Catchall email', - 'Editing Mail Account' => 'Editing Mail Account', - 'Autoreply' => 'Autoreply', - 'Message' => 'Message', - 'Editing Package' => 'Editing Package', - 'Editing User' => 'Editing User', - 'Default Name Servers' => 'Default Name Servers', - 'Editing Domain' => 'Editing Domain', - 'Create Backup' => 'Create Backup', - 'apply to selected' => 'apply to selected', - 'toggle all' => 'toggle all', - 'delete' => 'delete', - 'active' => 'active', - 'download' => 'download', - 'Owner' => 'Owner', - 'restore' => 'restore', - 'restart' => 'restart', - 'CPU' => 'CPU', - 'Memory' => 'Memory', - 'stop' => 'stop', - 'Run Time' => 'Run Time', - 'BACKUP_DELETE_CONFIRMATION' => 'Are you sure to delete %s backup?', - 'Backup Size' => 'Backup Size', - 'SYS' => 'SYS', - 'one archive' => 'one archive', - '%s archives' => '%s archives', - 'Add Cron Job' => 'Add Cron Job', - 'add account' => 'add account', - 'open webmail' => 'open webmail', - 'suspend' => 'suspend', - 'unsuspend' => 'unsuspend', - 'CRON_ACTION_CONFIRMATION' => 'Are you sure to %s cron job?', - 'Confirmation' => 'Confirmation', - 'one cron job' => 'one cron job', - '%s cron jobs' => '%s cron jobs', - 'Add Database' => 'Add Database', - 'open %s' => 'open %s', - 'DATABASE_ACTION_CONFIRMATION' => 'Are you sure to %s database %s?', - 'one database' => 'ne database', - '%s databases' => '%s databases', - 'Add DNS Domain' => 'Add DNS Domain', - 'Search' => 'Search', - 'LIST_DOMAIN_RECORDS' => 'List %s records', - 'LIST_MAIL_ACCOUNTS' => 'List %s accounts', - 'add record' => 'add record', - 'DOMAIN_ACTION_CONFIRMATION' => 'Are you sure to %s domain %s?', - '1 domain' => '1 domain', - '%s domains' => '%s domains', - 'Add DNS Record' => 'Add DNS Record', - 'Listing' => 'Listing', - 'list' => 'list', - 'RECORD_ACTION_CONFIRMATION' => 'Are you sure to %s record %s?', - 'one DNS record' => 'one DNS record', - '%s DNS records' => '%s DNS records', - 'Add IP' => 'Add IP', - 'IP_DELETE_CONFIRMATION' => 'Are you sure to delere IP-address %s?', - 'Status' => 'Status', - 'one IP address' => 'one IP address', - '%s IP addresses' => '%s IP addresses', - 'one log record' => 'one log record', - '%s log records' => '%s log records', - 'Add Mail Domain' => 'Add Mail Domain', - 'MAIL_ACTION_CONFIRMATION' => 'Are you sure to %s mail for domain %s?', - 'one domain with email' => 'one domain with email', - '%s domains with email' => '%s domains with email', - 'Add Mail Account' => 'Add Mail Account', - 'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Are you sure to %s mail account %s?', - 'one mail account' => 'one mail account', - '%s mail accounts' => '%s mail accounts', - 'Add Package' => 'Add Package', - 'PACKAGE_DELETE_CONFIRMATION' => 'Are you sure to delete package %s?', - 'one package' => 'one package', - '%s packages' => '%s packages', - 'Daily' => 'Daily', - 'Weekly' => 'Weekly', - 'Monthly' => 'Monthly', - 'Yearly' => 'Yearly', - 'Search Results' => 'Search Results', - 'login as' => 'login as', - 'Object' => 'Object', - 'one object' => 'one object', - '%s objects' => '%s objects', - 'Overall Statistics' => 'Overall Statistics', - 'show per user' => 'show per user', - 'Web' => 'Web', - 'Mail' => 'Mail', - 'User Directories' => 'Папки User Directories', - 'Web SSL Domains' => 'Web SSL Domains', - 'one month' => 'one month', - '%s months' => '%s months', - 'Add User' => 'Add User', - 'Add Domain' => 'Add Domain', - 'rebuild' => 'rebuild', - 'rebuild web' => 'rebuild web', - 'rebuild DNS' => 'rebuild DNS', - 'rebuild mail' => 'rebuild mail', - 'rebuild db' => 'rebuild db', - 'rebuild cron' => 'rebuild cron', - 'update counters' => 'update counters', - 'LOGGED_IN_AS' => 'Logged in as user %s', - 'USER_ACTION_CONFIRMATION' => 'Are you sure to %s user %s?', - 'one account' => 'one account', - '%s accounts' => '%s accounts', - 'Add Domain for hosting' => 'Add Domain for hosting', - 'open webstats' => 'open webstats', - 'Error Log' => 'Error Log', - 'CGI Support' => 'CGI Support', - 'Statistics Auth' => 'Statistics Auth', - 'running' => 'running', - 'SERVICE_ACTION_FAILED' => 'Error: Oparaion "%s" for service "%s" has been failed', - 'Memory Usage' => 'Memory Usage', - 'Bandwidth Usage' => 'Bandwidth Usage', - 'IP Address' => 'IP Address', - 'Accounts' => 'Accounts', -); + 'Packages' => 'Packages', + 'IP' => 'IP', + 'Graphics' => 'Graphics', + 'Statistics' => 'Statistics', + 'Log' => 'Log', + 'Services' => 'Services', + 'Updates' => 'Updates', + 'Log in' => 'Log in', + 'Log out' => 'Log out', -/*error_reporting(E_ALL); -ini_set('display_errors',true);*/ \ No newline at end of file + 'USER' => 'USER', + 'WEB' => 'WEB', + 'DNS' => 'DNS', + 'MAIL' => 'MAIL', + 'DB' => 'DB', + 'CRON' => 'CRON', + 'BACKUP' => 'BACKUP', + + 'Add User' => 'Add User', + 'Add Domain' => 'Add Domain', + 'Add Web Domain' => 'Add Web Domain', + 'Add DNS Domain' => 'Add DNS Domain', + 'Add DNS Record' => 'Add DNS Record', + 'Add Mail Domain' => 'Add Mail Domain', + 'Add Mail Account' => 'Add Mail Account', + 'Add Database' => 'Add Database', + 'Add Cron Job' => 'Add Cron Job', + 'Create Backup' => 'Create Backup', + 'Add Package' => 'Add Package', + 'Add IP' => 'Add IP', + 'Search' => 'Search', + 'Overall Statistics' => 'Overall Statistics', + 'Daily' => 'Daily', + 'Weekly' => 'Weekly', + 'Monthly' => 'Monthly', + 'Yearly' => 'Yearly', + 'Add' => 'Add', + 'Back' => 'Back', + 'Save' => 'Save', + 'Submit' => 'Submit', + + 'toggle all' => 'toggle all', + 'apply to selected' => 'apply to selected', + 'rebuild' => 'rebuild', + 'rebuild web' => 'rebuild web', + 'rebuild dns' => 'rebuild dns', + 'rebuild mail' => 'rebuild mail', + 'rebuild db' => 'rebuild db', + 'rebuild cron' => 'rebuild cron', + 'update counters' => 'update counters', + 'suspend' => 'suspend', + 'unsuspend' => 'unsuspend', + 'delete' => 'delete', + 'show per user' => 'show per user', + 'login as' => 'login as', + 'logout' => 'logout', + 'edit' => 'edit', + 'open webstats' => 'open webstats', + 'list records' => 'list %s records', + 'add record' => 'add record', + 'list accounts' => 'list %s accounts', + 'add account' => 'add account', + 'open webmail' => 'open webmail', + 'open %s' => 'open %s', + 'download' => 'download', + 'restore' => 'restore', + 'stop' => 'stop', + 'start' => 'start', + 'restart' => 'restart', + 'update' => 'update', + 'generate' => 'generate', + + 'Adding User' => 'Adding User', + 'Editing User' => 'Editing User', + 'Adding Domain' => 'Adding Domain', + 'Editing Domain' => 'Editing Domain', + 'Adding DNS Domain' => 'Adding DNS Domain', + 'Editing DNS Domain' => 'Editing DNS Domain', + 'Adding DNS Record' => 'Adding DNS Record', + 'Editing DNS Record' => 'Editing DNS Record', + 'Adding Mail Domain' => 'Adding Mail Domain', + 'Editing Mail Domain' => 'Editing Mail Domain', + 'Adding Mail Account' => 'Adding Mail Account', + 'Editing Mail Account' => 'Editing Mail Account', + 'Adding database' => 'Adding database', + 'Editing Cron Job' => 'Editing Cron Job', + 'Adding Cron Job' => 'Adding Cron Job', + 'Editing Database' => 'Editing Database', + 'Adding Package' => 'Adding Package', + 'Editing Package' => 'Editing Package', + 'Adding IP address' => 'Adding IP address', + 'Editing IP Address' => 'Editing IP Address', + 'Listing' => 'Listing', + 'Search Results' => 'Search Results', + + 'active' => 'active', + 'spnd' => 'suspended', + 'suspended' => 'suspended', + 'running' => 'running', + 'stopped' => 'stopped', + 'outdated' => 'outdated', + 'updated' => 'updated', + + 'yes' => 'yes', + 'no' => 'no', + 'none' => 'none', + 'pb' => 'pb', + 'tb' => 'tb', + 'gb' => 'gb', + 'mb' => 'mb', + 'minute' => 'minute', + 'hour' => 'hour', + 'day' => 'day', + 'days' => 'days', + 'hours' => 'hours', + 'minutes' => 'minutes', + 'month' => 'month', + 'package' => 'package', + 'Bandwidth' => 'Bandwidth', + 'Disk' => 'Disk', + 'Web' => 'Web', + 'Mail' => 'Mail', + 'Databases' => 'Databases', + 'User Directories' => 'User Directories', + 'Template' => 'Template', + 'Web Domains' => 'Web Domains', + 'SSL Domains' => 'SSL Domains', + 'Web Aliases' => 'Web Aliases', + 'per domain' => 'per domain', + 'DNS domains' => 'DNS domains', + 'DNS records' => 'DNS records' , + 'Name Servers' => 'Name Servers', + 'Mail Domains' => 'Mail Domains', + 'Mail Accounts' => 'Mail Accounts', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'SSH Access', + 'IP Addresses' => 'IP Addresses', + 'Backups' => 'Backups', + 'template' => 'template', + 'SSL Support' => 'SSL Support', + 'SSL Home Directory' => 'SSL Home', + 'Nginx Support' => 'Nginx Support', + 'Nginx Extentions' => 'Nginx Extentions', + 'Web Statistics' => 'Web Statistics', + 'Additional FTP Account' => 'Additional FTP Account', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'Expire', + 'Records' => 'Records', + 'Catchall email' => 'Catchall email', + 'AntiVirus Support' => 'AntiVirus Support', + 'AntiSpam Support' => 'AntiSpam Support', + 'DKIM Support' => 'DKIM Support', + 'Accounts' => 'Accounts', + 'Quota' => 'Quota', + 'Autoreply' => 'Autoreply', + 'Forward to' => 'Forward to', + 'database' => 'database', + 'User' => 'User', + 'Host' => 'Host', + 'Charset' => 'Charset', + 'Min' => 'Min', + 'Hour' => 'Hour', + 'Day' => 'Day', + 'Month' => 'Month', + 'Day of week' => 'Day of week', + 'local' => 'local', + 'Run Time' => 'Run Time', + 'Backup Size' => 'Backup Size', + 'SYS' => 'SYS', + 'Domains' => 'Domains', + 'Status' => 'Status', + 'shared' => 'shared', + 'dedicated' => 'dedicated', + 'Users' => 'Users', + 'Load Average' => 'Load Average', + 'Memory Usage' => 'Memory Usage', + 'HTTPD Usage' => 'HTTPD Usage', + 'NGINX Usage' => 'NGINX Usage', + 'MySQL Usage on localhost' => 'MySQL Usage on localhost', + 'PostgreSQL Usage on localhost' => 'PostgreSQL Usage on localhost', + 'Bandwidth Usage eth0' => 'Bandwidth Usage eth0', + 'FTP Usage' => 'FTP Usage', + 'SSH Usage' => 'SSH Usage', + 'reverse proxy' => 'reverse proxy', + 'web server' => 'web server', + 'dns server' => 'dns server', + 'mail server' => 'mail server', + 'pop/imap server' => 'pop/imap server', + 'email antivirus' => 'email antivirus', + 'email antispam' => 'email antispam', + 'database server' => 'database server', + 'ftp server' => 'ftp server', + 'job scheduler' => 'job scheduler', + 'CPU' => 'CPU', + 'Memory' => 'Memory', + 'Uptime' => 'Uptime', + 'core package' => 'core package', + 'php interpreter' => 'php interpreter', + 'internal web server' => 'internal web server', + 'Version' => 'Version', + 'Release' => 'Release', + 'Architecture' => 'Architecture', + 'Object' => 'Object', + 'Owner' => 'Owner', + 'Username' => 'Username', + 'Password' => 'Password', + 'Email' => 'Email', + 'Package' => 'Package', + 'Language' => 'Language', + 'First Name' => 'First Name', + 'Last Name' => 'Last Name', + 'Send login credentials to email address' => 'Send login credentials to email address', + 'Default Template' => 'Default Template', + 'Default Name Servers' => 'Default Name Servers', + 'Domain' => 'Domain', + 'DNS Support' => 'DNS Support', + 'Mail Support' => 'Mail Support', + 'Advanced options' => 'Advanced options', + 'Aliases' => 'Aliases', + 'Apache template' => 'Apache template', + 'Nginx template' => 'Nginx template', + 'SSL Certificate' => 'SSL Certificate', + 'SSL Key' => 'SSL Key', + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', + 'optional' => 'optional', + 'Statistics Authorization' => 'Statistics Authorization', + 'Statistics Auth' => 'Statistics Auth', + 'Account' => 'Account', + 'Prefix will be automaticaly added to username' => 'Prefix %s will be automaticaly added to username', + 'Send FTP credentials to email' => 'Send FTP credentials to email', + 'Expiration Date' => 'Expiration Date', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'Name servers', + 'Record' => 'Record', + 'IP or Value' => 'IP or Value', + 'Priority' => 'Priority', + 'in megabytes' => 'in megabytes', + 'Message' => 'Message', + 'use local-part' => 'use local-part', + 'one or more email addresses' => 'one or more email addresses', + 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s will be automaticaly added to database name and database user', + 'Database' => 'Database', + 'Type' => 'Type', + 'Minute' => 'Minute', + 'Command' => 'Command', + 'Package Name' => 'Package Name', + 'Netmask' => 'Netmask', + 'Interface' => 'Interface', + 'Shared' => 'Shared', + 'Assigned user' => 'Assigned user', + 'Assigned domain' => 'Assigned domain', + 'shell' => 'shell', + 'web domains' => 'web domains', + 'web aliases' => 'web aliases', + 'dns records' => 'dns records', + 'mail domains' => 'mail domains', + 'mail accounts' => 'mail accounts', + 'accounts' => 'accounts', + 'databases' => 'databases', + 'cron jobs' => 'cron jobs', + 'backups' => 'backups', + 'quota' => 'quota', + 'day of week' => 'day of week', + 'cmd' => 'cmd', + 'users' => 'users', + 'domains' => 'domains', + 'aliases' => 'aliases', + 'records' => 'records', + 'jobs' => 'jobs', + 'username' => 'username', + 'password' => 'password', + 'type' => 'type', + 'charset' => 'charset', + 'domain' => 'domain', + 'ip' => 'ip', + 'ip address' => 'ip address', + 'IP address' => 'IP address', + 'netmask' => 'netmask', + 'interface' => 'interface', + 'assigned user' => 'assigned user', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => 'user', + 'email' => 'email', + 'first name' => 'first name', + 'last name' => 'last name', + 'account' => 'account', + 'ssl certificate' => 'ssl certificate', + 'ssl key' => 'ssl key', + 'stats user password' => 'stats user password', + 'stats username' => 'stats username', + 'stats password' => 'stats password', + 'ftp user password' => 'ftp user password', + 'ftp user' => 'ftp user', + + '1 account' => '1 account', + '%s accounts' => '%s accounts', + '1 domain' => '1 domain', + '%s domains' => '%s domains', + '1 record' => '1 record', + '%s records' => '%s records', + '1 mail account' => '1 mail account', + '%s mail accounts' => '%s mail accounts', + '1 database' => '1 database', + '%s databases' => '%s databases', + '1 cron job' => '1 cron job', + '%s cron jobs' => '%s cron jobs', + '1 archive' => '1 archive', + '%s archives' => '%s archives', + '1 package' => '1 package', + '%s packages' => '%s packages', + '1 IP address' => '1 IP address', + '%s IP addresses' => '%s IP addresses', + '1 month' => '1 month', + '%s months' => '%s months', + '1 log record' => '1 log record', + '%s log records' => '%s log records', + '1 object' => '1 object', + '%s objects' => '%s objects', + + 'USER_CREATED_OK' => 'User %s has been created successfully.', + 'WEB_DOMAIN_CREATED_OK' => 'Domain %s has been created successfully.', + 'DNS_DOMAIN_CREATED_OK' => 'DNS domain %s has been created successfully.', + 'DNS_RECORD_CREATED_OK' => 'Record %s.%s has been created successfully.', + 'MAIL_DOMAIN_CREATED_OK' => 'Mail domain %s has been created successfully.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Mail account %s@%s has been created successfully.', + 'DATABASE_CREATED_OK' => 'Database %s has been created successfully.', + 'CRON_CREATED_OK' => 'Cron job has been created successfully.', + 'IP_CREATED_OK' => 'IP address %s has been created successfully.', + 'PACKAGE_CREATED_OK' => 'Package %s has been created successfully.', + 'Changes has been saved.' => 'Changes has been saved.', + 'Confirmation' => 'Confirmation', + 'USER_ACTION_CONFIRMATION' => 'Are you sure to %s user %s?', + 'DOMAIN_ACTION_CONFIRMATION' => 'Are you sure to %s domain %s?', + 'RECORD_ACTION_CONFIRMATION' => 'Are you sure to %s record %s?', + 'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Are you sure to %s mail account %s?', + 'DATABASE_ACTION_CONFIRMATION' => 'Are you sure to %s database %s?', + 'CRON_ACTION_CONFIRMATION' => 'Are you sure to %s cron job?', + 'BACKUP_DELETE_CONFIRMATION' => 'Are you sure to delete %s backup?', + 'PACKAGE_DELETE_CONFIRMATION' => 'Are you sure to delete package %s?', + 'IP_DELETE_CONFIRMATION' => 'Are you sure to delere IP address %s?', + 'Welcome' => 'Welcome', + 'LOGGED_IN_AS' => 'Logged in as user %s', + 'Error' => 'Error', + 'Invalid username or password' => 'Invalid username or password', + 'Invalid username or code' => 'Invalid username or code', + 'Passwords not match' => 'Passwords not match', + 'Please enter valid email address.' => 'Please enter valid email address.', + 'Field "%s" can not be blank.' => 'Field "%s" can not be blank.', + 'Error code:' => 'Error code:', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" failed', + + 'Welcome to Vesta Control Panel' => 'Welcome to Vesta Control Panel', + 'MAIL_FROM' => 'Vesta Control Panel ', + 'GREETINGS_GORDON_FREEMAN' => "Hello, %s %s,\n", + 'GREETINGS' => "Hello,\n", + 'ACCOUNT_READY' => "Your account has been created and ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n", + + 'FTP login credentials' => 'FTP login credentials', + 'FTP_ACCOUNT_READY' => "FTP account has been created and ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n", + + 'Database Credentials' => 'Database Credentials', + 'DATABASE_READY' => "Database has been created successfully.\n\nDatabase: %s\nUser: %s\nPassword: %s\n%s\n\n--\nVesta Control Panel\n", + + 'forgot password' => 'forgot password', + 'Confirm' => 'Confirm', + 'New Password' => 'New Password', + 'Confirm Password' => 'Confirm Password', + 'Reset' => 'Reset', + 'Reset Code' => 'Reset Code', + 'RESET_NOTICE' => '', + '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", +); diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index c33fb2432..94db5cc93 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -1,353 +1,187 @@ 'да', - 'no' => 'нет', - 'none' => 'нет', - 'Hour' => 'Час', - 'Min' => 'Мин', - 'pb' => 'пб', - 'tb' => 'тб', - 'gb' => 'гб', - 'mb' => 'мб', - 'Error' => 'Ошибка', - 'minute' => 'мин.', - 'hour' => 'час', - 'day' => 'день', - 'days' => 'дня(ей)', - 'hours' => 'часа(ов)', - 'minutes' => 'минут(ы)', - 'month' => 'месяц', - 'day of week' => 'день недели', - 'cmd' => 'командная строка', - 'Error: field "%s" can not be blank.' => 'Поле "%s" не может быть пустым.', - _('Error: vesta did not return any output.')=>'Vesta не отвечает', - 'OK: cron job has been created successfully.' => 'Задание Cron успешно создано', - 'database' => 'база данных', - 'username' => 'аккаунт', - 'password' => 'пароль', - 'type' => 'тип', - 'charset' => 'кодировка', - 'edit' => 'редактировать', - 'DATABASE_CREATED_OK' => 'База данных %s успешно создана.', - 'User' => 'Пользователь', - 'Host' => 'Хост', - 'domain' => 'домен', - 'ip' => 'IP', - 'DOMAIN_CREATED_OK' => 'Домен %s успешно создан.', - 'RECORD_CREATED_OK' => 'Запись %s.%s успешно создана.', - 'ip address' => 'IP-адрес', - 'IP Address' => 'IP-адрес', - 'netmask' => 'маска подсети', - 'Netmask' => 'Маска подсети', - 'interface' => 'интерфейс', - 'Interface' => 'Интерфейс', - 'assigned user' => 'назначенный пользователь', - 'IP_CREATED_OK' => '"ip-адрес %s успешно создан.', - 'DOMAIN_MAIL_CREATED_OK' => 'Домен %s успешно создан.', - 'account' => 'аккаунт', - 'Account' => 'Аккаунт', - 'MAIL_ACCOUNT_CREATED_OK' => 'Аккаунт %s@%s успешно создан.', - 'package' => 'пакет', - 'template' => 'шаблон', - 'shell' => 'SSH', - 'web domains' => 'веб домены', - 'Web Domains' => 'Веб домены', - 'Web Aliases' => 'Веб алиасы', - 'per domain' => 'на домен', - 'DNS domains' => 'DNS домены', - 'DNS records count' => 'DNS записи', - 'DNS records' => 'DNS записи', - 'DNS Support' => 'Поддержка DNS', - 'Mail Support' => 'Поддержка почты', - 'web aliases' => 'алиасы хостов', - 'dns records' => 'DNS записи', - 'mail domains' => 'почтовые домены', - 'mail accounts' => 'почтовые аккаунты', - 'Accounts' => 'Аккаунты', - 'Mail Domains' => 'Почтовые домены', - 'Mail Accounts' => 'Почтовые аккаунты', - 'accounts' => 'аккаунты', - 'databases' => 'базы данных', - 'Databases' => 'Базы данных', - 'cron jobs' => 'cron задания', - 'Cron Jobs' => 'Cron задания', - 'Backups' => 'Резервные копии', - 'backups' => 'архивы', - 'quota' => 'квота диска', - 'bandwidth' => 'ширина канала', - 'Bandwidth' => 'Трафик', - 'ns1' => 'DNS-сервер #1', - 'ns2' => 'DNS-сервер #2', - 'PACKAGE_CREATED_OK' => 'Пакет %s успешно создан.', - 'user' => 'пользователь', - 'email' => 'email', - 'Email' => 'Адрес электронной почты', - 'first name' => 'Имя', - 'last name' => 'Фамилия', - 'Please enter valid email address.' => 'Пожалуйста, введите реальный email адрес.', - 'Welcome to Vesta Control Panel' => 'Добро пожаловать в панель управления Vesta', - 'MAIL_FROM' => 'Vesta Control Panel ', - 'GREETINGS_GORDON_FREEMAN'=>"Здравствуйте, %s %s,\n", - 'GREETINGS'=>"Здравствуйте,\n", - 'ACCOUNT_READY'=>"Ваш аккаунт успешно создан и готов к использованию.\n\nhttps://%s/login/\nИмя пользователя: %s\nПароль: %s\n\n--\nПанель управления Vesta\n", - 'ACCOUNT_CREATED_OK' => 'Аккаунт %s успешно создан.', - 'ssl certificate' => 'SSL сертификат', - 'ssl key' => 'ключ SSL сертификата', - 'SSL Support' => 'Поддержка SSL', - 'SSL Home Directory' => 'Директория SSL', - 'SSL Certificate' => 'SSL сертификат', - 'SSL Key' => 'Ключ SSL сертификата', - 'SSL Certificate Authority / Intermediate' => 'Центр сертификации SSL / Intermediate', - 'stats user password' => 'пароль для доступа к статистике', - 'stats username' => 'имя пользователя статистики', - 'stats password' => 'пароль пользователя статистики', - 'ftp user password' => 'пароль для доступа к FTP', - 'ftp user' => 'пользователь FTP', - 'FTP login credentials' => 'Данные для доступа к FTP', - 'FTP_ACCOUNT_READY'=>"FTP аккаунт успешно создан и готов к использованию.\n\nХост: %s\nИмя пользователя: %s_%s\nПароль: %s\n\n--\nПанель управления Vesta\n", - 'WEB_DOMAIN_CREATED_OK' => '%s был успешно создан.', - 'OK: changes has been saved.' => 'Изменения сохранены.', - 'FTP login credentials' => 'Данные для доступа к FTP', - '505' => '505 — внутренняя ошибка', - 'An internal error occurred' => 'Произошла внутренняя ошибка', - 'GO_BACK_LINK' => 'Попробуйте вернуться на главную страницу или вернитесь на предыдущую страницу', - 'ERROR: Invalid username or password' => 'Неверный логин или пароль', - 'ERROR: Invalid username or code' => 'Неверный логин или код сброса пароля', - 'MAIL_RESET_SUBJECT' => 'Сброс пароля %s', - 'PASSWORD_RESET_REQUEST'=>"Вы недавно запросили смену пароля.\nЧтобы произвести смену пароля, пройдите по этой ссылке:\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", - 'ERROR: Passwords not match' => 'Пароли не совпадают', - 'Adding Cron Job' => 'Добавление cron задания', - 'Minute' => 'Минута', - 'Day' => 'День', - 'Month' => 'Месяц', - 'Day of week' => 'День недели', - 'Command' => 'Команда', - 'Add' => 'Добавить', - 'Back' => 'Назад', - 'Adding database' => 'Добавление базы данных', - 'DB_PREFIX_WILL_BE_ADDED' => 'Префикс %s будет автоматически добавлен к БД и пользователю БД', - 'FTP_PREFIX_WILL_BE_ADDED' => 'Префикс %s будет автоматически добавлен к названию акккаунта', - 'Database' => 'База данных', - 'Username' => 'Аккаунт', - 'Password' => 'Пароль', - 'generate' => 'сгенерировать', - 'Type' => 'Тип', - 'Charset' => 'Кодировка', - 'Adding DNS Domain' => 'Добавление DNS домена', - 'Domain' => 'Домен', - 'IP-Address' => 'IP-адрес', - 'Advanced options' => 'Расширенные опции', - 'Template' => 'Шаблон', - 'Expiration date' => 'Зарегистрирован до', - 'Expiration Date' => 'Зарегистрирован до', - 'Expire' => 'Регистрация до', - 'YYYY-MM-DD' => 'ГГГГ-ММ-ДД', - 'Name servers' => 'Сервер имен', - 'Name Servers' => 'Сервер имен', - 'Powered by Vesta Control Panel' => 'Работает на Панели Управления Vesta', - 'Vesta Control Panel' => 'Панель Управления Vesta', - 'Translation by ZonD80' => 'Перевод ZonD80', - 'Forgot Password?' => 'Забыли пароль?', + + 'Packages' => 'Пакеты', + 'IP' => 'IP', + 'Graphics' => 'Графики', + 'Statistics' => 'Статистика', + 'Log' => 'Журнал', + 'Services' => 'Службы', + 'Updates' => 'Обновления', 'Log in' => 'Войти', 'Log out' => 'Выйти', - "RESET_NOTICE"=>"Для сброса пароля введите ваше имя пользователя, и мы расскажем, что нужно делать дальше.", - 'Submit' => 'Отправить', - 'RESET_CODE_SENT' => 'Код сброса пароля выслан на ваш email
Пожалуйста, введите код в располженное ниже поле для продолжения', - 'Confirm' => 'Подтвердить', - 'New Password' => 'Новый пароль', - 'Confirm Password' => 'Подтверждение пароля', - 'Reset' => 'Сбросить', - 'Statistics' => 'Статистика', - 'Web Statistics' => 'Статистика сайта', - 'History Log' => 'Журнал', - 'Vesta logo' => 'Логотип Vesta', + 'USER' => 'USER', - 'logout' => 'выйти', - 'users' => 'пользователи', - 'Users' => 'Пользователи', - 'spnd' => 'заблокировано', - 'suspended' => 'заблокирован', 'WEB' => 'WEB', - 'domains' => 'домены', - 'aliases' => 'алиасы', - 'Aliases' => 'Алиасы', 'DNS' => 'DNS', - 'records' => 'записи', - 'Records' => 'DNS записи', 'MAIL' => 'MAIL', 'DB' => 'DB', 'CRON' => 'CRON', 'BACKUP' => 'BACKUP', - 'Packages' => 'Пакеты', - 'IP Addresses' => 'IP адреса', - 'RRD Graphics' => 'RRD Графики', - 'jobs' => 'задания', - 'Reset Code' => 'Код сброса', - 'disk' => 'диск', - 'Disk' => 'Диск', - 'traffic' => 'трафик', - 'Database Credentials' => 'Данные для доступа к БД', - 'DATABASE_READY'=>"База данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n", - 'Adding DNS Record' => 'Добавление DNS записи', - 'Record' => 'Запись / Поддомен', - 'IP or Value' => 'IP-адрес или значение', - 'Priority' => 'Приоритет', - 'optional' => 'опционально', - 'Adding IP address' => 'Добавление IP-адреса', - 'Shared' => 'Общий', - 'Assigned user' => 'Назначить пользователю', - 'Assigned domain' => 'Домен', - 'Adding Mail Domain' => 'Добавление почтового домена', - 'AntiSpam Support' => 'Поддержка анти-спама', - 'AntiVirus Support' => 'Поддержка антивируса', - 'DKIM Support' => 'Поддержка DKIM', - 'Adding Mail Account' => 'Добавление почтового аккаунта', - 'Advanced options' => 'Дополнительные опции', - 'Quota' => 'Квота', - 'in megabytes' => 'в мегабайтах', - 'use local-part' => 'используйте только имена аккаунтов', - 'Forward to' => 'Пересылка', - 'one or more email addresses' => 'один или несколько email-адресов', - 'Adding Package' => 'Добавление пакета', - 'Package Name' => 'Название пакета', - 'Package' => 'Пакет', - 'Default Template' => 'Шаблон по умолчанию', - 'SSH Access' => 'Доступ по SSH', - 'Adding User' => 'Добавление аккаунта', - 'First Name' => 'Имя', - 'Last Name' => 'Фамилия', - 'SEND_CREDENTIALS_NOTICE' => 'Отправить данные аккаунта по адресу', - 'SEND_FTP_CREDENTIALS' => 'Отправить данные ftp аккаунта по адресу', - 'Adding Web Domain' => 'Добавление домена', - 'Apache template' => 'Шаблон Apache', - 'Nginx Support' => 'Поддержка Nginx', - 'Nginx Extentions' => 'Обработка Nginx', - 'Nginx Template' => 'Шаблон для Nginx', - 'Statistics Authorization' => 'Ограниченный доступ к статистике', - 'Additional FTP Account' => 'Дополнительный ftp', - 'Editing Cron Job' => 'Редактирование cron-задания', - 'Save' => 'Сохранить', - 'Editing Database' => 'Редактирование БД', - 'Editing DNS Domain' => 'Редактирование DNS домена', - 'Editing DNS Record' => 'Редактирование DNS записи', - 'Editing IP Address' => 'Редактирование IP-адреса', - 'Editing Mail Domain' => 'Редактирование почты для домена', - 'Catchall email' => 'Ловушка почты', - 'Editing Mail Account' => 'Редактирование почтового акканунта', - 'Autoreply' => 'Автоответчик', - 'Message' => 'Сообщение', - 'Editing Package' => 'Редактирование пакета', - 'Editing User' => 'Редактирование аккаунта', - 'Default Name Servers' => 'Серверы имен', - 'Editing Domain' => 'Редактирование домена', - 'Create Backup' => 'Создать архив', - 'apply to selected' => 'применить к выбранным', - 'toggle all' => 'выделить все', - 'delete' => 'удалить', - 'active' => 'активен', - 'download' => 'скачать', - 'Owner' => 'Владелец', - 'restore' => 'восстановить', - 'restart' => 'перезапустить', - 'CPU' => 'Процессор', - 'Memory' => 'Память', - 'stop' => 'остановить', - 'Run Time' => 'Время выполнения', - 'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s архив?', - 'Backup Size' => 'Размер', - 'SYS' => 'Системный', - '1 archive' => 'архивов на странице: 1', - '%s archives' => 'архивов на странице: %s', - 'Add Cron Job' => 'Добавить задание', - 'add account' => 'добавить аккаунт', - 'open webmail' => 'открыть веб-почту', - 'suspend' => 'заблокировать', - 'unsuspend' => 'активировать', - 'CRON_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s cron-задание?', - 'Confirmation' => 'Подтверждение', - '1 cron job' => 'заданий на странице: 1', - '%s cron jobs' => 'заданий на странице: %s', - 'Add Database' => 'Добавить БД', - 'open %s' => 'открыть %s', - 'DATABASE_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s базу данных %s?', - '1 database' => 'баз данных на странице: 1', - '%s databases' => 'баз данных на странице: %s', + + 'Add User' => 'Добавить аккаунт', + 'Add Domain' => 'Добавить домен', + 'Add Web Domain' => 'Добавить домен', 'Add DNS Domain' => 'Добавить домен', - 'Search' => 'Поиск', - 'LIST_DOMAIN_RECORDS' => 'показать dns записи', - 'add record' => 'добавить запись', - 'LIST_MAIL_ACCOUNTS' => 'показать аккаунты', - 'DOMAIN_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s домен %s?', - '1 domain' => 'доменов на странице: 1', - '%s domains' => 'доменов на странице: %s', 'Add DNS Record' => 'Добавить запись', - 'Listing' => 'Просмотр', - 'list' => 'посмотреть', - 'RECORD_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s запись %s?', - '1 DNS record' => 'записей на странице: 1', - '%s DNS records' => 'записей на странице: %s', - 'Add IP' => 'Добавить IP адрес', - 'IP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?', - 'Status' => 'Статус', - '1 IP address' => 'IP адресов на странице: 1', - '%s IP addresses' => 'IP адресов на странице: %s', - '1 log record' => 'записей на странице: 1', - '%s log records' => 'записей на странице %s', 'Add Mail Domain' => 'Добавить домен', - 'MAIL_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почту для домена %s?', 'Add Mail Account' => 'Добавить аккаунт', - 'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почтовый ящик %s?', - '1 mail account' => 'почтовых акаунтов на странице: 1', - '%s mail accounts' => 'почтовых акаунтов на странице: %s', + 'Add Database' => 'Добавить БД', + 'Add Cron Job' => 'Добавить задание', + 'Create Backup' => 'Создать архив', 'Add Package' => 'Добавить пакет', - 'PACKAGE_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить пакет %s?', - '1 package' => 'пакетов на странице: 1', - '%s packages' => 'пакетов на странице: %s', + 'Add IP' => 'Добавить IP', + 'Search' => 'Поиск', + 'Overall Statistics' => 'Сводная статистика', 'Daily' => 'Ежедневый', 'Weekly' => 'Еженедельный', 'Monthly' => 'Ежемесячный', 'Yearly' => 'Ежегодный', - 'Search Results' => 'Результаты поиска', - 'login as' => 'войти как', - 'Object' => 'Объект', - '1 object' => 'объектов на странице: 1', - '%s objects' => 'объектов на странице: %s', - 'Overall Statistics' => 'Сводная статистика', - 'show per user' => 'выбрать пользователя', - 'Web' => 'Веб', - 'Mail' => 'Почта', - 'User Directories' => 'Папки пользователя', - 'Web SSL Domains' => 'SSL домены', - '1 month' => 'месяцев на странице: 1', - '%s months' => 'месяцев на странице: %s', - 'Add User' => 'Добавить аккаунт', - 'Add Domain' => 'Добавить домен', + 'Add' => 'Добавить', + 'Back' => 'Назад', + 'Save' => 'Сохранить', + 'Submit' => 'Отправить', + + 'toggle all' => 'выделить все', + 'apply to selected' => 'применить к выбранным', 'rebuild' => 'пересоздать', 'rebuild web' => 'пересоздать WEB', - 'rebuild DNS' => 'пересоздать DNS', + 'rebuild dns' => 'пересоздать DNS', 'rebuild mail' => 'пересоздать MAIL', 'rebuild db' => 'пересоздать DB', 'rebuild cron' => 'пересоздать CRON', 'update counters' => 'пересчитать счетчики', - 'LOGGED_IN_AS' => 'Вы вошли как пользователь %s', - 'USER_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s пользователя %s?', - '1 account' => ' пользователей на странице: 1', - '%s accounts' => 'пользователей на странице: %s', - 'Add Web Domain' => 'Добавить домен', + 'suspend' => 'заблокировать', + 'unsuspend' => 'активировать', + 'delete' => 'удалить', + 'show per user' => 'выбрать пользователя', + 'login as' => 'войти как', + 'logout' => 'выйти', + 'edit' => 'редактировать', 'open webstats' => 'открыть отчет веб-аналитики', - 'Error Log' => 'Лог Ошибок', - 'CGI Support' => 'Поддержка CGI', - 'Statistics Auth' => 'Авторизация Статистики', + 'list records' => 'показать записи: %s', + 'add record' => 'добавить запись', + 'list accounts' => 'показать аккаунты: %s', + 'add account' => 'добавить аккаунт', + 'open webmail' => 'открыть веб-почту', + 'open %s' => 'открыть %s', + 'download' => 'скачать', + 'restore' => 'восстановить', + 'stop' => 'остановить', + 'start' => 'запустить', + 'restart' => 'перезапустить', + 'update' => 'обновить', + 'generate' => 'сгенерировать', + + 'Adding User' => 'Добавление аккаунта', + 'Editing User' => 'Редактирование аккаунта', + 'Adding Domain' => 'Добавление домена', + 'Editing Domain' => 'Редактирование домена', + 'Adding DNS Domain' => 'Добавление DNS домена', + 'Editing DNS Domain' => 'Редактирование DNS домена', + 'Adding DNS Record' => 'Добавление DNS записи', + 'Editing DNS Record' => 'Редактирование DNS записи', + 'Adding Mail Domain' => 'Добавление почтового домена', + 'Editing Mail Domain' => 'Редактирование почты для домена', + 'Adding Mail Account' => 'Добавление почтового аккаунта', + 'Editing Mail Account' => 'Редактирование почтового акканунта', + 'Adding database' => 'Добавление базы данных', + 'Editing Cron Job' => 'Редактирование cron-задания', + 'Adding Cron Job' => 'Добавление cron задания', + 'Editing Database' => 'Редактирование БД', + 'Adding Package' => 'Добавление пакета', + 'Editing Package' => 'Редактирование пакета', + 'Adding IP address' => 'Добавление IP адреса', + 'Editing IP Address' => 'Редактирование IP адреса', + 'Listing' => 'Просмотр', + 'Search Results' => 'Результаты поиска', + + 'active' => 'активен', + 'spnd' => 'заблокировано', + 'suspended' => 'заблокирован', 'running' => 'работает', - 'SERVICE_ACTION_FAILED' => 'Операция "%s" для сервиса "%s" не удалась', + 'stopped' => 'остановлен', + 'outdated' => 'устарел', + 'updated' => 'обновлен', + + 'yes' => 'да', + 'no' => 'нет', + 'none' => 'нет', + 'pb' => 'пб', + 'tb' => 'тб', + 'gb' => 'гб', + 'mb' => 'мб', + 'minute' => 'мин.', + 'hour' => 'час', + 'day' => 'дн.', + 'days' => 'дн.', + 'hours' => 'час.', + 'minutes' => 'мин.', + 'month' => 'месяц', + 'package' => 'пакет', + 'Bandwidth' => 'Трафик', + 'Disk' => 'Диск', + 'Web' => 'Веб', + 'Mail' => 'Почта', + 'Databases' => 'Базы данных', + 'User Directories' => 'Папки пользователя', + 'Template' => 'Шаблон', + 'Web Domains' => 'Веб домены', + 'SSL Domains' => 'SSL домены', + 'Web Aliases' => 'Веб алиасы', + 'per domain' => 'на домен', + 'DNS domains' => 'DNS домены', + 'DNS records' => 'DNS записи', + 'Name Servers' => 'Сервер имен', + 'Mail Domains' => 'Почтовые домены', + 'Mail Accounts' => 'Почтовые аккаунты', + 'Cron Jobs' => 'Cron задания', + 'SSH Access' => 'Доступ по SSH', + 'IP Addresses' => 'IP адреса', + 'Backups' => 'Резервные копии', + 'template' => 'шаблон', + 'SSL Support' => 'Поддержка SSL', + 'SSL Home Directory' => 'Директория SSL', + 'Nginx Support' => 'Поддержка Nginx', + 'Nginx Extentions' => 'Обработка Nginx', + 'Web Statistics' => 'Статистика сайта', + 'Additional FTP Account' => 'Дополнительный ftp', + 'SOA' => 'SOA', + 'TTL' => 'TTL', + 'Expire' => 'Регистрация до', + 'Records' => 'DNS записи', + 'Catchall email' => 'Ловушка почты', + 'AntiVirus Support' => 'Ативирус', + 'AntiSpam Support' => 'Антспам', + 'DKIM Support' => 'DKIM', + 'Accounts' => 'Аккаунты', + 'Quota' => 'Квота', + 'Autoreply' => 'Автоответчик', + 'Forward to' => 'Пересылка', + 'database' => 'база данных', + 'User' => 'Пользователь', + 'Host' => 'Сервер', + 'Charset' => 'Кодировка', + 'Min' => 'Мин', + 'Hour' => 'Час', + 'Day' => 'День', + 'Month' => 'Месяц', + 'Day of week' => 'День недели', + 'local' => 'локальный', + 'Run Time' => 'Выполнен за', + 'Backup Size' => 'Размер', + 'SYS' => 'Системный', + 'Domains' => 'Домены', + 'Status' => 'Статус', + 'shared' => 'общий', + 'dedicated' => 'выделенный', + 'Users' => 'Пользователи', 'Load Average' => 'Общая нагрузка', 'Memory Usage' => 'Использование памяти', 'HTTPD Usage' => 'Веб сервер', @@ -357,14 +191,195 @@ $LANG['ru'] = array( 'Bandwidth Usage eth0' => 'Использование cети: eth0', 'FTP Usage' => 'FTP сервер', 'SSH Usage' => 'SSH сервер', - 'local' => 'локальный', - 'shared' => 'общий', - 'dedicated' => 'выделенный', - 'Domains' => 'Домены', + 'reverse proxy' => 'обратный прокси', + 'web server' => 'веб сервер', + 'dns server' => 'сервер имен', + 'mail server' => 'почтовый сервер', + 'pop/imap server' => 'pop/imap сервер', + 'email antivirus' => 'почтовый антивирус', + 'email antispam' => 'почтовый антиcпам', + 'database server' => 'сервер баз данных', + 'ftp server' => 'ftp сервер', + 'job scheduler' => 'планировщик заданий', + 'CPU' => 'Процессор', + 'Memory' => 'Память', + 'Uptime' => 'Запущен', + 'core package' => 'главный пакет', + 'php interpreter' => 'php интерпретатор', + 'internal web server' => 'внутренний веб сервер', + 'Version' => 'Версия', + 'Release' => 'Релиз', + 'Architecture' => 'Архитектура', + 'Object' => 'Объект', + 'Owner' => 'Владелец', + 'Username' => 'Аккаунт', + 'Password' => 'Пароль', + 'Email' => 'Адрес электронной почты', + 'Package' => 'Пакет', + 'Language' => 'Язык', + 'First Name' => 'Имя', + 'Last Name' => 'Фамилия', + 'Send login credentials to email address' => 'Отправить данные аккаунта по адресу', + 'Default Template' => 'Шаблон по умолчанию', + 'Default Name Servers' => 'Серверы имен', + 'Domain' => 'Домен', + 'DNS Support' => 'Поддержка DNS', + 'Mail Support' => 'Поддержка почты', + 'Advanced options' => 'Дополнительные опции', + 'Aliases' => 'Алиасы', + 'Apache template' => 'Шаблон Apache', + 'Nginx template' => 'Шаблон для Nginx', + 'SSL Certificate' => 'SSL сертификат', + 'SSL Key' => 'Ключ SSL сертификата', + 'SSL Certificate Authority / Intermediate' => 'Центр сертификации SSL / Intermediate', + 'optional' => 'опционально', + 'Statistics Authorization' => 'Ограниченный доступ к статистике', + 'Statistics Auth' => 'Авторизация Статистики', + 'Account' => 'Аккаунт', + 'Prefix will be automaticaly added to username' => 'Префикс %s будет автоматически добавлен к названию акккаунта', + 'Send FTP credentials to email' => 'Отправить данные ftp аккаунта по адресу', + 'Expiration Date' => 'Зарегистрирован до', + 'YYYY-MM-DD' => 'ГГГГ-ММ-ДД', + 'Name servers' => 'Сервер имен', + 'Record' => 'Запись / Поддомен', + 'IP or Value' => 'IP адрес или значение', + 'Priority' => 'Приоритет', + 'in megabytes' => 'в мегабайтах', + 'Message' => 'Сообщение', + 'use local-part' => 'используйте только имена аккаунтов', + 'one or more email addresses' => 'один или несколько email-адресов', + 'Prefix will be automaticaly added to database name and database user' => 'Префикс %s будет автоматически добавлен к БД и пользователю БД', + 'Database' => 'База данных', + 'Type' => 'Тип', + 'Minute' => 'Минута', + 'Command' => 'Команда', + 'Package Name' => 'Название пакета', + 'Netmask' => 'Маска подсети', + 'Interface' => 'Интерфейс', + 'Shared' => 'Общий', + 'Assigned user' => 'Назначить пользователю', + 'Assigned domain' => 'Домен', + 'shell' => 'ssh доступ', + 'web domains' => 'веб домены', + 'web aliases' => 'алиасы хостов', + 'dns records' => 'DNS записи', + 'mail domains' => 'почтовые домены', + 'mail accounts' => 'почтовые аккаунты', + 'accounts' => 'аккаунты', + 'databases' => 'базы данных', + 'cron jobs' => 'cron задания', + 'backups' => 'архивы', + 'quota' => 'квота диска', + 'day of week' => 'день недели', + 'cmd' => 'командная строка', + 'users' => 'пользователи', + 'domains' => 'домены', + 'aliases' => 'алиасы', + 'records' => 'записи', + 'jobs' => 'задания', + 'username' => 'аккаунт', + 'password' => 'пароль', + 'type' => 'тип', + 'charset' => 'кодировка', + 'domain' => 'домен', + 'ip' => 'IP', + 'ip address' => 'IP адрес', 'IP address' => 'IP адрес', - 'Welcome' => 'Добро пожаловать', - 'Language' => 'Язык' -); + 'netmask' => 'маска подсети', + 'interface' => 'интерфейс', + 'assigned user' => 'назначенный пользователь', + 'ns1' => 'сервер имен #1', + 'ns2' => 'сервер имен #2', + 'user' => 'пользователь', + 'email' => 'email', + 'first name' => 'имя', + 'last name' => 'фамилия', + 'account' => 'аккаунт', + 'ssl certificate' => 'SSL сертификат', + 'ssl key' => 'ключ SSL сертификата', + 'stats user password' => 'пароль для доступа к статистике', + 'stats username' => 'имя пользователя статистики', + 'stats password' => 'пароль пользователя статистики', + 'ftp user password' => 'пароль для доступа к FTP', + 'ftp user' => 'пользователь FTP', -/*error_reporting(E_ALL); -ini_set('display_errors',true);*/ + '1 account' => ' пользователей на странице: 1', + '%s accounts' => 'пользователей на странице: %s', + '1 domain' => 'доменов на странице: 1', + '%s domains' => 'доменов на странице: %s', + '1 record' => 'записей на странице: 1', + '%s records' => 'записей на странице: %s', + '1 mail account' => 'акаунтов на странице: 1', + '%s mail accounts' => 'акаунтов на странице: %s', + '1 database' => 'баз данных на странице: 1', + '%s databases' => 'баз данных на странице: %s', + '1 cron job' => 'заданий на странице: 1', + '%s cron jobs' => 'заданий на странице: %s', + '1 archive' => 'архивов на странице: 1', + '%s archives' => 'архивов на странице: %s', + '1 package' => 'пакетов на странице: 1', + '%s packages' => 'пакетов на странице: %s', + '1 IP address' => 'IP адресов на странице: 1', + '%s IP addresses' => 'IP адресов на странице: %s', + '1 month' => 'месяцев на странице: 1', + '%s months' => 'месяцев на странице: %s', + '1 log record' => 'записей на странице: 1', + '%s log records' => 'записей на странице %s', + '1 object' => 'объектов на странице: 1', + '%s objects' => 'объектов на странице: %s', + + 'USER_CREATED_OK' => 'Аккаунт %s успешно создан.', + 'WEB_DOMAIN_CREATED_OK' => 'Домен %s был успешно создан.', + 'DNS_DOMAIN_CREATED_OK' => 'Домен %s успешно создан.', + 'DNS_RECORD_CREATED_OK' => 'Запись %s.%s успешно создана.', + 'MAIL_DOMAIN_CREATED_OK' => 'Домен %s успешно создан.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Аккаунт %s@%s успешно создан.', + 'DATABASE_CREATED_OK' => 'База данных %s успешно создана.', + 'CRON_CREATED_OK' => 'Задание успешно создано', + 'IP_CREATED_OK' => '"IP адрес %s успешно создан.', + 'PACKAGE_CREATED_OK' => 'Пакет %s успешно создан.', + 'Changes has been saved.' => 'Изменения сохранены.', + 'Confirmation' => 'Подтверждение', + 'USER_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s пользователя %s?', + 'DOMAIN_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s домен %s?', + 'RECORD_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s запись %s?', + 'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почтовый ящик %s?', + 'DATABASE_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s базу данных %s?', + 'CRON_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s cron-задание?', + 'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s архив?', + 'PACKAGE_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить пакет %s?', + 'IP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?', + 'Welcome' => 'Добро пожаловать', + 'LOGGED_IN_AS' => 'Вы вошли как пользователь %s', + 'Error' => 'Ошибка', + 'Invalid username or password' => 'Неверный логин или пароль', + 'Invalid username or code' => 'Неверный логин или код сброса пароля', + 'Passwords not match' => 'Пароли не совпадают', + 'Please enter valid email address.' => 'Пожалуйста, введите реальный email адрес.', + 'Field "%s" can not be blank.' => 'Поле "%s" не может быть пустым.', + 'Error code:' => 'Код ошибки: %s', + 'SERVICE_ACTION_FAILED' => 'Не удалось "%s" "%s"', + + 'Welcome to Vesta Control Panel' => 'Добро пожаловать в панель управления Vesta', + 'MAIL_FROM' => 'Vesta Control Panel ', + 'GREETINGS_GORDON_FREEMAN' => "Здравствуйте, %s %s,\n", + 'GREETINGS' => "Здравствуйте,\n", + 'ACCOUNT_READY' => "Ваш аккаунт успешно создан и готов к использованию.\n\nhttps://%s/login/\nИмя пользователя: %s\nПароль: %s\n\n--\nПанель управления Vesta\n", + + 'FTP login credentials' => 'Данные для доступа к FTP', + 'FTP_ACCOUNT_READY' => "FTP аккаунт успешно создан и готов к использованию.\n\nХост: %s\nИмя пользователя: %s_%s\nПароль: %s\n\n--\nПанель управления Vesta\n", + + 'Database Credentials' => 'Данные для доступа к БД', + 'DATABASE_READY' => "База данных создана успешно.\n\nБаза данных: %s\nПользователь: %s\nПароль: %s\n%s\n\n--\nПанель управления Vesta\n", + + 'forgot password' => 'напомнить', + 'Confirm' => 'Подтвердить', + 'New Password' => 'Новый пароль', + 'Confirm Password' => 'Подтверждение пароля', + 'Reset' => 'Сбросить', + 'Reset Code' => 'Код восстановления', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => 'Код для восстановления пароля был выслан на ваш электронный адрес.
', + 'MAIL_RESET_SUBJECT' => 'Восстановление пароля %s', + 'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извиниения.\n\n--\nПанель управления Vesta\n", +); diff --git a/web/inc/main.php b/web/inc/main.php index 6766cc695..e1f573522 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,5 +1,17 @@ 1) { $args[0] = $text; - return call_user_func_array("sprintf",$args); - } - else return $text; -} + if (!isset($LANG[$l][$key])) { + $text=$key; + } else { + $text=$LANG[$l][$key]; + } + + array_shift($args); + if (count($args)>1) { + $args[0] = $text; + return call_user_func_array("sprintf",$args); + } else { + return $text; + } +} define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); $i = 0; -// setting language here - - - $ls['command'] = VESTA_CMD."v-list-sys-languages json"; - exec ($ls['command'], $ls['output'], $ls['return_var']); - $ls['langs'] = json_decode(implode('', $ls['output']), true); - - if (isset($_SESSION['language'])&&!in_array($_SESSION['language'],$ls['langs'])) { - $ls['browserlang'] = strtolower(substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2)); - if (!in_array($ls['browserlang'],$ls['langs'])) { - unset($ls); - $ls['command'] = VESTA_CMD."v-list-sys-config json"; - exec ($ls['command'], $ls['output'], $ls['return_var']); - $ls['langs'] = json_decode(implode('',$ls['output']),true); - $_SESSION['language'] = $ls['langs']['config']['LANGUAGE']; - } else { - $_SESSION['language'] = $ls['browserlang']; - } +if (isset($_SESSION['language'])) { + switch ($_SESSION['language']) { + case 'ru': + setlocale(LC_ALL, 'ru_RU.utf8'); + default: + setlocale(LC_ALL, 'en_EN.utf8'); } - unset($ls); - -if ((!isset($_SESSION['user'])) && (!isset($api_mode))&&!defined('NO_AUTH_REQUIRED')) { - $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; - header("Location: /login/"); - exit; +} + +if (isset($_SESSION['user'])) { + $user = $_SESSION['user']; } if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) { $user = $_SESSION['look']; -} else { - $user = $_SESSION['user']; } -// Define functions + function check_error($return_var){ if ( $return_var > 0 ) { header("Location: /error/"); diff --git a/web/index.php b/web/index.php index ab20f591d..35c889c9f 100644 --- a/web/index.php +++ b/web/index.php @@ -1,11 +1,5 @@ 0 ) { - $ERROR = ""._('ERROR: Invalid username or password').""; +} + +// Auth +if (isset($_POST['user']) && isset($_POST['password'])) { + $v_user = escapeshellarg($_POST['user']); + $v_password = escapeshellarg($_POST['password']); + exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'", $output, $return_var); + if ( $return_var > 0 ) { + $ERROR = ""._('Invalid username or password').""; + } else { + unset($output); + exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); + $data = json_decode(implode('', $output), true); + $_SESSION['language'] = $data[$_POST['user']]['LANGUAGE']; + if (empty($_SESSION['language'])) $_SESSION['language'] = $LANGUAGE; + $_SESSION['user'] = $_POST['user']; + if ($_POST['user'] == 'root') $_SESSION['user'] = 'admin'; + if (!empty($_SESSION['request_uri'])) { + header("Location: ".$_SESSION['request_uri']); + unset($_SESSION['request_uri']); + exit; } else { - $_SESSION['user'] = $_POST['user']; - if ($_POST['user'] == 'root') $_SESSION['user'] = 'admin'; - if (!empty($_SESSION['request_uri'])) { - header("Location: ".$_SESSION['request_uri']); - unset($_SESSION['request_uri']); - exit; - } else { - header("Location: /"); - exit; - } + header("Location: /"); + exit; } } - require_once '../templates/header.html'; - require_once '../templates/login.html'; +} else { + // Set system language + exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); + $data = json_decode(implode('', $output), true); + if (!empty( $data['config']['LANGUAGE'])) { + $_SESSION['language'] = $data['config']['LANGUAGE']; + } else { + $_SESSION['language'] = 'en'; + } + + require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); + require_once('../templates/header.html'); + require_once('../templates/login.html'); } ?> diff --git a/web/reset/index.php b/web/reset/index.php index 4ba203f95..1bc264b3a 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -1,12 +1,10 @@ "._('ERROR: Invalid username or code').""; + $ERROR = ""._('Invalid username or code').""; } } else { - $ERROR = ""._('ERROR: Invalid username or code').""; + $ERROR = ""._('Invalid username or code').""; } } else { - $ERROR = ""._('ERROR: Passwords not match').""; + $ERROR = ""._('Passwords not match').""; } } -require_once '../templates/header.html'; + if (empty($_GET['action'])) { + // Set system language + exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); + $data = json_decode(implode('', $output), true); + if (!empty( $data['config']['LANGUAGE'])) { + $_SESSION['language'] = $data['config']['LANGUAGE']; + } else { + $_SESSION['language'] = 'en'; + } + require_once '../templates/header.html'; require_once '../templates/reset_1.html'; } else { + // Set system language + exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var); + $data = json_decode(implode('', $output), true); + if (!empty( $data['config']['LANGUAGE'])) { + $_SESSION['language'] = $data['config']['LANGUAGE']; + } else { + $_SESSION['language'] = 'en'; + } + require_once '../templates/header.html'; if ($_GET['action'] == 'code' ) { require_once '../templates/reset_2.html'; } diff --git a/web/reset/mail/index.php b/web/reset/mail/index.php index b49700c68..db29acdf7 100644 --- a/web/reset/mail/index.php +++ b/web/reset/mail/index.php @@ -1,7 +1,7 @@ diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index efab9c54b..46ca948d1 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -62,8 +62,8 @@ - @@ -162,7 +162,7 @@ diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html index 28e5b2aff..110a53e35 100644 --- a/web/templates/admin/add_dns.html +++ b/web/templates/admin/add_dns.html @@ -106,7 +106,7 @@ diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index b7e5ab39b..3f13dace9 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -130,7 +130,7 @@ diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 06836b294..9b791df31 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -155,7 +155,7 @@ diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 35d5d2922..c46b466e6 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -10,7 +10,7 @@
- + +
- +
- () + ()
- () + ()
- +
- @@ -356,7 +356,7 @@ diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 0f8b00d94..0dde1f801 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -131,7 +131,7 @@ diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index d866a4caa..227f32046 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -300,7 +300,7 @@ @@ -324,7 +324,7 @@ ?> diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index 24e9b6beb..9a4895640 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -53,8 +53,8 @@
+ → ".$_SESSION['error_msg'].""; @@ -336,7 +336,7 @@

- +
- +
- () + ()
- ' . _('FTP_PREFIX_WILL_BE_ADDED',$user."_") . '' ?> + ' . _('Prefix will be automaticaly added to username',$user."_") . '' ?>
- +
- - + + " /> @@ -63,19 +63,18 @@ - "> - + " class="data-controls"> + - - + + -
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index 22a07db64..dc7dabbbc 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -52,8 +52,8 @@
- - + + @@ -62,8 +62,8 @@ - - + + @@ -72,8 +72,8 @@ - - + + diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html index 9b5f6b3c7..15037191b 100644 --- a/web/templates/admin/list_db.html +++ b/web/templates/admin/list_db.html @@ -32,7 +32,7 @@ - - + + " /> @@ -76,14 +76,14 @@ - - + + - - + + diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html index b0efb5bf2..0c2f5f24e 100644 --- a/web/templates/admin/list_dns.html +++ b/web/templates/admin/list_dns.html @@ -50,8 +50,8 @@ - - + + @@ -60,8 +60,8 @@ - - + + @@ -70,22 +70,22 @@ - - + + - - + + - - + + - + @@ -111,11 +111,11 @@
- + - +
SOA::
TTL::
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html index 11d24292b..37e5ea7de 100644 --- a/web/templates/admin/list_dns_rec.html +++ b/web/templates/admin/list_dns_rec.html @@ -58,8 +58,8 @@
- - + + @@ -68,8 +68,8 @@ - - + + @@ -78,8 +78,8 @@ - - + + @@ -106,9 +106,9 @@ diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html index e54af488d..9f4458537 100644 --- a/web/templates/admin/list_ip.html +++ b/web/templates/admin/list_ip.html @@ -44,8 +44,8 @@ - - + + " /> @@ -54,8 +54,8 @@ - - + + diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html index 0398da0ef..f83a86e39 100644 --- a/web/templates/admin/list_log.html +++ b/web/templates/admin/list_log.html @@ -33,11 +33,7 @@ - - - - -
+
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html index a89eba862..419f160a7 100644 --- a/web/templates/admin/list_mail.html +++ b/web/templates/admin/list_mail.html @@ -30,7 +30,7 @@
$value) { ++$i; if ($data[$key]['SUSPENDED'] == 'yes') { @@ -53,51 +53,50 @@
- - + + - - + + - - + + - " target="_blank"> - + " target="_blank" class="data-controls"> + + - - + + - - + + - + - -
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html index 1c5164e78..030e7f451 100644 --- a/web/templates/admin/list_mail_acc.html +++ b/web/templates/admin/list_mail_acc.html @@ -60,8 +60,8 @@
- - + + @@ -70,8 +70,8 @@ - - + + @@ -80,8 +80,8 @@ - - + + diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html index 9ead55bfb..801c5eac7 100644 --- a/web/templates/admin/list_packages.html +++ b/web/templates/admin/list_packages.html @@ -44,8 +44,8 @@
- - + + " /> @@ -55,8 +55,8 @@ - - + + @@ -132,7 +132,7 @@ - : + : diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html index 04a1b1798..01392d897 100644 --- a/web/templates/admin/list_rrd.html +++ b/web/templates/admin/list_rrd.html @@ -4,9 +4,9 @@
href="?period=daily"> - href="?period=weekly"> - href="?period=monthly"> - href="?period=yearly"> + href="?period=weekly"> + href="?period=monthly"> + href="?period=yearly">
@@ -40,8 +40,8 @@ - " target="_blank"> - + " target="_blank" class="data-controls"> + diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html index a43ca437e..f917f5927 100644 --- a/web/templates/admin/list_search.html +++ b/web/templates/admin/list_search.html @@ -48,15 +48,23 @@ @@ -65,23 +73,32 @@ @@ -90,7 +107,7 @@ @@ -103,10 +120,13 @@ $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; } if ($data[$key]['KEY'] == 'JOB') { - $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; - } - if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB')) { - $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; + $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER']; + } + if ($data[$key]['KEY'] == 'DATABASE') { + $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; + } + if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) { + $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER']; } ?> diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html index f3238db90..50d8ae6dc 100644 --- a/web/templates/admin/list_services.html +++ b/web/templates/admin/list_services.html @@ -78,13 +78,18 @@ - - - - - - -
+ + + + + + + + + + + + @@ -97,7 +102,7 @@
- +
@@ -130,7 +135,7 @@
- : + : diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index e06dc6784..59d50dc9f 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -46,16 +46,11 @@
- +
">
 - - - - -
- +
+ +
@@ -116,7 +111,7 @@
- : + : diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html new file mode 100644 index 000000000..bc3061372 --- /dev/null +++ b/web/templates/admin/list_updates.html @@ -0,0 +1,151 @@ + + + + + +
+
+ + + + +
+
+
+ + + +
+ +
+ +
+

+
+
+ +
+
+ +
+ + + $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 f80cfc0a0..bfbf31ccc 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -24,7 +24,7 @@ - + @@ -64,9 +64,8 @@
- - - + + @@ -75,9 +74,8 @@
- - - + + @@ -86,23 +84,21 @@ - - "> - + + - + - - - + + - +