\
\
\
\
+ \
+ \
+ \
+
\
\
\
\
@@ -848,7 +875,7 @@ App.Templates.html = {
\
'],
ENTRY: ['\
@@ -884,7 +911,11 @@ App.Templates.html = {
Add user\
\
\
- backup\
+ \
+ \
+ Character Set:\
+ ~!:CHARSET~!\
+ \
\
']
diff --git a/web/js/user_templates_old.js b/web/js/user_templates_old.js
new file mode 100644
index 000000000..beefbc05d
--- /dev/null
+++ b/web/js/user_templates_old.js
@@ -0,0 +1,1151 @@
+alert('User templates loaded');
+App.Templates.html = {
+ help: {
+ DNS_form: ['\
\
\
@@ -958,7 +989,7 @@ App.Templates.html = {
\
'],
ENTRIES_WRAPPER: ['~!:content~!
'],
@@ -1044,13 +1075,13 @@ App.Templates.html = {
download\
\
-
\
\
+ \
\
Some Things You Just Can\'t Explain
\ + A farmer was sitting in the neighborhood bar getting drunk. A man came in and asked the farmer, "Hey, why are you sitting here on this beautiful day, getting drunk?" The farmer shook his head and replied, "Some things you just can\'t explain."\ + "So what happened that\'s so horrible?" the man asked as he sat down next to the farmer.\ + "Well," the farmer said, "today I was sitting by my cow, milking her. Just as I got the bucket full, she lifted her left leg and kicked over the bucket."\ + "Okay," said the man, "but that\'s not so bad." "Some things you just can\'t explain," the farmer replied. "So what happened then?" the man asked. The farmer said, "I took her left leg and tied it to the post on the left."\ + "And then?"\ + "Well, I sat back down and continued to milk her. Just as I got the bucket full, she took her right leg and kicked over the bucket."\ + The man laughed and said, "Again?" The farmer replied, "Some things you just can\'t explain." "So, what did you do then?" the man asked.\ + "I took her right leg this time and tied it to the post on the right."\ + "And then?"\ + "Well, I sat back down and began milking her again. Just as I got the bucket full, the stupid cow knocked over the bucket with her tail."\ + "Hmmm," the man said and nodded his head. "Some things you just can\'t explain," the farmer said.\ + "So, what did you do?" the man asked.\ + "Well," the farmer said, "I didn\'t have anymore rope, so I took off my belt and tied her tail to the rafter. In that moment, my pants fell down and my wife walked in ... Some things you just can\'t explain."'] + }, + general: { + logged_as: ['You (~!:YOU_ARE~!) are viewing ~!:USER~! interface. Exit it to return to your own.
'],
+ over_bar: [''],
+ loading: ['\
+
, However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on this email: BLABLA,
Sorry for inconvinience. (We recommend you to reload the page) '],
+ change_psw: [
+ '
\
+
'],
+ popup: ['\
+ ~!:content~!
'],
+ inner_popup: ['\
+
'],
+ select_option: [''],
+ error_elm: ['\
+ ×\
+
\
+ ~!:POPUP_TITLE~!
\
+ \
+ ~!:CONTENT~!\
+
\
+ ~!:ERROR~!
'],
+ SUSPENDED_TPL_NOT_SUSPENDED : ['enabled'],
+ SUSPENDED_TPL_SUSPENDED : ['suspended']
+ },
+ popup: {
+ error: ['Important: An Error Has Occured.
, However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on this email: BLABLA,
\
+
'
+ ],
+ login: ['\
+
\
+ \
+ 
\
+ ~!:VERSION~!\
+
\
+ \
+ ~!:PRODUCT_NAME~! \
+
\
+ \
+ \
+ \
+
\
+ For questions please contact ~!:EMAIL~!
\ + © ~!:YEAR~! Vesta Control Panel\ +\
+
']
+ },
+ dates: {
+ 'lock_plan_date' : [''],
+ 'save_forecasted_date' : ['']
+ },
+ dns: {
+ FORM: [
+ '\
+
\
+ \
+ \
+ ~!:VERSION~!\
+
\
+ \
+ ~!:PRODUCT_NAME~! \
+
\
+ \
+ \
+ \
+
\
+ For questions please contact ~!:EMAIL~!
\ + © ~!:YEAR~! Vesta Control Panel\ +\
+ \
+ \
+
'
+ ],
+ ENTRIES_WRAPPER: ['~!:title~!
\
+ \
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ ~!:TPL_DEFAULT_VALUE~!\
+ \
+ View template settings\
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ ~!:content~!
'],
+ ENTRY: ['\
+ \
+ \
+
'],
+ SUBFORM: [''],
+ SUBENTRY: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:DNS_DOMAIN~!\
+
\
+ Show records
\
+ \
+
\
+ \
+ ~!:IP~!\
+ \
+ template:\
+ \
+ ~!:TPL~!\
+ \
+
\
+ \
+ \
+ ttl:\
+ ~!:TTL~!\
+ \
+ \
+ soa:\
+ ~!:SOA~!\
+ \
+
\
+ \
+ \
+
']
+ },
+ ip: {
+ FORM: ['\
+ \
+ \
+
\
+ \
+ \
+
\
+ in
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ '],
+ DOT: ['.'],
+ ENTRY: ['\
+ ~!:title~!
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ '],
+ ENTRIES_WRAPPER: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:IP_ADDRESS~!\
+
\
+ \
+ netmask:\
+ ~!:NETMASK~!\
+ \
+ \
+ interface:\
+ ~!:INTERFACE~!\
+ \
+ \
+ name:\
+ ~!:NAME~!\
+ \
+ \
+ \
+ owner:\
+ ~!:OWNER~!\
+ \
+ \
+ status:\
+ ~!:STATUS~!\
+ \
+
\
+ \
+ \
+ sys users:\
+ ~!:U_SYS_USERS~!\
+ \
+ \
+ web domains:\
+ ~!:U_WEB_DOMAINS~!\
+ \
+
\
+ ~!:content~!
'],
+ SUSPENDED_TPL_ENABLED : ['enabled\
+ delete'],
+ SUSPENDED_TPL_DISABLED : ['suspended']
+ },
+
+
+ user: {
+ WEB_TPL_MINIMIZED: ['~!:WEB_TPL_MINI~!\
+ \
+ ~!:MORE_NUMBER~! more\
+ ~!:WEB_TPL_FULL~!'],
+ WEB_TPL: ['~!:NAME~!'],
+ NS_MINIMIZED: ['~!:NS_MINI~!\
+ \
+ ~!:MORE_NUMBER~! more\
+ ~!:NS_FULL~!'],
+ NS_RECORD: ['~!:NAME~!'],
+ NS_INPUT: ['\
+ \
+ \
+ \
+
'],
+ PLUS_ONE_NS: ['\
+ \
+ \
+ Add additional NS\
+ \
+
'],
+ ENTRIES_WRAPPER: ['~!:content~!
'],
+ FORM: ['\
+ \
+ \
+
'],
+ ENTRY: ['~!:title~!
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ Generate\
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ ~!:NS~!\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
']
+ },
+ web_domain: {
+ FORM: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+
\
+ \
+
\
+ \
+
\
+ \
+ \
+ \
+ \
+ ~!:LOGIN_NAME~!\
+ \
+ \
+ \
+ package:\
+ ~!:PACKAGE~!\
+ \
+
\
+ \
+ \
+ name:\
+ ~!:FULLNAME~!\
+ \
+ \
+ email:\
+ \
+ ~!:CONTACT~!\
+ (reports ~!:REPORTS_ENABLED~!)\
+ \
+ \
+
\
+ \
+
\
+ \
+ stats
\
+ \
+ \
+ disk usage:\
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:U_DISK_PERCENTAGE~!% (~!:U_DISK~! ~!:DISK_QUOTA_MEASURE~!)\
+ \
+ ~!:OVER_BAR~!\
+
\
+ ~!:DISK_QUOTA~! ~!:DISK_QUOTA_MEASURE_2~!
\
+ \
+ bandwidth:\
+
\
+ \
+ \
+
\
+ \
+
\
+ \
+ ~!:U_BANDWIDTH_PERCENTAGE~!% (~!:U_BANDWIDTH~! ~!:BANDWIDTH_MEASURE~!)\
+ \
+ ~!:OVER_BAR_2~!\
+
\
+ ~!:BANDWIDTH~! ~!:BANDWIDTH_MEASURE_2~!
\
+ \
+ \
+ web ssl:\
+ ~!:U_WEB_SSL~! (~!:WEB_SSL~!)\
+ \
+ \
+ web alias:\
+ ~!:WEB_ALIASES~! per domain\
+ \
+ \
+ web templates:\
+ \
+ ~!:WEB_TPL~!\
+ \
+ \
+ \
+ databases:\
+ ~!:U_DATABASES~! (~!:DATABASES~!)\
+ \
+ \
+ shell:\
+ ~!:SHELL~!\
+ \
+ \
+ backups:\
+ retention ~!:BACKUPS~!\
+ \
+
\
+ \
+ \
+ mailboxes:\
+ ~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)\
+ \
+ \
+ mail forwarders:\
+ ~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)\
+ \
+ \
+ mail domains:\
+ ~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)\
+ \
+ \
+ web domains:\
+ ~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)\
+ \
+ \
+ dns domains:\
+ ~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)\
+ \
+ \
+ ns list:\
+ \
+ ~!:NS~!\
+ \
+
\
+ \
+ \
+ \
+
'],
+ ENTRIES_WRAPPER: ['~!:title~!
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+ ~!:content~!
'],
+ ENTRY: ['\
+ \
+ \
+
']
+ },
+ db: {
+ USER_ITEMS_WRAPPER: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+
\
+ \
+ ~!:DOMAIN~!\
+ Alias:\
+ ~!:ALIAS~!\
+
\
+ \
+
\
+ \
+ ~!:IP~!\
+ \
+ template:\
+ ~!:TPL~!\
+ \
+
\
+ \
+
\
+ \
+ stats
\
+ \
+ \
+ disk usage:\
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:U_DISK_PERCENTAGE~!% (~!:U_DISK~! ~!:DISK_QUOTA_MEASURE~!)\
+ \
+ ~!:OVER_BAR~!\
+
\
+ ~!:DISK_QUOTA~! ~!:DISK_QUOTA_MEASURE_2~!
\
+ \
+ bandwidth:\
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:U_BANDWIDTH_PERCENTAGE~!% (~!:U_BANDWIDTH~! ~!:BANDWIDTH_MEASURE~!)\
+ \
+ ~!:OVER_BAR_2~!\
+
\
+ ~!:BANDWIDTH~! ~!:BANDWIDTH_MEASURE_2~!
\
+ \
+ \
+ php:\
+ ~!:PHP~!\
+ \
+ \
+ cgi:\
+ ~!:CGI~!\
+ \
+ \
+ elog:\
+ ~!:ELOG~!\
+ \
+ \
+ stats:\
+ ~!:STAT~!\
+ \
+ ~!:STATS_AUTH~!\
+ \
+ \
+
\
+ \
+ \
+ ssl:\
+ ~!:SSL~!\
+ \
+ \
+ nginx:\
+ ~!:NGINX~!\
+ extension list\
+ \
+
\
+ ~!:CONTENT~!
'],
+ USER_ITEM: ['\
+ ~!:NAME~!\
+ \
+ change password'],
+ DIVIDER: ['\
+ \
+ \
+ ~!:TYPE~!\
+ \
+ \
+
'],
+ ENTRIES_WRAPPER: ['~!:content~!
'],
+ FORM: ['\
+ \
+ \
+
'],
+ ENTRY: ['~!:title~!
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ Generate\
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
']
+ },
+ cron: {
+ FORM: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+
\
+ \
+
\
+ \
+ \
+ ~!:DB~!\
+
\
+ \
+ backup\
+ \
+
\
+ \
+
\
+ \
+
\
+ \
+ ~!:U_DISK~! Mb\
+
\
+ \
+ \
+
\
+ ~!:DISK~! ~!:DISK_MEASURE~!
\
+ \
+ \
+ \
+
'],
+ ENTRIES_WRAPPER: ['~!:title~!
\
+ \
+ \
+ Schedule Time:\
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+ \
+
\
+ \
+ ~!:content~!
'],
+ ENTRY: ['\
+ \
+ \
+
']
+ },
+ backup: {
+ WRAPPER: ['\
+ \
+
\
+ \
+ \
+ ~!:SUSPENDED_TPL~!\
+
\
+ \
+ \
+
\
+ \
+ ~!:CMD~!\
+
\
+ \
+ ~!:CONTENT~!
'],
+ ENTRY: ['\
+ \
+
']
+ }
+}
+
+
+// Internals
+var Tpl = App.Templates;
+var Templator = function()
+{
+ var init = function() {
+ fb.info('Templator work');
+ Templator.splitThemAll();
+ Templator.freezeTplIndexes();
+ };
+
+ /**
+ * Split the tpl strings into arrays
+ */
+ Templator.splitThemAll = function()
+ {
+ fb.info('splitting tpls');
+ $.each(App.Templates.html, function(o) {
+ var tpls = App.Templates.html[o];
+ $.each(tpls, function(t) {
+ tpls[t] = tpls[t][0].split('~!');
+ });
+ });
+ },
+
+ /**
+ * Iterates tpls
+ */
+ Templator.freezeTplIndexes = function()
+ {
+ fb.info('freezing tpl keys');
+ $.each(App.Templates.html, Templator.cacheTplIndexes);
+ },
+
+ /**
+ * Grab the tpl group key and process it
+ */
+ Templator.cacheTplIndexes = function(key)
+ {
+ var tpls = App.Templates.html[key];
+ $.each(tpls, function(o) {
+ var tpl = tpls[o];
+ Templator.catchIndex(key, o, tpl);
+ });
+ },
+
+ /**
+ * Set the indexes
+ */
+ Templator.catchIndex = function(key, ref_key, tpl)
+ {
+ '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;
+ $(tpl).each(function(index, o) {
+ if(':' == o.charAt(0)){
+ App.Templates._indexes[key][ref_key][o.toString()] = index;
+ }
+ });
+ }
+
+ /**
+ * Get concrete templates
+ */
+ init();
+ return Templator;
+};
+Templator.getTemplate = function(ns, key)
+{
+ return [
+ App.Templates._indexes[ns][key],
+ App.Templates.html[ns][key].slice(0)
+ ];
+}
+// init templator
+Tpl.Templator = Templator();
+Tpl.get = function(key, group)
+{
+ return Tpl.Templator.getTemplate(group, key);
+}
diff --git a/web/vesta/api/CRON.class.php b/web/vesta/api/CRON.class.php
index 94c2ed744..793c99708 100644
--- a/web/vesta/api/CRON.class.php
+++ b/web/vesta/api/CRON.class.php
@@ -31,7 +31,7 @@ class CRON extends AjaxHandler
'MONTH' => $record['MONTH'],
'WDAY' => $record['WDAY'],
'SUSPEND' => $record['SUSPEND'],
- 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE']))),
+ 'DATE' => $record['DATE'], //date(Config::get('ui_date_format', strtotime($record['DATE']))),
'JOB' => $id
);
}
diff --git a/web/vesta/api/DB.class.php b/web/vesta/api/DB.class.php
index 142c44b26..64bbde7c0 100644
--- a/web/vesta/api/DB.class.php
+++ b/web/vesta/api/DB.class.php
@@ -40,7 +40,7 @@ class DB extends AjaxHandler
'DISK' => 2024,
'CHARSET' => strtolower($record['CHARSET']),
'SUSPEND' => $record['SUSPEND'],
- 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
+ 'DATE' => $record['DATE']// date(Config::get('ui_date_format', strtotime($record['DATE'])))
);
}
diff --git a/web/vesta/api/DNS.class.php b/web/vesta/api/DNS.class.php
index 85bf3d548..5d3823e7a 100644
--- a/web/vesta/api/DNS.class.php
+++ b/web/vesta/api/DNS.class.php
@@ -34,7 +34,7 @@ class DNS extends AjaxHandler
'EXP' => $details['EXP'],
'SOA' => $details['SOA'],
'SUSPEND' => $details['SUSPEND'],
- 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
+ 'DATE' => $details['DATE'] // date(Config::get('ui_date_format', strtotime($details['DATE'])))
);
}
diff --git a/web/vesta/api/IP.class.php b/web/vesta/api/IP.class.php
index 43e248081..f45363adc 100644
--- a/web/vesta/api/IP.class.php
+++ b/web/vesta/api/IP.class.php
@@ -29,7 +29,7 @@ class IP extends AjaxHandler
$reply[] = array_merge(
array(
'IP_ADDRESS' => $ip,
- 'DATE' => date(Config::get('ui_date_format', strtotime($details['DATE'])))
+ 'DATE' => $details['DATE'] //date(Config::get('ui_date_format', strtotime($details['DATE'])))
), $details);
}
diff --git a/web/vesta/api/USER.class.php b/web/vesta/api/USER.class.php
index bd5529ffd..6f9821b03 100644
--- a/web/vesta/api/USER.class.php
+++ b/web/vesta/api/USER.class.php
@@ -23,12 +23,10 @@ class USER extends AjaxHandler
return self::getUserExecute($request);
}
-
$reply = array();
$result = Vesta::execute(Vesta::V_LIST_SYS_USERS, array(Config::get('response_type')));
foreach ($result['data'] as $user => $details) {
- $nses = $this->getNS($user, $details);
$user_details = array(
"FNAME" => $details['FNAME'],
"LNAME" => $details['LNAME'],
@@ -50,7 +48,7 @@ class USER extends AjaxHandler
"WEB_TPL" => $details['WEB_TPL'],
"SUSPEND" => $details['SUSPENDED'],
"CONTACT" => $details['CONTACT'],
- "REPORTS" => $details['REPORTS'],
+ // "REPORTS" => $details['REPORTS'],
"REPORTS_ENABLED" => $details['REPORTS'],
"IP_OWNED" => $details['IP_OWNED'],
"U_DIR_DISK" => $details['U_DIR_DISK'],
@@ -68,6 +66,7 @@ class USER extends AjaxHandler
"IP_OWNED" => $details['IP_OWNED'],
"NGINX_EXT" => $details['"NGINX_EXT']
);
+ $nses = $this->getNS($user, $details);
$reply[$user] = array_merge($user_details, $nses);
// $reply[$user] = $user_details;
}
@@ -119,7 +118,9 @@ class USER extends AjaxHandler
"IP_OWNED" => $details['IP_OWNED'],
"DATE" => $details['DATE']
);
- $reply[$user] = $user_details;
+ $nses = $this->getNS($user, $details);
+ $reply[$user] = array_merge($user_details, $nses);
+ // $reply[$user] = $user_details;
}
return $this->reply(TRUE, $reply);
@@ -230,8 +231,6 @@ class USER extends AjaxHandler
}
}
- $reports_result = $this->setUserReports($_USER, $_new['REPORTS_ENABLED']);
-
if (!empty($_new['PASSWORD']) && $_new['PASSWORD'] != Vesta::SAME_PASSWORD) {
$result = array();
$result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD, array('USER' => $_USER, 'PASSWORD' => $_new['PASSWORD']));
@@ -265,7 +264,7 @@ class USER extends AjaxHandler
$result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS, array('USER' => $_USER));
}
else{
- $result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS, array('USER' => $_USER));
+ $result = Vesta::execute(Vesta::V_DEL_SYS_USER_REPORTS, array('USER' => $_USER));
}
if (!$result['status']) {
$this->status = FALSE;
@@ -274,27 +273,34 @@ class USER extends AjaxHandler
}
// Set SHELL
- $this->setShell($_USER, $_new['SHELL']);
+ if($_new['SHELL'] != $_old['SHELL']){
+ $this->setShell($_USER, $_new['SHELL']);
+ }
- $this->setNSentries($_USER, $_new);
+ if($_new[NS1].' '.$_new[NS2].' '.$_new[NS3].' '.$_new[NS4].' '.$_new[NS5].' '.$_new[NS6].' '.$_new[NS7].' '.$_new[NS8] !=
+ $_old[NS1].' '.$_old[NS2].' '.$_old[NS3].' '.$_old[NS4].' '.$_old[NS5].' '.$_old[NS6].' '.$_old[NS7].' '.$_old[NS8]){
+ $this->setNSentries($_USER, $_new);
+ }
- $names = array(
- 'USER' => $_USER,
- 'FNAME' => $_new['FNAME'],
- 'LNAME' => $_new['LNAME']
- );
+ if($_new['FNAME'] != $_old['FNAME'] || $_new['LNAME'] != $_old['LNAME']){
+ $names = array(
+ 'USER' => $_USER,
+ 'FNAME' => $_new['FNAME'],
+ 'LNAME' => $_new['LNAME']
+ );
- $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_NAME, $names);
- if (!$result['status']) {
- $this->status = FALSE;
- $this->errors['NAMES'] = array($result['error_code'] => $result['error_message']);
- }
+ $result = Vesta::execute(Vesta::V_CHANGE_SYS_USER_NAME, $names);
+ if (!$result['status']) {
+ $this->status = FALSE;
+ $this->errors['NAMES'] = array($result['error_code'] => $result['error_message']);
+ }
+ }
if (!$this->status) {
Vesta::execute(Vesta::V_CHANGE_SYS_USER_PASSWORD, array('USER' => $_USER, 'PASSWORD' => $_old['PASSWORD']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_PACKAGE, array('USER' => $_USER, 'PACKAGE' => $_old['PACKAGE']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_CONTACT, array('USER' => $_USER, 'EMAIL' => $_old['EMAIL']));
- Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, array('USER' => $_USER, 'NS1' => $_old['NS1'], 'NS2' => $_old['NS2']));
+ // Vesta::execute(Vesta::V_CHANGE_SYS_USER_NS, array('USER' => $_USER, 'NS1' => $_old['NS1'], 'NS2' => $_old['NS2']));
Vesta::execute(Vesta::V_CHANGE_SYS_USER_SHELL, array('USER' => $_USER, 'SHELL' => $_old['SHELL']));
}
diff --git a/web/vesta/api/WEB_DOMAIN.class.php b/web/vesta/api/WEB_DOMAIN.class.php
index 498d53b51..6ba8c9328 100644
--- a/web/vesta/api/WEB_DOMAIN.class.php
+++ b/web/vesta/api/WEB_DOMAIN.class.php
@@ -44,7 +44,7 @@ class WEB_DOMAIN extends AjaxHandler
'NGINX' => $record['NGINX'],
'NGINX_EXT' => $record['NGINX_EXT'],
'SUSPEND' => $record['SUSPEND'], // == 'yes' ? 'on' : 'off',
- 'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
+ 'DATE' => $record['DATE'] //date(Config::get('ui_date_format', strtotime($record['DATE'])))
);
$web_details['STAT'] == '' ? $web_details['STAT'] = 'none' : true;
diff --git a/web/vesta/config/vesta_config.ini b/web/vesta/config/vesta_config.ini
index 83e8d8ae3..ebc1fb75f 100644
--- a/web/vesta/config/vesta_config.ini
+++ b/web/vesta/config/vesta_config.ini
@@ -7,6 +7,6 @@ sudo_path = /usr/bin/sudo
vesta_functions_path = /usr/local/vesta/bin/
; common
-ui_date_format = 'd.m.Y'
+ui_date_format = 'Y-m-d'
; session
session_dirname = 'vesta_sessions'
\
+ \
+
']
+ },
+ stats: {
+ WRAPPER: ['\
+
\
+ \
+ \
+ \
+ ~!:CREATED_AT~!\
+ ~!:CREATED_AT_TIME~!\
+ \
+ ~!:CREATED_AT_WDAY~!\
+ \
+ \
+ Generation time:\
+ ~!:GENERATION_TIME~!\
+ \
+
\
+ \
+ \
+ ~!:SIZE~!\
+ \
+ download\
+
\
+ \
+
\
+ \
+ restore\
+ \
+ detailed\
+ restore\
+ \
+
\
+ ~!:CONTENT~!
'],
+ ENTRY: ['\
+
'],
+ SUBMENU: ['~!:HEADER~!
\ +\
+ 
\
+
\
+