same template for users and admin

This commit is contained in:
Serghey Rodin 2014-02-04 11:21:19 +02:00
commit f8178b16d7
4 changed files with 11 additions and 521 deletions

View file

@ -40,14 +40,14 @@ if (!empty($_POST['ok'])) {
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else { } else {
// Add DNS // Add DNS
exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4, $output, $return_var); exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." no", $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
unset($output); unset($output);
// Change Expiriation date // Change Expiriation date
if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) { if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
$v_exp = escapeshellarg($_POST['v_exp']); $v_exp = escapeshellarg($_POST['v_exp']);
exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var); exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
unset($output); unset($output);
} }
@ -55,7 +55,7 @@ if (!empty($_POST['ok'])) {
// Change TTL // Change TTL
if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) { if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) {
$v_ttl = escapeshellarg($_POST['v_ttl']); $v_ttl = escapeshellarg($_POST['v_ttl']);
exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var); exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
unset($output); unset($output);
} }
@ -64,6 +64,13 @@ if (!empty($_POST['ok'])) {
$_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]); $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
unset($v_domain); unset($v_domain);
} }
if (empty($_SESSION['error_msg'])) {
exec (VESTA_CMD."v-restart-dns", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
}
} }
} }
@ -120,11 +127,7 @@ if ((empty($_GET['domain'])) && (empty($_POST['domain']))) {
} }
if (empty($v_ttl)) $v_ttl = 14400; if (empty($v_ttl)) $v_ttl = 14400;
if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year')); if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
} else {
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
}
unset($_SESSION['error_msg']); unset($_SESSION['error_msg']);
unset($_SESSION['ok_msg']); unset($_SESSION['ok_msg']);
} else { } else {

View file

@ -272,12 +272,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
$stats = json_decode(implode('', $output), true); $stats = json_decode(implode('', $output), true);
unset($output); unset($output);
// Are you admin?
if ($_SESSION['user'] == 'admin') {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html');
} else {
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html');
}
unset($_SESSION['error_msg']); unset($_SESSION['error_msg']);
unset($_SESSION['ok_msg']); unset($_SESSION['ok_msg']);
//} //}

View file

@ -1,143 +0,0 @@
<?php
$back = $_SESSION['back'];
if (empty($back)) {
$back = "location.href='/list/dns/'";
} else {
$back = "location.href='".$back."'";
}
?>
<table class="submenu">
<tr>
<td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
<?php
if (!empty($_SESSION['error_msg'])) {
echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
} else {
if (!empty($_SESSION['ok_msg'])) {
echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
}
}
?>
</td>
</tr>
</div>
</table>
</div>
<form id="vstobjects" name="v_add_dns" method="post">
<script language="javascript">
function elementHideShow(elementToHideOrShow){
var el = document.getElementById(elementToHideOrShow);
if (el.style.display == "block") {
el.style.display = "none";
} else {
el.style.display = "block";
}
}
</script>
<table class="data">
<tr class="data-add">
<td class="data-dotted" width="150">
<table class="data-col1">
<tr><td></td></tr>
</table>
</td>
<td class="data-dotted" width="830px">
<table width="830px">
<tr>
<td></td>
</tr>
</table>
<table class="data-col2" width="600px">
<tr>
<td class="vst-text" style="padding: 20px 0 0 2px;">
<?php print __('Domain');?>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('IP address');?>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ip" <?php if (!empty($v_ip)) echo "value=".$v_ip; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0px;">
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_exp" <?php if (!empty($v_exp)) echo "value=".$v_exp; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
TTL
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Name servers');?>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
</td>
</tr>
</table>
</td>
</tr>
</table>
<table class="data-col2">
<tr>
<td style="padding: 24px 0 0 0;" width="116px">
<input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
</td>
<td style="padding: 24px 0 0 0;">
<input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>

View file

@ -1,365 +0,0 @@
<?php
$back = $_SESSION['back'];
if (empty($back)) {
$back = "location.href='/list/web/'";
} else {
$back = "location.href='".$back."'";
}
?>
<table class="submenu">
<tr>
<td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
<?php
if (!empty($_SESSION['error_msg'])) {
echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
} else {
if (!empty($_SESSION['ok_msg'])) {
echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
}
}
?>
</td>
</tr>
</table>
</div>
<form id="vstobjects" name="v_add_web" method="post">
<script type="text/javascript">
$(function() {
$("#v_domain").change(function() {
var prefix = 'www.';
document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
});
});
function WEBrandom() {
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
var string_length = 10;
var webrandom = '';
for (var i=0; i<string_length; i++) {
var rnum = Math.floor(Math.random() * chars.length);
webrandom += chars.substring(rnum,rnum+1);
}
document.v_add_web.v_stats_password.value = webrandom;
}
function FTPrandom() {
var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
var string_length = 10;
var ftprandomstring = '';
for (var i=0; i<string_length; i++) {
var rnum = Math.floor(Math.random() * chars.length);
ftprandomstring += chars.substring(rnum,rnum+1);
}
document.v_add_web.v_ftp_password.value = ftprandomstring;
}
function elementHideShow(elementToHideOrShow){
var el = document.getElementById(elementToHideOrShow);
if (el.style.display == "block") {
el.style.display = "none";
} else {
el.style.display = "block";
}
}
</script>
<table class='data'>
<tr class="data-add">
<td class="data-dotted" width="150">
<table class="data-col1">
<tr>
<td></td>
</tr>
</table>
</td>
<td class="data-dotted" width="830px">
<table width="830px">
<tr>
<td></td>
</tr>
</table>
<table class="data-col2" width="600px">
<tr>
<td class="vst-text" style="padding: 20px 0 0 2px;">
<?php print __('Domain');?>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_domain" id="v_domain" <?php if (!empty($v_domain)) echo "value=".$v_domain; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('IP address');?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
echo "\t\t\t\t<option value=\"".$display_ip."\"";
if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
echo ' selected';
}
echo ">".$display_ip."</option>\n";
}
?>
</select>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('DNS Support');?>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_dns" <?php if (empty($v_dns)) echo "checked=yes"; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Mail Support');?>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_mail" <?php if (empty($v_mail)) echo "checked=yes"; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
</td>
</tr>
</table>
<table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Aliases');?>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases; ?></textarea>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Proxy Support');?>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');">
</td>
</tr>
<tr>
<td>
<table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
<tr>
<td class="vst-text" style="padding: 9px 0 0 0;">
<?php print __('Proxy Extentions');?>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_proxy_ext"><?php if (!empty($v_proxy_ext)) { echo $v_proxy_ext;} else { echo 'jpg, jpeg, gif, png, ico, svg, css, zip, tgz, gz, rar, bz2, exe, pdf, doc, xls, ppt, txt, odt, ods, odp, odf, tar, bmp, rtf, js, mp3, avi, mpeg, flv, html, htm'; } ?></textarea>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('SSL Support');?> /
<a class="generate" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');">
</td>
</tr>
<tr>
<td>
<table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
<tr>
<td class="vst-text" style="padding: 9px 0 0 0;">
<?php print __('SSL Home Directory');?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_ssl_home">
<option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
public_html
</option>
<option value='single' <?php if ($v_ssl_home == 'single') echo "selected";?>>
public_shtml
</option>
</select>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('SSL Certificate');?>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_crt"><?php if (!empty($v_ssl_crt)) echo $v_ssl_crt; ?></textarea>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('SSL Key');?>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_key"><?php if (!empty($v_ssl_key)) echo $v_ssl_key; ?></textarea>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print __('optional');?>)</span>
</td>
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo $v_ssl_ca; ?></textarea>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Web Statistics');?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_stats">
<?php
foreach ($stats as $key => $value) {
$svalue = "'".$value."'";
echo "\t\t\t\t<option value=\"".$value."\"";
if (empty($v_stats)) $v_stats = 'none';
if (( $value == $v_stats ) || ($svalue == $v_stats )){
echo ' selected' ;
}
echo ">" . __($value) . "</option>\n";
}
?>
</select>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Statistics Authorization');?>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');">
</td>
</tr>
<tr>
<td>
<table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
<tr>
<td class="vst-text" style="padding: 9px 0 0 0;">
<?php print __('Username');?>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_stats_user" <?php if (!empty($v_stats_user)) echo "value=".$v_stats_user; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_stats_password" <?php if (!empty($v_stats_password)) echo "value=".$v_stats_password; ?> id="v_password">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 2px;">
<?php print __('Additional FTP Account');?>
</td>
</tr>
<tr>
<td>
<input type="checkbox" size="20" class="vst-checkbox" name="v_ftp" <?php if (!empty($v_ftp)) echo "checked=yes" ?> onclick="javascript:elementHideShow('ftptable');">
</td>
</tr>
<tr>
<td>
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('Username');?><br>
<span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
<small class="hint"></small>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate" ><?php print __('generate');?></a>
</td>
</tr>
<tr>
<td>
<input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10px 0 0 0;">
<?php print __('Send FTP credentials to email');?>
</td>
</tr>
<tr>
<td>
<input type="text" class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
</td>
</tr>
</table>
</td>
</tr>
</table>
<table class="data-col2">
<tr>
<td style="padding: 33px 0 0 0;" width="116px">
<input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
</td>
<td style="padding: 33px 0 0 0;">
<input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
<script type="text/javascript">
GLOBAL.FTP_USER_PREFIX = '<?php echo $user; ?>_';
</script>
<script type="text/javascript" src="/js/pages/add.web.js"></script>