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

Merge branch 'master' into feature/800

Browse source 
Conflicts:
	web/edit/web/index.php
This commit is contained in:
Derrick Hammer 2016-10-08 11:22:23 -04:00
commit 09e1238d54
542 changed files with 5342 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

7
web/templates/admin/add_db.html
View file

@ -42,7 +42,7 @@
<table class="data-col2" width="600px">
<tr>
<td class="step-top hint" style="color:#777;" >
<?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
<?php print __('Prefix will be automaticaly added to database name and database user',"<b>".$user."_</b>");?>
</td>
</tr>
<tr>
@ -58,7 +58,10 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('User');?>
<?php
print __('User');
if (is_it_mysql_or_mariadb()=='mysql') echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum 16 characters length, including prefix').")</small></em>";
?>
</td>
</tr>
<tr>

20
web/templates/admin/add_mail_acc.html
View file

@ -143,15 +143,15 @@
</tr>
<tr>
<td><?=__('IMAP hostname')?>:</td>
<td><?=$hostname?></td>
<td id="td_imap_hostname"><?=$hostname?></td>
</tr>
<tr>
<td><?=__('IMAP port')?>:</td>
<td>143</td>
<td id="td_imap_port">143</td>
</tr>
<tr>
<td><?=__('IMAP security')?>:</td>
<td><?=__('STARTTLS')?></td>
<td id="td_imap_encryption"><?=__('STARTTLS')?></td>
</tr>
<tr>
<td><?=__('IMAP auth method')?>:</td>
@ -159,21 +159,29 @@
</tr>
<tr>
<td><?=__('SMTP hostname')?></td>
<td><?=$hostname?></td>
<td id="td_smtp_hostname"><?=$hostname?></td>
</tr>
<tr>
<td><?=__('SMTP port')?>:</td>
<td>587</td>
<td id="td_smtp_port">587</td>
</tr>
<tr>
<td><?=__('SMTP security')?>:</td>
<td><?=__('STARTTLS')?></td>
<td id="td_smtp_encryption"><?=__('STARTTLS')?></td>
</tr>
<tr>
<td><?=__('SMTP auth method')?>:</td>
<td><?=__('Normal password')?></td>
</tr>
</table>
<br />
<table>
<tr><td>&#8226; <a href="javascript:use_hostname('<?=$hostname?>');" class="generate"><?php print __('Use server hostname');?></a></td></tr>
<tr><td>&#8226; <a href="javascript:use_hostname('<?=$v_domain?>');" class="generate"><?php print __('Use domain hostname');?></a></td></tr>
<tr><td>&#8226; <a href="javascript:use_starttls();" class="generate"><?php print __('Use STARTTLS');?></a></td></tr>
<tr><td>&#8226; <a href="javascript:use_ssl();" class="generate"><?php print __('Use SSL');?></a></td></tr>
<tr><td>&#8226; <a href="javascript:use_no_encryption('<?=$v_domain?>', '<?php print __('No encryption');?>');" class="generate"><?php print __('Do not use encryption');?></a></td></tr>
</table>
</div>
</td>

49
web/templates/admin/edit_mail_acc.html
View file

@ -137,6 +137,55 @@
</tr>
</table>
</td>
<td class="mail-infoblock-td">
<div class="mail-infoblock">
<table>
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
<tr>
<td><?=__('Username')?>:</td>
<td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
</tr>
<tr>
<td><?=__('Password')?>:</td>
<td id="v_password">******</td>
</tr>
<tr>
<td><?=__('IMAP hostname')?>:</td>
<td><?=$hostname?></td>
</tr>
<tr>
<td><?=__('IMAP port')?>:</td>
<td>143</td>
</tr>
<tr>
<td><?=__('IMAP security')?>:</td>
<td><?=__('STARTTLS')?></td>
</tr>
<tr>
<td><?=__('IMAP auth method')?>:</td>
<td><?=__('Normal password')?></td>
</tr>
<tr>
<td><?=__('SMTP hostname')?></td>
<td><?=$hostname?></td>
</tr>
<tr>
<td><?=__('SMTP port')?>:</td>
<td>587</td>
</tr>
<tr>
<td><?=__('SMTP security')?>:</td>
<td><?=__('STARTTLS')?></td>
</tr>
<tr>
<td><?=__('SMTP auth method')?>:</td>
<td><?=__('Normal password')?></td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</form>

116
web/templates/admin/edit_server.html
View file

