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

Merge branch 'master' into feature/800

Browse source 
Conflicts:
	web/js/pages/edit_web.js
This commit is contained in:
Derrick Hammer 2016-10-18 18:30:45 -04:00
commit 1b287ff73e
49 changed files with 830 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,8 @@
<td class="vst-text input-label">
<?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>";
// if (is_it_mysql_or_mariadb()=='mysql')
echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum characters length, including prefix', 16).")</small></em>";
?>
</td>
</tr>

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

@ -131,60 +131,71 @@
</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 id="td_imap_hostname"><?=$hostname?></td>
</tr>
<tr>
<td><?=__('IMAP port')?>:</td>
<td id="td_imap_port">143</td>
</tr>
<tr>
<td><?=__('IMAP security')?>:</td>
<td id="td_imap_encryption"><?=__('STARTTLS')?></td>
</tr>
<tr>
<td><?=__('IMAP auth method')?>:</td>
<td><?=__('Normal password')?></td>
</tr>
<tr>
<td><?=__('SMTP hostname')?></td>
<td id="td_smtp_hostname"><?=$hostname?></td>
</tr>
<tr>
<td><?=__('SMTP port')?>:</td>
<td id="td_smtp_port">587</td>
</tr>
<tr>
<td><?=__('SMTP security')?>:</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>
<table>
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
<tr>
<td colspan="2">
<select id="mail_configuration" class="vst-list flat">
<option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
<option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
<option v_type="starttls"><?=__('Use STARTTLS')?></option>
<option v_type="ssl"><?=__('Use SSL')?></option>
<option v_type="no_encription" domain="<?=$v_domain?>" encription="<?=__('No encryption')?>"><?=__('No encryption')?></option>
</select>
</td>
</tr>
<tr>
<td><?=__('Username')?>:</td>
<td><div><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></div></td>
</tr>
<tr>
<td><?=__('Password')?>:</td>
<td><div id="v_password">******</div></td>
</tr>
<tr>
<td><?=__('IMAP hostname')?>:</td>
<td><div id="td_imap_hostname"><?=$hostname?></div></td>
</tr>
<tr>
<td><?=__('IMAP port')?>:</td>
<td><div id="td_imap_port">143</div></td>
</tr>
<tr>
<td><?=__('IMAP security')?>:</td>
<td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
</tr>
<tr>
<td><?=__('IMAP auth method')?>:</td>
<td><div><?=__('Normal password')?></div></td>
</tr>
<tr>
<td><?=__('SMTP hostname')?></td>
<td><div id="td_smtp_hostname"><?=$hostname?></div></td>
</tr>
<tr>
<td><?=__('SMTP port')?>:</td>
<td><div id="td_smtp_port">587</div></td>
</tr>
<tr>
<td><?=__('SMTP security')?>:</td>
<td><div id="td_smtp_encryption"><?=__('STARTTLS')?></div></td>
</tr>
<tr>
<td><?=__('SMTP auth method')?>:</td>
<td><div><?=__('Normal password')?></div></td>
</tr>
<?
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
$webmail = "http://".$http_host."/webmail/";
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
?>
<tr>
<td><?=__('Webmail URL')?>:</td>
<td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</form>

25
web/templates/admin/add_web.html
View file

@ -123,14 +123,18 @@
<?php echo ""; }?>
<tr>
<td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
<a class="generate" id="generate-csr" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label>
</td>
</tr>
<tr>
<td>
<table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
<tr>
<tr>
<td class="step-left input-label vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text input-label step-left">
<?php print __('SSL Home Directory');?>
</td>
@ -149,7 +153,9 @@
</tr>
<tr>
<td class="vst-text input-label step-left">
<?php print __('SSL Certificate');?>
<?php print __('SSL Certificate');?>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
</td>
</tr>
<tr>
@ -180,11 +186,6 @@
</table>
</td>
</tr>
<tr>
<td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text step-top">
<?php print __('Web Statistics');?>
@ -207,8 +208,8 @@
</select>
</td>
</tr>
<tr>
<td class="vst-text input-label">
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
<td class="step-left vst-text input-label">
<label><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');"> <?php print __('Statistics Authorization');?></label>
</td>
</tr>
@ -391,6 +392,6 @@
</div>
<script>
GLOBAL.FTP_USER_PREFIX = <?=json_encode($user)?>;
GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
</script>

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

