Skip to content

Commit 7f926a4

Browse files
jaapmarcusjaapmarcus
committed
Spell check
1 parent cf47dba commit 7f926a4

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎web/edit/web/index.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
$v_stats_user = $data[$v_domain]['STATS_USER'];
7575
if (!empty($v_stats_user)) $v_stats_password = "";
7676
$v_custom_doc_root_prepath = '/home/'.$v_username.'/web/';
77-
$v_costum_doc_root = $data[$v_domain]['CUSTOM_DOCROOT'];
77+
$v_custom_doc_root = $data[$v_domain]['CUSTOM_DOCROOT'];
7878

79-
$m = preg_match('/\/home\/'.$v_username.'\/web\/([A-Za-z0-9.-].*)\/([A-Za-z0-9.-\/].*)/', $v_costum_doc_root, $matches);
80-
$v_costum_doc_domain = $matches[1];
81-
$v_costum_doc_folder = str_replace('public_html/','',$matches[2]);
79+
$m = preg_match('/\/home\/'.$v_username.'\/web\/([A-Za-z0-9.-].*)\/([A-Za-z0-9.-\/].*)/', $v_custom_doc_root, $matches);
80+
$v_custom_doc_domain = $matches[1];
81+
$v_custom_doc_folder = str_replace('public_html/','',$matches[2]);
8282

8383
$v_ftp_user = $data[$v_domain]['FTP_USER'];
8484
$v_ftp_path = $data[$v_domain]['FTP_PATH'];
@@ -743,22 +743,22 @@
743743
}
744744
}
745745
//custom docoot with check box disabled
746-
if( !empty($v_costum_doc_root) && empty($_POST['v_custom_doc_root_check']) ){
746+
if( !empty($v_custom_doc_root) && empty($_POST['v_custom_doc_root_check']) ){
747747
exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." default", $output, $return_var);
748748
check_return_code($return_var,$output);
749749
unset($output);
750-
unset($_POST['v-costum-doc-domain'], $_POST['v-costum-doc-folder']);
750+
unset($_POST['v-custom-doc-domain'], $_POST['v-custom-doc-folder']);
751751
}
752752

753-
if ( !empty($_POST['v-costum-doc-domain']) && !empty($_POST['v_custom_doc_root_check']) && $v_custom_doc_root_prepath.$v_costum_doc_domain.'/public_html'.$v_costum_doc_folder != $v_costum_doc_root){
753+
if ( !empty($_POST['v-custom-doc-domain']) && !empty($_POST['v_custom_doc_root_check']) && $v_custom_doc_root_prepath.$v_custom_doc_domain.'/public_html'.$v_custom_doc_folder != $v_custom_doc_root){
754754

755-
$v_costum_doc_domain = escapeshellarg($_POST['v-costum-doc-domain']);
756-
$v_costum_doc_folder = escapeshellarg($_POST['v-costum-doc-folder']);
755+
$v_custom_doc_domain = escapeshellarg($_POST['v-custom-doc-domain']);
756+
$v_custom_doc_folder = escapeshellarg($_POST['v-custom-doc-folder']);
757757

758-
exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." ".$v_costum_doc_domain." ".$v_costum_doc_folder, $output, $return_var);
758+
exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." ".$v_custom_doc_domain." ".$v_custom_doc_folder, $output, $return_var);
759759
check_return_code($return_var,$output);
760760
unset($output);
761-
$v_costum_doc_root = 1;
761+
$v_custom_doc_root = 1;
762762

763763

764764
}

