Skip to content

Commit 230c93f

Browse files
naumov-socolovnaumov-socolov
committed
[php][js][css] fixing all little issues and making forms work. Removed all unnecessary elements for Firsta Release
1 parent b7710ee commit 230c93f

File tree

13 files changed

+3463
-3320
lines changed

13 files changed

+3463
-3320
lines changed

‎web/css/main.css‎

Lines changed: 3159 additions & 3140 deletions
Large diffs are not rendered by default.

‎web/js/actions.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,14 +366,13 @@ App.Actions.save_form = function(evt) {
366366
if (!confirmed) {
367367
return true;
368368
}
369-
else {
370-
var values = App.Helpers.getFormValues(elm);
371-
if(App.Validate.form(values, $('#'+elm_id))) {
372-
App.Model.add(values, source);
373-
var form_id = App.Constants[App.Env.world + '_FORM_ID'];
374-
$('#'+form_id).remove();
375-
}
376-
}
369+
}
370+
371+
var values = App.Helpers.getFormValues(elm);
372+
if(App.Validate.form(values, $('#'+elm_id))) {
373+
App.Model.add(values, source);
374+
var form_id = App.Constants[App.Env.world + '_FORM_ID'];
375+
$('#'+form_id).remove();
377376
}
378377
}
379378
else { // OLD ITEM, UPDATING IT

‎web/js/html.js‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ App.HTML.Build.user_form = function (options, id) {
9595
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
9696
}
9797
options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
98+
9899
if (in_edit == true) {
99100
options.PASSWORD = App.Settings.PASSWORD_IMMUTE;
100101
var ns = [];
@@ -109,7 +110,7 @@ App.HTML.Build.user_form = function (options, id) {
109110
ns[ns.length++] = App.Templates.get('PLUS_ONE_NS', 'user').finalize();
110111
tpl.set(':NS', ns.done());
111112
} else {
112-
tpl.set(':NS', '');
113+
// tpl.set(':NS', '');
113114
}
114115
tpl = App.HTML.setTplKeys(tpl, options, true);
115116
tpl = App.HTML.Build.user_selects(tpl, options);
@@ -146,6 +147,15 @@ App.HTML.Build.web_domain_form = function (options, id) {
146147
tpl.set(':title', 'Edit WEB domain');
147148
tpl.set(':save_button', 'SAVE');
148149
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
150+
151+
if(options.SSL_CRT == '' || options.SSL_KEY == ''){
152+
options.SSL = '';
153+
options.SSL_HOME = '';
154+
options.SSL_CRT = '';
155+
options.SSL_KEY = '';
156+
options.SSL_CA = '';
157+
}
158+
149159
if (options.SSL == 'on') {
150160
tpl.set(':ssl_checked', 'checked="checked"');
151161
}
@@ -167,7 +177,7 @@ App.HTML.Build.web_domain_form = function (options, id) {
167177
tpl = App.HTML.setTplKeys(tpl, options, true);
168178
tpl = App.HTML.Build.web_domain_selects(tpl, options);
169179
tpl = App.HTML.toggle_suspended_form(tpl, options);
170-
if (options.CGI == 'yes') {
180+
if (options.CGI == 'yes' || !in_edit) {
171181
tpl.set(':CHECKED_CGI', 'checked="checked"');
172182
}
173183
if (options.ELOG == 'yes') {
@@ -384,8 +394,11 @@ App.HTML.Build.web_domain_entry = function (o, key) {
384394
'DISK_QUOTA_MEASURE': App.Helpers.getMbHumanMeasure(App.Env.initialParams.user_data.DISK_QUOTA),
385395
'BANDWIDTH_MEASURE': App.Helpers.getMbHumanMeasure(App.Env.initialParams.user_data.BANDWIDTH),
386396
'BANDWIDTH': App.Helpers.getMbHuman(App.Env.initialParams.user_data.BANDWIDTH),
387-
'DISK_QUOTA': App.Helpers.getMbHuman(App.Env.initialParams.user_data.DISK_QUOTA)
397+
'DISK_QUOTA': App.Helpers.getMbHuman(App.Env.initialParams.user_data.DISK_QUOTA),
398+
'SSL': (o.SSL_CRT == '' || o.SSL_KEY == '' || o.SSL != 'on') ? 'off' : 'on'
388399
};
400+
401+
389402
var o = $.extend(o, processed_data);
390403
o.U_DISK_PERCENTAGE_2 = o.U_DISK_PERCENTAGE;
391404
o.U_DISK_PERCENTAGE_3 = o.U_DISK_PERCENTAGE;
@@ -691,9 +704,11 @@ App.HTML.Build.dns_selects = function (tpl, options) {
691704
$.each(App.Env.initialParams.DNS.TPL, function (key) {
692705
obj[key] = key;
693706
});
694-
var opts = App.HTML.Build.options(obj, options.PACKAGE);
707+
708+
var opts = App.HTML.Build.options(obj, options.TPL);
695709
tpl.set(':TPL', opts);
696-
tpl.set(':TPL_DEFAULT_VALUE', options.TPL || App.Helpers.getFirstKey(obj));
710+
// tpl.set(':TPL_DEFAULT_VALUE', options.TPL || App.Helpers.getFirstKey(obj));
711+
697712
} catch (e) {
698713
return tpl;
699714
}

‎web/js/templates.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ App.Templates.html = {
138138
</div>\
139139
<div class="form-row dns-template-box cc">\
140140
<label for="#" class="field-label">Template:</label>\
141-
<span class="select" id="selecttemplate">~!:TPL_DEFAULT_VALUE~!</span>\
141+
<span class="select" id="selecttemplate">~!:TPL_DEFAULT_VALUE~! t </span>\
142142
<select name="TPL" class="styled tpl-item">\
143143
~!:TPL~!\
144144
</select>\
@@ -286,10 +286,10 @@ App.Templates.html = {
286286
<label for="#" class="field-label">Associated DNS Name:</label>\
287287
<input type="text" name="NAME" value="~!:NAME~!" class="text-field rule-domain">\
288288
</div>\
289-
<div class="form-row suspended cc">\
289+
<!-- div class="form-row suspended cc">\
290290
<label for="#" class="field-label">Suspended:</label>\
291291
<input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND"/>\
292-
</div>\
292+
</div -->\
293293
<div class="form-row buttons-row cc">\
294294
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
295295
<span class="cancel-btn do_action_cancel_form">Cancel</span>\
@@ -403,12 +403,12 @@ App.Templates.html = {
403403
~!:PACKAGE_OPTIONS~!\
404404
</select>\
405405
</div>\
406-
<div class="form-row cc">\
406+
<!-- div class="form-row cc">\
407407
<label for="#" class="field-label">Shell:</label>\
408408
<select class="styled disabled" name="SHELL">\
409409
~!:SHELL_OPTIONS~!\
410410
</select>\
411-
</div>\
411+
</div -->\
412412
<!-- div class="form-row cc">\
413413
<label for="#" class="field-label">role:</label>\
414414
<select class="styled" name="ROLE">\
@@ -474,9 +474,9 @@ App.Templates.html = {
474474
<span class="prop-value">~!:FULLNAME~!</span>\
475475
</span>\ </div>\
476476
<div class="user-details-box">\
477-
<span class="prop-box prop-box_group-values cc user-details do_action_login_as">\
477+
<!-- span class="prop-box prop-box_group-values cc user-details do_action_login_as">\
478478
<span class="prop-value login-as do_action_login_as">login as</span>\
479-
</span>\
479+
</span -->\
480480
<span class="prop-box prop-box_group-values cc user-details">\
481481
<span class="prop-title">email:</span>\
482482
<span class="group-values">\
@@ -716,7 +716,7 @@ App.Templates.html = {
716716
</div>\
717717
</div><!-- Mail options -->\
718718
<div class="form-row cc">\
719-
<label for="#" class="field-label">create DNS domain:</label>\
719+
<label for="#" class="field-label">Create DNS domain also:</label>\
720720
<input type="checkbox" value="" name="DNS_DOMAIN" class="styled">\
721721
</div>\
722722
<div class="form-row buttons-row cc">\
@@ -846,7 +846,7 @@ App.Templates.html = {
846846
<select name="TYPE" class="styled">~!:TYPE_OPTIONS~!</select>\
847847
</div>\
848848
<div class="form-row cc">\
849-
<label for="#" class="field-label">Name:</label>\
849+
<label for="#" class="field-label">DB name:</label>\
850850
<input type="text" class="text-field" name="DB" value="~!:DB~!">\
851851
</div>\
852852
<div class="db-credentials ">\
@@ -864,10 +864,10 @@ App.Templates.html = {
864864
<label for="#" class="field-label">Host:</label>\
865865
<select name="HOST" class="styled">~!:HOST_OPTIONS~!</select>\
866866
</div -->\
867-
<div class="form-row cc">\
867+
<!-- div class="form-row cc">\
868868
<label for="#" class="field-label">Encoding:</label>\
869869
<select name="ENCODING" class="styled">~!:ENCODING_OPTIONS~!</select>\
870-
</div>\
870+
</div -->\
871871
<div class="form-row suspended cc">\
872872
<label for="#" class="field-label">Suspended:</label>\
873873
<input type="checkbox" ~!:SUSPENDED_CHECKED~! value="~!:SUSPENDED_VALUE~!" class="styled do_action_toggle_suspend" name="SUSPEND" />\
@@ -912,10 +912,10 @@ App.Templates.html = {
912912
</div>\
913913
<div class="props-ext">\
914914
<!-- span class="backup-db do_action_backup_db">backup</span-->\
915-
<span class="prop-box">\
915+
<!-- span class="prop-box">\
916916
<span class="prop-title">encoding:</span>\
917917
<span class="prop-value">~!:ENCODING~!</span>\
918-
</span>\
918+
</span -->\
919919
<!-- disk usage block -->\
920920
<div class="b-usage-box disk-usage cc">\
921921
<div class="usage-box">\
@@ -1075,13 +1075,13 @@ App.Templates.html = {
10751075
<a class="backup-url" href="return alert(\'Not available at the time\');">download</a>\
10761076
</div>\
10771077
<div class="props-ext">\
1078-
<div class="backup-actions">\
1078+
<!-- div class="backup-actions">\
10791079
<a class="backup-actions-url restore-url" href="return alert(\'Not available at the time\');">restore</a>\
10801080
<a class="backup-actions-url detailed-restore-url" href="return alert(\'Not available at the time\');">\
10811081
<span class="detailed-restore-title">detailed</span>\
10821082
<span class="detailed-restore-ext">restore</span>\
10831083
</a>\
1084-
</div>\
1084+
</div -->\
10851085
</div> \
10861086
</div><!-- // .row-details -->\
10871087
</div><!-- // .row 1 -->']

‎web/vesta/api/CRON.class.php‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,21 @@ public function changeExecute(Request $request)
132132
$_new = $request->getParameter('new');
133133
$result = array();
134134

135-
if($_new['SUSPEND'] == 'on') {
136-
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_new['CMD']));
137-
return $this->reply($result['status']);
135+
136+
$result = array();
137+
if(@Utils::getCheckboxBooleanValue($_new['SUSPEND'])){
138+
$result = Vesta::execute(Vesta::V_SUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_old['JOB']));
139+
return $this->reply($result['status'], $result['error_message']);
138140
}
139-
else {
140-
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_new['CMD']));
141+
elseif(@Utils::getCheckboxBooleanValue($_old['SUSPEND'])){
142+
$result = Vesta::execute(Vesta::V_UNSUSPEND_CRON_JOB, array('USER' => $user['uid'], 'JOB' => $_old['JOB']));
143+
if (!$result['status']) {
144+
$this->status = FALSE;
145+
$this->errors['UNSUSPEND'] = array($result['error_code'] => $result['error_message']);
146+
return $this->reply($result['status'], $result['error_message']);
147+
}
141148
}
142149

143-
if (!$result['status']) {
144-
$this->status = FALSE;
145-
$this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
146-
}
147-
148150
$params = array(
149151
'USER' => $user['uid'],
150152
'JOB' => $_old['JOB'],

‎web/vesta/api/DB.class.php‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public function getListExecute(Request $request)
3838
'TYPE' => $record['TYPE'],
3939
'U_DISK' => $record['U_DISK'],
4040
'DISK' => 2024,
41+
'ENCODING' => "utf-8",//$record['ENCODING'],
42+
// 'ENCODING' => $record['ENCODING'],
4143
'SUSPEND' => $record['SUSPEND'],
4244
'DATE' => date(Config::get('ui_date_format', strtotime($record['DATE'])))
4345
);
@@ -65,7 +67,9 @@ public function addExecute(Request $request)
6567
'DB' => $_s['DB'],
6668
'DB_USER' => $_s['USER'],
6769
'DB_PASSWORD' => $_s['PASSWORD'],
68-
'TYPE' => $_s['TYPE']
70+
'TYPE' => $_s['TYPE'],
71+
'HOST' => ''
72+
// 'ENCODING' => $_s['ENCODING']
6973
);
7074

7175
$result = Vesta::execute(Vesta::V_ADD_DB_BASE, $params);
@@ -74,7 +78,7 @@ public function addExecute(Request $request)
7478
$this->errors[] = array($result['error_code'] => $result['error_message']);
7579
}
7680

77-
if ($_s['SUSPEND'] == 'on') {
81+
if (Utils::getCheckboxBooleanValue($_s['SUSPEND'])) {
7882
if($result['status']){
7983
$result = array();
8084

@@ -86,7 +90,6 @@ public function addExecute(Request $request)
8690
}
8791
}
8892

89-
9093
return $this->reply($result['status'], $result['data']);
9194
}
9295

@@ -128,16 +131,19 @@ public function changeExecute(Request $request)
128131

129132
$user = $this->getLoggedUser();
130133
$result = array();
131-
if($_new['SUSPEND'] == 'on'){
134+
135+
$result = array();
136+
if(@Utils::getCheckboxBooleanValue($_new['SUSPEND'])){
132137
$result = Vesta::execute(Vesta::V_SUSPEND_DB_BASE, array('USER' => $user['uid'], 'DB' => $_new['DB']));
138+
return $this->reply($result['status'], $result['error_message']);
133139
}
134-
else{
140+
elseif(@Utils::getCheckboxBooleanValue($_old['SUSPEND'])){
135141
$result = Vesta::execute(Vesta::V_UNSUSPEND_DB_BASE, array('USER' => $user['uid'], 'DB' => $_new['DB']));
136-
}
137-
138-
if (!$result['status']) {
139-
$this->status = FALSE;
140-
$this->errors['SUSPEND'] = array($result['error_code'] => $result['error_message']);
142+
if (!$result['status']) {
143+
$this->status = FALSE;
144+
$this->errors['UNSUSPEND'] = array($result['error_code'] => $result['error_message']);
145+
return $this->reply($result['status'], $result['error_message']);
146+
}
141147
}
142148

143149
if ($_new['PASSWORD'] != Vesta::SAME_PASSWORD && $_new['PASSWORD'] != $_old['PASSWORD']) {

0 commit comments

Comments
 (0)