Skip to content

Commit f6df8d3

Browse files
author
Kristan Kenney
committed
Merge branch '1.2.0-rc-hotfix'
2 parents c62cf92 + 875c699 commit f6df8d3

File tree

9 files changed

+37
-22
lines changed

9 files changed

+37
-22
lines changed

‎func/rebuild.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,17 @@ rebuild_web_domain_conf() {
257257
fi
258258
fi
259259

260+
# Refresh HTTPS redirection if previously enabled
261+
if [ "$SSL_FORCE" = 'yes' ]; then
262+
$BIN/v-delete-web-domain-ssl-force $user $domain no
263+
$BIN/v-add-web-domain-ssl-force $user $domain yes
264+
fi
265+
266+
if [ "$SSL_HSTS" = 'yes' ]; then
267+
$BIN/v-delete-web-domain-ssl-hsts $user $domain no
268+
$BIN/v-add-web-domain-ssl-hsts $user $domain yes
269+
fi
270+
260271
# Adding proxy configuration
261272
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
262273
conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"

‎web/inc/i18n/en.php‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -771,33 +771,36 @@
771771
'Avoid adding web domains on admin account' => 'It is strongly advised to create a standard user account before adding web domains to the server due to the increased privileges the admin account possesses and potential security risks involved.',
772772

773773
//SSH Key
774-
'Field SSH_KEY can not be blank.' => 'Field SSH Key may not be blank',
774+
'Field SSH_KEY can not be blank.' => 'Field SSH Key must not be blank',
775775
'SSH KEY is invalid' => 'SSH key is invalid',
776-
'SSH KEY already exists' => 'SSH key already exsits',
776+
'SSH KEY already exists' => 'SSH key already exists',
777777
'SSH KEY Added' => 'SSH key has been added',
778778
'Add SSH Key' => 'Add SSH key',
779779
'SSH KEY' => 'SSH Key',
780-
'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete key %s?',
781-
'SSH_ID' => 'SSH Id',
780+
'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete SSH key %s?',
781+
'SSH_ID' => 'SSH ID',
782+
'Manage SSH keys' => 'Manage SSH keys',
782783

783784
//Header
784785
'Fm' => 'Files',
785786
//PHP Cli
786787
'PHP CLI Version' => 'PHP CLI Version',
788+
787789
//Ipset Firewall rules
788-
'Adding Firewall Ipset List' => 'Adding Firewall Ipset List',
789-
'Ip List Name' => 'Ip List Name',
790+
'Adding Firewall Ipset List' => 'Add New IP list',
791+
'Ip List Name' => 'IP List Name',
790792
'Data Source' => 'Data Source',
791-
'Ip Version' => 'Ip Version',
792-
'Autoupdate' => 'Autoupdate',
793+
'Ip Version' => 'IP Version',
794+
'Autoupdate' => 'Auto Update',
795+
'Add IP list' => 'Add IP list',
793796
'BLACKLIST' => 'BLACKLIST',
794797
'IPVERSE' => 'IPVERSE',
795-
'IPSET_CREATED_OK' => 'Ipset created',
796-
'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete Ipset %2',
797-
'1 Ipset list' => '1 Ipset list',
798-
'%s Ipset lists' => '%s Ipset lists',
799-
'There are currently no Ipset lists defined.' => 'There are currently no Ipset lists defined.',
800-
'list ipset' => 'Ipset',
798+
'IPSET_CREATED_OK' => 'IP list created successfully',
799+
'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete IP list %2',
800+
'1 Ipset list' => '1 IP list',
801+
'%s Ipset lists' => '%s IP lists',
802+
'There are currently no IP lists defined.' => 'There are currently no IP lists defined.',
803+
'list ipset' => 'Manage IP lists',
801804

802805
//Backup
803806
'File Name' => 'File Name',

‎web/templates/admin/edit_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('SSH_KEY');?>"><i class="fas fa-key status-icon green"></i><?=__('SSH KEY')?></a>
5+
<a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('Manage SSH keys');?>"><i class="fas fa-key status-icon green"></i><?=__('Manage SSH keys')?></a>
66
</div>
77
<div class="l-unit-toolbar__buttonstrip float-right">
88
<a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>

‎web/templates/admin/list_firewall.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<a href="/add/firewall/" id="btn-create" class="ui-button cancel" title="<?=__('Add Rule')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Rule')?></a>
66
<?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
77
<a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i> <?=__('list fail2ban')?></a>
8-
<a class="ui-button cancel" href="/list/firewall/ipset/"><i class="fas fa-list status-icon green"></i> <?=__('list ipset')?></a>
8+
<a class="ui-button cancel" href="/list/firewall/ipset/"><i class="fas fa-list status-icon blue"></i> <?=__('list ipset')?></a>
99
<?php endif; ?>
1010
</div>
1111
<ul class="context-menu sort-order animated fadeIn" style="display:none;">

‎web/templates/admin/list_firewall_ipset.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
5-
<a href="/add/firewall/ipset/" id="btn-create" class="ui-button cancel" title="<?=__('Add Ipset List')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add Ipset List')?></a>
5+
<a href="/add/firewall/ipset/" id="btn-create" class="ui-button cancel" title="<?=__('Add IP list')?>"><i class="fas fa-plus-circle status-icon green"></i> <?=__('Add IP list')?></a>
66
</div>
77
<div class="l-sort-toolbar clearfix">
88
<table>
@@ -32,10 +32,10 @@
3232
<div class="clearfix l-unit__stat-col--left super-compact">
3333
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
3434
</div>
35-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ipset Name');?></b></div>
35+
<div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ip List Name');?></b></div>
3636
<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
3737
<div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Autoupdate');?></b></div>
38-
<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Ver');?></b></div>
38+
<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Version');?></b></div>
3939
<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Date');?></b></div>
4040
<div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Time');?></b></div>
4141
</div>

‎web/templates/admin/list_key.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4+
<a class="ui-button cancel" id="btn-back" href="javascript:history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
45
<?php
56
echo '<a href="/add/key/" id="btn-create" class="ui-button cancel" title="'.__('Add SSH Key').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add SSH Key').'</a>';
67
?>

‎web/templates/admin/panel.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<!-- /.l-logo -->
1313
<div class="l-menu clearfix noselect">
1414
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?><?php if($TAB == 'PACKAGE' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'USER' ) echo 'l-menu__item--active' ?>"><a href="/list/user/"><i class="fas fa-tasks"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15+
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
1516
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
1617
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
1718
<div class="l-menu__item <?php if($TAB == 'SERVER' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'UPDATES' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'IP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'RRD' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'FIREWALL' ) echo 'l-menu__item--active' ?>"><a href="/list/server/"><i class="fas fa-server"></i>&nbsp;&nbsp;&nbsp;<?=__('Server')?></a></div>
18-
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
1919
</div>
2020
<!-- /.l-menu -->
2121
<div class="l-profile noselect">

‎web/templates/user/list_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<?php
55
if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {
66
if (intval($panel[$user]['WEB_DOMAINS']) > 0 || $panel[$user]['WEB_DOMAINS'] == 'unlimited') {
7-
echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"><i class="fas fa-plus-circle status-icon green"></i>'.__('Add Web Domain').'</a>';
7+
echo '<a href="/add/web/" id="btn-create" class="ui-button cancel" title="'.__('Add Web Domain').'"> <i class="fas fa-plus-circle status-icon green"></i> '.__('Add Web Domain').'</a>';
88
}
99
}
1010
?>

‎web/templates/user/panel.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<!-- /.l-logo -->
1313
<div class="l-menu clearfix noselect">
1414
<div class="l-menu__item <?php if($TAB == 'WEB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DNS' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'MAIL' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'DB' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'BACKUP' ) echo 'l-menu__item--active' ?> <?php if($TAB == 'CRON' ) echo 'l-menu__item--active' ?>"><a href="/list/web/"><i class="fas fa-tasks"></i>&nbsp;&nbsp;&nbsp;<?=__('Records')?></a></div>
15+
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
1516
<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/"><i class="fas fa-history"></i>&nbsp;&nbsp;&nbsp;<?=__('Log')?></a></div>
1617
<div class="l-menu__item <?php if($TAB == 'STATS' ) echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line"></i>&nbsp;&nbsp;&nbsp;<?=__('Statistics')?></a></div>
17-
<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open"></i>&nbsp;&nbsp;&nbsp;<?=__('Fm')?></a></div>
1818
</div>
1919
<!-- /.l-menu -->
2020
<div class="l-profile noselect">

0 commit comments

Comments
 (0)