‎web/js/pages/edit_web.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
App.Actions.WEB.update_custom_doc_root = function(elm, hint) {
2-
var prepath = $('input[name="v-costum-doc-root_prepath"]').val();
3-
var domain = $('select[name="v-costum-doc-domain"]').val();
4-
var folder = $('input[name="v-costum-doc-folder"]').val();
2+
var prepath = $('input[name="v-custom-doc-root_prepath"]').val();
3+
var domain = $('select[name="v-custom-doc-domain"]').val();
4+
var folder = $('input[name="v-custom-doc-folder"]').val();
55
console.log(domain, folder);
66
$('.custom_docroot_hint').html(prepath+domain+'/public_html/'+folder);
77
}
88
App.Listeners.DB.keypress_custom_folder = function() {
9-
var ref = $('input[name="v-costum-doc-folder"]');
9+
var ref = $('input[name="v-custom-doc-folder"]');
1010
var current_rec = ref.val();
1111
App.Actions.WEB.update_custom_doc_root(ref, current_rec);
1212

@@ -21,7 +21,7 @@ App.Listeners.DB.keypress_custom_folder = function() {
2121
}
2222

2323
App.Listeners.DB.change_custom_doc = function() {
24-
var ref = $('select[name="v-costum-doc-domain"]');
24+
var ref = $('select[name="v-custom-doc-domain"]');
2525
var current_rec = ref.val();
2626
ref.bind('change select', function(evt) {
2727
clearTimeout(window.frp_usr_tmt);

‎web/templates/admin/edit_web.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,26 +245,26 @@
245245
<?php } ?>
246246
<tr>
247247
<td class="vst-text step-top">
248-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_costum_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"> <?php print __('Custom document root');?></label>
248+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"> <?php print __('Custom document root');?></label>
249249
</td>
250250
</tr>
251251
<tr>
252252
<td class="step-left">
253-
<table style="display:<?php if (empty($v_costum_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
253+
<table style="display:<?php if (empty($v_custom_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
254254
<tr>
255255
<td class="vst-text input-label">
256256
<?php print __('Point to');?>
257257
</td>
258258
</tr>
259259
<tr>
260260
<td>
261-
<input type="hidden" name="v-costum-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
262-
<select class="vst-list" name="v-costum-doc-domain">
261+
<input type="hidden" name="v-custom-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
262+
<select class="vst-list" name="v-custom-doc-domain">
263263
<option value="<?php echo $v_domain;?>"><?php echo $v_domain;?></option>
264264
<?php
265265
foreach ($user_domains as $domain) {
266266
if($domain != $v_domain ){
267-
if($v_costum_doc_domain == $domain){
267+
if($v_custom_doc_domain == $domain){
268268
?>
269269
<option value="<?php echo $domain;?>" selected="selected"><?php echo $domain;?></option>
270270
<?php
@@ -287,7 +287,7 @@
287287
<tr>
288288
<td>
289289
<input type="text" size="20" class="vst-input"
290-
name="v-costum-doc-folder" value="<?=htmlentities(trim($v_costum_doc_folder, "'"))?>">
290+
name="v-custom-doc-folder" value="<?=htmlentities(trim($v_custom_doc_folder, "'"))?>">
291291
</td>
292292
</tr>
293293
<tr>

‎web/templates/user/edit_web.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,26 +258,26 @@
258258
<?php } ?>
259259
<tr>
260260
<td class="vst-text step-top">
261-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_costum_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"> <?php print __('Custom document root');?></label>
261+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"> <?php print __('Custom document root');?></label>
262262
</td>
263263
</tr>
264264
<tr>
265265
<td class="step-left">
266-
<table style="display:<?php if (empty($v_costum_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
266+
<table style="display:<?php if (empty($v_custom_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
267267
<tr>
268268
<td class="vst-text input-label">
269269
<?php print __('Point to');?>
270270
</td>
271271
</tr>
272272
<tr>
273273
<td>
274-
<input type="hidden" name="v-costum-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
275-
<select class="vst-list" name="v-costum-doc-domain">
274+
<input type="hidden" name="v-custom-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
275+
<select class="vst-list" name="v-custom-doc-domain">
276276
<option value="<?php echo $v_domain;?>"><?php echo $v_domain;?></option>
277277
<?php
278278
foreach ($user_domains as $domain {
279279
if($domain != $v_domain ){
280-
if($v_costum_doc_domain == $domain){
280+
if($v_custom_doc_domain == $domain){
281281
?>
282282
<option value="<?php echo $domain;?>" selected="selected"><?php echo $domain;?></option>
283283
<?php
@@ -300,7 +300,7 @@
300300
<tr>
301301
<td>
302302
<input type="text" size="20" class="vst-input"
303-
name="v-costum-doc-folder" value="<?=htmlentities(trim($v_costum_doc_folder, "'"))?>">
303+
name="v-custom-doc-folder" value="<?=htmlentities(trim($v_custom_doc_folder, "'"))?>">
304304
</td>
305305
</tr>
306306
<tr>

0 commit comments

Comments
 (0)