github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 18:49:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Flatta and Diman fixes

Browse source
This commit is contained in:
Serghey Rodin 2016-07-06 13:53:03 +03:00
commit 3bed87ba15
98 changed files with 5260 additions and 3031 deletions
Download patch file Download diff file Expand all files Collapse all files

45
web/templates/user/edit_user.html
View file

@ -218,47 +218,4 @@
</tr>
</table>
</form>
</div>
<?php insert_scripts(); ?>
<script>
function randomString() {
var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
var string_length = 10;
var randomstring = '';
for (var i = 0; i < string_length; i++) {
var rnum = Math.floor(Math.random() * chars.length);
randomstring += chars.substr(rnum, 1);
}
document.v_edit_user.v_password.value = randomstring;
}
$(document).ready(function(){
$('.add-ns-button').click(function(){
var n = $('input[name^=v_ns]').length;
if(n < 8){
var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
t.find('input').attr({value:'', name:'v_ns'+(n+1)});
t.find('span').show();
$('tr.add-ns').before(t);
}
if( n == 7 ) {
$('.add-ns').hide();
}
});
$('.remove-ns').click(function(){
$(this).parents('tr')[0].remove();
$('input[name^=v_ns]').each(function(i, ns){
$(ns).attr({name: 'v_ns'+(i+1)});
i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
});
$('.add-ns').show();
});
$('input[name^=v_ns]').each(function(i, ns){
i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
});
});
</script>
</div>

40
web/templates/user/edit_web.html
View file

@ -380,46 +380,6 @@
</div>
</div>
<?php insert_scripts(); ?>
<script>
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.substr(rnum, 1);
}
document.v_edit_web.v_stats_password.value = webrandom;
}
function FTPrandom(elm) {
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.substr(rnum, 1);
}
$(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
}
function elementHideShow(elementToHideOrShow){
var el = document.getElementById(elementToHideOrShow);
el.style.display = el.style.display === 'none' ? 'block' : 'none';
}
$('#vstobjects').bind('submit', function(evt) {
$('input[disabled]').each(function(i, elm) {
var copy_elm = $(elm).clone(true);
$(copy_elm).attr('type', 'hidden');
$(copy_elm).removeAttr('disabled');
$(elm).after(copy_elm);
});
});
GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
</script>
<script src="/js/pages/edit.web.js"></script>

2
web/templates/user/list_dns_rec.html
View file

@ -132,7 +132,7 @@
?>
</div>
<div class="data-count l-unit__col l-unit__col--right back clearfix">
<a class="button cancel" href="/list/dns/">back</a>
<a class="button cancel" href="/list/dns/"><?=__('Back')?></a>
</div>
</div>
</div>

2
web/templates/user/list_mail_acc.html
View file

@ -200,7 +200,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
?>
</div>
<div class="data-count l-unit__col l-unit__col--right back clearfix">
<a class="button cancel" href="/list/mail/">back</a>
<a class="button cancel" href="/list/mail/"><?=__('Back')?></a>
</div>
</div>
</div>

74
web/templates/user/list_search.html
View file

