',
'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' => 'Новий пароль',
diff --git a/web/js/events.js b/web/js/events.js
index f183ba831..881eadcfa 100644
--- a/web/js/events.js
+++ b/web/js/events.js
@@ -102,7 +102,7 @@ VE.helpers.createConfirmationDialog = function(elm, dialog_title, confirmed_loca
$(this).dialog("destroy");
},
buttons: {
- "Ok": function(event, ui) {
+ "OK": function(event, ui) {
location.href = confirmed_location_url;
},
"Cancel": function() {
diff --git a/web/js/pages/add.web.js b/web/js/pages/add.web.js
index 8b06b14a0..d350a4375 100644
--- a/web/js/pages/add.web.js
+++ b/web/js/pages/add.web.js
@@ -1,37 +1,158 @@
-//
-//
-// Updates ftp username dynamically, showing its prefix
App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
if (hint.trim() == '') {
$(elm).parent().find('.hint').html('');
- }
- // remove prefix from value in order to eliminate duplicates
+ }
+
+ hint = hint.replace(/[^\w\d]/gi, '');
+
if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
}
-
+ $(elm).parent().find('.v-ftp-user').val(hint);
$(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint);
}
-//
-// listener that triggers ftp user hint updating
App.Listeners.WEB.keypress_ftp_username = function() {
- var ref = $('input[name="v_ftp_user"]');
- var current_val = ref.val();
- if (current_val.trim() != '') {
- App.Actions.DB.update_ftp_username_hint(ref, current_val);
- }
-
- ref.bind('keypress input', function(evt) {
+ var ftp_user_inputs = $('.v-ftp-user');
+ $.each(ftp_user_inputs, function(i, ref) {
+ var ref = $(ref);
+ var current_val = ref.val();
+ if (current_val.trim() != '') {
+ App.Actions.WEB.update_ftp_username_hint(ref, current_val);
+ }
+
+ ref.bind('keypress', function(evt) {
+ clearTimeout(window.frp_usr_tmt);
+ window.frp_usr_tmt = setTimeout(function() {
+ var elm = $(evt.target);
+ App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+ }, 100);
+ });
+ });
+}
+
+App.Listeners.WEB.keypress_domain_name = function() {
+ $('#v_domain').bind('keypress', function(evt) {
clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() {
- var elm = $(evt.target);
- App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+ //var elm = $(evt.target);
+ //App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+ var domain = $('.ftp-path-prefix').text(GLOBAL.FTP_USER_PREPATH + '/' + $('#v_domain').val());
}, 100);
});
}
+//
+//
+
+App.Actions.WEB.update_ftp_path_hint = function(elm, hint) {
+ if (hint.trim() == '') {
+ $(elm).parent().find('.v-ftp-path-hint').html('');
+ }
+
+ if (hint[0] != '/') {
+ hint = '/' + hint;
+ }
+ hint = hint.replace(/\/(\/+)/g, '/');
+
+ $(elm).parent().find('.v-ftp-path-hint').text(hint);
+}
+
+App.Listeners.WEB.keypress_ftp_path = function() {
+ var ftp_path_inputs = $('.v-ftp-path');
+ $.each(ftp_path_inputs, function(i, ref) {
+ var ref = $(ref);
+ var current_val = ref.val();
+ if (current_val.trim() != '') {
+ App.Actions.WEB.update_ftp_path_hint(ref, current_val);
+ }
+
+ ref.bind('keypress', function(evt) {
+ clearTimeout(window.frp_usr_tmt);
+ window.frp_usr_tmt = setTimeout(function() {
+ var elm = $(evt.target);
+ App.Actions.WEB.update_ftp_path_hint(elm, $(elm).val());
+ }, 100);
+ });
+ });
+}
+
+//
+//
+App.Actions.WEB.add_ftp_user_form = function() {
+ var ref = $('#templates').find('.ftptable').clone(true);
+ var index = $('.data-col2 .ftptable').length + 1;
+
+ ref.find('input').each(function(i, elm) {
+ var attr_value = $(elm).attr('name').replace('%INDEX%', index);
+ $(elm).attr('name', attr_value);
+ });
+
+ ref.find('.ftp-user-number').text(index);
+
+ $('.data-col2 .ftptable:last').after(ref);
+
+ var index = 1;
+ $('.data-col2 .ftp-user-number:visible').each(function(i, o) {
+ $(o).text(index);
+ index += 1;
+ });
+}
+
+App.Actions.WEB.remove_ftp_user = function(elm) {
+ var ref = $(elm).parents('.ftptable');
+ ref.remove();
+
+ var index = 1;
+ $('.data-col2 .ftp-user-number:visible').each(function(i, o) {
+ $(o).text(index);
+ index += 1;
+ });
+
+ if ($('.ftptable-nrm:visible').length == 0) {
+ $('.v-add-new-user').hide();
+ $('input[name="v_ftp"]').attr('checked', false);
+ }
+}
+
+
+App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
+ if ($(elm).attr('checked')) {
+ $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').show();
+ $('.ftptable-nrm').each(function(i, elm) {
+ var login = $(elm).find('.v-ftp-user');
+ if (login.val().trim() != '') {
+ $(elm).find('.v-ftp-user-deleted').val(0);
+ }
+ });
+ }
+ else {
+ $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').hide();
+ $('.ftptable-nrm').each(function(i, elm) {
+ var login = $(elm).find('.v-ftp-user');
+ if (login.val().trim() != '') {
+ $(elm).find('.v-ftp-user-deleted').val(1);
+ }
+ });
+ }
+
+ if ($('.ftptable-nrm:visible').length == 0) {
+ var ref = $('#templates').find('.ftptable').clone(true);
+ var index = $('.data-col2 .ftptable').length + 1;
+
+ ref.find('input').each(function(i, elm) {
+ var attr_value = $(elm).attr('name').replace('%INDEX%', index);
+ $(elm).attr('name', attr_value);
+ });
+
+ ref.find('.ftp-user-number').text(index);
+
+ $('.v-add-new-user').parent('tr').prev().find('td').html(ref);
+ }
+}
+
//
// Page entry point
-// Trigger listeners
App.Listeners.WEB.keypress_ftp_username();
+App.Listeners.WEB.keypress_ftp_path();
+App.Listeners.WEB.keypress_domain_name();
diff --git a/web/js/pages/edit.web.js b/web/js/pages/edit.web.js
index fc9be3fcf..5d8ede2f2 100644
--- a/web/js/pages/edit.web.js
+++ b/web/js/pages/edit.web.js
@@ -1,29 +1,138 @@
App.Actions.WEB.update_ftp_username_hint = function(elm, hint) {
if (hint.trim() == '') {
$(elm).parent().find('.hint').html('');
- }
+ }
+
+ hint = hint.replace(/[^\w\d]/gi, '');
+
if (hint.indexOf(GLOBAL.FTP_USER_PREFIX) == 0) {
hint = hint.slice(GLOBAL.FTP_USER_PREFIX.length, hint.length);
}
+ $(elm).parent().find('.v-ftp-user').val(hint);
$(elm).parent().find('.hint').text(GLOBAL.FTP_USER_PREFIX + hint);
}
App.Listeners.WEB.keypress_ftp_username = function() {
- var ref = $('input[name="v_ftp_user"]');
- var current_val = ref.val();
- if (current_val.trim() != '') {
- App.Actions.DB.update_ftp_username_hint(ref, current_val);
+ var ftp_user_inputs = $('.v-ftp-user');
+ $.each(ftp_user_inputs, function(i, ref) {
+ var ref = $(ref);
+ var current_val = ref.val();
+ if (current_val.trim() != '') {
+ App.Actions.WEB.update_ftp_username_hint(ref, current_val);
+ }
+
+ ref.bind('keypress', function(evt) {
+ clearTimeout(window.frp_usr_tmt);
+ window.frp_usr_tmt = setTimeout(function() {
+ var elm = $(evt.target);
+ App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
+ }, 100);
+ });
+ });
+}
+
+//
+//
+
+App.Actions.WEB.update_ftp_path_hint = function(elm, hint) {
+ if (hint.trim() == '') {
+ $(elm).parent().find('.v-ftp-path-hint').html('');
+ }
+
+ if (hint[0] != '/') {
+ hint = '/' + hint;
}
- ref.bind('keypress', function(evt) {
- clearTimeout(window.frp_usr_tmt);
- window.frp_usr_tmt = setTimeout(function() {
- var elm = $(evt.target);
- App.Actions.WEB.update_ftp_username_hint(elm, $(elm).val());
- }, 100);
+ hint = hint.replace(/\/(\/+)/g, '/');
+
+ $(elm).parent().find('.v-ftp-path-hint').text(hint);
+}
+
+App.Listeners.WEB.keypress_ftp_path = function() {
+ var ftp_path_inputs = $('.v-ftp-path');
+ $.each(ftp_path_inputs, function(i, ref) {
+ var ref = $(ref);
+ var current_val = ref.val();
+ if (current_val.trim() != '') {
+ App.Actions.WEB.update_ftp_path_hint(ref, current_val);
+ }
+
+ ref.bind('keypress', function(evt) {
+ clearTimeout(window.frp_usr_tmt);
+ window.frp_usr_tmt = setTimeout(function() {
+ var elm = $(evt.target);
+ App.Actions.WEB.update_ftp_path_hint(elm, $(elm).val());
+ }, 100);
+ });
});
}
+//
+//
+App.Actions.WEB.add_ftp_user_form = function() {
+ var ref = $('#templates').find('.ftptable').clone(true);
+ var index = $('.data-col2 .ftptable').length + 1;
+
+ ref.find('input').each(function(i, elm) {
+ var attr_value = $(elm).attr('name').replace('%INDEX%', index);
+ $(elm).attr('name', attr_value);
+ });
+
+ ref.find('.ftp-user-number').text(index);
+
+ $('.data-col2 .ftptable:last').after(ref);
+
+ var index = 1;
+ $('.data-col2 .ftp-user-number:visible').each(function(i, o) {
+ $(o).text(index);
+ index += 1;
+ });
+}
+
+App.Actions.WEB.remove_ftp_user = function(elm) {
+ var ref = $(elm).parents('.ftptable');
+ ref.find('.v-ftp-user-deleted').val('1');
+ if (ref.find('.v-ftp-user-is-new').val() == 1) {
+ ref.remove();
+ return true;
+ }
+ ref.removeClass('ftptable-nrm');
+ ref.hide();
+
+ var index = 1;
+ $('.data-col2 .ftp-user-number:visible').each(function(i, o) {
+ $(o).text(index);
+ index += 1;
+ });
+
+ if ($('.ftptable-nrm:visible').length == 0) {
+ $('.add-new-ftp-user-button').hide();
+ $('input[name="v_ftp"]').attr('checked', false);
+ }
+}
+
+App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
+ if ($(elm).attr('checked')) {
+ $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').show();
+ $('.ftptable-nrm').each(function(i, elm) {
+ var login = $(elm).find('.v-ftp-user');
+ if (login.val().trim() != '') {
+ $(elm).find('.v-ftp-user-deleted').val(0);
+ }
+ });
+ }
+ else {
+ $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').hide();
+ $('.ftptable-nrm').each(function(i, elm) {
+ var login = $(elm).find('.v-ftp-user');
+ if (login.val().trim() != '') {
+ $(elm).find('.v-ftp-user-deleted').val(1);
+ }
+ });
+ }
+}
+
//
// Page entry point
App.Listeners.WEB.keypress_ftp_username();
+App.Listeners.WEB.keypress_ftp_path();
diff --git a/web/js/templates.js b/web/js/templates.js
index ee5aeda60..e91f2f799 100644
--- a/web/js/templates.js
+++ b/web/js/templates.js
@@ -66,7 +66,7 @@ var Templator = function()
{
'undefined' == typeof App.Templates._indexes[key] ? App.Templates._indexes[key] = {} : false;
'undefined' == typeof App.Templates._indexes[key][ref_key] ?
- App.Templates._indexes[key][ref_key] = {} : false;
+ App.Templates._indexes[key][ref_key] = {} : false;
jQuery(tpl).each(function(index, o) {
if (':' == o.charAt(0)) {
@@ -84,8 +84,8 @@ var Templator = function()
Templator.getTemplate = function(ns, key){
return [
- App.Templates._indexes[ns][key],
- App.Templates.html[ns][key].slice(0)
+ App.Templates._indexes[ns][key],
+ App.Templates.html[ns][key].slice(0)
];
}
// init templator
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index c988cba9b..ac998b9c1 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -34,7 +34,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -54,7 +54,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -84,22 +84,22 @@
-
+
- >
+ >
-
+
-
+
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index 438824ab3..b864043b4 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -54,12 +54,12 @@
-
+
-
+
@@ -70,7 +70,7 @@
-
+
@@ -81,17 +81,17 @@
-
+
/
-
+
-
+
@@ -109,7 +109,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
@@ -174,7 +174,7 @@
-
+
@@ -186,10 +186,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index c7d042594..c78393d3a 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -65,15 +65,15 @@
-
+
-
-
+
+
-
+
()
@@ -83,7 +83,7 @@
-
+
TTL
@@ -93,7 +93,7 @@
-
+
@@ -123,10 +123,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 4fb6ad71b..f79eb0b2d 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -34,7 +34,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
()
@@ -100,10 +100,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 2957bd6c4..6bb0ec5fe 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -45,7 +45,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -83,25 +83,20 @@
-
-
+
+ onclick="javascript:elementHideShow('usrtable');">
-
- onclick="javascript:elementHideShow('usrtable');">
-
-
-
-
+
-
+
-
+
$value) {
@@ -117,7 +112,7 @@
-
+
()
@@ -127,7 +122,7 @@
-
+
()
@@ -141,10 +136,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index 3c839b482..3f284b7dc 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -34,7 +34,7 @@
-
+
-
+
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index bbf943e62..65afefeab 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -55,7 +55,7 @@
-
+
-
+
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index 56777f656..833b088e2 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -35,7 +35,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
()
@@ -157,7 +157,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
()
@@ -177,7 +177,7 @@
-
+
@@ -187,7 +187,7 @@
-
+
()
@@ -197,7 +197,7 @@
-
+
@@ -207,7 +207,7 @@
-
+
@@ -217,7 +217,7 @@
-
+
@@ -227,7 +227,7 @@
-
+
()
@@ -237,7 +237,7 @@
-
+
()
@@ -247,7 +247,7 @@
-
+
@@ -274,10 +274,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index b645e7ac9..2913a9497 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -53,7 +53,7 @@
-
+
@@ -63,17 +63,17 @@
-
+
/
- >
+ >
-
+
@@ -83,7 +83,7 @@
-
+
@@ -107,7 +107,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
@@ -143,7 +143,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -166,10 +166,10 @@
-
+
-
+
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index 6f50d67a5..b8522c1ab 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -42,7 +42,7 @@
document.v_add_web.v_stats_password.value = webrandom;
}
- function FTPrandom() {
+ function FTPrandom(elm) {
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
var string_length = 10;
var ftprandomstring = '';
@@ -50,7 +50,7 @@
var rnum = Math.floor(Math.random() * chars.length);
ftprandomstring += chars.substring(rnum,rnum+1);
}
- document.v_add_web.v_ftp_password.value = ftprandomstring;
+ $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
}
function elementHideShow(elementToHideOrShow){
@@ -75,7 +75,7 @@
-
+
@@ -144,25 +134,20 @@
-
-
-
-
-
-
- onclick="javascript:elementHideShow('proxytable');">
+
+ onclick="javascript:elementHideShow('proxytable');">
-
+
-
+
@@ -170,26 +155,21 @@
-
- /
+
+ onclick="javascript:elementHideShow('ssltable');"> /
-
-
- onclick="javascript:elementHideShow('ssltable');">
-
-
+
+
+
+
diff --git a/web/templates/admin/edit_backup_exclusions.html b/web/templates/admin/edit_backup_exclusions.html
index 770966eb5..e2f974d78 100644
--- a/web/templates/admin/edit_backup_exclusions.html
+++ b/web/templates/admin/edit_backup_exclusions.html
@@ -38,7 +38,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -100,10 +100,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index 9a6cd1bcb..786180a0b 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -40,7 +40,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -60,7 +60,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -90,22 +90,22 @@
-
+
- >
+ >
-
+
\ No newline at end of file
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 8a7af352d..96111abdd 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -61,7 +61,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -83,17 +83,17 @@
-
+
/
- >
+ >
-
+
@@ -103,7 +103,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -125,10 +125,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index 017ffca65..ff28fc8e5 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -40,7 +40,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
@@ -60,7 +60,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
()
@@ -91,7 +91,7 @@
-
+
SOA
@@ -101,7 +101,7 @@
-
+
TTL
@@ -113,10 +113,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index ad900fa75..b9e5f97c8 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -40,7 +40,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
()
@@ -91,7 +91,7 @@
-
+
()
@@ -104,10 +104,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index 49e97b1c5..a166a2d14 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -52,7 +52,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
@@ -82,35 +82,36 @@
-
-
+
+ onclick="javascript:elementHideShow('usrtable');">
-
-
+
+
+
+
+
+
+
+
+
+
+ $value) {
+ echo "\t\t\t\t".$value." \n";
+ }
+ ?>
+
+
+
+
-
-
-
-
-
-
-
- $value) {
- echo "\t\t\t\t".$value." \n";
- }
- ?>
-
-
-
-
-
+
()
@@ -120,7 +121,7 @@
-
+
()
@@ -133,10 +134,10 @@
-
+
\ No newline at end of file
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index 4f4e82006..e9317d1c2 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -40,7 +40,7 @@
-
+
-
+
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index c427685b1..1ca35090a 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -62,7 +62,7 @@
-
+
@@ -74,17 +74,17 @@
-
+
/
-
+
-
+
()
@@ -94,7 +94,7 @@
-
+
()
@@ -104,7 +104,7 @@
-
+
()
@@ -114,27 +114,17 @@
-
-
+
+ >
-
- >
+
+ onclick="javascript:elementHideShow('autoreplytable');">
-
-
-
-
-
-
- onclick="javascript:elementHideShow('autoreplytable');">
-
-
-
-
+
-
+
-
+
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index 079d637b5..e7248659e 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -40,7 +40,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -143,7 +143,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
()
@@ -163,7 +163,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
()
@@ -183,7 +183,7 @@
-
+
@@ -193,7 +193,7 @@
-
+
()
@@ -203,7 +203,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -223,7 +223,7 @@
-
+
@@ -233,7 +233,7 @@
-
+
()
@@ -243,7 +243,7 @@
-
+
()
@@ -253,7 +253,7 @@
-
+
@@ -280,10 +280,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index c1b93a3c5..bec90e90d 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -52,7 +52,7 @@
-
+
@@ -62,17 +62,17 @@
-
+
/
- >
+ >
-
+
@@ -82,7 +82,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
@@ -195,10 +195,10 @@
-
+
-
+
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index 3ef861501..dd2696ce5 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -10,12 +10,15 @@
→ ".$_SESSION['ok_msg']."";
+ }
if (!empty($_SESSION['error_msg'])) {
echo " → ".$_SESSION['error_msg']." ";
- } else {
- if (!empty($_SESSION['ok_msg'])) {
- echo " → ".$_SESSION['ok_msg']." ";
- }
+ }
+ if (!empty($_SESSION['flash_error_msg'])) {
+ echo " / FTP USER ".$_SESSION['flash_error_msg']." ";
+ unset($_SESSION['flash_error_msg']);
}
?>
@@ -36,7 +39,7 @@
document.v_edit_web.v_stats_password.value = webrandom;
}
- function FTPrandom() {
+ function FTPrandom(elm) {
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
var string_length = 10;
var ftprandomstring = '';
@@ -44,7 +47,8 @@
var rnum = Math.floor(Math.random() * chars.length);
ftprandomstring += chars.substring(rnum,rnum+1);
}
- document.v_edit_web.v_ftp_password.value = ftprandomstring;
+
+ $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
}
function elementHideShow(elementToHideOrShow){
@@ -72,7 +76,7 @@
-
+
@@ -82,7 +86,7 @@
-
+
@@ -105,7 +109,7 @@
-
+
@@ -115,7 +119,7 @@
-
+
@@ -136,20 +140,15 @@
-
-
+
+ onclick="javascript:elementHideShow('proxytable');">
-
- onclick="javascript:elementHideShow('proxytable');">
-
-
-
-
+
-
+
@@ -173,7 +172,7 @@
-
+
@@ -186,21 +185,16 @@
-
- /
+
+ onclick="javascript:elementHideShow('ssltable');"> /
-
- onclick="javascript:elementHideShow('ssltable');">
-
-
-
-
+
-
+
@@ -218,7 +212,7 @@
-
+
@@ -228,7 +222,7 @@
-
+
@@ -238,7 +232,7 @@
-
+
()
@@ -251,7 +245,7 @@
-
+
@@ -273,20 +267,15 @@
-
-
+
+ onclick="javascript:elementHideShow('statstable');">
-
- onclick="javascript:elementHideShow('statstable');">
-
-
-
-
+
-
-
+
+ onclick="App.Actions.WEB.toggle_additional_ftp_accounts(this)">
- onclick="javascript:elementHideShow('ftptable');">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 3fb26ed11..b532f6b4e 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -1,6 +1,6 @@