@ -86,7 +86,7 @@
</tr>
<tr>
<td>
<textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo htmlentities($v_aliases); ?></textarea>
<textarea size="20" class="vst-textinput short" name="v_aliases"><?php if (!empty($v_aliases)) echo htmlentities($v_aliases); ?></textarea>
</td>
</tr>
<tr>
@ -140,53 +140,72 @@
<td class="mail-infoblock-td">
<div class="mail-infoblock">
<table>
<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>
<tr>
<td colspan="2">
<select id="mail_configuration" class="vst-list flat">
<option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
<option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
<option v_type="starttls"><?=__('Use STARTTLS')?></option>
<option v_type="ssl"><?=__('Use SSL')?></option>
<option v_type="no_encription" domain="<?=$v_domain?>" encription="<?=__('No encryption')?>"><?=__('No encryption')?></option>
</select>
</td>
</tr>
<tr>
<td><?=__('Username')?>:</td>
<td><div><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></div></td>
</tr>
<tr>
<td><?=__('Password')?>:</td>
<td><div id="v_password">******</div></td>
</tr>
<tr>
<td><?=__('IMAP hostname')?>:</td>
<td><div id="td_imap_hostname"><?=$hostname?></div></td>
</tr>
<tr>
<td><?=__('IMAP port')?>:</td>
<td><div id="td_imap_port">143</div></td>
</tr>
<tr>
<td><?=__('IMAP security')?>:</td>
<td><div id="td_imap_encryption"><?=__('STARTTLS')?></div></td>
</tr>
<tr>
<td><?=__('IMAP auth method')?>:</td>
<td><div><?=__('Normal password')?></div></td>
</tr>
<tr>
<td><?=__('SMTP hostname')?></td>
<td><div id="td_smtp_hostname"><?=$hostname?></div></td>
</tr>
<tr>
<td><?=__('SMTP port')?>:</td>
<td><div id="td_smtp_port">587</div></td>
</tr>
<tr>
<td><?=__('SMTP security')?>:</td>
<td><div id="td_smtp_encription"><?=__('STARTTLS')?></div></td>
</tr>
<tr>
<td><?=__('SMTP auth method')?>:</td>
<td><div><?=__('Normal password')?></div></td>
</tr>
<?
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
$webmail = "http://".$http_host."/webmail/";
if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
?>
<tr>
<td><?=__('Webmail URL')?>:</td>
<td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</form>
</div>
</div>

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

@ -180,14 +180,18 @@
<?php echo ""; }?>
<tr>
<td class="vst-text step-top">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
<a class="generate" id="generate-csr" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label>
</td>
</tr>
<tr>
<td class="step-left">
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
<tr>
<tr>
<td class="input-label vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('SSL Home Directory');?>
</td>
@ -208,6 +212,7 @@
<tr>
<td class="vst-text input-label">
<?php print __('SSL Certificate');?>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
</td>
</tr>
<tr>
@ -235,11 +240,11 @@
<textarea size="20" class="vst-textinput" name="v_ssl_ca"><?php if (!empty($v_ssl_ca)) echo htmlentities($v_ssl_ca); ?></textarea>
</td>
</tr>
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename'];
if ($v_ssl != 'no' ) { ?>
<tr>
<td>
<table class="additional-info">
<?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
<tr>
<td>
<?=__('SUBJECT')?>:
@ -301,14 +306,10 @@
</table>
</td>
</tr>
<? } // if ssl is enabled ?>
</table>
</td>
</tr>
<tr>
<td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text step-top">
<?php print __('Web Statistics');?>
@ -331,12 +332,12 @@
</select>
</td>
</tr>
<tr>
<td class="vst-text input-label">
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
<td class="vst-text input-label step-left">
<label><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');"><?php print __('Statistics Authorization');?></label>
</td>
</tr>
<tr>
<tr class="stats-auth">
<td class="step-left">
<table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
<tr>