@ -36,27 +36,27 @@
<?
foreach ($data as $key => $value) {
++$i;
if ($data[$key]['SUSPENDED'] == 'yes') {
if ($value['SUSPENDED'] == 'yes') {
$status = 'suspended';
$spnd_action = 'unsuspend' ;
} else {
$status = 'active';
$spnd_action = 'suspend';
}
if ($data[$key]['TYPE'] == 'db') {
if ($value['TYPE'] == 'db') {
$object = 'database';
} else {
$object = strtolower($data[$key]['TYPE']." ".$data[$key]['KEY']);
$object = strtolower($value['TYPE']." ".$value['KEY']);
}
$uniq_id = $data[$key]['TYPE'].'-';
if($data[$key]['KEY'] == 'ACCOUNT'){
$uniq_id = $value['TYPE'].'-';
if($value['KEY'] == 'ACCOUNT'){
$uniq_id .= 'acc-';
}
$uniq_id .= sha1($data[$key]['RESULT']);
$uniq_id .= sha1($value['RESULT']);
?>
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred';?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$data[$key]['RESULT']?>">
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE[$uniq_id] == 1) echo ' l-unit--starred';?>" id="web-unit-<?=$i?>" uniq-id="<?=$uniq_id?>" sort-date="<?=strtotime($value['DATE'].' '.$value['TIME'])?>" sort-name="<?=$value['RESULT']?>">
<div class="l-unit-toolbar clearfix">
<!--div class="l-unit-toolbar__col l-unit-toolbar__col--left">
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="check" value="check<?=$i?>">
@ -67,7 +67,7 @@
<div class="actions-panel clearfix">
<?
if ($data[$key]['USER'] != $user && $data[$key]['KEY'] == 'ACCOUNT') {
if ($value['USER'] != $user && $value['KEY'] == 'ACCOUNT') {
if ($key == $user) {
?>
<div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
@ -81,46 +81,46 @@
<?
if ($data[$key]['KEY'] == 'RECORD') {
$edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'RECORD') {
$edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
}
if ($data[$key]['KEY'] == 'ACCOUNT') {
$edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'ACCOUNT') {
$edit_lnk = '/edit/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
}
if ($data[$key]['KEY'] == 'JOB') {
$edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'JOB') {
$edit_lnk = '/edit/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
}
if ($data[$key]['KEY'] == 'DATABASE') {
$edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'DATABASE') {
$edit_lnk = '/edit/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
}
if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
$edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
$edit_lnk = '/edit/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
}
?>
<div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="<?=$edit_lnk?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
<? if (!empty($data[$key]['STATS'])) { ?>
<div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$data[$key]['RESULT']?>/vstats/" target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;W</span></div>
<? if (!empty($value['STATS'])) { ?>
<div class="actions-panel__col actions-panel__logs shortcut-w" key-action="href"><a href="http://<?=$value['RESULT']?>/vstats/" target="_blank"><?=__('open webstats')?> <i></i></a><span class="shortcut">&nbsp;W</span></div>
<? } ?>
<?
if ($data[$key]['KEY'] == 'RECORD') {
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'RECORD') {
$delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&record_id='.$value['LINK'].'&user='.$value['USER'];
$cnfrm = 'DELETE_RECORD_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'ACCOUNT') {
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'ACCOUNT') {
$delete_lnk = '/delete/'.$value['TYPE'].'/?domain='.$value['PARENT'].'&account='.$value['LINK'].'&user='.$value['USER'];
$cnfrm = 'DELETE_USER_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'JOB') {
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'JOB') {
$delete_lnk = '/delete/'.$value['TYPE'].'/?job='.$value['LINK'].'&user='.$value['USER'];
$cnfrm = 'DELETE_CRON_CONFIRMATION';
}
if ($data[$key]['KEY'] == 'DATABASE') {
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
if ($value['KEY'] == 'DATABASE') {
$delete_lnk = '/delete/'.$value['TYPE'].'/?database='.$value['RESULT'].'&user='.$value['USER'];
$cnfrm = 'DELETE_DATABASE_CONFIRMATION';
}
if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
$delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
if (($value['KEY'] != 'RECORD') && ($value['KEY'] != 'ACCOUNT') && ($value['KEY'] != 'JOB') && ($value['KEY'] != 'DATABASE') ) {
$delete_lnk = '/delete/'.$value['TYPE'].'/?'.strtolower($value['KEY']).'='.$value['RESULT'].'&user='.$value['USER'];
$cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
}
?>
@ -129,7 +129,7 @@
<?=__('delete')?> <i class="do_delete"></i>
<input type="hidden" name="delete_url" value="<?=$delete_lnk?>&token=<?=$_SESSION['token']?>" />
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
<p class="confirmation"><?=__($cnfrm, $data[$key]['RESULT'])?></p>
<p class="confirmation"><?=__($cnfrm, $value['RESULT'])?></p>
</div>
</a>
<span class="shortcut delete">&nbsp;Del</span>
@ -142,8 +142,8 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
<?=translate_date($data[$key]['DATE'])?>
<div class="l-unit__date" u_date="<?=strtotime($value['DATE'])?>">
<?=translate_date($value['DATE'])?>
</div>
<div class="l-unit__suspended"><?__('suspended')?></div>
<div class="text-center">
@ -152,8 +152,8 @@
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
<div class="l-unit__name separate" u_name="<?=$data[$key]['RESULT']?>">
<?=$data[$key]['RESULT']?> <span><?=str_replace(',', ', ', $data[$key]['ALIAS'])?></span>
<div class="l-unit__name separate" u_name="<?=$value['RESULT']?>">
<?=$value['RESULT']?> <span><?=str_replace(',', ', ', $value['ALIAS'])?></span>
</div>
<!-- /.l-unit__name -->
<div class="l-unit__stats">
@ -161,14 +161,14 @@
<tr>
<td>
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=$object?></div>
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__($object)?></div>
</div>
</td>
<td>
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Owner')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=$data[$key]['USER']?></b>
<b><?=$value['USER']?></b>
</div>
</div>
</td>

2
web/templates/user/list_web.html
View file

@ -192,7 +192,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web Template')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=__($data[$key]['TPL'])?></b>
<b><?=$data[$key]['TPL']?></b>
</div>
</div>
</td>