Jaap Marcus 5 лет назад
Родитель
Сommit
7f926a493c

+ 11 - 11
web/edit/web/index.php

@@ -74,11 +74,11 @@ $v_stats = $data[$v_domain]['STATS'];
 $v_stats_user = $data[$v_domain]['STATS_USER'];
 if (!empty($v_stats_user)) $v_stats_password = "";
 $v_custom_doc_root_prepath = '/home/'.$v_username.'/web/';
-$v_costum_doc_root = $data[$v_domain]['CUSTOM_DOCROOT'];
+$v_custom_doc_root = $data[$v_domain]['CUSTOM_DOCROOT'];
 
-$m = preg_match('/\/home\/'.$v_username.'\/web\/([A-Za-z0-9.-].*)\/([A-Za-z0-9.-\/].*)/', $v_costum_doc_root, $matches);
-$v_costum_doc_domain = $matches[1];
-$v_costum_doc_folder = str_replace('public_html/','',$matches[2]);
+$m = preg_match('/\/home\/'.$v_username.'\/web\/([A-Za-z0-9.-].*)\/([A-Za-z0-9.-\/].*)/', $v_custom_doc_root, $matches);
+$v_custom_doc_domain = $matches[1];
+$v_custom_doc_folder = str_replace('public_html/','',$matches[2]);
 
 $v_ftp_user = $data[$v_domain]['FTP_USER'];
 $v_ftp_path = $data[$v_domain]['FTP_PATH'];
@@ -743,22 +743,22 @@ if (!empty($_POST['save'])) {
         }
     }
     //custom docoot with check box disabled      
-    if( !empty($v_costum_doc_root) && empty($_POST['v_custom_doc_root_check']) ){
+    if( !empty($v_custom_doc_root) && empty($_POST['v_custom_doc_root_check']) ){
         exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." default",  $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);    
-        unset($_POST['v-costum-doc-domain'], $_POST['v-costum-doc-folder']);    
+        unset($_POST['v-custom-doc-domain'], $_POST['v-custom-doc-folder']);    
     }
 
-    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){
+    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){
         
-        $v_costum_doc_domain = escapeshellarg($_POST['v-costum-doc-domain']);
-        $v_costum_doc_folder = escapeshellarg($_POST['v-costum-doc-folder']);
+        $v_custom_doc_domain = escapeshellarg($_POST['v-custom-doc-domain']);
+        $v_custom_doc_folder = escapeshellarg($_POST['v-custom-doc-folder']);
         
-        exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." ".$v_costum_doc_domain." ".$v_costum_doc_folder,  $output, $return_var);
+        exec(HESTIA_CMD."v-change-web-domain-docroot ".$v_username." ".escapeshellarg($v_domain)." ".$v_custom_doc_domain." ".$v_custom_doc_folder,  $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);  
-        $v_costum_doc_root = 1;        
+        $v_custom_doc_root = 1;        
         
         
     }    

+ 5 - 5
web/js/pages/edit_web.js

@@ -1,12 +1,12 @@
 App.Actions.WEB.update_custom_doc_root = function(elm, hint) {
-    var prepath = $('input[name="v-costum-doc-root_prepath"]').val();
-    var domain = $('select[name="v-costum-doc-domain"]').val();
-    var folder = $('input[name="v-costum-doc-folder"]').val();
+    var prepath = $('input[name="v-custom-doc-root_prepath"]').val();
+    var domain = $('select[name="v-custom-doc-domain"]').val();
+    var folder = $('input[name="v-custom-doc-folder"]').val();
     console.log(domain, folder);
     $('.custom_docroot_hint').html(prepath+domain+'/public_html/'+folder);
 }
 App.Listeners.DB.keypress_custom_folder = function() {
-    var ref = $('input[name="v-costum-doc-folder"]');
+    var ref = $('input[name="v-custom-doc-folder"]');
     var current_rec = ref.val();
     App.Actions.WEB.update_custom_doc_root(ref, current_rec);
 
@@ -21,7 +21,7 @@ App.Listeners.DB.keypress_custom_folder = function() {
 }
 
 App.Listeners.DB.change_custom_doc = function() {
-    var ref = $('select[name="v-costum-doc-domain"]');
+    var ref = $('select[name="v-custom-doc-domain"]');
     var current_rec = ref.val();
     ref.bind('change select', function(evt) {
         clearTimeout(window.frp_usr_tmt);

+ 6 - 6
web/templates/admin/edit_web.html

@@ -245,12 +245,12 @@
                             <?php } ?>
                             <tr>
                                 <td class="vst-text step-top">
-                                    <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>
+                                    <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>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="step-left">
-                                    <table style="display:<?php if (empty($v_costum_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
+                                    <table style="display:<?php if (empty($v_custom_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print __('Point to');?>
@@ -258,13 +258,13 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="hidden" name="v-costum-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
-                                                <select class="vst-list" name="v-costum-doc-domain">
+                                                <input type="hidden" name="v-custom-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
+                                                <select class="vst-list" name="v-custom-doc-domain">
                                                     <option value="<?php echo $v_domain;?>"><?php echo $v_domain;?></option>
                                                     <?php
                                                     foreach ($user_domains as $domain) {
                                                         if($domain != $v_domain ){
-                                                        if($v_costum_doc_domain == $domain){
+                                                        if($v_custom_doc_domain == $domain){
                                                     ?>
                                                             <option value="<?php echo $domain;?>" selected="selected"><?php echo $domain;?></option> 
                                                     <?php
@@ -287,7 +287,7 @@
                                         <tr>
                                             <td>
                                                 <input type="text" size="20" class="vst-input"
-                                                name="v-costum-doc-folder" value="<?=htmlentities(trim($v_costum_doc_folder, "'"))?>">
+                                                name="v-custom-doc-folder" value="<?=htmlentities(trim($v_custom_doc_folder, "'"))?>">
                                             </td>
                                         </tr>
                                         <tr>

+ 6 - 6
web/templates/user/edit_web.html

@@ -258,12 +258,12 @@
                             <?php } ?>
                             <tr>
                                 <td class="vst-text step-top">
-                                    <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>
+                                    <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>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="step-left">
-                                    <table style="display:<?php if (empty($v_costum_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
+                                    <table style="display:<?php if (empty($v_custom_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print __('Point to');?>
@@ -271,13 +271,13 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="hidden" name="v-costum-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
-                                                <select class="vst-list" name="v-costum-doc-domain">
+                                                <input type="hidden" name="v-custom-doc-root_prepath"" value="<?php echo $v_custom_doc_root_prepath;?>">
+                                                <select class="vst-list" name="v-custom-doc-domain">
                                                     <option value="<?php echo $v_domain;?>"><?php echo $v_domain;?></option>
                                                     <?php
                                                     foreach ($user_domains  as $domain {
                                                         if($domain != $v_domain ){
-                                                        if($v_costum_doc_domain == $domain){
+                                                        if($v_custom_doc_domain == $domain){
                                                     ?>
                                                             <option value="<?php echo $domain;?>" selected="selected"><?php echo $domain;?></option> 
                                                     <?php
@@ -300,7 +300,7 @@
                                         <tr>
                                             <td>
                                                 <input type="text" size="20" class="vst-input"
-                                                name="v-costum-doc-folder" value="<?=htmlentities(trim($v_costum_doc_folder, "'"))?>">
+                                                name="v-custom-doc-folder" value="<?=htmlentities(trim($v_custom_doc_folder, "'"))?>">
                                             </td>
                                         </tr>
                                         <tr>