|
|
@@ -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;
|
|
|
|
|
|
|
|
|
}
|