From 6689220cd2038171deac227b2958ea69adc05d11 Mon Sep 17 00:00:00 2001
From: Malishev Dmitry <dima.malishev@gmail.com>
Date: Mon, 19 Dec 2011 11:11:15 +0200
Subject: [PATCH 1/2] Css updated: Inactive items styles added

---
 web/css/main.css | 255 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 199 insertions(+), 56 deletions(-)

diff --git a/web/css/main.css b/web/css/main.css
index 694e2c9dc..fe10b550a 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -3,7 +3,7 @@ Title  : Vesta
 Author : Eugen Lobicov, eugen.lobicov@gmail.com 
 
 created : November 27, 2009
-last updated : December 06, 2011
+last updated : December 16, 2011
 - - - - - - - - - - - - - - - - - - */
 
 html{
@@ -29,8 +29,7 @@ body{
 	background:#fff url(../images/footer-bg.gif) repeat-x 0 100%;
 }
 #header{
-	/*overflow:hidden;*/
-	padding:0 10px;
+	padding:0 1px 0 10px;
 	height:26px;
 	border-bottom:2px solid #333527;
 	background-color:#484439;
@@ -59,31 +58,31 @@ body{
 	top:1px;
 	left:0;
 	z-index:1;
-	background:url(../images/vesta-logo.png) no-repeat;
+	width:72px;
+	height:24px;
+	background:url(../images/vesta-logo-2011-12-14.png) no-repeat;
 }
 .settings{
 	float:right;
-	padding-left:28px;
-	background:url(../images/vesta-italic-logo.png) no-repeat 0 50%;	
-}
-.settings .service-item{
-	color:#cddce3;
 }
 .settings .settings-item,
 .extra-services .service-item{
 	float:left;
 	display:block;
-	margin:0 10px 0;
-	font-size:11px;
-	line-height:25px;
+	padding:0 10px;
+	font-size:9px;
+	line-height:26px;
 	
 	text-transform:uppercase;
+	letter-spacing:1px;
 }
 .settings .item-title,
 .extra-services .item-title{
-	color:#b3b051;
+	font-family:Arial, Helvetica, san-serif;	
+	font-size:9px;
+	color:#C0BD00;
 	text-decoration:none;
-	border-bottom:1px dashed #b3b051;
+	border-bottom:1px dotted #68684B;
 }
 .settings a.item-title:hover{
 	color:#fefda0;
@@ -93,20 +92,63 @@ body{
 	color:#E16734;
 	text-decoration:none;
 }
-/*.settings .logged-as{
-	color:#fefda0;
+.settings .logged-as{
+	margin:0;
+}
+.settings .logged-as{
+	position:relative;
+	top:1px;
+	padding-right:5px;
+	font-size:16px;
+	line-height:20px;
+	font-family:Georgia, Cambria, "Times New Roman", Times, serif;
+	font-weight:bold;
+	font-style:italic;
+	color:#fff;
 	text-transform:none;
 	border:none;
-}*/
+	letter-spacing:normal;
+}
+.settings .logout{
+	float:left;
+	display:block;
+	text-transform:uppercase;
+	letter-spacing:1px;
+	line-height:26px;	
+	}
+	.settings .logout .item-title{
+		display:block;
+		padding:0 10px;
+		font-size:9px;
+		line-height:26px;
+		border:none;
+	}
+	.settings .logout .item-title-inner{
+		border-bottom:1px dotted #68684B;
+	}
+	.logout a.item-title:hover{
+		background-color:#a3b82d;
+		color:#ffffc5;
+		}
+		.logout a.item-title:hover .item-title-inner{
+			border:none;
+		}
+	
+	.logout a.item-title:active{
+		background-color:#ffff66;
+		color:#272700;
+	}
+
+	
 .extra-services{
 	float:right;
-	margin-right:90px;
+	margin-right:59px;
 }
 .extra-services .service-item{
 	position:relative;
-	margin:0;
-	padding:0 10px;
+	padding:0 13px;
 	line-height:26px;
+	letter-spacing:normal;
 }
 .extra-services .item-devider{
 	position:absolute;
@@ -114,33 +156,40 @@ body{
 	left:0;
 	width:100%;
 	height:3px;
-
 }
 .extra-services .item-title{
-	color:#cbdde1;
-	border-bottom:1px dashed #72736d;
-}
-.extra-services .service-item_backups .item-title{
-	padding-left:22px;
-	background:url(../images/backup-ico.png) no-repeat 0 50%;
+	font-family:Arial, Helvetica, san-serif;
+	font-size:10px;
+	font-weight:bold;
+	color:#C0E1F3;
+	border-bottom:1px dotted #7D939F;
 }
 .extra-services .active{
 	cursor:default;
 	background:#333;
+	font-weight:bold;
 	}
 	.extra-services .service-item:hover{
 		cursor:pointer;
+	}
+	.extra-services .service-item:hover .item-title{
+		color:#fffa96;
+		border-bottom-color:#fffa96;
+	}
+	.extra-services .service-item:active{
 		background:#333;
 	}
-	.extra-services .service-item:hover .item-title,
+	.extra-services .service-item:active .item-title{
+		color:#fff;
+		border:none;
+	}
 	.extra-services .active .item-title{
 		color:#fff997;
 		border:none;
 	}
-	.extra-services .service-item:hover .item-devider,
 	.extra-services .active .item-devider{
 		background:#ff6766;
-}
+	}
 
 /*Remove button padding in FF*/
 input::-moz-focus-inner{ 
@@ -216,6 +265,7 @@ input::-moz-focus-inner{
 		background:url(../images/plus-sprite1.png) no-repeat;
 		font-size:0;
 		line-height:0;
+		visibility:hidden;
 		}
 		.section .section-title .add-entry:hover{
 			background-position:-14px 0;
@@ -491,7 +541,7 @@ input::-moz-focus-inner{
 		.db-manager:active .highlighted{
 			color:#b85152;		
 		} 
-	
+		
 /* Row filters */
 
 .row-filters{}
@@ -652,10 +702,45 @@ input::-moz-focus-inner{
 		background-position:5px -79px;
 	}
 
+.b-cust-sel_inactive{
+	background:#f3f3d9;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	}	
+	.b-cust-sel_inactive .cust-sel-arrow{
+		background:#f3f3d9;
+	}
+	.b-cust-sel_inactive .cust-sel-options{
+		display:none;
+	}
+	
 .domain-groups-selector{
 	float:left;	
 	width:270px;
-}
+	padding-top:2px;
+	font-size:11px;
+	line-height:15px;
+	}
+	.domain-groups-selector .selector-wrap{
+		display:-moz-inline-stack;
+		display: inline-block;
+		zoom: 1;
+		*display: inline;
+		vertical-align:top;
+		padding-right:15px;
+		border-bottom:1px solid #d5d6c4;
+		background:url(../images/custom-arrow.png) no-repeat 100% 6px;
+	}
+	.domain-groups-selector .selector-title{
+		padding-right:5px;
+		font-weight:normal;
+		text-transform:uppercase;
+		color:#8b8b8b;	
+	}
+	.domain-groups-selector .selected-groups{
+		color:#5d5d5d;
+	}
 
 #content{
 	padding:8px 0 50px;
@@ -1193,7 +1278,7 @@ input::-moz-focus-inner{
 			position:relative;
 			display:block;
 			float:left;
-			margin-right:25px;
+			/*margin-right:25px;*/
 			padding-right:15px;
 			font-size:12px;
 			}
@@ -1201,7 +1286,7 @@ input::-moz-focus-inner{
 				visibility:hidden;
 			}
 			.row .ip-suspended-status{
-				margin-right:78px;
+				margin:0;
 				background:url(../images/suspended-ico.png) no-repeat 100% 65%;
 				}
 				.row .ip-suspended-status .ip-status-text{
@@ -1486,7 +1571,6 @@ input::-moz-focus-inner{
 	}
 	.b-new-entry select.styled{
 		top:10px;
-		width:230px;
 	}
 	.b-new-entry option{
 		font:14px arial,sans-serif;
@@ -1534,6 +1618,13 @@ input::-moz-focus-inner{
 			color:#4B9427;
 		}
 		
+		.b-new-entry .mail-options-group{
+			margin-bottom:27px;
+			}
+			.b-new-entry .mail-options-group .form-row{
+				padding-bottom:0;
+			}
+		
 	.b-new-entry .delete-record{
 		display: block;
 		position:relative;
@@ -1613,8 +1704,12 @@ input::-moz-focus-inner{
 	}
 
 	.b-new-entry .add-ns{
-		display:inline-block;
-		margin-left:180px;
+		display:-moz-inline-stack;
+		display: inline-block;
+		zoom: 1;
+		*display: inline;
+
+		margin:0 0 7px 180px;
 		font-family:Georgia, "Times New Roman", Times, serif;
 		font-size:14px;
 		line-height:1;
@@ -1648,12 +1743,12 @@ input::-moz-focus-inner{
 	
 	.b-new-entry .buttons-row{
 		position:relative;
-		margin-top:10px;
+		margin-top:13px;
 		padding:8px 15px 8px 195px;
 		border-top:1px solid #dcdbad;
 		background:url(../images/form-bottom-bg.png) repeat-x;
 	}
-	.b-new-entry .help-btn{
+/*	.b-new-entry .help-btn{
 		position:absolute;
 		top:13px;
 		right:20px;		
@@ -1672,24 +1767,56 @@ input::-moz-focus-inner{
 		.b-new-entry .help-btn:active{
 			color:#4B9427;
 		}
+*/
+
 	.b-new-entry .cancel-btn{
-		position:absolute;
-		top:15px;
-		left:16px;
+
+		display:-moz-inline-stack;
+		display: inline-block;
+		zoom: 1;
+		*display: inline;
+		
+		margin-left:30px;
 		font-size:12px;
 		line-height:1;
+		font-weight:bold;
+		
 		text-transform:uppercase;
-		color:#cc7c4b;
+		color:#2ca9bd;
 		cursor:pointer;
-		border-bottom:1px solid #cc7c4b;
+		border-bottom:1px solid #2ca9bd;
 		}
 		.b-new-entry .cancel-btn:hover{
-			color:#000;
-			border-bottom-color:#c5795f;
+			color:#999;
+			border-bottom-color:#999;
 		}
 		.b-new-entry .cancel-btn:active{		
-			color:#CC7C4B;
+			color:#fc0;
+			border-bottom-color:#fc0;
 		}
+		
+	.b-new-entry .delete-btn{
+		position:absolute;
+		top:15px;
+		right:16px;
+		
+		font-size:12px;
+		line-height:14px;
+		text-transform:uppercase;
+		color:#333;
+		letter-spacing:2px;
+		cursor:pointer;
+		border-bottom:1px solid #ff6766;
+		}
+		.b-new-entry .delete-btn:hover{
+			color:#ff6766;
+		}
+		.b-new-entry .delete-btn:active{		
+			color:#fc0;
+			border-bottom-color:#fc0;
+		}
+
+		
 	.b-new-entry .add-entry-btn{
 		overflow:visible;
 		height:28px;
@@ -1757,7 +1884,6 @@ input::-moz-focus-inner{
 			border:1px solid #dcdbad;
 			background:url(../images/form-bottom-bg.png) repeat-x;
 			}
-            
 			.form-error .error-box{
 				padding-left:18px;
 				background:url(../images/error-bullet.png) no-repeat 0 50%;
@@ -1823,16 +1949,18 @@ input::-moz-focus-inner{
 		height:60px;
 	}
 
+
 	.b-new-detailed-restore{}
 	
 	.b-new-detailed-restore .add-entry-btn{
 		padding:0 30px;
 	}
-	
+/*	
 	.b-new-detailed-restore .cancel-btn{
 		left:auto;
 		right:16px;
 	}
+*/
 	
 /* Show/edit dns records form
 - - - - - - - - - - - - - - - - - - - */
@@ -2062,7 +2190,7 @@ input::-moz-focus-inner{
 		line-height:12px;
 		background:url(../images/stats-curve.png) no-repeat 100% 50%;
 		color:#acacac;
-		border-bottom:1px solid #acacac;
+		/*border-bottom:1px solid #acacac;*/
 	}
 .b-usage-box2{
 	display:block;
@@ -2677,7 +2805,7 @@ input::-moz-focus-inner{
 	}
 	
 	.backup-tree{
-		padding-left:70px;
+		padding-left:130px;
 	}
 	
 	.backup-tree .backup-tree-item{
@@ -2762,7 +2890,7 @@ input::-moz-focus-inner{
 	.backups-list .backup-details-row_highlighted .backup-actions{
 		display:none;
 	}
-			
+	
 /* row hover effect
 - - - - - - - - - - - - - - - - - - - */
 .row:hover{
@@ -2815,6 +2943,9 @@ input::-moz-focus-inner{
 .row .ip-status-info:hover{
 	background-image:url(../images/enabled-ico-hover.png);
 }
+.row .ip-suspended-status:hover{
+	background-image:url(../images/suspended-ico.png);
+}
 .row .delete-entry:hover,
 .row .db-user-box .db-user:hover{
 	background-image:url(../images/delete-ico.png);
@@ -2912,22 +3043,29 @@ input::-moz-focus-inner{
 	.suspended-row .user-details .user-email,
 	.suspended-row .user-details .user-reports,
 	.suspended-row .template-box .prop-value,
-	.suspended-row .stats-box-title{
+	.suspended-row .stats-box-title,
+	.suspended-row .stats-box .stats-auth,
+	.suspended-row .nginx-box .nginx-ext-list{
 		color:#ccc;
 		border:none;
 	}
 	.ip-details-suspended:hover .ip-adr,
 	.suspended-row:hover .ip-adr,
+	.suspended-row:hover .names .primary,
+	.domains-list .suspended-row:hover .names .primary, 
+	.dns-list .suspended-row:hover .names .primary,
 	.cron-list .suspended-row:hover .cron-command-line,
 	.users-list .suspended-row:hover .username-box .nickname,
-	.users-list .suspended-row:hover .user-backups-box .prop-title{
+	.users-list .suspended-row:hover .user-backups-box .prop-title,
+	.suspended-row .stats-box .stats-auth-text{
 		border:none;
 	}
 	.ip-details-suspended:hover .ip-adr:hover,
 	.suspended-row:hover .ip-adr:hover,
 	.cron-list .suspended-row:hover .cron-command-line:hover,
 	.users-list .suspended-row:hover .username-box .nickname:hover,
-	.users-list .suspended-row:hover .user-backups-box .prop-title:hover{
+	.users-list .suspended-row:hover .user-backups-box .prop-title:hover,
+	.cron-list .suspended-row:hover .cron-command-line{
 		border:none;
 		cursor:default;		
 	}
@@ -2944,7 +3082,8 @@ input::-moz-focus-inner{
 .suspended-row .b-usage-box .max-size,
 .suspended-row .b-usage-box .max-size .units,
 .suspended-row .b-usage-box2 .value,
-.suspended-row .b-usage-box2 .max-size{
+.suspended-row .b-usage-box2 .max-size,
+.suspended-row .names .primary{
 	color:#ccc;
 }
 .suspended-row .b-usage-box .bar,
@@ -2980,3 +3119,7 @@ input::-moz-focus-inner{
 }
 
 .success-box {border: 1px dashed #BBBF45;color: #BBBF45;}
+
+.inactive-row { font-style: italic; opacity: 0.38; background: url('../images/bg_line.png');filter: alpha(opacity = 38); }
+.form-suspended input[type="text"], .form-suspended input[type="checkbox"], .form-suspended .checkbox, .form-suspended select, .form-suspended textarea, .form-suspended .select { opacity: 0.38;filter: alpha(opacity = 38); }
+.form-suspended .do_action_toggle_suspend {opacity: 1; filter: alpha(opacity = 100);}

From d87616899864ee3a461d6c62c080e77201cc99d9 Mon Sep 17 00:00:00 2001
From: Malishev Dmitry <dima.malishev@gmail.com>
Date: Mon, 19 Dec 2011 11:12:17 +0200
Subject: [PATCH 2/2] JS/PHP features update. Closes #4 Closes #3

---
 web/js/__init__.js                 |   6 +-
 web/js/actions.js                  |  77 ++-
 web/js/app.js                      |   8 +-
 web/js/helpers.js                  |  18 +-
 web/js/html.js                     | 822 +++++++++++++----------------
 web/js/lib/custom-form-elements.js |  54 +-
 web/js/model.js                    | 114 ++--
 web/js/pages.js                    |  36 +-
 web/js/templates.js                | 208 +++++---
 web/vesta/api/AjaxHandler.php      |   4 +-
 web/vesta/api/CRON.class.php       |  54 +-
 web/vesta/api/DB.class.php         |  56 +-
 web/vesta/api/DNS.class.php        |  33 ++
 web/vesta/api/IP.class.php         |  22 +-
 web/vesta/api/MAIN.class.php       |  40 +-
 web/vesta/api/USER.class.php       |  78 ++-
 web/vesta/api/WEB_DOMAIN.class.php | 127 ++++-
 web/vesta/core/Vesta.class.php     |  33 +-
 18 files changed, 1042 insertions(+), 748 deletions(-)

diff --git a/web/js/__init__.js b/web/js/__init__.js
index a475c716c..0926352f8 100644
--- a/web/js/__init__.js
+++ b/web/js/__init__.js
@@ -11,9 +11,9 @@ $('document').ready(function() {
         App.Utils.detectBrowser();
         App.Ref.init();    
         
-        App.Env.world = 'USER';
+        //App.Env.world = 'USER';
         // Disabled cookie tab restoring. Enable if needed
-        /*if ('undefined' != typeof App.Tmp.loadTAB) {
+        if ('undefined' != typeof App.Tmp.loadTAB) {
             App.Env.world = App.Tmp.loadTAB;
         }
         
@@ -25,7 +25,7 @@ $('document').ready(function() {
             else {
                 App.Env.world = App.Constants.TABS[0];
             }
-        }*/
+        }
         
         App.Pages.init();        
         App.Core.listen();
diff --git a/web/js/actions.js b/web/js/actions.js
index ed081bde6..7a3aa056c 100644
--- a/web/js/actions.js
+++ b/web/js/actions.js
@@ -1,3 +1,21 @@
+App.Actions.toggle_suspend = function(evt)
+{
+	var elm = $(evt.target);
+	var ref = elm.parents('.form');
+	ref.removeClass('form-suspended');
+	fb.warn(ref);
+	var ref_checkbox = ref.find('input[name="SUSPEND"]');
+	ref_checkbox.val() == 'on' ? ref_checkbox.val('off') : ref_checkbox.val('on'); //  switch state
+	if (ref_checkbox.val() == 'on') { // set class on new state
+		ref.addClass('form-suspended');
+		fb.warn('SUSP');
+	}
+	else {
+		ref.removeClass('form-suspended');		
+		fb.warn('UNSUSP');
+	}
+}
+
 App.Actions.toggle_custom_select = function(evt)
 {
     var elm = $(evt.target);
@@ -54,10 +72,11 @@ App.Actions.back_to_login = function()
 {    
     $('body').addClass('page-auth');
     var tpl = App.Templates.get('login', 'popup');
-    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
+    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
     tpl.set(':YEAR', new Date().getFullYear());
     tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
-    tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
+    tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
+    tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
     tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);
     $('body').prepend(tpl.finalize());
     $('#change-psw-block').remove();    
@@ -73,12 +92,13 @@ App.Actions.change_password = function(evt)
     }  
     
     var tpl = App.Templates.get('change_psw', 'popup');
-    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
+    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
     tpl.set(':YEAR', new Date().getFullYear());
     tpl.set(':CAPTCHA_URL', App.Helpers.generateUrl('captcha.php?')+Math.floor(Math.random() * 9999));
     tpl.set(':CAPTCHA_URL_2', App.Helpers.generateUrl('captcha.php'));  
     tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
-    tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
+    tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
+    tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
     tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);  
     $('#auth-block').remove();
     $('body').prepend(tpl.finalize()); 
@@ -104,10 +124,11 @@ App.Actions.authorize = function()
     $('#page').addClass('hidden');
     $('body').addClass('page-auth');
     var tpl = App.Templates.get('login', 'popup');
-    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo.png'));
+    tpl.set(':LOGO_URL', App.Helpers.generateUrl('images/vesta-logo-2011-12-14.png'));
     tpl.set(':YEAR', new Date().getFullYear());
     tpl.set(':EMAIL_REAL', App.Settings.VestaAbout.company_email);
-    tpl.set(':EMAIL', App.Settings.VestaAbout.company_name);
+    tpl.set(':EMAIL', App.Settings.VestaAbout.company_email);
+    tpl.set(':PRODUCT_NAME', App.Settings.VestaAbout.company_name);
     tpl.set(':VERSION', App.Settings.VestaAbout.version_name + ' ' + App.Settings.VestaAbout.version);
     $('body').prepend(tpl.finalize());
     $(document).ready(function(){
@@ -123,12 +144,15 @@ App.Actions.authorize = function()
 App.Actions.new_entry = function() {
     if ('undefined' != typeof App.Pages[App.Env.world].new_entry) {fb.log(1);
         App.Pages[App.Env.world].new_entry();
-    } else {fb.log(2);
+    } else {
         var form_id = App.Constants[App.Env.world + '_FORM_ID'];
         $('#'+form_id).remove();
         var build_method = App.Env.getWorldName() + '_form';
         var tpl = App.HTML.Build[build_method]({}, form_id);
-        App.Ref.CONTENT.prepend(tpl);
+        var box = $('<div>').html(tpl);
+        $(box).find('.suspended').addClass('hidden');
+        App.Ref.CONTENT.prepend($(box).html());
+        
         App.Helpers.updateScreen();
     }
 }
@@ -158,7 +182,7 @@ App.Actions.delete_entry = function(evt)
         return;
     }
     var elm = $(evt.target);
-    var elm = elm.hasClass('row') ? elm : elm.parents('.row');    
+    var elm = elm.hasClass('form') ? elm : elm.parents('.form');
     App.Model.remove(App.Env.world, elm);
 }
 
@@ -182,18 +206,25 @@ App.Actions.view_template_settings = function(evt)
     var elm = $(evt.target);    
     var ref = elm.hasClass('tpl-item') ? elm : elm.prev('.tpl-item');
     var tpl_name = $(ref).val() || $(ref).text();    
-    fb.log(tpl_name);
-    App.Helpers.openInnerPopup(elm, App.Env.initialParams.WEB_DOMAIN.TPL[tpl_name].DESCR || tpl_name);
+    App.Helpers.openInnerPopup(elm, App.Env.initialParams.WEB_DOMAIN.TPL[tpl_name].DESCR || tpl_name, 'Template Settings');
 }
 
 App.Actions.view_dns_template_settings = function(evt) 
+{
+    var elm = $(evt.target);    
+    var ref = elm.hasClass('tpl-item') ? elm : elm.prev('.tpl-item');
+    var tpl_name = $(ref).val() || $(ref).text();    
+    App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name, 'Template Settings');
+}
+
+/*App.Actions.view_dns_template_settings = function(evt) 
 {
     var elm = $(evt.target);    
     var ref = elm.prev('.tpl-item');        
     var tpl_name = $(ref).val() || $(ref).text();    
-    fb.log(tpl_name);
-    App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name);
-}
+
+    App.Helpers.openInnerPopup(elm, App.Env.initialParams.DNS.TPL[tpl_name].DESCR || tpl_name, '');
+}*/
 
 App.Actions.add_subrecord_dns = function(evt)
 {
@@ -392,14 +423,16 @@ App.Actions.delete_subentry = function(evt)
     $(ref).remove();    
 }
 
-App.Actions.generate_pass = function()
+App.Actions.generate_pass = function(evt)
 {
-    $('.password').val(App.Helpers.generatePassword());
+    var elm = $(evt.target);
+    var ref = elm.parents('.form-row');
+    $('.password', ref).val(App.Helpers.generatePassword());
 }
 
 App.Actions.toggle_section = function(evt)
 {
-    var elm = $(evt.target);    
+    var elm = $(evt.target);
     var ref = $(elm).parents('.form-options-group:first');
     fb.log(ref);
     if ($('.sub_section:first', ref).hasClass('hidden')) {
@@ -420,7 +453,7 @@ App.Actions.close_inner_popup = function(evt)
 App.Actions.open_inner_popup = function(evt)
 {
     var elm = $(evt.target);  
-    App.Helpers.openInnerPopup(elm, $(elm).next('.inner-popup-html').val());
+    App.Helpers.openInnerPopup(elm, $(elm).next('.inner-popup-html').val(), 'Details');
 }
 
 App.Actions.add_db_user = function(evt)
@@ -488,7 +521,7 @@ App.Actions.delete_ns = function(evt)
 App.Actions.view_full_ns_list = function(evt)
 {
     var elm = $(evt.target);
-    App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html());    
+    App.Helpers.openInnerPopup(elm, $(elm).parents('.prop-box').find('.ns-full-list:first').html(), 'NS list');    
 }
 
 App.Actions.view_template_info = function(evt)
@@ -503,7 +536,7 @@ App.Actions.view_template_info = function(evt)
             $.each(reply.data, function(key) {
                 html += '<li><strong>'+key+':</strong> '+reply.data[key]+'</li>';
             });
-            App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>');
+            App.Helpers.openInnerPopup(elm, '<ul>'+html+'</ul>', 'Template Info');
         }        
     });
 }
@@ -522,13 +555,13 @@ App.Actions.toggle_stats_block = function(evt)
 App.Actions.exec_v_console = function(evt)
 {
     evt.preventDefault();
-    App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases');
+    App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases', 'Details');
 }
 
 App.Actions.view_profile_settings = function(evt)
 {
     evt.preventDefault();
-    App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases');
+    App.Helpers.openInnerPopup(evt.target, 'This functionality will be available in next releases', 'Details');
 }
 
 App.Actions.select_all = function(evt) 
diff --git a/web/js/app.js b/web/js/app.js
index 63f3f48b8..7af8bc35b 100644
--- a/web/js/app.js
+++ b/web/js/app.js
@@ -93,7 +93,9 @@ var App = {
             DB: {},
             DNS: {},
             IP: {},
-            CRON: {}
+            CRON: {},
+            BACKUPS: {},
+            STATS: {}
         }
     },
     Messages: {},
@@ -116,7 +118,9 @@ var App = {
         DB: {},
         DNS: {},
         IP: {},
-        CRON: {}
+        CRON: {},
+		BACKUPS: {},
+		STATS: {}
     },
     Ref: {},
     Tmp: { AJAX_SYNCRONOUS:{} },
diff --git a/web/js/helpers.js b/web/js/helpers.js
index 8ed6a0fb7..df8fd806f 100644
--- a/web/js/helpers.js
+++ b/web/js/helpers.js
@@ -38,6 +38,12 @@ App.Helpers.getHumanTabName = function()
     if (App.Env.world == 'DB') {
         return 'DATABASE';
     }
+    if (App.Env.world == 'BACKUPS') {
+        return 'BACKUP';
+    }
+    if (App.Env.world == 'STATS') {
+        return 'STATS';
+    }
     return App.Env.world;
 }
 
@@ -241,11 +247,11 @@ App.Helpers.getFormValuesFromElement = function(ref)
 App.Helpers.updateScreen = function()
 {
     
-    App.Ajax.request('MAIN.getInitial', {}, function(reply){
+    /*App.Ajax.request('MAIN.getInitial', {}, function(reply){
         App.Env.initialParams = reply.data;
         App.Helpers.updateInitial();
-    });
-    $('.row:first').addClass('first-row');    
+    });*/
+    $('.row:first').addClass('first-row');
     Custom.init();
 }
 
@@ -256,7 +262,7 @@ App.Helpers.alert = function(msg)
 
 App.Helpers.isEmpty = function(o) 
 {
-    return jQuery.isEmptyObject(o);
+    return 'undefined' == typeof o ? true : jQuery.isEmptyObject(o);
 }
 
 App.Helpers.liveValidate = function()
@@ -283,8 +289,9 @@ App.Helpers.Warn = function(msg)
     alert(msg);
 }
 
-App.Helpers.openInnerPopup = function(elm, html)
+App.Helpers.openInnerPopup = function(elm, html, title)
 {
+    var title = title || '';
     App.Helpers.closeInnerPopup();
     
     var offset = $(elm).offset();
@@ -292,6 +299,7 @@ App.Helpers.openInnerPopup = function(elm, html)
     tpl.set(':CONTENT', html);
     tpl.set(':LEFT', offset.left);
     tpl.set(':TOP', offset.top);
+    tpl.set(':POPUP_TITLE', title);
     
     $(document.body).append(tpl.finalize());
 }
diff --git a/web/js/html.js b/web/js/html.js
index 40168c4da..9a2125c48 100644
--- a/web/js/html.js
+++ b/web/js/html.js
@@ -1,192 +1,267 @@
-App.HTML.setTplKeys = function(tpl, o, empty)
-{
+App.HTML.setTplKeys = function (tpl, o, empty) {
     var empty = empty || '';
     fb.log(empty);
     tpl.set(':source', $.toJSON(o).replace(/'/gi, "\\'"))
-    $(o).each(function(i, object)
-    {
-        $.each(o, function(key)
-        {
+    $(o).each(function (i, object) {
+        $.each(o, function (key) {
             var val = o[key];
             if (empty == true) {
                 tpl.set(':' + key, val || '');
-            }
-            else {
+            } else {
                 tpl.set(':' + key, val || '');
             }
         });
     });
-
     return tpl;
 }
 
-App.HTML.makeDatabases = function(databases)
-{
-    var acc = [];
-    $(databases).each(function(i, o)
-    {
-        var tpl = App.Templates.get('database', 'database');
-        tpl.set(':name', o.Database);
-        tpl.set(':db_name', o.Database);
-        acc[acc.length++] = tpl.finalize();
-    });
+//
+//	BUILD FORMS
+//
 
-    return acc.done();
-}
-
-App.HTML.makeDbTableList = function(data)
-{
-    var acc = [];
-    $(data).each(function(i, o)
-    {
-        var name = App.Helpers.getFirstValue(o);
-        var tpl = App.Templates.get('database_table', 'database');
-        tpl.set(':name', name);
-        tpl.set(':table_name', name);
-        acc[acc.length++] = tpl.finalize();
-    });
-
-    return acc.done();
-}
-
-App.HTML.makeDbFieldsList = function(data)
-{
-    var acc = [];
-    $(data).each(function(i, o)
-    {
-        var details = [o['Type'], o['Null'], o['Key'], o['Default'], o['Extra']].join(' ');
-        var tpl = App.Templates.get('database_field', 'database');
-        tpl.set(':name', o.Field);
-        tpl.set(':details', details);
-        acc[acc.length++] = tpl.finalize();
-    });
-
-    return acc.done();
-}
-
-App.HTML.Build.dns_form = function(options, id) 
-{
-    if('undefined' == typeof App.Env.initialParams) {
+App.HTML.Build.dns_form = function (options, id) {
+    if ('undefined' == typeof App.Env.initialParams) {
         return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
     }
     var tpl = App.Templates.get('FORM', 'dns');
     tpl.set(':source', options);
-
     options = App.Helpers.evalJSON(options) || {};
     if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New dns record'); 
-       tpl.set(':save_button', 'ADD'); 
+        tpl.set(':title', 'New dns record');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit dns record');
+        tpl.set(':save_button', 'SAVE');
     }
-    else {
-        tpl.set(':title', 'Edit dns record'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-
-    tpl.set(':id', id || ''); 
-    tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || '');    
+    tpl.set(':id', id || '');
+    tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || '');
     tpl.set(':IP', options.IP || '');
     tpl.set(':TTL', options.TTL || '');
     tpl.set(':SOA', options.SOA || '');
     tpl.set(':DATE', options.DATE || '');
-
     tpl = App.HTML.Build.dns_selects(tpl, options);
-
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    
     return tpl.finalize();
 }
 
-App.HTML.Build.ip_form = function(options, id) 
-{
-    if('undefined' == typeof App.Env.initialParams) {
+App.HTML.Build.ip_form = function (options, id) {
+    if ('undefined' == typeof App.Env.initialParams) {
         return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
     }
     var tpl = App.Templates.get('FORM', 'ip');
     tpl.set(':source', options);
-
     options = App.Helpers.evalJSON(options) || {};
     if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New ip address'); 
-       tpl.set(':save_button', 'ADD'); 
+        tpl.set(':title', 'New ip address');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit ip address');
+        tpl.set(':save_button', 'SAVE');
     }
-    else {
-        tpl.set(':title', 'Edit ip address'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-
-    tpl.set(':id', id || ''); 
+    tpl.set(':id', id || '');
     tpl.set(':IP_ADDRESS', options.IP_ADDRESS || '');
     tpl.set(':NETMASK', options.NETMASK || '');
     tpl.set(':NAME', options.NAME || '');
-    
     tpl = App.HTML.Build.ip_selects(tpl, options);
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    
+    return tpl.finalize();
+}
+
+App.HTML.Build.user_form = function (options, id) {
+    var in_edit = false;
+    if (!App.Helpers.isEmpty(options)) {
+        in_edit = true;
+    }
+    if ('undefined' == typeof App.Env.initialParams) {
+        return alert('Please wait a bit. Some background processes are not yet executed. Thank you for patience.');
+    }
+    var tpl = App.Templates.get('FORM', 'user');
+    tpl.set(':source', options);
+    tpl.set(':id', id || '');
+    options = App.Helpers.evalJSON(options) || {};
+    if (App.Helpers.isEmpty(options)) {
+        tpl.set(':title', 'New user');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit user');
+        tpl.set(':save_button', 'SAVE');
+    }
+    options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
+    if (in_edit == true) {
+        options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
+        var ns = [];
+        $([3, 4, 5, 6, 7, 8]).each(function (i, index) {
+            if (options['NS' + index].trim() != '') {
+                var tpl_ns = App.Templates.get('NS_INPUT', 'user');
+                tpl_ns.set(':NS_LABEL', 'NS #' + (index));
+                tpl_ns.set(':NAME', options['NS' + index]);
+                ns[ns.length++] = tpl_ns.finalize();
+            }
+        });
+        ns[ns.length++] = App.Templates.get('PLUS_ONE_NS', 'user').finalize();
+        tpl.set(':NS', ns.done());
+    } else {
+        tpl.set(':NS', '');
+    }
+    tpl = App.HTML.setTplKeys(tpl, options, true);
+    tpl = App.HTML.Build.user_selects(tpl, options);
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    if (options.REPORTS_ENABLED == 'yes') {
+        tpl.set(':CHECKED', 'checked="checked"');
+    } else {
+        tpl.set(':CHECKED', '');
+    }
+    if (!in_edit) {
+        tpl.set(':REPORTS_ENABLED_EDITABLE', 'hidden');
+    }
 
     return tpl.finalize();
 }
 
-
-App.HTML.Build.options = function(initial, default_value) 
-{
-    var opts = [];
-    $.each(initial, function(key){
-       var selected = key == default_value ? 'selected="selected"' : ''; 
-       opts[opts.length++] = '<option value="'+key+'" '+selected+'>'+initial[key]+'</options>';
-    });
-    return opts.join('');
+App.HTML.Build.web_domain_form = function (options, id) {
+    if ('undefined' == typeof App.Env.initialParams) {
+        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
+    }
+    var in_edit = false;
+    if (!App.Helpers.isEmpty(options)) {
+        in_edit = true;
+    }
+    var tpl = App.Templates.get('FORM', 'web_domain');
+    tpl.set(':source', options);
+    tpl.set(':id', id || '');
+    options = App.Helpers.evalJSON(options) || {};
+    if (App.Helpers.isEmpty(options)) {
+        tpl.set(':title', 'New WEB domain');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit WEB domain');
+        tpl.set(':save_button', 'SAVE');
+    }
+    options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
+    if (in_edit == true) {
+        options.STATS_PASSWORD = options.STATS_LOGIN.trim() != '' ? App.Settings.PASSWORD_IMMUTE : '';
+    }
+    tpl = App.HTML.setTplKeys(tpl, options, true);
+    tpl = App.HTML.Build.web_domain_selects(tpl, options);
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    if (options.CGI == 'yes') {
+        tpl.set(':CHECKED_CGI', 'checked="checked"');
+    }
+    if (options.ELOG == 'yes') {
+        tpl.set(':CHECKED_ELOG', 'checked="checked"');
+    }
+    if (options.STATS_LOGIN.trim() != '') {
+        tpl.set(':STAT_AUTH', 'checked="checked"');
+        tpl.set(':ACTIVE_LOGIN', '');
+        tpl.set(':ACTIVE_PASSWORD', '');
+        tpl.set(':stats_auth_checked', 'checked="checked"');
+    } else {
+        tpl.set(':ACTIVE_LOGIN', 'hidden');
+        tpl.set(':ACTIVE_PASSWORD', 'hidden');
+        tpl.set(':stats_auth_checked', '');
+    }
+    return tpl.finalize();
 }
 
-App.HTML.Build.ip_entry = function(o)
-{
+App.HTML.Build.db_form = function (options, id) {
+    var in_edit = false;
+    if (!App.Helpers.isEmpty(options)) {
+        in_edit = true;
+    }
+    if ('undefined' == typeof App.Env.initialParams) {
+        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
+    }
+    var tpl = App.Templates.get('FORM', 'db');
+    tpl.set(':source', options);
+    tpl.set(':id', id || '');
+    options = App.Helpers.evalJSON(options) || {};
+    if (App.Helpers.isEmpty(options)) {
+        tpl.set(':title', 'New database');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit database "' + options.DB + '"');
+        tpl.set(':save_button', 'SAVE');
+    }
+    options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB;
+    if (in_edit == true) {
+        options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
+    }
+    tpl = App.HTML.setTplKeys(tpl, options, true);
+    tpl = App.HTML.Build.db_selects(tpl, options);
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    
+    return tpl.finalize();
+}
+
+App.HTML.Build.cron_form = function (options, id) {
+    if ('undefined' == typeof App.Env.initialParams) {
+        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
+    }
+    var tpl = App.Templates.get('FORM', 'cron');
+    tpl.set(':source', options);
+    tpl.set(':id', id || '');
+    options = App.Helpers.evalJSON(options) || {};
+    if (App.Helpers.isEmpty(options)) {
+        tpl.set(':title', 'New cron entry');
+        tpl.set(':save_button', 'ADD');
+    } else {
+        tpl.set(':title', 'Edit cron entry');
+        tpl.set(':save_button', 'SAVE');
+    }
+    options = !App.Helpers.isEmpty(options) ? options : {
+        DAY: '',
+        MONTH: '',
+        WDAY: '',
+        HOUR: '',
+        CMD: '',
+        MIN: ''
+    };
+    tpl = App.HTML.setTplKeys(tpl, options);
+    tpl = App.HTML.toggle_suspended_form(tpl, options);
+    
+    return tpl.finalize();
+}
+
+//
+//	BUILD ENTRIES
+//
+
+
+App.HTML.Build.ip_entry = function (o) {
     var tpl = App.Templates.get('ENTRY', 'ip');
     tpl = App.HTML.setTplKeys(tpl, o);
-
-    /*if (App.Constants.SUSPENDED_YES == o.SUSPENDED) {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_ENABLED', 'ip');
-    }
-    else {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_DISABLED', 'ip');
-    }*/
-
-    tpl.set(':SUSPENDED_TPL', '');
-
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
+    
     return tpl.finalize();
 }
-
-App.HTML.Build.dns_entry = function(o, is_new)
-{
+App.HTML.Build.dns_entry = function (o, is_new) {
     var tpl = App.Templates.get('ENTRY', 'dns');
-    tpl = App.HTML.setTplKeys(tpl, o);      
-
+    tpl = App.HTML.setTplKeys(tpl, o);
     var ip = o.IP.split('.');
-    tpl.set(':IP', ip.join('<span class="dot">.</span>'));    
+    tpl.set(':IP', ip.join('<span class="dot">.</span>'));
     tpl.set(':CHECKED', '');
     if (is_new) {
         var now = new Date();
         tpl.set(':DATE', now.format("d.mm.yyyy"));
     }
     tpl.set(':TPL_VAL', o.TPL);
-    /*if (App.Constants.SUSPENDED_YES == o.SUSPEND) {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_NOT_SUSPENDED', 'general');
-    }
-    else {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_SUSPENDED', 'general');
-    }*/
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
     
-    tpl.set(':SUSPENDED_TPL', '');
-
     return tpl.finalize();
 }
-
-App.HTML.Build.user_entry = function(o, key)
-{   
+App.HTML.Build.user_entry = function (o, key) {
     var processed_data = {
-        'NICKNAME'              : key, 
-        'U_DISK_PERCENTAGE'     : o.U_DISK > 0 ? o.U_DISK / o.DISK_QUOTA * 100 : 1,
+        'NICKNAME': key,
+        'U_DISK_PERCENTAGE': o.U_DISK > 0 ? o.U_DISK / o.DISK_QUOTA * 100 : 1,
         'U_BANDWIDTH_PERCENTAGE': o.U_BANDWIDTH > 0 ? o.U_BANDWIDTH / o.BANDWIDTH * 100 : 1,
-        'U_DISK'                : o.U_DISK == 0 ? 1 : App.Helpers.formatNumber(o.U_DISK),
-        'U_BANDWIDTH'           : o.U_BANDWIDTH == 0 ? 1 : App.Helpers.formatNumber(o.U_BANDWIDTH),
-        'DISK_QUOTA_MEASURE'    : App.Helpers.getMbHumanMeasure(o.DISK_QUOTA),
-        'BANDWIDTH_MEASURE'     : App.Helpers.getMbHumanMeasure(o.BANDWIDTH),
-        'BANDWIDTH'             : App.Helpers.getMbHuman(o.BANDWIDTH),
-        'DISK_QUOTA'            : App.Helpers.getMbHuman(o.DISK_QUOTA)
+        'U_DISK': o.U_DISK == 0 ? 1 : App.Helpers.formatNumber(o.U_DISK),
+        'U_BANDWIDTH': o.U_BANDWIDTH == 0 ? 1 : App.Helpers.formatNumber(o.U_BANDWIDTH),
+        'DISK_QUOTA_MEASURE': App.Helpers.getMbHumanMeasure(o.DISK_QUOTA),
+        'BANDWIDTH_MEASURE': App.Helpers.getMbHumanMeasure(o.BANDWIDTH),
+        'BANDWIDTH': App.Helpers.getMbHuman(o.BANDWIDTH),
+        'DISK_QUOTA': App.Helpers.getMbHuman(o.DISK_QUOTA)
     };
     var o = $.extend(o, processed_data);
     o.U_DISK_PERCENTAGE_2 = o.U_DISK_PERCENTAGE;
@@ -195,17 +270,13 @@ App.HTML.Build.user_entry = function(o, key)
     o.DISK_QUOTA_MEASURE_2 = o.DISK_QUOTA_MEASURE;
     o.U_BANDWIDTH_PERCENTAGE_2 = o.U_BANDWIDTH_PERCENTAGE;
     o.U_BANDWIDTH_PERCENTAGE_3 = o.U_BANDWIDTH_PERCENTAGE;
-    var tpl = App.Templates.get('ENTRY', 'user');  
+    var tpl = App.Templates.get('ENTRY', 'user');
     tpl = App.HTML.setTplKeys(tpl, o);
-       
-    tpl.set(':SUSPENDED_TPL', '');//sub_tpl.finalize());
-   
-    var ns      = [];
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
+    var ns = [];
     var ns_full = [];
-    
-    $([1,2,3,4,5,6,7,8]).each(function(i, index)
-    {
-        var key = 'NS'+index;
+    $([1, 2, 3, 4, 5, 6, 7, 8]).each(function (i, index) {
+        var key = 'NS' + index;
         if ('undefined' != typeof o[key]) {
             if (o[key].trim() != '') {
                 var tpl_ns = App.Templates.get('NS_RECORD', 'user');
@@ -216,359 +287,243 @@ App.HTML.Build.user_entry = function(o, key)
                     ns[ns.length++] = tpl_finalized;
                 }
             }
-        }        
+        }
     });
-        
     if (ns_full.length <= App.Settings.USER_VISIBLE_NS) {
         tpl.set(':NS', ns.done());
-    }
-    else {
+    } else {
         var ns_custom = App.Templates.get('NS_MINIMIZED', 'user');
         ns_custom.set(':NS_MINI', ns.done());
         ns_custom.set(':NS_FULL', ns_full.done());
         ns_custom.set(':MORE_NUMBER', Math.abs(App.Settings.USER_VISIBLE_NS - ns_full.length));
         tpl.set(':NS', ns_custom.finalize());
     }
-    
     tpl = App.HTML.Build.user_web_tpl(tpl, o);
-    tpl.set(':REPORTS_ENABLED', o.REPORTS_ENABLED == 'yes' ? 'enabled' : 'DISABLED');    
+    tpl.set(':REPORTS_ENABLED', o.REPORTS_ENABLED == 'yes' ? 'enabled' : 'DISABLED');
     if (o.U_DISK_PERCENTAGE > 100) {
         var tpl_over = App.Templates.get('over_bar', 'general');
-        var difference = parseInt(o.U_DISK_PERCENTAGE, 10) - 100;             
+        var difference = parseInt(o.U_DISK_PERCENTAGE, 10) - 100;
         tpl_over.set(':OVER_PERCENTS', difference);
         tpl_over.set(':OVER_PERCENTS_2', difference);
         tpl.set(':OVER_BAR', tpl_over.finalize());
         tpl.set(':U_DISK_PERCENTAGE_3', 100);
         tpl.set(':OVER_DRAFT_VALUE', 'overdraft');
-    }
-    else {
+    } else {
         tpl.set(':OVER_BAR', '');
         tpl.set(':OVER_DRAFT_VALUE', '');
     }
-    // OVER BANDWIDTH
     if (o.U_BANDWIDTH_PERCENTAGE > 100) {
         var tpl_over = App.Templates.get('over_bar', 'general');
-        var difference = parseInt(o.U_BANDWIDTH_PERCENTAGE, 10) - 100;       
+        var difference = parseInt(o.U_BANDWIDTH_PERCENTAGE, 10) - 100;
         tpl_over.set(':OVER_PERCENTS', difference);
         tpl_over.set(':OVER_PERCENTS_2', difference);
         tpl.set(':OVER_BAR_2', tpl_over.finalize());
         tpl.set(':U_BANDWIDTH_PERCENTAGE_3', 100);
         tpl.set(':OVER_DRAFT_VALUE_2', 'overdraft');
-    }
-    else {
+    } else {
         tpl.set(':OVER_BAR_2', '');
         tpl.set(':OVER_DRAFT_VALUE_2', '');
     }
-    
-        
     return tpl.finalize();
 }
 
-
-App.HTML.Build.user_form = function(options, id) 
-{
-    var in_edit = false;
-    if (!App.Helpers.isEmpty(options)) {
-        in_edit = true;
-    }
-    if('undefined' == typeof App.Env.initialParams) {
-        return alert('Please wait a bit. Some background processes are not yet executed. Thank you for patience.');
-    }
-    var tpl = App.Templates.get('FORM', 'user');
-    tpl.set(':source', options);
-    tpl.set(':id', id || '');
-    options = App.Helpers.evalJSON(options) || {};
-    if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New user'); 
-       tpl.set(':save_button', 'ADD'); 
-    }
-    else {
-        tpl.set(':title', 'Edit user'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-    
-    options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
-    
-    
-    
-    if (in_edit == true) {
-        options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
-        // NS
-        var ns = [];
-        $([3,4,5,6,7,8]).each(function(i, index)
-        {
-            if (options['NS'+index].trim() != '') {
-                var tpl_ns = App.Templates.get('NS_INPUT', 'user');
-                tpl_ns.set(':NS_LABEL', 'NS #' + (index));
-                tpl_ns.set(':NAME', options['NS'+index]);
-                ns[ns.length++] = tpl_ns.finalize();
-            }
-        });
-        ns[ns.length++] = App.Templates.get('PLUS_ONE_NS', 'user').finalize();
-        
-        tpl.set(':NS', ns.done());
-    }
-    else {
-        tpl.set(':NS', '');
-    }
-    tpl = App.HTML.setTplKeys(tpl, options, true);        
-    tpl = App.HTML.Build.user_selects(tpl, options);
-    
-    if (options.REPORTS_ENABLED == 'yes') {
-        tpl.set(':CHECKED', 'checked="checked"');
-    }
-    else {
-        tpl.set(':CHECKED', '');
-    }
-    
-    if (!in_edit) {
-        tpl.set(':REPORTS_ENABLED_EDITABLE', 'hidden');
-    }
-    
-    return tpl.finalize();
-}
-
-App.HTML.Build.web_domain_entry = function(o, key)
-{    
+App.HTML.Build.web_domain_entry = function (o, key) {
     var processed_data = {
         DOMAIN: key
     };
     var o = $.extend(o, processed_data);
     var tpl = App.Templates.get('ENTRY', 'web_domain');
-    tpl = App.HTML.setTplKeys(tpl, o);      
-    
-    if (App.Constants.SUSPENDED_YES == o.SUSPEND) {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_SUSPENDED', 'general');
-    }
-    else {
-        var sub_tpl = App.Templates.get('SUSPENDED_TPL_NOT_SUSPENDED', 'general');
-    }    
-    tpl.set(':SUSPENDED_TPL', sub_tpl.finalize());
-    
+    tpl = App.HTML.setTplKeys(tpl, o);
+	tpl = App.HTML.toggle_suspended_entry(tpl, o);
     if (o.STATS_LOGIN.trim() != '') {
         tpl.set(':STATS_AUTH', '+auth');
-    }
-    else {
+    } else {
         tpl.set(':STATS_AUTH', '');
     }
-    
-    tpl.set(':DISK',      App.Env.initialParams.PROFILE.BANDWIDTH);
+    tpl.set(':DISK', App.Env.initialParams.PROFILE.BANDWIDTH);
     tpl.set(':BANDWIDTH', App.Env.initialParams.PROFILE.DISK);
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
     
     return tpl.finalize();
 }
 
-App.HTML.Build.web_domain_form = function(options, id) 
-{
-    if('undefined' == typeof App.Env.initialParams) {
-        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
-    }
-    
-    var in_edit = false;
-    if (!App.Helpers.isEmpty(options)) {
-        in_edit = true;
-    }
-    
-    var tpl = App.Templates.get('FORM', 'web_domain');
-    tpl.set(':source', options);
-    tpl.set(':id', id || '');
-    options = App.Helpers.evalJSON(options) || {};
-    if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New WEB domain'); 
-       tpl.set(':save_button', 'ADD'); 
-    }
-    else {
-        tpl.set(':title', 'Edit WEB domain'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-    
-    options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
-    if (in_edit == true) {
-        options.STATS_PASSWORD = options.STATS_LOGIN.trim() != '' ? App.Settings.PASSWORD_IMMUTE : '';
-    }  
-    tpl = App.HTML.setTplKeys(tpl, options, true);        
-    tpl = App.HTML.Build.web_domain_selects(tpl, options);
-    
-    if (options.CGI == 'yes') {
-        tpl.set(':CHECKED_CGI', 'checked="checked"');
-    }
-    
-    if (options.ELOG == 'yes') {
-        tpl.set(':CHECKED_ELOG', 'checked="checked"');
-    }
-    
-    if (options.STATS_LOGIN.trim() != '') {
-        tpl.set(':STAT_AUTH', 'checked="checked"');
-        tpl.set(':ACTIVE_LOGIN', '');
-        tpl.set(':ACTIVE_PASSWORD', '');
-        tpl.set(':stats_auth_checked', 'checked="checked"');
-    }
-    else {
-        tpl.set(':ACTIVE_LOGIN', 'hidden');
-        tpl.set(':ACTIVE_PASSWORD', 'hidden');
-        tpl.set(':stats_auth_checked', '');
-    }
-    
-    return tpl.finalize();
-}
-
-App.HTML.Build.mail_entry = function(o, key)
-{        
+App.HTML.Build.mail_entry = function (o, key) {
     var processed_data = {
         DOMAIN: key
     };
     var o = $.extend(o, processed_data);
     var tpl = App.Templates.get('ENTRY', 'mail');
-    tpl = App.HTML.setTplKeys(tpl, o);      
+    tpl = App.HTML.setTplKeys(tpl, o);
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
     
     return tpl.finalize();
 }
-
-App.HTML.Build.db_entry = function(o, key)
-{
-    var user_list_html = [];    
-    $(o['USERS']).each(function(i, o)
-    {
+App.HTML.Build.db_entry = function (o, key) {
+    var user_list_html = [];
+    $(o['USERS']).each(function (i, o) {
         var tpl = App.Templates.get('USER_ITEM', 'db');
         tpl.set(':NAME', o);
         user_list_html.push(tpl.finalize());
-    });   
+    });
     var wrapper = App.Templates.get('USER_ITEMS_WRAPPER', 'db');
     wrapper.set(':CONTENT', user_list_html.done());
     var processed_data = {
         'USER_LIST': wrapper.finalize(),
         'USERS': o['USERS'].length || 0,
-        'U_DISK_PERCENTAGE'     : o.U_DISK > 0 ? o.U_DISK / o.DISK * 100 : 0.01,
+        'U_DISK_PERCENTAGE': o.U_DISK > 0 ? o.U_DISK / o.DISK * 100 : 0.01,
         'DISK_MEASURE': App.Helpers.getMbHumanMeasure(o.DISK),
         'DISK': App.Helpers.getMbHuman(o.DISK)
     };
     var o = $.extend(o, processed_data);
-    
     var tpl = App.Templates.get('ENTRY', 'db');
-    tpl = App.HTML.setTplKeys(tpl, o);      
+    tpl = App.HTML.setTplKeys(tpl, o);
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
     
     return tpl.finalize();
 }
 
-App.HTML.Build.db_form = function(options, id) 
-{
-    var in_edit = false;
-    if (!App.Helpers.isEmpty(options)) {
-        in_edit = true;
-    }
-    if('undefined' == typeof App.Env.initialParams) {
-        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
-    }
-    var tpl = App.Templates.get('FORM', 'db');
-    tpl.set(':source', options);
-    tpl.set(':id', id || '');
-    options = App.Helpers.evalJSON(options) || {};
-    if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New database'); 
-       tpl.set(':save_button', 'ADD'); 
-    }
-    else {
-        tpl.set(':title', 'Edit database "'+options.DB+'"'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-    
-    options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB;  
-    if (in_edit == true) {
-        options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
-    }  
-    tpl = App.HTML.setTplKeys(tpl, options, true);        
-    tpl = App.HTML.Build.db_selects(tpl, options);       
-    
-    return tpl.finalize();
-}
-
-App.HTML.Build.cron_entry = function(o, key)
-{        
+App.HTML.Build.cron_entry = function (o, key) {
     var processed_data = {
         DOMAIN: key
     };
-    var o = $.extend(o, processed_data);    
+    var o = $.extend(o, processed_data);
     var tpl = App.Templates.get('ENTRY', 'cron');
-    tpl = App.HTML.setTplKeys(tpl, o);     
+    tpl = App.HTML.setTplKeys(tpl, o);
+    tpl = App.HTML.toggle_suspended_entry(tpl, o);
     
-    if (App.Constants.SUSPENDED_YES == o.SUSPENDED) {
+    return tpl.finalize();
+}
+
+//
+//	GENERAL METHODS
+//
+
+App.HTML.Build.backup_list = function(backups)
+{
+	if (!backups || backups.length == 0) {
+		return '<br /><br /><center><h1>Backups are not available</h1></center>';
+	}
+	
+	var acc = [];
+	$.each(backups, function(key) {
+		var bckp = backups[key];
+		var tpl = App.Templates.get('ENTRY', 'backup');
+		tpl.set(':CREATED_AT', key);
+		tpl.set(':CREATED_AT_TIME', bckp.TIME);
+		tpl.set(':CREATED_AT_TIME', bckp.TIME);
+		acc[acc.length++] = tpl.finalize()
+	})
+	
+	var wrap = App.Templates.get('WRAPPER', 'backup');
+	wrap.set(':CONTENT', acc.done());
+	
+	return wrap.finalize();
+}
+
+//
+//	HANDY METHODS
+//
+
+App.HTML.toggle_suspended_form = function(tpl, options)
+{
+	if (App.Constants.SUSPENDED_YES == options.SUSPEND) {
+		tpl.set(':SUSPENDED_CHECKED', 'checked="checked"');
+        tpl.set(':FORM_SUSPENDED', 'form-suspended');
+        tpl.set(':SUSPENDED_VALUE', 'on');
+    } else {
+		tpl.set(':SUSPENDED_CHECKED', '');
+        tpl.set(':FORM_SUSPENDED', '');
+        tpl.set(':SUSPENDED_VALUE', 'off');
+    }
+        
+    return tpl;
+}
+
+App.HTML.toggle_suspended_entry = function(tpl, options)
+{
+	if (App.Constants.SUSPENDED_YES == options.SUSPEND) {
         var sub_tpl = App.Templates.get('SUSPENDED_TPL_SUSPENDED', 'general');
-    }
-    else {
+        tpl.set(':SUSPENDED_CLASS', 'inactive-row');
+        
+    } else {
         var sub_tpl = App.Templates.get('SUSPENDED_TPL_NOT_SUSPENDED', 'general');
-    }    
-    tpl.set(':SUSPENDED_TPL', sub_tpl.finalize()); 
+        tpl.set(':SUSPENDED_CLASS', '');
+    }
+    tpl.set(':SUSPENDED_TPL', sub_tpl.finalize());
     
-    return tpl.finalize();
+    return tpl;
 }
-     
 
-App.HTML.Build.cron_form = function(options, id) 
-{
-    if('undefined' == typeof App.Env.initialParams) {
-        return alert('PLease wait a bit. Some background processes are not yet executed. Thank you for patience.');
-    }
-    var tpl = App.Templates.get('FORM', 'cron');
-    tpl.set(':source', options);
-    tpl.set(':id', id || '');
-    options = App.Helpers.evalJSON(options) || {};
-    if (App.Helpers.isEmpty(options)) {
-       tpl.set(':title', 'New cron entry'); 
-       tpl.set(':save_button', 'ADD'); 
-    }
-    else {
-        tpl.set(':title', 'Edit cron entry'); 
-        tpl.set(':save_button', 'SAVE'); 
-    }
-    
-    options = !App.Helpers.isEmpty(options) ? options : {DAY:'', MONTH: '', WDAY:'',HOUR:'',CMD:'',MIN:''};    
-    tpl = App.HTML.setTplKeys(tpl, options);     
-
-    return tpl.finalize();
-}
-    
-
-App.HTML.Build.dns_records = function(records)
-{
+App.HTML.makeDatabases = function (databases) {
     var acc = [];
-    $.each(records, function(i, record)
-    {
+    $(databases).each(function (i, o) {
+        var tpl = App.Templates.get('database', 'database');
+        tpl.set(':name', o.Database);
+        tpl.set(':db_name', o.Database);
+        acc[acc.length++] = tpl.finalize();
+    });
+    return acc.done();
+}
+App.HTML.makeDbTableList = function (data) {
+    var acc = [];
+    $(data).each(function (i, o) {
+        var name = App.Helpers.getFirstValue(o);
+        var tpl = App.Templates.get('database_table', 'database');
+        tpl.set(':name', name);
+        tpl.set(':table_name', name);
+        acc[acc.length++] = tpl.finalize();
+    });
+    return acc.done();
+}
+App.HTML.makeDbFieldsList = function (data) {
+    var acc = [];
+    $(data).each(function (i, o) {
+        var details = [o['Type'], o['Null'], o['Key'], o['Default'], o['Extra']].join(' ');
+        var tpl = App.Templates.get('database_field', 'database');
+        tpl.set(':name', o.Field);
+        tpl.set(':details', details);
+        acc[acc.length++] = tpl.finalize();
+    });
+    return acc.done();
+}
+
+App.HTML.Build.options = function (initial, default_value) {
+    var opts = [];
+    $.each(initial, function (key) {
+        var selected = key == default_value ? 'selected="selected"' : '';
+        opts[opts.length++] = '<option value="' + key + '" ' + selected + '>' + initial[key] + '</options>';
+    });
+    return opts.join('');
+}
+
+
+App.HTML.Build.dns_records = function (records) {
+    var acc = [];
+    $.each(records, function (i, record) {
         var record = records[i];
         var tpl = App.HTML.Build.dns_subrecord(record);
         acc[acc.length++] = tpl.finalize();
     });
-    
     return acc.done();
 }
-
-App.HTML.Build.dns_subrecord = function(record)
-{
+App.HTML.Build.dns_subrecord = function (record) {
     var tpl = App.Templates.get('SUBENTRY', 'dns');
     tpl.set(':RECORD', record.RECORD || '');
     tpl.set(':RECORD_VALUE', record.RECORD_VALUE || '');
     tpl.set(':RECORD_ID', record.RECORD_ID || '');
     tpl.set(':RECORD_TYPE', App.HTML.Build.options(App.Env.initialParams.DNS.record.RECORD_TYPE, (record.RECORD_TYPE || -1)));
-    
     return tpl;
 }
-
-App.HTML.Build.ssl_key_file = function()
-{
-    return '<iframe src="'+App.Helpers.getUploadUrl()+'?action=show&type=key" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
+App.HTML.Build.ssl_key_file = function () {
+    return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=key" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
 }
-
-App.HTML.Build.ssl_cert_file = function()
-{
-    return '<iframe src="'+App.Helpers.getUploadUrl()+'?action=show&type=cert" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
+App.HTML.Build.ssl_cert_file = function () {
+    return '<iframe src="' + App.Helpers.getUploadUrl() + '?action=show&type=cert" width="500px;" height="53px;" framevorder="0" scroll="no">..</iframe>';
 }
-
-App.HTML.Build.user_selects = function(tpl, options)
-{
+App.HTML.Build.user_selects = function (tpl, options) {
     var acc = [];
-    // PACKAGE
     var pkg = App.Env.initialParams.USERS.PACKAGE;
-    $.each(pkg, function(val)
-    {
+    $.each(pkg, function (val) {
         var tpl = App.Templates.get('select_option', 'general');
         tpl.set(':VALUE', val);
         tpl.set(':TEXT', pkg[val]);
@@ -576,23 +531,9 @@ App.HTML.Build.user_selects = function(tpl, options)
         acc[acc.length++] = tpl.finalize();
     });
     tpl.set(':PACKAGE_OPTIONS', acc.done());
-    // ROLE
-    acc = [];
-    var roles = App.Env.initialParams.USERS.ROLE;
-    $.each(roles, function(val)
-    {
-        var tpl = App.Templates.get('select_option', 'general');
-        tpl.set(':VALUE', val);
-        tpl.set(':TEXT', roles[val]);
-        tpl.set(':SELECTED', val == options.ROLE ? 'selected="selected"' : '');
-        acc[acc.length++] = tpl.finalize();
-    });
-    tpl.set(':ROLE_OPTIONS', acc.done());
-    // SHELL
     acc = [];
     var shell = App.Env.initialParams.USERS.SHELL;
-    $.each(shell, function(val)
-    {
+    $.each(shell, function (val) {
         var tpl = App.Templates.get('select_option', 'general');
         tpl.set(':VALUE', val);
         tpl.set(':TEXT', shell[val]);
@@ -600,17 +541,12 @@ App.HTML.Build.user_selects = function(tpl, options)
         acc[acc.length++] = tpl.finalize();
     });
     tpl.set(':SHELL_OPTIONS', acc.done());
-    
     return tpl;
 }
-
-App.HTML.Build.db_selects = function(tpl, options)
-{
+App.HTML.Build.db_selects = function (tpl, options) {
     var acc = [];
-    // PACKAGE
     var items = App.Env.initialParams.DB.TYPE;
-    $.each(items, function(val)
-    {
+    $.each(items, function (val) {
         var tpl = App.Templates.get('select_option', 'general');
         tpl.set(':VALUE', val);
         tpl.set(':TEXT', items[val]);
@@ -618,11 +554,9 @@ App.HTML.Build.db_selects = function(tpl, options)
         acc[acc.length++] = tpl.finalize();
     });
     tpl.set(':TYPE_OPTIONS', acc.done());
-    // ROLE
     acc = [];
     var items = App.Env.initialParams.DB.HOST;
-    $.each(items, function(val)
-    {
+    $.each(items, function (val) {
         var tpl = App.Templates.get('select_option', 'general');
         tpl.set(':VALUE', val);
         tpl.set(':TEXT', items[val]);
@@ -630,78 +564,52 @@ App.HTML.Build.db_selects = function(tpl, options)
         acc[acc.length++] = tpl.finalize();
     });
     tpl.set(':HOST_OPTIONS', acc.done());
-        
     return tpl;
 }
-
-App.HTML.Build.ip_selects = function(tpl, options) 
-{
-    // OWNER
+App.HTML.Build.ip_selects = function (tpl, options) {
     var users = App.Env.initialParams.IP.OWNER;
     var opts = App.HTML.Build.options(users, options.OWNER);
     tpl.set(':owner_options', opts);
-    
-    // STATUS
     var opts = App.HTML.Build.options(App.Env.initialParams.IP.STATUSES, options.STATUS);
     tpl.set(':status_options', opts);
-    
-    // INTERFACE
     var opts = App.HTML.Build.options(App.Env.initialParams.IP.INTERFACES, options.INTERFACE);
     tpl.set(':interface_options', opts);
-    
     return tpl;
 }
-
-App.HTML.Build.dns_selects = function(tpl, options) 
-{    
+App.HTML.Build.dns_selects = function (tpl, options) {
     try {
-        // TPL
         var obj = {};
-        $.each(App.Env.initialParams.DNS.TPL, function(key) {
+        $.each(App.Env.initialParams.DNS.TPL, function (key) {
             obj[key] = key;
-        });        
+        });
         var opts = App.HTML.Build.options(obj, options.PACKAGE);
         tpl.set(':TPL', opts);
         tpl.set(':TPL_DEFAULT_VALUE', options.TPL || App.Helpers.getFirstKey(obj));
-    }
-    catch (e) {        
+    } catch (e) {
         return tpl;
     }
-    
     return tpl;
 }
-
-App.HTML.Build.web_domain_selects = function(tpl, options) 
-{    
+App.HTML.Build.web_domain_selects = function (tpl, options) {
     try {
-        // IP
         var obj = App.Env.initialParams.WEB_DOMAIN.IP;
         var opts = App.HTML.Build.options(obj, options.IP);
-        tpl.set(':IP_OPTIONS', opts);        
-        
-        // TPL        
+        tpl.set(':IP_OPTIONS', opts);
         var obj = {};
-        $.each(App.Env.initialParams.WEB_DOMAIN.TPL, function(key) {
+        $.each(App.Env.initialParams.WEB_DOMAIN.TPL, function (key) {
             obj[key] = key;
-        });   
-        //var obj = App.Env.initialParams.WEB_DOMAIN.TPL;
+        });
         var opts = App.HTML.Build.options(obj, options.TPL);
-        tpl.set(':TPL_OPTIONS', opts);        
-        
-        // STAT
+        tpl.set(':TPL_OPTIONS', opts);
         var obj = App.Env.initialParams.WEB_DOMAIN.STAT;
         var opts = App.HTML.Build.options(obj, options.STAT);
-        tpl.set(':STAT_OPTIONS', opts);                
-    }
-    catch (e) {        
+        tpl.set(':STAT_OPTIONS', opts);
+    } catch (e) {
         return tpl;
     }
-    
     return tpl;
 }
-
-App.HTML.Build.user_web_tpl = function(tpl, o)
-{
+App.HTML.Build.user_web_tpl = function (tpl, o) {
     var wt = [];
     var wt_full = [];
     var templates = o.WEB_TPL;
@@ -709,8 +617,7 @@ App.HTML.Build.user_web_tpl = function(tpl, o)
     if (templates.length == 0) {
         templates = templates.split(' ');
     }
-    
-    $(templates).each(function(i, web_tpl) {
+    $(templates).each(function (i, web_tpl) {
         var tpl_wt = App.Templates.get('WEB_TPL', 'user');
         tpl_wt.set(':NAME', web_tpl);
         var tpl_finalized = tpl_wt.finalize();
@@ -719,19 +626,14 @@ App.HTML.Build.user_web_tpl = function(tpl, o)
             wt[wt.length++] = tpl_finalized;
         }
     });
-    
     if (templates.length <= App.Settings.USER_VISIBLE_NS) {
         tpl.set(':WEB_TPL', wt.done());
-    }
-    else {
+    } else {
         var wt_custom = App.Templates.get('WEB_TPL_MINIMIZED', 'user');
         wt_custom.set(':WEB_TPL_MINI', wt.done());
         wt_custom.set(':WEB_TPL_FULL', wt_full.done());
         wt_custom.set(':MORE_NUMBER', Math.abs(App.Settings.USER_VISIBLE_NS - wt_full.length));
         tpl.set(':WEB_TPL', wt_custom.finalize());
     }
-    
     return tpl;
 }
-
-
diff --git a/web/js/lib/custom-form-elements.js b/web/js/lib/custom-form-elements.js
index 77131453f..e5bd43dab 100644
--- a/web/js/lib/custom-form-elements.js
+++ b/web/js/lib/custom-form-elements.js
@@ -37,9 +37,13 @@ var Custom = {
 	init: function() {
 		var inputs = document.getElementsByTagName("input"), span = Array(), textnode, option, active;
 		for(a = 0; a < inputs.length; a++) {
-			if((inputs[a].type == "checkbox" || inputs[a].type == "radio") && $(inputs[a]).hasClass("styled")) {
-				span[a] = document.createElement("span");
+			if((inputs[a].type == "checkbox" || inputs[a].type == "radio") && $(inputs[a]).hasClass("styled") && !$(inputs[a]).hasClass("style-applied")) {
+				$(inputs[a]).addClass('style-applied');
+                span[a] = document.createElement("span");
 				span[a].className = inputs[a].type;
+				if ($(inputs[a]).attr('class').indexOf('do_action_toggle_suspend') != -1) {
+					span[a].className += ' do_action_toggle_suspend'; // save toggle functionality
+				}
 
 				if(inputs[a].checked == true) {
 					if(inputs[a].type == "checkbox") {
@@ -61,33 +65,33 @@ var Custom = {
 			}
 		}
 		inputs = document.getElementsByTagName("select");
-		for(a = 0; a < inputs.length; a++) {
-                    try{
-                        fb.log($(inputs[a]).hasClass("styled"));
-			if($(inputs[a]).hasClass("styled")) {
-				option = inputs[a].getElementsByTagName("option");
-				active = option[0].childNodes[0].nodeValue;
-				textnode = document.createTextNode(active);
-				for(b = 0; b < option.length; b++) {
-					if(option[b].selected == true) {
-						textnode = document.createTextNode(option[b].childNodes[0].nodeValue);
+		try {
+			for(a = 0; a < inputs.length; a++) {
+				if($(inputs[a]).hasClass("styled")) {
+					option = inputs[a].getElementsByTagName("option");
+					active = option[0].childNodes[0].nodeValue;
+					textnode = document.createTextNode(active);
+					for(b = 0; b < option.length; b++) {
+						if(option[b].selected == true) {
+							textnode = document.createTextNode(option[b].childNodes[0].nodeValue);
+						}
+					}
+					span[a] = document.createElement("span");
+					span[a].className = "select";
+					span[a].id = "select-" + inputs[a].name + a;
+					span[a].appendChild(textnode);
+					inputs[a].parentNode.insertBefore(span[a], inputs[a]);
+									inputs[a].id = inputs[a].name + a;
+					if(!inputs[a].getAttribute("disabled")) {
+						inputs[a].onchange = Custom.choose;
+					} else {
+						inputs[a].previousSibling.className = inputs[a].previousSibling.className += " disabled";
 					}
 				}
-				span[a] = document.createElement("span");
-				span[a].className = "select";
-				span[a].id = "select-" + inputs[a].name + a;
-				span[a].appendChild(textnode);
-				inputs[a].parentNode.insertBefore(span[a], inputs[a]);
-                                inputs[a].id = inputs[a].name + a;
-				if(!inputs[a].getAttribute("disabled")) {
-					inputs[a].onchange = Custom.choose;
-				} else {
-					inputs[a].previousSibling.className = inputs[a].previousSibling.className += " disabled";
-				}
 			}
-                    }catch(e){fb.error(e);}
+			document.onmouseup = Custom.clear;			
 		}
-		document.onmouseup = Custom.clear;
+		catch(e){ /* */ }
 	},
 	pushed: function() {
 		element = this.nextSibling;
diff --git a/web/js/model.js b/web/js/model.js
index 8e02f5d44..c62ee1767 100644
--- a/web/js/model.js
+++ b/web/js/model.js
@@ -1,64 +1,81 @@
-App.Model.DNS.loadList = function()
+App.Model.DNS.loadList = function(callback)
 {
-    App.Ajax.request('DNS.getList', {}, App.View.listItems);
+	if (!callback) {
+		callback = App.View.listItems;
+	}
+    App.Ajax.request('DNS.getList', {}, callback);
 }
 
-App.Model.IP.loadList = function()
+App.Model.IP.loadList = function(callback)
 {
-    App.Ajax.request('IP.getList', {}, App.View.listItems);
+	if (!callback) {
+		callback = App.View.listItems;
+	}
+    App.Ajax.request('IP.getList', {}, callback);
 }
 
-App.Model.USER.loadList = function()
+App.Model.USER.loadList = function(callback)
 {
-    App.Ajax.request('USER.getList', {}, App.View.listItems);
+	if (!callback) {
+		callback = App.View.listItems;
+	}
+    App.Ajax.request('USER.getList', {}, callback);
 }
 
-App.Model.WEB_DOMAIN.loadList = function()
+App.Model.WEB_DOMAIN.loadList = function(callback)
 {
-    App.Ajax.request('WEB_DOMAIN.getList', {}, App.View.listItems);
+	if (!callback) {
+		callback = App.View.listItems;
+	}
+    App.Ajax.request('WEB_DOMAIN.getList', {}, callback);
 }
 
-App.Model.MAIL.loadList = function()
+App.Model.MAIL.loadList = function(callback)
 {
     //App.Ajax.request('MAIL.getList', {}, App.View.listItems);
     App.Ref.CONTENT.html('<center><h1 style="padding-top: 20px; font-size: 28px; position: absolute; margin-left: 351px; color: white; text-shadow: 2px 1px 1px rgb(65, 124, 213);">Under maintanance</h1><img width="900px" src="'+App.Helpers.generateUrl('images/Asteroid_Vesta.jpg')+'"></center>');
 }
 
-App.Model.DB.loadList = function()
+App.Model.DB.loadList = function(callback)
 {
-    App.Ajax.request('DB.getList', {}, function(reply)
-    {
-        var acc = [];
-        var build_method = App.Env.getWorldName() + '_entry';
-        var data = reply.data;   
-        // TODO: fix it data.data
-        $.each(data, function(key) 
-        {
-            var db_list = data[key];
-            fb.warn('KEY: %o', key);
-            fb.warn('DATA: %o', data[key]);
-            var tpl_divider = App.Templates.get('DIVIDER', 'db');
-            tpl_divider.set(':TYPE', key);
-            acc[acc.length++] = tpl_divider.finalize();
-            $(db_list).each(function(i, o)
-            {
-                acc[acc.length++] = App.HTML.Build[build_method](o, key);
-            });
-            
-            /*var o = data[key];
-            fb.warn(key);
-            acc[acc.length++] = App.HTML.Build[build_method](o, key);*/
-        });
-        
-        var html = acc.done().wrapperize('ENTRIES_WRAPPER', App.Env.getWorldName());
-        App.Ref.CONTENT.html(html);
-        App.Helpers.updateScreen();
-    });
+	if (!callback) {
+		callback = function(reply) {
+			var acc = [];
+			var build_method = App.Env.getWorldName() + '_entry';
+			var data = reply.data;   
+			// TODO: fix it data.data
+			$.each(data, function(key) 
+			{
+				var db_list = data[key];
+				fb.warn('KEY: %o', key);
+				fb.warn('DATA: %o', data[key]);
+				var tpl_divider = App.Templates.get('DIVIDER', 'db');
+				tpl_divider.set(':TYPE', key);
+				acc[acc.length++] = tpl_divider.finalize();
+				$(db_list).each(function(i, o)
+				{
+					acc[acc.length++] = App.HTML.Build[build_method](o, key);
+				});
+				
+				/*var o = data[key];
+				fb.warn(key);
+				acc[acc.length++] = App.HTML.Build[build_method](o, key);*/
+			});
+			
+			var html = acc.done().wrapperize('ENTRIES_WRAPPER', App.Env.getWorldName());
+			App.Ref.CONTENT.html(html);
+			App.Helpers.updateScreen();
+		};
+	}
+    App.Ajax.request('DB.getList', {}, callback);
 }
 
-App.Model.CRON.loadList = function()
+App.Model.CRON.loadList = function(callback)
 {
-    App.Ajax.request('CRON.getList', {}, App.View.listItems);
+	if (!callback) {
+		callback = App.View.listItems;
+	}
+    App.Ajax.request('CRON.getList', {}, callback);
 }
 
 
@@ -121,6 +138,23 @@ App.Model.update = function(values, source_json, elm)
             // todo: reply.data;
             App.Pages.prepareHTML();
             App.Helpers.updateScreen();
+            /*var refl = {'USER': 'LOGIN_NAME'};
+            App.Model[App.Env.world].loadList(function(reply) {
+				var acc = [];
+				var build_method = App.Env.getWorldName() + '_entry';
+				var data = reply.data;   
+				// TODO: fix it data.data
+				$.each(data, function(key) 
+				{
+					var o = data[key];
+					fb.warn(key);
+					acc[acc.length++] = App.HTML.Build[build_method](o, key);
+				});
+				
+				var html = acc.done().wrapperize('ENTRIES_WRAPPER', App.Env.getWorldName());
+				App.Ref.CONTENT.html(html);
+				App.Helpers.updateScreen();
+			);*/
         }
         // TODO: !
     });
diff --git a/web/js/pages.js b/web/js/pages.js
index 4f988ee03..50ac7c696 100644
--- a/web/js/pages.js
+++ b/web/js/pages.js
@@ -15,8 +15,9 @@ App.Pages.init = function()
 
 App.Pages.prepareHTML = function()
 {
+	$('.active').removeClass('active');
     if ('undefined' != typeof App.Pages[App.Env.world].prepareHTML) {
-        App.Pages.prepareHTML();
+        App.Pages[App.Env.world].prepareHTML();
     }  
     else {        
         App.Model[App.Env.world].loadList();
@@ -48,7 +49,9 @@ App.Pages.USER.new_entry = function(evt)
     $('#'+form_id).remove();
     var build_method = App.Env.getWorldName() + '_form';
     var tpl = App.HTML.Build[build_method]({}, form_id);
-    App.Ref.CONTENT.prepend(tpl);
+    var box = $('<div>').html(tpl);
+    $(box).find('.suspended').addClass('hidden');
+    App.Ref.CONTENT.prepend($(box).html());
     App.Helpers.updateScreen(); 
     $('#'+form_id).find('.ns-entry, .additional-ns-add').addClass('hidden');   
 }
@@ -59,7 +62,10 @@ App.Pages.WEB_DOMAIN.new_entry = function(evt)
     $('#'+form_id).remove();
     var build_method = App.Env.getWorldName() + '_form';
     var tpl = App.HTML.Build[build_method]({}, form_id);
-    App.Ref.CONTENT.prepend(tpl);
+    var box = $('<div>').html(tpl);
+    $(box).find('.suspended').addClass('hidden');
+    App.Ref.CONTENT.prepend($(box).html());
+    //App.Ref.CONTENT.prepend(tpl);
     App.Helpers.updateScreen(); 
     $('#'+form_id).find('.ns-entry, .additional-ns-add').addClass('hidden');   
     var ssl_key_upload  = App.HTML.Build.ssl_key_file();
@@ -93,3 +99,27 @@ App.Pages.WEB_DOMAIN.setSSL = function(type, frame)
     var ref = frame.frameElement;
     $(ref).next('textarea').val(frame.document.getElementById('result').value);
 }
+
+App.Pages.loadBackups = function()
+{
+	App.Env.world = 'BACKUPS';
+	App.Pages.prepareHTML();
+}
+
+App.Pages.BACKUPS.prepareHTML = function()
+{
+	$('#primary-nav-box .active').removeClass('active');
+	$('#BACKUPS').addClass('active');
+	$('#new-entry-keyword').text(App.Helpers.getHumanTabName());
+    document.title = 'Vesta | ' + App.Helpers.getHumanTabName();
+    
+    App.Ajax.request('MAIN.getBackups', {}, function(reply) {
+		if (!reply.result) {
+			App.Herlers.alert('Backups list failed to load. Please try again a bit later');
+		}
+		
+		App.Ref.CONTENT.html(App.HTML.Build.backup_list(reply.data));
+        App.Helpers.updateScreen();
+		//$('#content').html(App.HTML.Build.backup_list(reply.data));
+	});
+}
diff --git a/web/js/templates.js b/web/js/templates.js
index b97e053f1..05c074667 100644
--- a/web/js/templates.js
+++ b/web/js/templates.js
@@ -25,6 +25,7 @@ App.Templates.html = {
         inner_popup: ['<div id="inner-popup" style="left:~!:LEFT~!px;top:~!:TOP~!px;z-index:1000;display:block;" class="d-popup d-popup-ns-list">\
             <div class="d-popup-inner">\
                 <span class="close do_action_close_inner_popup">×</span>\
+                <div class="d-popup-title">~!:POPUP_TITLE~!</div>\
                 <div class="d-popup-content">\
                     ~!:CONTENT~!\
                 </div>\
@@ -32,8 +33,8 @@ App.Templates.html = {
         </div>'],
         select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'],
         error_elm: ['<div class="error-box">~!:ERROR~!</div>'],
-        SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status do_action_suspend"><span class="ip-status-text do_action_suspend">enabled</span></span>'],
-        SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status do_action_unsuspend"><span class="ip-status-text do_action_unsuspend">suspended</span></span>']        
+        SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>'],
+        SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>']        
     },
     popup: {
         error: ['<div class="error"><center><h1 style="color: red;">Important: An Error Has Occured.</h1><hr></center>&nbsp;&nbsp;&nbsp;&nbsp;Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.<br>,&nbsp;&nbsp;&nbsp;&nbsp;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 <a href="mail_to">this email: BLABLA</a>,<br><br><center><span style="color: rgb(92, 92, 92);">Sorry for inconvinience. (We recommend you to reload the page)</span></center></div>'],
@@ -42,8 +43,9 @@ App.Templates.html = {
                 <div class="b-auth-form">\
                     <div class="b-auth-form-wrap">\
                         <img width="72" height="24" alt="" src="~!:LOGO_URL~!" class="vesta-logo">\
+                        <span style="color: #5E696B; float: right; margin-top: -48px;">~!:VERSION~!</span>\
                         <div class="b-client-title">\
-                            <span class="client-title-wrap">~!:VERSION~!<i class="planets">&nbsp;</i></span>\
+                            <span class="client-title-wrap">~!:PRODUCT_NAME~!<i class="planets">&nbsp;</i></span>\
                         </div>\
                         <form id="change_psw-form" method="post" action="#" class="auth">\
                             <div class="form-row cc">\
@@ -76,8 +78,9 @@ App.Templates.html = {
         <div class="b-auth-form">\
             <div class="b-auth-form-wrap">\
                 <img width="72" height="24" alt="" src="~!:LOGO_URL~!" class="vesta-logo">\
+                <span style="color: #5E696B; float: right; margin-top: -48px;">~!:VERSION~!</span>\
                 <div class="b-client-title">\
-                    <span class="client-title-wrap">~!:VERSION~!<i class="planets">&nbsp;</i></span>\
+                    <span class="client-title-wrap">~!:PRODUCT_NAME~!<i class="planets">&nbsp;</i></span>\
                 </div>\
                 <form id="login-form" method="post" action="#" class="auth">\
                     <div class="form-row cc">\
@@ -112,7 +115,7 @@ App.Templates.html = {
     },
     dns: {
         FORM: [
-            '<div style="margin-top: 25px;" class="b-new-entry b-new-entry_dns form" id="~!:id~!">\
+            '<div style="margin-top: 25px;" class="b-new-entry b-new-entry_dns form ~!:FORM_SUSPENDED~!" id="~!:id~!">\
                 <input type="hidden" name="source" class="source" value=~!:source~!>\
                     <input type="hidden" name="target" class="target" value=\'\'>\
                     <div class="entry-header">~!:title~!</div>\
@@ -136,7 +139,7 @@ App.Templates.html = {
                                 <select name="TPL" class="styled tpl-item">\
                                        ~!:TPL~!\
                                 </select>\
-                            <span class="context-settings do_action_view_template_settings">View template settings</span>\
+                            <span class="context-settings do_action_view_dns_template_settings">View template settings</span>\
                     </div>\
                     <div class="form-row cc">\
                             <label for="#" class="field-label">ttl:</label>\
@@ -146,22 +149,25 @@ App.Templates.html = {
                             <label for="#" class="field-label">soa:</label>\
                             <input type="text" value="~!:SOA~!" name="SOA" class="text-field rule-required rule-ns">\
                     </div>\
+                    <div class="form-row suspended cc">\
+							<label for="#" class="field-label">suspended:</label>\
+							<input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND" />\
+					</div>\
                     <div class="form-row buttons-row cc">\
-                            <input type="submit" value="~!:save_button~!" class="add-entry-btn do_action_save_form" name="save">\
-                            <span class="cancel-btn do_action_cancel_form">Cancel</span>\
-                            <a class="help-btn" href="http://vestacp.com/docs/dns/" target="_blank">Help</a>\
+                       <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                       <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                       <span class="delete-btn do_action_delete_entry">Delete</span>\
                     </div>\
             </div>'
         ],        
         ENTRIES_WRAPPER: ['<div class="dns-list items-list">~!:content~!</div>'],
-        ENTRY: ['<div class="row dns-details-row ~!:CHECKED~!">\
+        ENTRY: ['<div class="row dns-details-row ~!:CHECKED~! ~!:SUSPENDED_CLASS~!">\
                             <input type="hidden" name="source" class="source" value=~!:source~! />\
                             <input type="hidden" class="target" name="target" value=\'\' />\
                             <div class="row-actions-box cc">\
                                         <div class="check-this check-control"></div>\
                                         <div class="row-operations">\
                                                 ~!:SUSPENDED_TPL~!\
-                                                <span class="delete-entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
                                         </div>\
                                 </div>\
                                 <div class="row-meta">\
@@ -237,7 +243,7 @@ App.Templates.html = {
     },
     ip: {
         FORM: ['\
-            <div class="b-new-entry b-new-entry_ip form" id="~!:id~!">\
+            <div class="b-new-entry b-new-entry_ip form ~!:FORM_SUSPENDED~!" id="~!:id~!">\
                 <input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                 <input type="hidden" name="target" class="target" value=\'~!:target~!\'>\
                 <div class="entry-header">~!:title~!</div>\
@@ -262,7 +268,7 @@ App.Templates.html = {
                 </div>\
                 <div class="form-row cc">\
                         <label for="#" class="field-label">name:</label>\
-                        <input type="text" name="NAME" value="~!:NAME~!" class="text-field rule-abc">\
+                        <input type="text" name="NAME" value="~!:NAME~!" class="text-field rule-domain">\
                 </div>\
                 <div class="form-row cc">\
                         <label for="#" class="field-label">interface:</label>\
@@ -277,23 +283,26 @@ App.Templates.html = {
                                 <input type="text" value="~!:NETMASK~!" name="NETMASK" class="text-field">\
                         </div>\
                 </div>\
-                <div class="form-row buttons-row cc">\
-                        <input type="submit" value="~!:save_button~!" name="save" class="add-entry-btn do_action_save_form">\
-                        <span class="cancel-btn do_action_cancel_form">Cancel</span>\
-                        <a class="help-btn" href="http://vestacp.com/docs/ip/" target="_blank">Help</a>\
+                <div class="form-row suspended cc">\
+							<label for="#" class="field-label">suspended:</label>\
+							<input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND"/>\
+					</div>\
+				<div class="form-row buttons-row cc">\
+                   <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                   <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                   <span class="delete-btn do_action_delete_entry">Delete</span>\
                 </div>\
         </div>\
          '],
         DOT: ['<span class="dot">.</span>'],
         ENTRY: ['\
-            <div class="row ip-details-row">\
+            <div class="row ip-details-row ~!:SUSPENDED_CLASS~!">\
                 <input type="hidden" class="source" name="source" value=\'~!:source~!\' />\
                 <input type="hidden" class="target" name="target" value="" />\
                 <div class="row-actions-box cc">\
                         <div class="check-this"></div>\
                         <div class="row-operations">\
-                        ~!:SUSPENDED_TPL~!\
-                        <span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
+                            ~!:SUSPENDED_TPL~!\
                         </div>\
                 </div>\
                 <div class="row-meta">\
@@ -349,12 +358,12 @@ App.Templates.html = {
         WEB_TPL_MINIMIZED: ['~!:WEB_TPL_MINI~!\
                         <span class="group-switcher">\
                             <span class="group-values-count do_action_view_full_ns_list">~!:MORE_NUMBER~! more</span>\
-                        </span><span class="hidden ns-full-list"><span class="group-values group-values__bullet">~!:WEB_TPL_FULL~!</span></span>'],
+                        </span><span class="hidden ns-full-list"><span class="group-values">~!:WEB_TPL_FULL~!</span></span>'],
         WEB_TPL: ['<span class="prop-value">~!:NAME~!</span>'],
         NS_MINIMIZED: ['~!:NS_MINI~!\
                         <span class="group-switcher">\
                             <span class="group-values-count do_action_view_full_ns_list">~!:MORE_NUMBER~! more</span>\
-                        </span><span class="hidden ns-full-list"><span class="group-values group-values__bullet">~!:NS_FULL~!</span></span>'],        
+                        </span><span class="hidden ns-full-list"><span class="group-values">~!:NS_FULL~!</span></span>'],        
         NS_RECORD: ['<span class="prop-value">~!:NAME~!</span>'],
         NS_INPUT: ['<div class="form-row ns-entry cc">\
 							<label for="#" class="field-label">~!:NS_LABEL~!:</label>\
@@ -367,8 +376,8 @@ App.Templates.html = {
 								<span class="btn-title do_action_add_form_ns">Add additional NS</span>\
 							</a>\
 						</div>'],
-        ENTRIES_WRAPPER: ['<div class="users-list items-list">~!:content~!</div>'],
-        FORM:  ['<div id="~!:id~!" class="b-new-entry b-new-entry_user form">\
+        ENTRIES_WRAPPER: ['<div class="users-list items-list">~!:content~!</div>'], 
+        FORM:  ['<div id="~!:id~!" class="b-new-entry b-new-entry_user form ~!:FORM_SUSPENDED~!">\
                         <input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                         <input type="hidden" name="target" class="target" value=\'\'>\
 						<div class="entry-header">~!:title~!</div>\
@@ -395,12 +404,12 @@ App.Templates.html = {
 								~!:SHELL_OPTIONS~!\
 							</select>\
 						</div>\
-						<div class="form-row cc">\
+						<!-- div class="form-row cc">\
 							<label for="#" class="field-label">role:</label>\
 							<select class="styled" name="ROLE">\
 								~!:ROLE_OPTIONS~!\
 							</select>\
-						</div>\
+						</div -->\
 						<div class="form-row cc">\
 							<label for="#" class="field-label">contact email:</label>\
 							<input type="text" name="CONTACT" class="text-field rule-email rule-required" value="~!:CONTACT~!">\
@@ -417,7 +426,7 @@ App.Templates.html = {
 							<label for="#" class="field-label">Lastname:</label>\
 							<input type="text" name="LNAME" class="text-field rule-abc rule-required" value="~!:LNAME~!">\
 						</div>\
-                        <!-- div class="form-row ns-entry cc">\
+                        <div class="form-row ns-entry cc">\
 							<label for="#" class="field-label">NS #1:</label>\
 							<input type="text" value="~!:NS1~!" name="NS1" class="text-field rule-required rule-ns">\
 						</div>\
@@ -425,31 +434,28 @@ App.Templates.html = {
 							<label for="#" class="field-label">NS #2:</label>\
 							<input type="text" value="~!:NS2~!" name="NS2" class="text-field rule-required rule-ns">\
 						</div>\
-                        ~!:NS~!\ -->\
+                        ~!:NS~!\
+                        <div class="form-row suspended cc">\
+                            <label for="#" class="field-label">suspended:</label>\
+                            <input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND"/>\
+                        </div>\
                         <div class="form-row buttons-row cc">\
-							<input type="submit" value="~!:save_button~!" name="save" class="add-entry-btn do_action_save_form">\
-							<span class="cancel-btn do_action_cancel_form">Cancel</span>\
-							<a class="help-btn" href="http://vestacp.com/docs/user/" target="_blank">Help</a>\
-						</div>\
+                           <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                           <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                           <span class="delete-btn do_action_delete_entry">Delete</span>\
+                        </div>\
 					</div>'],
-        ENTRY: ['<div class="row user-details-row">\
+        ENTRY: ['<div class="row user-details-row ~!:SUSPENDED_CLASS~!">\
                     <input type="hidden" class="source" name="source" value=\'~!:source~!\' />\
                     <input type="hidden" class="target" name="target" value="" />\
 						<div class="row-actions-box cc">\
 							<div class="check-this check-control"></div>\
 							<div class="row-operations">\
 								~!:SUSPENDED_TPL~!\
-								<span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
 							</div>\
 						</div>\
 						<div class="row-meta">\
 							<div class="entry-created">~!:DATE~!</div>\
-							<div class="ownership">\
-								<span class="prop-box">\
-									<span class="prop-title">owner:</span>\
-									<span class="prop-value">~!:OWNER~!</span>\
-								</span>\
-							</div>\
 						</div>\
 						<div class="row-details cc">\
 							<div class="props-main">\
@@ -457,8 +463,7 @@ App.Templates.html = {
 									<div class="username-box">\
 										<span class="user">\
 											<span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\
-                                            <span class="role"></span>\
-											<span class="role">(~!:ROLE~!)</span>\
+                                            <!-- span class="role">(~!:ROLE~!)</span -->\
 										</span>\
 										<span class="prop-box template-box">\
 											<span class="prop-title">package:</span>\
@@ -477,9 +482,6 @@ App.Templates.html = {
                                                 <span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
                                                 </span>\
                                         </span>\
-                                        <span class="prop-box childs-box">\
-                                        <span class="prop-title">childs:</span>\
-                                            <span class="prop-value prop-value-collapsed-childs">~!:U_CHILDS~! (~!:MAX_CHILDS~!)</span>\                                        </span>\
 									</div>\
 								</div>\
 								<!-- disk usage block -->\
@@ -523,11 +525,11 @@ App.Templates.html = {
 								</span>\
 								<span class="prop-box webalias-box">\
 									<span class="prop-title">web alias:</span>\
-									<span class="prop-value prop-value-collapsed-childs">(~!:WEB_ALIASES~!) per domain</span>\
+									<span class="prop-value">~!:WEB_ALIASES~! per domain</span>\
 								</span>\
 								<span class="prop-box prop-box_group-values cc webtpl-box">\
 									<span class="prop-title">web templates:</span>\
-									<span class="group-values group-values__bullet">\
+									<span class="group-values">\
 										~!:WEB_TPL~!\
 									</span>\
 								</span>\
@@ -567,7 +569,7 @@ App.Templates.html = {
 								</span>\
 								<span class="prop-box prop-box_group-values cc ns-list-box">\
 									<span class="prop-title">ns list:</span>\
-									<span class="group-values group-values__bullet">\
+									<span class="group-values">\
 									~!:NS~!</span>\
 								</span>\
 							</div>\
@@ -575,7 +577,7 @@ App.Templates.html = {
 					</div>']
     },
     web_domain: {        
-        FORM: ['<div id="~!:id~!"  class="b-new-entry b-new-entry_domain form">\
+        FORM: ['<div id="~!:id~!"  class="b-new-entry b-new-entry_domain form ~!:FORM_SUSPENDED~!">\
                         <input type="hidden" class="source" name="source" value=\'~!:source~!\' />\
                         <input type="hidden" class="target" name="target" value="" />\
 						<div class="entry-header">~!:title~!</div>\
@@ -599,6 +601,10 @@ App.Templates.html = {
 								~!:TPL_OPTIONS~!\
 								</select>\
 							</div>\
+                        <div class="form-row suspended cc">\
+                            <label for="#" class="field-label">suspended:</label>\
+                            <input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND"/>\
+                        </div>\
                         <!-- advanced options -->\
 						<div class="form-options-group">\
 							<div class="group-header cc collapsed">\
@@ -611,7 +617,7 @@ App.Templates.html = {
 								<label for="#" class="field-label">CGI:</label>\
 								<input type="checkbox" value="~!:CGI~!" ~!:CHECKED_CGI~! name="CGI" class="styled">\
 							</div>\
-                        <div class="form-row cc">\
+                            <div class="form-row cc">\
 								<label for="#" class="field-label">ELOG:</label>\
 								<input type="checkbox" value="~!:ELOG~!" ~!:CHECKED_ELOG~! name="ELOG" class="styled">\
 							</div>\
@@ -638,10 +644,10 @@ App.Templates.html = {
 									<span class="generate-pwd do_action_generate_pass">Generate</span>\
 								</div>\
 							</div><!-- // stats settings -->\
-							<div class="form-row cc">\
+							<!-- div class="form-row cc">\
 								<label for="#" class="field-label">ssl:</label>\
 								<input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\
-							</div>\
+							</div -->\
 							<div class="form-row cc">\
 								<label for="#" class="field-label">ssl home:</label>\
 								<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
@@ -685,20 +691,19 @@ App.Templates.html = {
                         </div>\
                         </div><!-- Mail options -->\
 						<div class="form-row buttons-row cc">\
-							<input type="submit" value="~!:save_button~!" class="add-entry-btn do_action_save_form">\
-							<span class="cancel-btn do_action_cancel_form">Cancel</span>\
-							<a target="_blank" href="http://vestacp.com/docs/web/" class="help-btn">Help</a>\
-						</div>\
+                           <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                           <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                           <span class="delete-btn do_action_delete_entry">Delete</span>\
+                        </div>\
 					</div>'],
         ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'],
-        ENTRY: ['<div class="row domain-details-row">\
+        ENTRY: ['<div class="row domain-details-row ~!:SUSPENDED_CLASS~!">\
                         <input type="hidden" class="source" name="source" value=\'~!:source~!\' />\
                         <input type="hidden" class="target" name="target" value="" />\
 						<div class="row-actions-box cc">\
 							<div class="check-this check-control"></div>\
 							<div class="row-operations">\
 								~!:SUSPENDED_TPL~!\
-								<span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
 							</div>\
 						</div>\
 						<div class="row-meta">\
@@ -794,7 +799,7 @@ App.Templates.html = {
 						</span>\
 					</div>'],
         ENTRIES_WRAPPER: ['<div class="db-list">~!:content~!</div>'],
-        FORM: ['<div id="~!:id~!"  class="b-new-entry b-new-entry_db form">\
+        FORM: ['<div id="~!:id~!"  class="b-new-entry b-new-entry_db form ~!:FORM_SUSPENDED~!">\
 						<input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                         <input type="hidden" name="target" class="target" value=\'\'>\
                         <div class="entry-header">~!:title~!</div>\
@@ -823,19 +828,23 @@ App.Templates.html = {
 							<label for="#" class="field-label">db host:</label>\
 							<select name="HOST" class="styled">~!:HOST_OPTIONS~!</select>\
 						</div>\
-						<div class="form-row buttons-row cc">\
-							<input type="submit" value="~!:save_button~!" class="add-entry-btn do_action_save_form">\
-							<span class="cancel-btn do_action_cancel_form">Cancel</span>\
-							<a target="_blank" href="http://vestacp.com/docs/db/" class="help-btn">Help</a>\
-						</div>\
+						<div class="form-row suspended cc">\
+                            <label for="#" class="field-label">suspended:</label>\
+                            <input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND" />\
+                        </div>\
+                        <div class="form-row buttons-row cc">\
+                           <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                           <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                           <span class="delete-btn do_action_delete_entry">Delete</span>\
+                        </div>\
 					</div>'],
-        ENTRY: ['<div class="row db-details-row">\
+        ENTRY: ['<div class="row db-details-row ~!:SUSPENDED_CLASS~!">\
 						<input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                         <input type="hidden" name="target" class="target" value=\'\'>\
                         <div class="row-actions-box cc">\
 							<div class="check-this check-control"></div>\
 							<div class="row-operations">\
-								<span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
+								~!:SUSPENDED_TPL~!\
 							</div>\
 						</div>\
 						<div class="row-meta">\
@@ -880,7 +889,7 @@ App.Templates.html = {
 					</div>']
     },
     cron: {
-        FORM: ['<div class="b-new-entry b-new-entry_cron form" id="~!:id~!" >\
+        FORM: ['<div class="b-new-entry b-new-entry_cron form ~!:FORM_SUSPENDED~!" id="~!:id~!" >\
 						<input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                         <input type="hidden" name="target" class="target" value=\'\'>\
                         <div class="entry-header">~!:title~!</div>\
@@ -929,21 +938,24 @@ App.Templates.html = {
 							<label for="#" class="field-label">report to: <span class="remark">(devide by comma ",")</span></label>\
 							<textarea class="textarea" name="REPORT_TO"></textarea>\
 						</div>\
-						<div class="form-row buttons-row cc">\
-							<input type="submit" value="~!:save_button~!" class="add-entry-btn do_action_save_form">\
-							<span class="cancel-btn do_action_cancel_form">Cancel</span>\
-							<a target="_blank" href="http://vestacp.com/docs/cron/" class="help-btn">Help</a>\
-						</div>\
+						<div class="form-row suspended cc">\
+                            <label for="#" class="field-label">suspended:</label>\
+                            <input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND"/>\
+                        </div>\
+                        <div class="form-row buttons-row cc">\
+                           <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
+                           <span class="cancel-btn do_action_cancel_form">Cancel</span>\
+                           <span class="delete-btn do_action_delete_entry">Delete</span>\
+                        </div>\
 					</div>'],
         ENTRIES_WRAPPER: ['<div class="cron-list">~!:content~!</div>'],
-        ENTRY: ['<div class="row cron-details-row">\
+        ENTRY: ['<div class="row cron-details-row ~!:SUSPENDED_CLASS~!">\
 						<input type="hidden" name="source" class="source" value=\'~!:source~!\'>\
                         <input type="hidden" name="target" class="target" value=\'\'>\
                         <div class="row-actions-box cc">\
 							<div class="check-this check-control"></div>\
 							<div class="row-operations">\
 								~!:SUSPENDED_TPL~!\
-                        <span class="delete-entry do_action_delete_entry"><span class="delete-entry-text do_action_delete_entry">delete</span></span>\
 							</div>\
 						</div>\
 						<div class="row-meta">\
@@ -984,11 +996,55 @@ App.Templates.html = {
 							</div>\
 						</div><!-- // .row-details -->\
 					</div>']
-    }
+    },
+    backup: {
+		WRAPPER: ['<div class="backups-list">~!:CONTENT~!</div>'],
+		ENTRY:   ['<div class="backups-list">\
+					<!-- row 1 -->\
+					<div class="row first-row backup-details-row">\
+						<div class="row-meta">\
+							<div class="ownership">\
+								<span class="prop-box">\
+									<span class="prop-title">owner:</span>\
+									<span class="prop-value">~!:OWNER~!</span>\
+								</span>\
+							</div>\
+						</div>\
+						<div class="row-details cc">\
+							<div class="props-main">\
+								<span class="prop-box entry-created">\
+									<span class="backup-date">\
+										<span class="backup-day">~!:CREATED_AT~!</span>\
+										<span class="backup-time">~!:CREATED_AT_TIME~!</span>\
+									</span>\
+									<span class="backup-weekday">~!:CREATED_AT_WDAY~!</span>\
+								</span>\
+								<span class="prop-box generation-time">\
+									<span class="prop-title">Generation time:</span>\
+									<span class="prop-value">~!:GENERATION_TIME~!</span>\
+								</span>\
+							</div>\
+							<div class="props-additional">\
+								<span class="backup-size">\
+									<span class="backup-size-inner">~!:SIZE~!</span>\
+								</span>\
+								<a class="backup-url" href="return alert(\'Not available at the time\');">download</a>\
+							</div>\
+							<div class="props-ext">\
+								<div class="backup-actions">\
+									<a class="backup-actions-url restore-url" href="return alert(\'Not available at the time\');">restore</a>\
+									<a class="backup-actions-url detailed-restore-url" href="return alert(\'Not available at the time\');">\
+										<span class="detailed-restore-title">detailed</span>\
+										<span class="detailed-restore-ext">restore</span>\
+									</a>\
+								</div>\
+							</div>							\
+						</div><!-- // .row-details -->\
+					</div><!-- // .row 1 -->']
+	}
 }
 
 
-
 // Internals
 var Tpl = App.Templates;
 var Templator = function()
diff --git a/web/vesta/api/AjaxHandler.php b/web/vesta/api/AjaxHandler.php
index bafad9be2..fcbdd2db3 100644
--- a/web/vesta/api/AjaxHandler.php
+++ b/web/vesta/api/AjaxHandler.php
@@ -46,8 +46,8 @@ class AjaxHandler {
         $allowed_actions = array(
                                 'MAIN.signin', 
                                 'MAIN.logout', 
-                                'MAIN.requestpassword',
-                                'MAIN.resetpassword',
+                                'MAIN.requestPassword',
+                                'MAIN.resetPassword',
                                 'MAIN.about');
         $method = Request::parseAjaxMethod($request);
         
diff --git a/web/vesta/api/CRON.class.php b/web/vesta/api/CRON.class.php
index e2ad7778c..1ad21a852 100644
--- a/web/vesta/api/CRON.class.php
+++ b/web/vesta/api/CRON.class.php
@@ -30,7 +30,7 @@ class CRON extends AjaxHandler
                             'DAY'       => $record['DAY'],
                             'MONTH'     => $record['MONTH'],
                             'WDAY'      => $record['WDAY'],
-                            'SUSPENDED' => $record['SUSPEND'],
+                            'SUSPEND'   => $record['SUSPEND'],
                             'DATE'      => date(Config::get('ui_date_format', strtotime($record['DATE']))),
                             'JOB'    => $id
                           );
@@ -51,16 +51,16 @@ class CRON extends AjaxHandler
      */
     public function addExecute(Request $request) 
     {
-    $user   = $this->getLoggedUser();
-    $spell  = $request->getParameter('spell');
+        $user   = $this->getLoggedUser();
+        $_s  = $request->getParameter('spell');
         $params = array(
                     'USER'      => $user['uid'],
-                    'MIN'       => $spell['MIN'],
-                    'HOUR'      => $spell['HOUR'],
-                    'DAY'       => $spell['DAY'],
-                    'MONTH'     => $spell['MONTH'],
-                    'WDAY'      => $spell['WDAY'],
-                    'CMD'       => $spell['CMD']
+                    'MIN'       => $_s['MIN'],
+                    'HOUR'      => $_s['HOUR'],
+                    'DAY'       => $_s['DAY'],
+                    'MONTH'     => $_s['MONTH'],
+                    'WDAY'      => $_s['WDAY'],
+                    'CMD'       => $_s['CMD']
                   );
     
         $result = Vesta::execute(Vesta::V_ADD_CRON_JOB, $params);
@@ -74,6 +74,20 @@ class CRON extends AjaxHandler
             }
         }
 
+
+        if ($_s['SUSPEND'] == 'on') {
+            if($result['status']){
+                $result = array();
+
+                $result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_s['CMD']));
+                if (!$result['status']) {
+                    $this->status = FALSE;
+                    $this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+                }   
+            }
+        }
+
+
         if (!$result['status']) {
             $this->errors[] = array($result['error_code'] => $result['error_message']);
         }
@@ -89,8 +103,8 @@ class CRON extends AjaxHandler
      */
     public function deleteExecute(Request $request) 
     {
-    $user   = $this->getLoggedUser();
-    $spell  = $request->getParameter('spell'); 
+        $user   = $this->getLoggedUser();
+        $spell  = $request->getParameter('spell'); 
         $params = array(
                     'USER' => $user['uid'],
                     'JOB'  => $spell['JOB']
@@ -117,6 +131,20 @@ class CRON extends AjaxHandler
         $_old   = $request->getParameter('old');
         $_new   = $request->getParameter('new');
         $result = array();
+
+		if($_new['SUSPEND'] == 'on') {
+			$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_new['CMD']));
+			return $this->reply($result['status']);
+		}
+		else {
+			$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_new['CMD']));
+		}
+
+		if (!$result['status']) {
+			$this->status = FALSE;
+			$this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+		}   
+
         $params = array(
                     'USER' => $user['uid'],
                     'JOB' => $_old['JOB'],
@@ -133,7 +161,9 @@ class CRON extends AjaxHandler
         if (!$result['status']) {
             $this->errors[] = array($result['error_code'] => $result['error_message']);
         }
-    
+
+                   
+
         return $this->reply($result['status'], $result['data']);
     }
 
diff --git a/web/vesta/api/DB.class.php b/web/vesta/api/DB.class.php
index dd34de21e..4707d8dbd 100644
--- a/web/vesta/api/DB.class.php
+++ b/web/vesta/api/DB.class.php
@@ -67,16 +67,25 @@ class DB extends AjaxHandler
                     'DB_PASSWORD'   => $_s['PASSWORD'],
                     'TYPE'          => $_s['TYPE']
                   );
-        // TODO: do not user it. Will be used in later releases         
-        /*if ($_s['HOST']) {
-            $params['HOST'] = $_s['HOST'];
-        }*/   
-            
+
         $result = Vesta::execute(Vesta::V_ADD_DB_BASE, $params);
         
         if (!$result['status']) {
             $this->errors[] = array($result['error_code'] => $result['error_message']);
         }
+
+        if ($_s['SUSPEND'] == 'on') {
+            if($result['status']){
+                $result = array();
+
+                $result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user['uid'], 'JOB' => $_s['DB']));
+                if (!$result['status']) {
+                    $this->status = FALSE;
+                    $this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+                }   
+            }
+        }
+
     
         return $this->reply($result['status'], $result['data']);
     }
@@ -113,20 +122,37 @@ class DB extends AjaxHandler
      */
     public function changeExecute(Request $request)
     {
-        $_s     = $request->getParameter('new');
+        $_s = $request->getParameter('spell');
+        $_old = $request->getParameter('old');
+        $_new = $request->getParameter('new');
+
         $user  = $this->getLoggedUser();
         $result = array();
-        $params = array(
-                    'USER'      => $user['uid'],
-                    'DB'        => $_s['DB'],
-                    'PASSWORD'  => $_s['PASSWORD']
-                  );
+		if($_new['SUSPEND'] == 'on'){
+			$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user['uid'], 'DB' => $_new['DB']));
+		}
+		else{
+			$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user['uid'], 'DB' => $_new['DB']));
+		}
 
-        $result = Vesta::execute(Vesta::V_CHANGE_DB_PASSWORD, $params);
+		if (!$result['status']) {
+			$this->status = FALSE;
+			$this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+		}
+
+        if ($_new['PASSWORD'] != Vesta::SAME_PASSWORD && $_new['PASSWORD'] != $_old['PASSWORD']) {
+			$params = array(
+						'USER'      => $user['uid'],
+						'DB'        => $_new['DB'],
+						'PASSWORD'  => $_new['PASSWORD']
+					  );
+
+			$result = Vesta::execute(Vesta::V_CHANGE_DB_PASSWORD, $params);
     
-        if (!$result['status']) {
-            $this->errors[] = array($result['error_code'] => $result['error_message']);
-        }
+			if (!$result['status']) {
+				$this->errors[] = array($result['error_code'] => $result['error_message']);
+			}
+		}
     
         return $this->reply($result['status'], $result['data']);
     }
diff --git a/web/vesta/api/DNS.class.php b/web/vesta/api/DNS.class.php
index 64d37a9d2..a50e183e3 100644
--- a/web/vesta/api/DNS.class.php
+++ b/web/vesta/api/DNS.class.php
@@ -119,6 +119,19 @@ class DNS extends AjaxHandler
             $this->errors[] = array($result['error_code'] => $result['error_message']);
         }
 
+    
+        if ($_s['SUSPEND'] == 'on') {
+            if($result['status']){
+                $result = array();
+
+                $result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_s['DNS_DOMAIN']));
+                if (!$result['status']) {
+                    $this->status = FALSE;
+                    $this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+                }   
+            }
+        }
+
         return $this->reply($result['status'], $result['data']);
     }
 
@@ -228,6 +241,19 @@ class DNS extends AjaxHandler
         $user       = $this->getLoggedUser();
         $_DNS_DOMAIN = $_old['DNS_DOMAIN'];
 
+		$result = array();
+		if($_new['SUSPEND'] == 'on'){
+			$result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+			return $this->reply($result['status']);
+		}
+		else{
+			$result = Vesta::execute(Vesta::V_UNSUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+		}
+
+		if (!$result['status']) {
+			$this->status = FALSE;
+			$this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+		}
      
         if ($_old['IP'] != $_new['IP']) {
             $result = array();
@@ -281,6 +307,13 @@ class DNS extends AjaxHandler
             Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_TTL, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['TTL']));
             Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_EXP, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN, 'IP' => $_old['EXP']));
             Vesta::execute(Vesta::V_CHANGE_DNS_DOMAIN_SOA, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_new['DNS_DOMAIN'], 'IP' => $_old['SOA']));
+
+            if($_old['SUSPEND'] == 'on'){
+                $result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+            }
+            else{
+                $result = Vesta::execute(Vesta::V_UNSUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+            }
         }
 
         return $this->reply($this->status, '');
diff --git a/web/vesta/api/IP.class.php b/web/vesta/api/IP.class.php
index 0aa3e6620..9605b2fd4 100644
--- a/web/vesta/api/IP.class.php
+++ b/web/vesta/api/IP.class.php
@@ -73,12 +73,16 @@ class IP extends AjaxHandler
         $spell  = $request->getParameter('spell');      
         $params = array(
                       'IP_ADDRESS' => $spell['IP_ADDRESS'],
-                      'MASK'        => $spell['NETMASK'],
+                      'MASK'       => $spell['NETMASK'],
                       'INTERFACE'  => $spell['INTERFACE'],
                       'OWNER'      => $spell['OWNER'],
-                      'IP_STATUS'  => $spell['STATUS']                      
+                      'STATUS'     => $spell['STATUS']                      
                   );
-      
+		if ($spell['NAME']) {
+			$params['NAME'] = $spell['NAME'];
+		}
+		
+     
         $result = Vesta::execute(Vesta::V_ADD_SYS_IP, $params);
       
         if (!$result['status']) {
@@ -128,7 +132,7 @@ class IP extends AjaxHandler
 
         if ($_old['OWNER'] != $_new['OWNER']) {
             $result = array();
-            $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_OWNER, array('OWNER' => $_new['OWNER'], 'IP' => $_new['IP_ADDRESS']));
+            $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_OWNER, array('IP' => $_new['IP_ADDRESS'], 'OWNER' => $_new['OWNER']));
             if (!$result['status']) {
                 $this->status = FALSE;
                 $this->errors['OWNER'] = array($result['error_code'] => $result['error_message']);
@@ -136,21 +140,21 @@ class IP extends AjaxHandler
         }
 
         // TODO: Handle NAME parameter
-        /*if ($_old['NAME'] != $_new['NAME']) {
+        if ($_old['NAME'] != $_new['NAME']) {
             $result = array();
             $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_NAME, array('IP' => $_new['IP_ADDRESS'], 'NAME' => $_new['NAME']));
             if (!$result['status']) {
                 $this->status = FALSE;
                 $this->errors['NAME'] = array($result['error_code'] => $result['error_message']);
             }
-        }*/
+        }
 
-        if ($_old['IP_STATUS'] != $_new['IP_STATUS']) {
+        if ($_old['STATUS'] != $_new['STATUS']) {
             $result = array();
-            $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_STATUS, array('IP' => $_new['IP_ADDRESS'], 'IP_STATUS' => $_new['IP_STATUS']));
+            $result = Vesta::execute(Vesta::V_CHANGE_SYS_IP_STATUS, array('IP' => $_new['IP_ADDRESS'], 'STATUS' => $_new['STATUS']));
             if (!$result['status']) {
                 $this->status = FALSE;
-                $this->errors['IP_STATUS'] = array($result['error_code'] => $result['error_message']);
+                $this->errors['STATUS'] = array($result['error_code'] => $result['error_message']);
             }
         }
 
diff --git a/web/vesta/api/MAIN.class.php b/web/vesta/api/MAIN.class.php
index 019002c9b..4580fe3b5 100644
--- a/web/vesta/api/MAIN.class.php
+++ b/web/vesta/api/MAIN.class.php
@@ -21,8 +21,10 @@ class MAIN extends AjaxHandler
 
     public function aboutExecute($request)
     {
+        // defaults
         $about  = array('version' => '0', 'company_email' => 'support@vestacp.com', 
                         'version_name' => 'OGRE-23-1', 'company_name' => 'vestacp.com');
+        // real data
         $config = Vesta::execute(Vesta::V_LIST_SYS_CONFIG, 'json');
         if (!empty($config['data']) && !empty($config['data']['config'])) {
             $config = $config['data']['config'];
@@ -37,12 +39,14 @@ class MAIN extends AjaxHandler
 
     public function requestPasswordExecute($request)
     {        
+        $user   = $this->getLoggedUser();
+        $rs = $config = Vesta::execute('v_get_sys_user_value', array($user['uid'], 'RKEY'));
+        
         if (empty($_SESSION['captcha_key']) 
                 || $_SESSION['captcha_key'] != $request->getParameter('captcha')) {
             return $this->reply(false, null, 'Captcha is invalid ');
         }
         
-        // TODO: captcha
         $users = Vesta::execute(Vesta::V_LIST_SYS_USERS, 'json');
         $email_matched_count = array();
         
@@ -103,10 +107,12 @@ MAIL;
     
     public function generateResetPasswordKey()
     {
-        $key = sha1($_SERVER['HTTP_USER_AGENT'].$_SERVER['REMOTE_ADDR']);
-        $key = substr($key, 0, 10) . $_SERVER['REQUEST_TIME'] . substr($key, 10, strlen($key));
+        /*$key = sha1($_SERVER['HTTP_USER_AGENT'].$_SERVER['REMOTE_ADDR']);
+        $key = substr($key, 0, 10) . $_SERVER['REQUEST_TIME'] . substr($key, 10, strlen($key));*/
+        $user   = $this->getLoggedUser();
+        $rs = Vesta::execute('v_get_sys_user_value', array('USER' => $user['uid'], 'VALUE' => 'RKEY'));
         
-        return $key;
+        return $rs[''];
     }
 
     public function signinExecute($request)
@@ -128,6 +134,14 @@ MAIL;
         VestaSession::logoff();
         return $this->reply(true);
     }
+    
+    public function getBackupsExecute(Request $request)
+    {
+		$user = VestaSession::getInstance()->getUser();
+		$rs = Vesta::execute(Vesta::V_LIST_SYS_USER_BACKUPS, array('USER' => $user['uid'], 'RESPONSE' => 'json'));
+		
+		return $this->reply($rs['status'], @$rs['data']);
+	}
 
     /**
      * Get Initial params.
@@ -198,8 +212,8 @@ MAIL;
         }
 
         $reply = array(
-                    'auth_user'  => array('uid' => $this->getLog),
-                    'WEB_DOMAIN' => $this->getWebDomainParams($data_web_domin, $global_data),
+                    'auth_user'  => array('uid' => $this->getLoggedUser()),
+                    'WEB_DOMAIN' => $this->getWebDomainParams($data_web_domain, $global_data),
                     'CRON'       => $this->getCronParams(),
                     'IP'         => $this->getIpParams($data_ip, $global_data),
                     'DNS'        => $this->getDnsParams(),
@@ -252,8 +266,8 @@ MAIL;
         return array(
                 'TPL' => $this->getTemplates(),
                 'ALIAS' => array(),
-                'STAT' => array(
-			    'none'      => 'none',
+                'STAT'  => array(
+			    'none'  => 'none',
                             'webalizer' => 'webalizer',
                             'awstats'   => 'awstats'
                           ),
@@ -288,15 +302,15 @@ MAIL;
         }                
 	
         return array(
-                'SYS_USERS' => $users,
+                'SYS_USERS' => $global_data['users'],
                 'STATUSES' => array(
-                                'shared' => 'shared',
+                                'shared'    => 'shared',
                                 'exclusive' => 'exclusive'
                               ),
                 'INTERFACES' => $ifaces,
                 'OWNER' => $global_data['users'],
                 'MASK' => array(
-                            '255.255.255.0' => '255.255.255.0',
+                            '255.255.255.0'   => '255.255.255.0',
                             '255.255.255.128' => '255.255.255.128',
                             '255.255.255.192' => '255.255.255.192',
                             '255.255.255.224' => '255.255.255.224', 
@@ -365,7 +379,7 @@ MAIL;
      * @params array $data
      * @return array
      */
-    public function getUsersParams($data = array(), $global_data)
+    public function getUsersParams($data = array(), $global_data = array())
     {        
         $pckg = array();
         // json
@@ -374,8 +388,6 @@ MAIL;
             $pckg[$pckg_name] = $pckg_name;
         }
         return array(
-                'ROLE'      => array('user' => 'user'),
-                'OWNER'     => $data['user_names'],
                 'PACKAGE'   => $pckg,
                 'SHELL'     => array(
                                 'sh'       => 'sh',
diff --git a/web/vesta/api/USER.class.php b/web/vesta/api/USER.class.php
index 672af0e11..bd300a902 100644
--- a/web/vesta/api/USER.class.php
+++ b/web/vesta/api/USER.class.php
@@ -26,12 +26,12 @@ class USER extends AjaxHandler
             // get reports attribute
             $result_report = Vesta::execute(Vesta::V_GET_SYS_USER_VALUE, array('USER' => $user, 'VALUE' => 'reports'), self::TEXT);
             if ($result_report['status'] != true) {
-            $report = null;
-        } 
-        else {
-            $report = $result_report['data'];
-        }
-            $fullname_id = rand(0, count($users)-1);
+                $report = null;
+            } 
+            else {
+                $report = $result_report['data'];
+            }
+            //$fullname_id = rand(0, count($users)-1);
             $fullname    = implode('', array($details['FNAME'], ' ', $details['LNAME']));
         
             $nses = $this->getNS($user, $details);
@@ -54,14 +54,12 @@ class USER extends AjaxHandler
                                 "SHELL"                 => $details['SHELL'],
                                 "BACKUPS"               => $details['BACKUPS'],
                                 "WEB_TPL"               => $details['WEB_TPL'],
-                                "MAX_CHILDS"            => $details['MAX_CHILDS'],
-                                "SUSPENDED"             => $details['SUSPENDED'],
-                                "OWNER"                 => $details['OWNER'],
-                                "ROLE"                  => $details['ROLE'],
+                                //"MAX_CHILDS"            => $details['MAX_CHILDS'],
+                                "SUSPEND"               => $details['SUSPENDED'],
                                 "IP_OWNED"              => $details['IP_OWNED'],
-                                "U_CHILDS"              => $details['U_CHILDS'],
-                                "U_DISK"                => $details['U_DISK'],//$u_disk,
-                                "U_BANDWIDTH"           => $details['U_BANDWIDTH'],//$u_bandwidth, 
+                                //"U_CHILDS"              => $details['U_CHILDS'],
+                                "U_DISK"                => $details['U_DISK'],
+                                "U_BANDWIDTH"           => $details['U_BANDWIDTH'],
                                 "U_WEB_DOMAINS"         => $details['U_WEB_DOMAINS'],
                                 "U_WEB_SSL"             => $details['U_WEB_SSL'],
                                 "U_DNS_DOMAINS"         => $details['U_DNS_DOMAINS'],
@@ -69,8 +67,8 @@ class USER extends AjaxHandler
                                 "U_MAIL_DOMAINS"        => $details['U_MAIL_DOMAINS'],
                                 "CONTACT"               => $details['CONTACT'],
                                 "DATE"                  => $details['DATE'],
-                                "U_MAIL_BOXES"          => rand(1, 10),  // TODO: skid
-                                "U_MAIL_FORWARDERS"     => rand(1, 10),  // TODO: skid
+                                "U_MAIL_BOXES"          => '0',  // TODO: skid
+                                "U_MAIL_FORWARDERS"     => '0',  // TODO: skid
                                 "REPORTS_ENABLED"       => $report,
                                 "U_WEB_DOMAINS"         => $details['U_WEB_DOMAINS']
                             );
@@ -94,13 +92,11 @@ class USER extends AjaxHandler
                     'USER'     => $spell['LOGIN_NAME'],
                     'PASSWORD' => $spell['PASSWORD'],
                     'EMAIL'    => $spell['CONTACT'],
-                    'ROLE'     => $spell['ROLE'],
-                    'OWNER'    => $user['uid'],
                     'PACKAGE'  => $spell['PACKAGE'],
                     'FNAME'    => $spell['FNAME'],
                     'LNAME'    => $spell['LNAME']
                   );
-    
+           
         $result = Vesta::execute(Vesta::V_ADD_SYS_USER, $params);      
         // Reports
         $enable_reports = Utils::getCheckboxBooleanValue($spell['REPORTS_ENABLED']);
@@ -111,7 +107,7 @@ class USER extends AjaxHandler
         if (!$result['status']) {
             $this->errors[] = array($result['error_code'] => $result['error_message']);
         }
-    
+
         return $this->reply($result['status'], $result['data']);
     }
   
@@ -150,6 +146,16 @@ class USER extends AjaxHandler
         $_old = $request->getParameter('old');
 
         $_USER = $_old['LOGIN_NAME'];
+        
+        if ($_new['SUSPEND'] == 'on') {
+            $result = Vesta::execute(Vesta::V_SUSPEND_SYS_USER, array('USER' => $_USER));
+            return $this->reply($result['status']);
+        }
+        else {
+            $result = Vesta::execute(Vesta::V_UNSUSPEND_SYS_USER, array('USER' => $_USER));
+        }
+        
+        $reports_result = $this->setUserReports($_USER, $_new['REPORTS_ENABLED']);
 
         if (!empty($_new['PASSWORD']) && $_new['PASSWORD'] != Vesta::SAME_PASSWORD) {
             $result = array();
@@ -180,7 +186,7 @@ class USER extends AjaxHandler
 
         // Set SHELL
         $this->setShell($_USER, $_new['SHELL']);
-
+    
         $this->setNSentries($_USER, $_new);
 
         $names = array(
@@ -195,12 +201,38 @@ class USER extends AjaxHandler
             $this->errors['NAMES'] = array($result['error_code'] => $result['error_message']);
         }        
 
+
+        /*
+        if ($_old['SUSPEND'] != $_new['SUSPEND']) {
+            $result = array();
+            if($_new['SUSPEND'] == 'on'){
+                $result = Vesta::execute(Vesta::V_SUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+            }
+            else{
+                $result = Vesta::execute(Vesta::V_UNSUSPEND_DNS_DOMAIN, array('USER' => $user['uid'], 'DNS_DOMAIN' => $_DNS_DOMAIN));
+            }
+
+            if (!$result['status']) {
+                $this->status = FALSE;
+                $this->errors['SUSPEND'] = 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_SHELL,    array('USER' => $_USER, 'SHELL'    => $_old['SHELL']));
+
+            /*
+            if($_old['SUSPEND'] == 'on'){
+                $result = Vesta::execute(Vesta::V_SUSPEND_SYS_USER, array('USER' => $_USER));
+            }
+            else{
+              $result = Vesta::execute(Vesta::V_UNSUSPEND_SYS_USER, array('USER' => $_USER));
+            }
+            */
         }
 
         return $this->reply($this->status, '');
@@ -208,11 +240,11 @@ class USER extends AjaxHandler
 
     protected function setUserReports($user, $enabled)
     {
-        if ($enabled === true) {
-            $result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS, array('USER' => $user));
+        if ($enabled == 'off') {
+            $result = Vesta::execute(Vesta::V_DEL_SYS_USER_REPORTS, array('USER' => $user));
         }
         else {
-            $result = Vesta::execute(Vesta::V_DEL_SYS_USER_REPORTS, array('USER' => $user));
+            $result = Vesta::execute(Vesta::V_ADD_SYS_USER_REPORTS, array('USER' => $user));
         }
 
         return $result['status'];
diff --git a/web/vesta/api/WEB_DOMAIN.class.php b/web/vesta/api/WEB_DOMAIN.class.php
index 8d5157267..16ebed8d9 100644
--- a/web/vesta/api/WEB_DOMAIN.class.php
+++ b/web/vesta/api/WEB_DOMAIN.class.php
@@ -17,12 +17,12 @@ class WEB_DOMAIN extends AjaxHandler
 
         $result = Vesta::execute(Vesta::V_LIST_WEB_DOMAINS, array('USER' => $user['uid']), self::JSON);
 
-	$stat = array();
-	$result_stat = Vesta::execute('v_list_web_domains_stats', array('USER' => $user['uid']), self::JSON);
+        $stat = array();
+        $result_stat = Vesta::execute('v_list_web_domains_stats', array('USER' => $user['uid']), self::JSON);
 
-	foreach ($result_stat['data'] as $w_d => $w_d_details) {
-	    $stat[$w_d] = $w_d_details;
-	}
+        foreach ($result_stat['data'] as $w_d => $w_d_details) {
+            $stat[$w_d] = $w_d_details;
+        }
         foreach($result['data'] as $web_domain => $record)
         {
             $web_details = array(
@@ -30,7 +30,7 @@ class WEB_DOMAIN extends AjaxHandler
                               'U_DISK'      => $record['U_DISK'],
                               'U_BANDWIDTH' => $record['U_BANDWIDTH'],
                               'TPL'         => $record['TPL'],
-                              'ALIAS'       => $record['ALIAS'],
+                              'ALIAS'       => @str_replace(",", ", ", $record['ALIAS']),
                               'PHP'         => $record['PHP'],
                               'CGI'         => $record['CGI'],
                               'ELOG'        => $record['ELOG'],
@@ -39,13 +39,14 @@ class WEB_DOMAIN extends AjaxHandler
                               'SSL'         => $record['SSL'],
                               'SSL_HOME'    => $record['SSL_HOME'],
                               'SSL_CERT'    => $record['SSL_CERT'],
+                              'SSL_KEY'		=> $record['SSL_KEY'],
                               'NGINX'       => $record['NGINX'],
                               'NGINX_EXT'   => $record['NGINX_EXT'],
                               'SUSPEND'     => $record['SUSPEND'],
                               'DATE'        => date(Config::get('ui_date_format', strtotime($record['DATE'])))
                           );
-	    $web_details['STAT'] == '' ? $web_details['STAT'] = 'none' : true;
-	    $reply[$web_domain] = $web_details;
+            $web_details['STAT'] == '' ? $web_details['STAT'] = 'none' : true;
+            $reply[$web_domain] = $web_details;
         }
 
         if (!$result['status']) {
@@ -90,7 +91,7 @@ class WEB_DOMAIN extends AjaxHandler
       
         if (!empty($_s['ALIAS'])) {
             $alias = str_replace("\n", "", $_s['ALIAS']);
-	    $alias = str_replace("\n", "", $alias);
+			$alias = str_replace("\n", "", $alias);
 
             foreach ($alias_arr as $alias) {
                 $params = array(
@@ -157,9 +158,9 @@ class WEB_DOMAIN extends AjaxHandler
             }
         }
 
-        /*if ($_s['SSL']) {
+      /*  if ($_s['SSL']) {
                 $params = array(
-                            'USER'     => $user[''],
+                            'USER'     => $user['uid'],
                             'DOMAIN'   => $_s['DOMAIN'],
                             'SSL_CERT' => $_s['SSL_CERT']
                           );
@@ -213,6 +214,20 @@ class WEB_DOMAIN extends AjaxHandler
         if (!$result['status']) 
           $this->errors['MAIL_DOMAIN'] = array($result['error_code'] => $result['error_message']);
         }*/
+
+
+        if ($_s['SUSPEND'] == 'on') {
+            if($result['status']){
+                $result = array();
+
+                $result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], 'JOB' => $_s['DOMAIN']));
+                if (!$result['status']) {
+                    $this->status = FALSE;
+                    $this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
+                }   
+            }
+        }
+
         
       
         return $this->reply($result['status'], $result['data']);
@@ -250,12 +265,20 @@ class WEB_DOMAIN extends AjaxHandler
 
         $_old['ELOG'] = $_old['ELOG'] == 'yes' ? 'on' : 'off';
         $_old['CGI']  = $_old['CGI']  == 'yes' ? 'on' : 'off';
-        $_old['AUTH']  = $_old['AUTH']  == 'yes' ? 'on' : 'off';
+        $_old['AUTH'] = $_old['AUTH']  == 'yes' ? 'on' : 'off';
         $_old['SSL']  = $_old['SSL']  == 'yes' ? 'on' : 'off';
 
         $user = $this->getLoggedUser();
         $_DOMAIN = $_new['DOMAIN'];
     
+		if ($_new['SUSPEND'] == 'on') {
+            $result = Vesta::execute(Vesta::V_SUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN));
+            return $this->reply($result['status']);
+        }
+        else {
+            $result = Vesta::execute(Vesta::V_UNSUSPEND_WEB_DOMAIN, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN));
+        }
+    
         if ($_old['IP'] != $_new['IP']) {
             $result = array();
             $result = Vesta::execute(Vesta::V_CHANGE_WEB_DOMAIN_IP, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN, 'IP' => $_new['IP']));
@@ -276,13 +299,33 @@ class WEB_DOMAIN extends AjaxHandler
 
         if ($_old['ALIAS'] != $_new['ALIAS']) {
             $result = array();
-
-            $old_arr = explode(',', $_old['ALIAS']);
-            $new_arr = explode(',', $_new['ALIAS']);
-
-            $added = array_diff($new_arr, $old_arr);
+			
+            $old_arr_raw = preg_split('/[,\s]/', $_old['ALIAS']);
+            $new_arr_raw = preg_split('/[,\s]/', $_new['ALIAS']);
+			$old_arr = array();
+			$new_arr = array();
+			foreach ($old_arr_raw as $alias) {
+				if ('' != trim($alias)) {
+					$old_arr[] = $alias;
+				}
+			}
+			foreach ($new_arr_raw as $alias) {
+				if ('' != trim($alias)) {
+					$new_arr[] = $alias;
+				}
+			}
+			
+            $added   = array_diff($new_arr, $old_arr);
             $deleted = array_diff($old_arr, $new_arr);
-
+ 
+			foreach ($deleted as $alias) {
+                $result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN_ALIAS, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN, 'ALIAS' => $alias));
+                if (!$result['status']) {
+                    $this->status = FALSE;
+                    $this->errors['DEL_ALIAS'] = array($result['error_code'] => $result['error_message']);
+                }
+            }
+ 
             foreach ($added as $alias) {
                 $result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN_ALIAS, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN, 'ALIAS' => $alias));
                 if (!$result['status']) {
@@ -290,18 +333,10 @@ class WEB_DOMAIN extends AjaxHandler
                     $this->errors['ADD_ALIAS'] = array($result['error_code'] => $result['error_message']);
                 }
             }
-        
-            foreach ($deleted as $alias) {
-                $result = Vesta::execute(Vesta::V_DEL_WEB_DOMAIN_ALIAS, array('USER' => $user['uid'], 'DOMAIN' => $_DOMAIN, 'ALIAS' => $alias));
-                if (!$result['status']) {
-                    $this->status = FALSE;
-                    $this->errors['DEL_ALIAS'] = array($result['error_code'] => $result['error_message']);
-                }
-            }
         }
 
 
-        if (($_old['STATH_AUTH'] != $_new['STAT_AUTH']) && !empty($_s['STAT_AUTH']) && @Utils::getCheckboxBooleanValue($_s['STATS_AUTH'])) {
+        if (($_old['STAT_AUTH'] != $_new['STAT_AUTH']) && !empty($_s['STAT_AUTH']) && @Utils::getCheckboxBooleanValue($_s['STATS_AUTH'])) {
             $params = array(
                         'USER'          => $user['uid'],
                         'DOMAIN'        => $_DOMAIN,
@@ -379,7 +414,45 @@ class WEB_DOMAIN extends AjaxHandler
                 }
             }
         }
+        
+        if ($_new['SSL']) {
+			$params = array(
+						'USER'     => $user['uid'],
+						'DOMAIN'   => $_new['DOMAIN'],
+						'SSL_CERT' => $_new['SSL_CERT']
+					  );
 
+			if ($_new['SSL_HOME']) {
+				$params['SSL_HOME'] = $_new['SSL_HOME'];
+			}
+
+			$result = 0;
+			$result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN_SSL, $params);
+
+			if (!$result['status']) {
+				$this->errors['SSL'] = array($result['error_code'] => $result['error_message']);
+			}
+		}
+		
+		if ($_s['SSL_KEY']) {
+			$params = array(
+						'USER'     => $user['uid'],
+						'DOMAIN'   => $_s['DOMAIN'],
+						'SSL_KEY' => $_s['SSL_KEY']
+					  );
+
+			if ($_s['SSL_HOME']) {
+				$params['SSL_HOME'] = $_s['SSL_HOME'];
+			}
+
+			$result = 0;
+			$result = Vesta::execute(Vesta::V_ADD_WEB_DOMAIN_SSL, $params);
+
+			if (!$result['status']) {
+				$this->errors['SSL'] = array($result['error_code'] => $result['error_message']);
+			}
+		}
+        
         return $this->reply($result['status'], $result['data']);
     }
 
diff --git a/web/vesta/core/Vesta.class.php b/web/vesta/core/Vesta.class.php
index b3ff0a2de..6407cf6d7 100644
--- a/web/vesta/core/Vesta.class.php
+++ b/web/vesta/core/Vesta.class.php
@@ -14,6 +14,8 @@ class Vesta
     const SAME_PASSWORD			            = '********'; 
 
     const V_LIST_SYS_CONFIG                 = 'v_list_sys_config';
+    // BACKUP
+    const V_LIST_SYS_USER_BACKUPS			= 'v_list_sys_user_backups';
     // IP
     const V_LIST_SYS_IPS                    = 'v_list_sys_ips';
     const V_ADD_SYS_IP                      = 'v_add_sys_ip';
@@ -36,6 +38,8 @@ class Vesta
     const V_CHANGE_DNS_DOMAIN_TTL           = 'v_change_dns_domain_ttl';
     const V_CHANGE_DNS_DOMAIN_EXP           = 'v_change_dns_domain_exp';
     const V_CHANGE_DNS_DOMAIN_RECORD        = 'v_change_dns_domain_record';
+    const V_SUSPEND_DNS_DOMAIN              = 'v_suspend_dns_domain';
+    const V_UNSUSPEND_DNS_DOMAIN            = 'v_unsuspend_dns_domain';
     const V_DEL_DNS_DOMAIN                  = 'v_del_dns_domain';
     const V_DEL_DNS_DOMAIN_RECORD           = 'v_del_dns_domain_record';
     // CRON
@@ -59,6 +63,14 @@ class Vesta
     const V_CHANGE_SYS_USER_PASSWORD        = 'v_change_sys_user_password';
     const V_CHANGE_SYS_USER_SHELL           = 'v_change_sys_user_shell';
     const V_CHANGE_SYS_USER_ROLE            = 'v_change_sys_user_role';
+    const V_SUSPEND_SYS_USER				= 'v_suspend_sys_user';
+    const V_UNSUSPEND_SYS_USER				= 'v_unsuspend_sys_user';
+    /*
+    const V_SUSPEND_SYS_USER                = 'v_suspend_sys_user';
+    const V_UNSUSPEND_SYS_USER              = 'v_unsuspend_sys_user';
+    const V_SUSPEND_SYS_USER                = 'v_suspend_sys_users';
+    const V_UNSUSPEND_SYS_USERS             = 'v_unsuspend_sys_users';
+    */ 
     const V_DEL_SYS_USER                    = 'v_del_sys_user';
     const V_CHANGE_SYS_USER_NAME	        = 'v_change_sys_user_name';
     // WEB_DOMAIN
@@ -99,7 +111,7 @@ class Vesta
     // DB    
     const V_LIST_DB_BASES                   = 'v_list_db_bases';
     const V_LIST_DB_HOSTS                   = 'v_list_db_hosts';
-    const V_LIST_WEB_DOMAIN_ALIAS	    = 'v_list_web_domain_alias';
+    const V_LIST_WEB_DOMAIN_ALIAS	        = 'v_list_web_domain_alias';
     const V_ADD_DB_BASE                     = 'v_add_db_base';
     const V_ADD_DB_HOST                     = 'v_add_db_host';
     const V_SUSPEND_DB_BASE                 = 'v_suspend_db_base';
@@ -120,7 +132,7 @@ class Vesta
      * @param array $parameters
      * @return string
      */
-    static function execute($cmd_command, $parameters=array(), $reply = '') 
+    static function execute($cmd_command, $parameters = array(), $reply = '') 
     {
         $r = new Request();
         $_DEBUG = $r->getParameter("debug", FALSE);
@@ -129,26 +141,27 @@ class Vesta
             throw new ProtectionException('No function name passed into Vesta::execute'); // TODO: move msg to Messages::
         }
 	
-	$reply_type = $reply;
-	if ($reply != AjaxHandler::JSON) {
-	    $reply = '';
-	}    
+        $reply_type = $reply;
+        if ($reply != AjaxHandler::JSON) {
+            $reply = '';
+        }    
 
         $params = array(
                     'sudo'       => Config::get('sudo_path'),
                     'functions'  => Config::get('vesta_functions_path'),
                     'parameters' => is_array($parameters) ? "'".implode("' '", $parameters)."'" : $parameters,
-		    'reply'      => $reply
+                    'reply'      => $reply
                   );
 
         // e.g.: /usr/bin/sudo /usr/local/vesta/bin/v_list_sys_users vesta json 
         $cmd = "{$params['sudo']} {$params['functions']}{$cmd_command} {$params['parameters']} {$params['reply']}";
+        
         exec($cmd, $output, $return);
         $result = 0;
         $result = array(
-                        'status' => TRUE,
-                        'data' => '',
-                        'error_code' => '',
+                        'status'        => TRUE,
+                        'data'          => '',
+                        'error_code'    => '',
                         'error_message' => ''
                   );