Merge pull request #1160 from hestiacp/staging/fixes

Staging/fixes

CHANGELOG.md

@@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue with PHPMyAdmin button (#1078)
 - Changed WordPress name in Webapp installer (#1074)
 - Add a free disk space validation during backup routine (#1115)
+- Removed PHP validation SSH keys allowing support other types then RSA / DSA
 
 
 ## [1.2.3] - Service Release

func/upgrade.sh

@@ -246,7 +246,7 @@ upgrade_send_notification_to_panel () {
 upgrade_send_notification_to_email () {
     if [ "$UPGRADE_SEND_EMAIL" = "true" ]; then
         # Retrieve admin email address, sendmail path, and message temp file path
-        admin_email=$(v-list-user admin json | grep "CONTACT" | cut -d'"' -f4)
+        admin_email=$($HESTIA/bin/v-list-user admin json | grep "CONTACT" | cut -d'"' -f4)
         send_mail="$HESTIA/web/inc/mail-wrapper.php"
         message_tmp_file="/tmp/hestia-upgrade-complete.txt"
 

src/lxd_build_all.sh

@@ -14,7 +14,7 @@
 
 # Configs:
 oslist=('debian=9,10' 'ubuntu=16.04,18.04,20.04')
-branch='master'
+branch='main'
 
 
 function setup_container() {

src/lxd_compile.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-branch=${1-master}
+branch=${1-main}
 
 apt -y install curl wget
 
-curl https://raw.githubusercontent.com/hestiacp/hestiacp/master/src/hst_autocompile.sh > /tmp/hst_autocompile.sh
+curl https://raw.githubusercontent.com/hestiacp/hestiacp/main/src/hst_autocompile.sh > /tmp/hst_autocompile.sh
 chmod +x /tmp/hst_autocompile.sh
 
 mkdir -p /opt/hestiacp

web/add/key/index.php

@@ -5,39 +5,6 @@ $TAB = 'USER';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-//check for valid format ssh key. Doesn't check it is working!
-//https://gist.github.com/jupeter/3248095    
-function validateKey($value)
-{
-    $key_parts = explode(' ', $value, 3);
-    if (count($key_parts) < 2) {
-        return false;
-    }
-    if (count($key_parts) > 3) {
-        return false;
-    }
-    
-    $algorithm = $key_parts[0];
-    $key = $key_parts[1];
-    
-    if (!in_array($algorithm, array('ssh-rsa', 'ssh-dss'))) {
-        return false;
-    }
-    
-    $key_base64_decoded = base64_decode($key, true);
-    if ($key_base64_decoded == FALSE) {
-        return false;
-    }
-    
-    $check = base64_decode(substr($key,0,16));
-    $check = preg_replace("/[^\w\-]/","", $check);
-        
-    if((string) $check !== (string) $algorithm) {
-        return false;
-    }
-    return true;
-}
-
 // Check POST request
 if (!empty($_POST['ok'])) {
     // Check token
@@ -51,38 +18,30 @@ if (!empty($_POST['ok'])) {
     }
     
     if(!$_SESSION['error_msg']){
-        switch ($_POST['v_key']){
-            default: 
+        if($_POST){
             //key if key already exisits
             exec (HESTIA_CMD . "v-list-user-ssh-key ".$user." json", $output, $return_var);
             $data = json_decode(implode('', $output), true);
+            unset($output);
             $keylist = array();
             foreach($data as $key => $value){
                 $idlist[] = trim($data[$key]['ID']);
                 $keylist[] = trim($data[$key]['KEY']);
             }
-        
-            if(!validateKey($_POST['v_key'])){
-                $_SESSION['error_msg']  = _('SSH KEY is invalid');
-                break;
-            }
     
             $v_key_parts = explode(' ',$_POST['v_key']);
             $key_id = trim($v_key_parts[2]);
             if($v_key_parts[2] == ''){
                 $_SESSION['error_msg']  = _('SSH KEY is invalid');
-                break;
             }
     
             //for deleting / revoking key the last part user@domain is used therefore needs to be unique
             //maybe consider adding random generated message or even an human read able string set by user?
             if(in_array($v_key_parts[2], $idlist)){
                 $_SESSION['error_msg']  =  _('SSH KEY already exists');
-                break;
             }
             if(in_array($v_key_parts[1], $keylist)){
                 $_SESSION['error_msg']  =  _('SSH KEY already exists');
-                break;
             }
             $v_key = escapeshellarg(trim($_POST['v_key']));
         }
@@ -92,9 +51,7 @@ if (!empty($_POST['ok'])) {
         exec (HESTIA_CMD."v-add-user-ssh-key ".$user." ".$v_key, $output, $return_var);
         check_return_code($return_var,$output);
     }
-
     unset($output);
-
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
     $_SESSION['ok_msg'] = _('SSH KEY created');

web/locale/hestiacp.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-02 00:53+0200\n"
+"POT-Creation-Date: 2020-09-07 15:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,7 +65,7 @@ msgstr ""
 
 #: ../../web/generate/ssl/index.php:42
 #: ../../web/templates/user/edit_user.html:112
-#: ../../web/templates/user/list_user.html:108
+#: ../../web/templates/user/list_user.html:99
 #: ../../web/templates/admin/edit_user.html:112
 #: ../../web/templates/admin/generate_ssl.html:60
 #: ../../web/templates/admin/list_user.html:106
@@ -156,10 +156,6 @@ msgstr ""
 msgid "Start \"%s\" failed"
 msgstr ""
 
-#: ../../web/copy/package/index.php:34
-msgid "Error: unable to copy package."
-msgstr ""
-
 #: ../../web/add/web/index.php:19 ../../web/add/dns/index.php:24
 #: ../../web/add/mail/index.php:38 ../../web/add/mail/index.php:103
 msgid "domain"
@@ -262,7 +258,7 @@ msgstr ""
 msgid "USER_CREATED_OK"
 msgstr ""
 
-#: ../../web/add/user/index.php:108 ../../web/templates/user/list_user.html:106
+#: ../../web/add/user/index.php:108 ../../web/templates/user/list_user.html:97
 #: ../../web/templates/admin/list_user.html:104
 #: ../../web/templates/admin/list_user.html:118
 msgid "login as"
@@ -572,7 +568,7 @@ msgstr ""
 #: ../../web/templates/user/edit_web.html:4
 #: ../../web/templates/user/list_search.html:4
 #: ../../web/templates/user/list_mail_acc.html:4
-#: ../../web/templates/reset2fa.html:60
+#: ../../web/templates/reset2fa.html:55
 #: ../../web/templates/admin/list_firewall_ipset.html:4
 #: ../../web/templates/admin/edit_server_bind9.html:4
 #: ../../web/templates/admin/edit_server_mysql.html:4
@@ -627,7 +623,7 @@ msgstr ""
 #: ../../web/templates/admin/list_backup_exclusions.html:4
 #: ../../web/templates/admin/add_user.html:4
 #: ../../web/templates/admin/edit_server_httpd.html:4
-#: ../../web/templates/reset_1.html:46 ../../web/templates/login_1.html:43
+#: ../../web/templates/reset_1.html:41 ../../web/templates/login_1.html:43
 #: ../../web/templates/reset_2.html:36 ../../web/templates/reset_3.html:44
 msgid "Back"
 msgstr ""
@@ -886,7 +882,7 @@ msgid "SSH KEY"
 msgstr ""
 
 #: ../../web/templates/user/edit_user.html:42
-#: ../../web/templates/user/list_user.html:114
+#: ../../web/templates/user/list_user.html:105
 #: ../../web/templates/admin/edit_user.html:42
 #: ../../web/templates/admin/list_user.html:120
 msgid "Editing User"
@@ -975,6 +971,46 @@ msgstr ""
 msgid "generate"
 msgstr ""
 
+#: ../../web/templates/user/edit_user.html:82
+#: ../../web/templates/admin/edit_db.html:95
+#: ../../web/templates/admin/edit_user.html:82
+#: ../../web/templates/admin/add_db.html:97
+#: ../../web/templates/admin/add_mail_acc.html:81
+#: ../../web/templates/admin/edit_mail_acc.html:82
+#: ../../web/templates/admin/add_user.html:77
+msgid "Your password must have at least"
+msgstr ""
+
+#: ../../web/templates/user/edit_user.html:84
+#: ../../web/templates/admin/edit_db.html:97
+#: ../../web/templates/admin/edit_user.html:84
+#: ../../web/templates/admin/add_db.html:99
+#: ../../web/templates/admin/add_mail_acc.html:83
+#: ../../web/templates/admin/edit_mail_acc.html:84
+#: ../../web/templates/admin/add_user.html:79
+msgid "8 characters long"
+msgstr ""
+
+#: ../../web/templates/user/edit_user.html:85
+#: ../../web/templates/admin/edit_db.html:98
+#: ../../web/templates/admin/edit_user.html:85
+#: ../../web/templates/admin/add_db.html:100
+#: ../../web/templates/admin/add_mail_acc.html:84
+#: ../../web/templates/admin/edit_mail_acc.html:85
+#: ../../web/templates/admin/add_user.html:80
+msgid "1 uppercase & 1 lowercase character"
+msgstr ""
+
+#: ../../web/templates/user/edit_user.html:86
+#: ../../web/templates/admin/edit_db.html:99
+#: ../../web/templates/admin/edit_user.html:86
+#: ../../web/templates/admin/add_db.html:101
+#: ../../web/templates/admin/add_mail_acc.html:85
+#: ../../web/templates/admin/edit_mail_acc.html:86
+#: ../../web/templates/admin/add_user.html:81
+msgid "1 number"
+msgstr ""
+
 #: ../../web/templates/user/edit_user.html:92
 #: ../../web/templates/admin/edit_user.html:92
 msgid "Enable 2FA"
@@ -1018,7 +1054,7 @@ msgstr ""
 #: ../../web/templates/user/list_dns.html:34
 #: ../../web/templates/user/list_dns.html:109
 #: ../../web/templates/user/list_dns_rec.html:27
-#: ../../web/templates/user/list_dns_rec.html:81
+#: ../../web/templates/user/list_dns_rec.html:72
 #: ../../web/templates/user/edit_web.html:474
 #: ../../web/templates/user/edit_web.html:550
 #: ../../web/templates/user/list_cron.html:40
@@ -1294,6 +1330,24 @@ msgstr ""
 msgid "SOA"
 msgstr ""
 
+#: ../../web/templates/user/list_dns.html:70
+#: ../../web/templates/user/list_web.html:75
+#: ../../web/templates/admin/list_dns.html:71
+#: ../../web/templates/admin/list_web.html:70
+msgid "UNSUSPEND_DOMAIN_CONFIRMATION"
+msgstr ""
+
+#: ../../web/templates/user/list_dns.html:75
+#: ../../web/templates/user/list_web.html:80
+#: ../../web/templates/user/list_mail.html:75
+#: ../../web/templates/user/list_mail.html:80
+#: ../../web/templates/admin/list_dns.html:76
+#: ../../web/templates/admin/list_web.html:75
+#: ../../web/templates/admin/list_mail.html:76
+#: ../../web/templates/admin/list_mail.html:81
+msgid "SUSPEND_DOMAIN_CONFIRMATION"
+msgstr ""
+
 #: ../../web/templates/user/list_dns.html:87
 #: ../../web/templates/user/list_dns.html:96
 #: ../../web/templates/admin/edit_package.html:216
@@ -1312,7 +1366,7 @@ msgstr ""
 
 #: ../../web/templates/user/list_dns.html:103
 #: ../../web/templates/user/list_dns.html:112
-#: ../../web/templates/user/list_dns_rec.html:84
+#: ../../web/templates/user/list_dns_rec.html:75
 #: ../../web/templates/user/list_cron.html:101
 #: ../../web/templates/user/list_cron.html:110
 #: ../../web/templates/user/list_web.html:154
@@ -1359,7 +1413,7 @@ msgid "Confirmation"
 msgstr ""
 
 #: ../../web/templates/user/list_dns.html:113
-#: ../../web/templates/user/list_dns_rec.html:85
+#: ../../web/templates/user/list_dns_rec.html:76
 #: ../../web/templates/user/list_web.html:164
 #: ../../web/templates/user/list_mail.html:120
 #: ../../web/templates/admin/list_web.html:159
@@ -1421,20 +1475,20 @@ msgstr ""
 msgid "IP or Value"
 msgstr ""
 
-#: ../../web/templates/user/list_dns_rec.html:74
-#: ../../web/templates/user/list_dns_rec.html:79
+#: ../../web/templates/user/list_dns_rec.html:65
+#: ../../web/templates/user/list_dns_rec.html:70
 #: ../../web/templates/admin/list_dns_rec.html:67
 #: ../../web/templates/admin/list_dns_rec.html:72
 #: ../../web/templates/admin/edit_dns_rec.html:40
 msgid "Editing DNS Record"
 msgstr ""
 
-#: ../../web/templates/user/list_dns_rec.html:110
+#: ../../web/templates/user/list_dns_rec.html:101
 #: ../../web/templates/admin/list_dns_rec.html:105
 msgid "1 DNS record"
 msgstr ""
 
-#: ../../web/templates/user/list_dns_rec.html:112
+#: ../../web/templates/user/list_dns_rec.html:103
 #: ../../web/templates/admin/list_dns_rec.html:107
 #, php-format
 msgid "%s DNS records"
@@ -1679,7 +1733,12 @@ msgstr ""
 
 #: ../../web/templates/user/edit_web.html:482
 #: ../../web/templates/user/edit_web.html:558
-msgid "Prefix will be automaticaly added to username"
+#: ../../web/templates/admin/edit_web.html:468
+#: ../../web/templates/admin/edit_web.html:544
+#: ../../web/templates/admin/add_web.html:333
+#: ../../web/templates/admin/add_web.html:405
+#, php-format
+msgid "Prefix %s will be added to username automatically"
 msgstr ""
 
 #: ../../web/templates/user/edit_web.html:505
@@ -1769,6 +1828,16 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+#: ../../web/templates/user/list_cron.html:75
+#: ../../web/templates/admin/list_cron.html:75
+msgid "UNSUSPEND_CRON_CONFIRMATION"
+msgstr ""
+
+#: ../../web/templates/user/list_cron.html:80
+#: ../../web/templates/admin/list_cron.html:80
+msgid "SUSPEND_CRON_CONFIRMATION"
+msgstr ""
+
 #: ../../web/templates/user/list_cron.html:91
 #: ../../web/templates/user/list_cron.html:96
 #: ../../web/templates/admin/list_cron.html:91
@@ -1897,12 +1966,12 @@ msgstr ""
 msgid "Package"
 msgstr ""
 
-#: ../../web/templates/user/list_user.html:142
+#: ../../web/templates/user/list_user.html:133
 #: ../../web/templates/admin/list_user.html:166
 msgid "1 user account"
 msgstr ""
 
-#: ../../web/templates/user/list_user.html:144
+#: ../../web/templates/user/list_user.html:135
 #: ../../web/templates/admin/list_user.html:168
 #, php-format
 msgid "%s user accounts"
@@ -1953,6 +2022,16 @@ msgstr ""
 msgid "Charset"
 msgstr ""
 
+#: ../../web/templates/user/list_db.html:98
+#: ../../web/templates/admin/list_db.html:99
+msgid "UNSUSPEND_DATABASE_CONFIRMATION"
+msgstr ""
+
+#: ../../web/templates/user/list_db.html:103
+#: ../../web/templates/admin/list_db.html:104
+msgid "SUSPEND_DATABASE_CONFIRMATION"
+msgstr ""
+
 #: ../../web/templates/user/list_db.html:123
 #: ../../web/templates/user/list_db.html:128
 #: ../../web/templates/admin/edit_db.html:41
@@ -2050,6 +2129,16 @@ msgstr ""
 msgid "Autoreply"
 msgstr ""
 
+#: ../../web/templates/user/list_mail_acc.html:72
+#: ../../web/templates/admin/list_mail_acc.html:72
+msgid "UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION"
+msgstr ""
+
+#: ../../web/templates/user/list_mail_acc.html:77
+#: ../../web/templates/admin/list_mail_acc.html:77
+msgid "SUSPEND_MAIL_ACCOUNT_CONFIRMATION"
+msgstr ""
+
 #: ../../web/templates/user/list_mail_acc.html:90
 #: ../../web/templates/user/list_mail_acc.html:97
 #: ../../web/templates/admin/edit_mail_acc.html:41
@@ -2226,19 +2315,19 @@ msgstr ""
 msgid "Hestia Control Panel"
 msgstr ""
 
-#: ../../web/templates/login_2.html:18
+#: ../../web/templates/login_2.html:16
 msgid "2 Factor Authentication"
 msgstr ""
 
-#: ../../web/templates/login_2.html:23
+#: ../../web/templates/login_2.html:21
 msgid "2FA Token"
 msgstr ""
 
-#: ../../web/templates/login_2.html:26
+#: ../../web/templates/login_2.html:24
 msgid "Forgot token"
 msgstr ""
 
-#: ../../web/templates/login_2.html:42 ../../web/templates/login_1.html:42
+#: ../../web/templates/login_2.html:40 ../../web/templates/login_1.html:42
 msgid "Login"
 msgstr ""
 
@@ -2259,10 +2348,6 @@ msgid "2FA Reset Code"
 msgstr ""
 
 #: ../../web/templates/reset2fa.html:54 ../../web/templates/reset_1.html:40
-msgid "RESET_NOTICE"
-msgstr ""
-
-#: ../../web/templates/reset2fa.html:59 ../../web/templates/reset_1.html:45
 msgid "Submit"
 msgstr ""
 
@@ -2465,42 +2550,6 @@ msgstr ""
 msgid "maximum characters length, including prefix"
 msgstr ""
 
-#: ../../web/templates/admin/edit_db.html:95
-#: ../../web/templates/admin/edit_user.html:82
-#: ../../web/templates/admin/add_db.html:97
-#: ../../web/templates/admin/add_mail_acc.html:81
-#: ../../web/templates/admin/edit_mail_acc.html:82
-#: ../../web/templates/admin/add_user.html:77
-msgid "Your password must have at least"
-msgstr ""
-
-#: ../../web/templates/admin/edit_db.html:97
-#: ../../web/templates/admin/edit_user.html:84
-#: ../../web/templates/admin/add_db.html:99
-#: ../../web/templates/admin/add_mail_acc.html:83
-#: ../../web/templates/admin/edit_mail_acc.html:84
-#: ../../web/templates/admin/add_user.html:79
-msgid "8 characters long"
-msgstr ""
-
-#: ../../web/templates/admin/edit_db.html:98
-#: ../../web/templates/admin/edit_user.html:85
-#: ../../web/templates/admin/add_db.html:100
-#: ../../web/templates/admin/add_mail_acc.html:84
-#: ../../web/templates/admin/edit_mail_acc.html:85
-#: ../../web/templates/admin/add_user.html:80
-msgid "1 uppercase & 1 lowercase character"
-msgstr ""
-
-#: ../../web/templates/admin/edit_db.html:99
-#: ../../web/templates/admin/edit_user.html:86
-#: ../../web/templates/admin/add_db.html:101
-#: ../../web/templates/admin/add_mail_acc.html:85
-#: ../../web/templates/admin/edit_mail_acc.html:86
-#: ../../web/templates/admin/add_user.html:81
-msgid "1 number"
-msgstr ""
-
 #: ../../web/templates/admin/edit_backup_exclusions.html:40
 #: ../../web/templates/admin/list_backup_exclusions.html:5
 msgid "Editing Backup Exclusions"
@@ -2658,18 +2707,6 @@ msgstr ""
 msgid "PHP CLI Version"
 msgstr ""
 
-#: ../../web/templates/admin/list_dns.html:71
-#: ../../web/templates/admin/list_web.html:70
-msgid "UNSUSPEND_DOMAIN_CONFIRMATION"
-msgstr ""
-
-#: ../../web/templates/admin/list_dns.html:76
-#: ../../web/templates/admin/list_web.html:75
-#: ../../web/templates/admin/list_mail.html:76
-#: ../../web/templates/admin/list_mail.html:81
-msgid "SUSPEND_DOMAIN_CONFIRMATION"
-msgstr ""
-
 #: ../../web/templates/admin/edit_firewall.html:41
 #: ../../web/templates/admin/list_firewall.html:82
 #: ../../web/templates/admin/list_firewall.html:102
@@ -2753,14 +2790,6 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../../web/templates/admin/edit_web.html:468
-#: ../../web/templates/admin/edit_web.html:544
-#: ../../web/templates/admin/add_web.html:333
-#: ../../web/templates/admin/add_web.html:405
-#, php-format
-msgid "Prefix %s will be added to username automatically"
-msgstr ""
-
 #: ../../web/templates/admin/edit_server.html:78
 msgid "Time Zone"
 msgstr ""
@@ -2984,14 +3013,6 @@ msgstr ""
 msgid "Adding DNS Record"
 msgstr ""
 
-#: ../../web/templates/admin/list_cron.html:75
-msgid "UNSUSPEND_CRON_CONFIRMATION"
-msgstr ""
-
-#: ../../web/templates/admin/list_cron.html:80
-msgid "SUSPEND_CRON_CONFIRMATION"
-msgstr ""
-
 #: ../../web/templates/admin/list_services.html:4
 #: ../../web/templates/admin/edit_server_nginx.html:5
 #: ../../web/templates/admin/edit_server_httpd.html:5
@@ -3624,14 +3645,6 @@ msgstr ""
 msgid "%s IP addresses"
 msgstr ""
 
-#: ../../web/templates/admin/list_db.html:99
-msgid "UNSUSPEND_DATABASE_CONFIRMATION"
-msgstr ""
-
-#: ../../web/templates/admin/list_db.html:104
-msgid "SUSPEND_DATABASE_CONFIRMATION"
-msgstr ""
-
 #: ../../web/templates/admin/edit_mail_acc.html:136
 msgid "Message"
 msgstr ""
@@ -3648,14 +3661,6 @@ msgstr ""
 msgid "Adding Package"
 msgstr ""
 
-#: ../../web/templates/admin/list_mail_acc.html:72
-msgid "UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION"
-msgstr ""
-
-#: ../../web/templates/admin/list_mail_acc.html:77
-msgid "SUSPEND_MAIL_ACCOUNT_CONFIRMATION"
-msgstr ""
-
 #: ../../web/templates/admin/list_ssl.html:74
 msgid "SSL CSR"
 msgstr ""
@@ -3890,11 +3895,11 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../web/login/index.php:54 ../../web/login/index.php:90
+#: ../../web/login/index.php:52 ../../web/login/index.php:85
 msgid "Invalid username or password"
 msgstr ""
 
-#: ../../web/login/index.php:107
+#: ../../web/login/index.php:104
 msgid "Invalid or missing 2FA token"
 msgstr ""
 
@@ -3965,6 +3970,11 @@ msgstr ""
 msgid "Info (Read-only mode): Crontab can be edited only trough ssh"
 msgstr ""
 
+#: ../../web/update/hestia/index.php:22
+#, php-format
+msgid "Error: %s update failed"
+msgstr ""
+
 #: ../../web/js/i18n.js.php:8
 msgid "Are you sure?"
 msgstr ""

web/templates/admin/list_dns.html

@@ -111,7 +111,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                         <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                           <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                             <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                              <p class="confirmation"><?=sprintf_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
+                              <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                             </div>
                           </a>
                         </div>

web/templates/admin/list_services.html

@@ -58,7 +58,7 @@
                         <i class="fas fa-flask icon-large status-icon red" title="<?php echo $sys['sysinfo']['RELEASE'];?>"></i>
                       <? } ?>
                       <? if($sys['sysinfo']['RELEASE'] == 'release') { ?>
-                        <i class="fas fa-cube icon-large status-icon" title="<?=__('Production release')?>"></i>
+                        <i class="fas fa-cube icon-large status-icon" title="<?=_('Production release')?>"></i>
                       <? } ?>
                       &nbsp;v<?=$sys['sysinfo']['HESTIA']?></div>
                   </div>

web/templates/reset2fa.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
-                                    <a href="/"><img border=0 src="/images/logo.png" alt="Hestia Control Panel" style="margin: 20px; margin-top: 64px;" /></a>
+                                    <a href="/"><img border=0 src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" style="margin-top: 70px;" /></a>
                                 </td>
                                 <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <?php if($success){?>
@@ -49,11 +49,6 @@
                                                     <input tabindex="1" type="text" size="20px" style="width:240px" name="twofa" class="vst-input">
                                                 </td>
                                             </tr>
-                                            <tr>
-                                                <td style="padding: 12px 0 0 2px;">
-                                                    <?php print _('RESET_NOTICE');?>
-                                                </td>
-                                            </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
                                                     <input tabindex="2" type="submit" value="<?php print _('Submit');?>" class="button">&nbsp;&nbsp;

web/templates/reset_1.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
-                                    <a href="/"><img border=0 src="/images/logo.png" alt="Hestia Control Panel" style="margin: 20px; margin-top: 64px;" /></a>
+                                    <a href="/"><img border=0 src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" style="margin-top: 70px;" /></a>
                                 </td>
                                 <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <form method="post" action="/reset/">
@@ -35,11 +35,6 @@
                                                     <input tabindex="1" type="text" size="20px" style="width:240px" name="email" class="vst-input">
                                                 </td>
                                             </tr>
-                                            <tr>
-                                                <td style="padding: 12px 0 0 2px;">
-                                                    <?php print _('RESET_NOTICE');?>
-                                                </td>
-                                            </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
                                                     <input tabindex="2" type="submit" value="<?php print _('Submit');?>" class="button">&nbsp;&nbsp;

web/templates/reset_2.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
-                                    <a href="/"><img border=0 src="/images/logo.svg" alt="Hestia Control Panel" style="margin-top: 70px;" /></a>
+                                    <a href="/"><img border=0 src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" style="margin-top: 70px;" /></a>
                                 </td>
                                 <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <form method="get" action="/reset/" >

web/templates/reset_3.html

@@ -5,7 +5,7 @@
                         <table>
                             <tr>
                                 <td style="padding: 22px 30px 0 42px; height: 280px; width: 170px;">
-                                    <a href="/"><img border=0 src="/images/logo.svg" alt="Hestia Control Panel" style="margin-top: 70px;" /></a>
+                                    <a href="/"><img border=0 src="/images/logo.svg" alt="<?=_('Hestia Control Panel');?>" style="margin-top: 70px;" /></a>
                                 </td>
                                 <td style="padding: 40px 60px 0 0;" class="animated fadeIn">
                                     <form method="post">