Merge branch '1.2.0-rc-hotfix'

func/rebuild.sh

@@ -257,6 +257,17 @@ rebuild_web_domain_conf() {
         fi
     fi
 
+    # Refresh HTTPS redirection if previously enabled
+    if [ "$SSL_FORCE" = 'yes' ]; then
+        $BIN/v-delete-web-domain-ssl-force $user $domain no
+        $BIN/v-add-web-domain-ssl-force $user $domain yes
+    fi
+
+    if [ "$SSL_HSTS" = 'yes' ]; then
+        $BIN/v-delete-web-domain-ssl-hsts $user $domain no
+        $BIN/v-add-web-domain-ssl-hsts $user $domain yes
+    fi
+
     # Adding proxy configuration
     if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
         conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"

web/inc/i18n/en.php

@@ -771,33 +771,36 @@ $LANG['en'] = array(
     '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.',
     
     //SSH Key
-    'Field SSH_KEY can not be blank.' => 'Field SSH Key may not be blank',
+    'Field SSH_KEY can not be blank.' => 'Field SSH Key must not be blank',
     'SSH KEY is invalid' => 'SSH key is invalid',
-    'SSH KEY already exists' => 'SSH key already exsits',
+    'SSH KEY already exists' => 'SSH key already exists',
     'SSH KEY Added' => 'SSH key has been added',
     'Add SSH Key' => 'Add SSH key',
     'SSH KEY' => 'SSH Key',    
-    'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete key %s?',
-    'SSH_ID' => 'SSH Id',
+    'DELETE_KEY_CONFIRM' => 'Are you sure you want to delete SSH key %s?',
+    'SSH_ID' => 'SSH ID',
+    'Manage SSH keys' => 'Manage SSH keys',
  
     //Header 
     'Fm' => 'Files',
     //PHP Cli
     'PHP CLI Version' => 'PHP CLI Version',
+
     //Ipset Firewall rules
-    'Adding Firewall Ipset List' => 'Adding Firewall Ipset List',
-    'Ip List Name' => 'Ip List Name',
+    'Adding Firewall Ipset List' => 'Add New IP list',
+    'Ip List Name' => 'IP List Name',
     'Data Source' => 'Data Source',
-    'Ip Version' => 'Ip Version',
-    'Autoupdate' => 'Autoupdate',
+    'Ip Version' => 'IP Version',
+    'Autoupdate' => 'Auto Update',
+    'Add IP list' => 'Add IP list',
     'BLACKLIST' => 'BLACKLIST',
     'IPVERSE' => 'IPVERSE',
-    'IPSET_CREATED_OK' => 'Ipset created',
-    'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete Ipset %2',
-    '1 Ipset list' => '1 Ipset list',
-    '%s Ipset lists' => '%s Ipset lists',
-    'There are currently no Ipset lists defined.' => 'There are currently no Ipset lists defined.',
-    'list ipset' => 'Ipset',
+    'IPSET_CREATED_OK' => 'IP list created successfully',
+    'DELETE_IPSET_CONFIRMATION' => 'Are you sure you want to delete IP list %2',
+    '1 Ipset list' => '1 IP list',
+    '%s Ipset lists' => '%s IP lists',
+    'There are currently no IP lists defined.' => 'There are currently no IP lists defined.',
+    'list ipset' => 'Manage IP lists',
     
     //Backup
     'File Name' => 'File Name',

web/templates/admin/edit_user.html

@@ -2,7 +2,7 @@
         <div class="l-sort clearfix">
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-            <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>
+            <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>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <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

@@ -5,7 +5,7 @@
           <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>
           <?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
             <a class="ui-button cancel" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i> <?=__('list fail2ban')?></a>
-            <a class="ui-button cancel" href="/list/firewall/ipset/"><i class="fas fa-list status-icon green"></i> <?=__('list ipset')?></a>
+            <a class="ui-button cancel" href="/list/firewall/ipset/"><i class="fas fa-list status-icon blue"></i> <?=__('list ipset')?></a>
           <?php endif; ?>
         </div>
         <ul class="context-menu sort-order animated fadeIn" style="display:none;">

web/templates/admin/list_firewall_ipset.html

@@ -2,7 +2,7 @@
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
           <a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
-          <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>
+          <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>
         </div>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -32,10 +32,10 @@
                     <div class="clearfix l-unit__stat-col--left super-compact">
                         <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                     </div>
-                    <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ipset Name');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left wide-3"><b><?php print __('Ip List Name');?></b></div>
                     <div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>  
                     <div class="clearfix l-unit__stat-col--left text-center compact-5"><b><?php print __('Autoupdate');?></b></div>
-                    <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Ver');?></b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Ip Version');?></b></div>
                     <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Date');?></b></div>
                     <div class="clearfix l-unit__stat-col--left text-center compact-4"><b><?php print __('Time');?></b></div>
                </div>

web/templates/admin/list_key.html

@@ -1,6 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
+            <a class="ui-button cancel" id="btn-back" href="javascript:history.back();"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
         <?php
         	 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>';
         ?>

web/templates/admin/panel.html

@@ -12,10 +12,10 @@
 		<!-- /.l-logo -->
 		<div class="l-menu clearfix noselect">
 			<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>
+			<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>
 			<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>
 			<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>
 			<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>
-			<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>
 		</div>
 		<!-- /.l-menu -->
 		<div class="l-profile noselect">

web/templates/user/list_web.html

@@ -4,7 +4,7 @@
             <?php
             if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {
                 if (intval($panel[$user]['WEB_DOMAINS']) > 0 || $panel[$user]['WEB_DOMAINS'] == 'unlimited') {
-                    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>';
+                    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>';
                 }
             }
             ?>

web/templates/user/panel.html

@@ -12,9 +12,9 @@
 		<!-- /.l-logo -->
 		<div class="l-menu clearfix noselect">
 			<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>
+			<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>
 			<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>
 			<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>
-			<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>
 		</div>
 		<!-- /.l-menu -->
 		<div class="l-profile noselect">