@ -113,7 +113,7 @@
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
<tr>
<td class="vst-text">
<?php print __('Proxy Server') ?>
<?php print __('Proxy Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -125,7 +125,7 @@
<?php } ?>
<tr>
<td class="vst-text">
<?php print __('Web Server') ?>
<?php print __('Web Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -137,7 +137,7 @@
<?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
<tr>
<td class="vst-text">
<?php print __('Backend Server') ?>
<?php print __('Backend Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -176,7 +176,7 @@
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="dns">
<tr>
<td class="vst-text">
<?php print __('DNS Server') ?>
<?php print __('DNS Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -234,7 +234,7 @@
<table style="display:<?php if (empty($v_mail_adv)) echo 'none';?> ;" id="mail">
<tr>
<td class="vst-text">
<?php print __('MAIL Server') ?>
<?php print __('MAIL Server') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -246,7 +246,7 @@
<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
<tr>
<td class="vst-text">
<?php print __('Antivirus') ?>
<?php print __('Antivirus') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -259,7 +259,7 @@
<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?>
<tr>
<td class="vst-text">
<?php print __('AntiSpam') ?>
<?php print __('AntiSpam') ?> / <a class="generate" href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -298,7 +298,7 @@
<table style="display:<?php if (empty($v_db_adv)) echo 'none';?> ;" id="db">
<tr>
<td class="vst-text input-label">
<?php print __('MySQL Support');?>
<?php print __('MySQL Support');?> / <a class="generate" href="/edit/server/mysql/"><?=__('configure')?></a>
</td>
</tr>
<tr>
@ -576,6 +576,106 @@
</td>
</tr>
<tr>
<td class="vst-text input-label step-top">
<a href="javascript:elementHideShow('ssl');" class="vst-text">
<b><?php print __('Vesta SSL');?> <!-- span style="color:#ff6701;font-size:10px; padding:0 10px;">preview</span--><img src="/images/arrow.png"></b>
</a>
</td>
</tr>
<tr>
<td class="vst-text input-label step-left">
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="ssl">
<tr>
<td class="vst-text input-label">
<?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 htmlentities($v_ssl_crt); ?></textarea>
</td>
</tr>
<tr>
<td class="vst-text input-label">
<?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 htmlentities($v_ssl_key); ?></textarea>
</td>
</tr>
<tr>
<td>
<table class="additional-info">
<tr>
<td>
<?=__('SUBJECT')?>:
</td>
<td class="details">
<?=$v_ssl_subject?>
</td>
</tr>
<? if($v_ssl_aliases){?>
<tr>
<td>
<?=__('ALIASES')?>:
</td>
<td class="details">
<?=$v_ssl_aliases?>
</td>
</tr>
<? } ?>
<tr>
<td>
<?=__('NOT_BEFORE')?>:
</td>
<td class="details">
<?=$v_ssl_not_before?>
</td>
</tr>
<tr>
<td>
<?=__('NOT_AFTER')?>:
</td>
<td class="details">
<?=$v_ssl_not_after?>
</td>
</tr>
<tr>
<td>
<?=__('SIGNATURE')?>:
</td>
<td class="details">
<?=$v_ssl_signature?>
</td>
</tr>
<tr>
<td>
<?=__('PUB_KEY')?>:
</td>
<td class="details">
<?=$v_ssl_pub_key?>
</td>
</tr>
<tr>
<td>
<?=__('ISSUER')?>
</td>
<td class="details">
<?=$v_ssl_issuer?>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="vst-text input-label step-top">
<a href="javascript:elementHideShow('vesta');" class="vst-text">

67
web/templates/admin/edit_web.html
View file

@ -235,6 +235,72 @@
<textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo htmlentities($v_ssl_ca); ?></textarea>
</td>
</tr>
<tr>
<td>
<table class="additional-info">
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
<tr>
<td>
<?=__('SUBJECT')?>:
</td>
<td class="details">
<?=$v_ssl_subject?>
</td>
</tr>
<? if($v_ssl_aliases){?>
<tr>
<td>
<?=__('ALIASES')?>:
</td>
<td class="details">
<?=$v_ssl_aliases?>
</td>
</tr>
<? } ?>
<tr>
<td>
<?=__('NOT_BEFORE')?>:
</td>
<td class="details">
<?=$v_ssl_not_before?>
</td>
</tr>
<tr>
<td>
<?=__('NOT_AFTER')?>:
</td>
<td class="details">
<?=$v_ssl_not_after?>
</td>
</tr>
<tr>
<td>
<?=__('SIGNATURE')?>:
</td>
<td class="details">
<?=$v_ssl_signature?>
</td>
</tr>
<tr>
<td>
<?=__('PUB_KEY')?>:
</td>
<td class="details">
<?=$v_ssl_pub_key?>
</td>
</tr>
<tr>
<td>
<?=__('ISSUER')?>
</td>
<td class="details">
<?=$v_ssl_issuer?>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
@ -351,6 +417,7 @@
<tr>
<td class="step-left">
<input type="hidden" class="vst-input v-ftp-pre-path" name="v_ftp_pre_path" value="<?php print !empty($v_ftp_pre_path) ? htmlentities($v_ftp_pre_path) : '/'; ?>">
<input type="hidden" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path_prev]" <?php if (!empty($v_ftp_path)) echo "value=".($v_ftp_path[0] != '/' ? '/' : '').htmlentities($v_ftp_path); ?>>
<input type="text" class="vst-input v-ftp-path" name="v_ftp_user[<?php print $i ?>][v_ftp_path]" <?php if (!empty($v_ftp_path)) echo "value=".($v_ftp_path[0] != '/' ? '/' : '').htmlentities($v_ftp_path); ?>>
<br /><span class="ftp-path-prefix"><?php print $v_ftp_pre_path ?></span><span class="ftp-path-value v-ftp-path-hint"></span>
</td>