Fixes most string issues

Gettext unable  work with to _('Error %s field empty', $string);

Things to do:
- Check emails / remove \n in translations files
- Update translations files
- Updated scanner...

web/add/cron/index.php

@@ -30,7 +30,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input

web/add/db/index.php

@@ -30,7 +30,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Validate email
@@ -89,15 +89,15 @@ if (!empty($_POST['ok'])) {
         $to = $v_db_email;
         $subject = _("Database Credentials");
         $hostname = exec('hostname');
-        $from = _('MAIL_FROM',$hostname);
-        $mailtext = _('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
+        $from = sprintf(_('MAIL_FROM'),$hostname);
+        $mailtext = sprintf(_('DATABASE_READY'),$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
         send_email($to, $subject, $mailtext, $from);
     }
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database']));
-        $_SESSION['ok_msg'] .= " / <a href=".$db_admin_link." target='_blank'>" . _('open %s',$db_admin) . "</a>";
+        $_SESSION['ok_msg'] = sprintf(_('DATABASE_CREATED_OK'),htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database']));
+        $_SESSION['ok_msg'] .= " / <a href=".$db_admin_link." target='_blank'>" . sprintf(_('open %s'),$db_admin) . "</a>";
         unset($v_database);
         unset($v_dbuser);
         unset($v_password);

web/add/dns/index.php

@@ -31,7 +31,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input
@@ -85,7 +85,7 @@ if (!empty($_POST['ok'])) {
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('DNS_DOMAIN_CREATED_OK',htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain']));
+        $_SESSION['ok_msg'] = sprintf(_('DNS_DOMAIN_CREATED_OK'),htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain']));
         unset($v_domain);
     }
 }
@@ -113,7 +113,7 @@ if (!empty($_POST['ok_rec'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input
@@ -134,7 +134,7 @@ if (!empty($_POST['ok_rec'])) {
     
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('DNS_RECORD_CREATED_OK',htmlentities($_POST['v_rec']),htmlentities($_POST['v_domain']));
+        $_SESSION['ok_msg'] = sprintf(_('DNS_RECORD_CREATED_OK'),htmlentities($_POST['v_rec']),htmlentities($_POST['v_domain']));
         unset($v_domain);
         unset($v_rec);
         unset($v_val);

web/add/firewall/banlist/index.php

@@ -32,7 +32,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input

web/add/firewall/index.php

@@ -51,7 +51,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input

web/add/firewall/ipset/index.php

@@ -35,7 +35,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     $v_ipname = $_POST['v_ipname'];

web/add/ip/index.php

@@ -34,7 +34,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input
@@ -66,7 +66,7 @@ if (!empty($_POST['ok'])) {
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('IP_CREATED_OK',htmlentities($_POST['v_ip']),htmlentities($_POST['v_ip']));
+        $_SESSION['ok_msg'] = sprintf(_('IP_CREATED_OK'),htmlentities($_POST['v_ip']),htmlentities($_POST['v_ip']));
         unset($v_ip);
         unset($v_netmask);
         unset($v_name);

web/add/mail/index.php

@@ -44,7 +44,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Check antispam option
@@ -82,7 +82,7 @@ if (!empty($_POST['ok'])) {
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('MAIL_DOMAIN_CREATED_OK',htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain']));
+        $_SESSION['ok_msg'] = sprintf(_('MAIL_DOMAIN_CREATED_OK'),htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain']));
         unset($v_domain);
     }
 }
@@ -111,7 +111,7 @@ if (!empty($_POST['ok_acc'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Validate email
@@ -204,14 +204,14 @@ if (!empty($_POST['ok_acc'])) {
         $to = $v_send_email;
         $subject = _("Email Credentials");
         $hostname = exec('hostname');
-        $from = _('MAIL_FROM', $hostname);
+        $from = sprintf(_('MAIL_FROM'), $hostname);
         $mailtext = $v_credentials;
         send_email($to, $subject, $mailtext, $from);
     }
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]));
+        $_SESSION['ok_msg'] = sprintf(_('MAIL_ACCOUNT_CREATED_OK'),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]));
         unset($v_account);
         unset($v_password);
         unset($v_password);

web/add/package/index.php

@@ -57,7 +57,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input
@@ -149,7 +149,7 @@ if (!empty($_POST['ok'])) {
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('PACKAGE_CREATED_OK',htmlentities($_POST['v_package']),htmlentities($_POST['v_package']));
+        $_SESSION['ok_msg'] = sprintf(_('PACKAGE_CREATED_OK'),htmlentities($_POST['v_package']),htmlentities($_POST['v_package']));
         unset($v_package);
     }
 

web/add/user/index.php

@@ -27,7 +27,7 @@ if (!empty($_POST['ok'])) {
     if (empty($_POST['v_package'])) $errrors[] = _('package');
     if (empty($_POST['v_email'])) $errors[] = _('email');
     if (empty($_POST['v_name'])) $errors[] = _('name');
-    if (!empty($errors[0])) {
+    if (!empty($errors)) {
         foreach ($errors as $i => $error) {
             if ( $i == 0 ) {
                 $error_msg = $error;
@@ -35,7 +35,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Validate email
@@ -91,20 +91,20 @@ if (!empty($_POST['ok'])) {
         $subject = _("Welcome to Hestia Control Panel"); //currently not supported to use the account language
         $hostname = exec('hostname');
         unset($output);
-        $from = _('MAIL_FROM',$hostname); //currently not supported to use the account language
+        $from = sprintf(_('MAIL_FROM'),$hostname); //currently not supported to use the account language
 
         if (!empty($_POST['v_name'])) {
-            $mailtext = _('GREETINGS_GORDON',$_POST['v_name']);
+            $mailtext = sprintf(_('GREETINGS_GORDON'),$_POST['v_name'])."\r\n";
         } else {
-            $mailtext = _('GREETINGS');
+            $mailtext = _('GREETINGS')."\r\n";
         }
-        $mailtext .= _($_POST['v_language'],'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']);
+        $mailtext .= sprintf(_('ACCOUNT_READY'),$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']);
         send_email($to, $subject, $mailtext, $from);
     }
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('USER_CREATED_OK',htmlentities($_POST['v_username']),htmlentities($_POST['v_username']));
+        $_SESSION['ok_msg'] = sprintf(_('USER_CREATED_OK'),htmlentities($_POST['v_username']),htmlentities($_POST['v_username']));
         $_SESSION['ok_msg'] .= " / <a href=/login/?loginas=".htmlentities($_POST['v_username']).">" . _('login as') ." ".htmlentities($_POST['v_username']). "</a>";
         unset($v_username);
         unset($v_password);

web/add/web/index.php

@@ -28,7 +28,7 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Check stats password length
@@ -288,7 +288,7 @@ if (!empty($_POST['ok'])) {
                             $error_msg = $error_msg.", ".$error;
                         }
                     }
-                    $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+                    $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
                 }
 
                 // Validate email
@@ -321,8 +321,8 @@ if (!empty($_POST['ok'])) {
                     if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {
                         $to = $v_ftp_user_data['v_ftp_email'];
                         $subject = _("FTP login credentials");
-                        $from = _('MAIL_FROM', $v_domain );
-                        $mailtext = _('FTP_ACCOUNT_READY',$v_domain,$user,$v_ftp_user_data['v_ftp_user'],$v_ftp_user_data['v_ftp_password']);
+                        $from = sprintf(_('MAIL_FROM'), $v_domain );
+                        $mailtext = sprintf(_('FTP_ACCOUNT_READY'),$v_domain,$user,$v_ftp_user_data['v_ftp_user'],$v_ftp_user_data['v_ftp_password']);
                         send_email($to, $subject, $mailtext, $from);
                         unset($v_ftp_email);
                     }
@@ -351,7 +351,7 @@ if (!empty($_POST['ok'])) {
         }
 
         if (!empty($_SESSION['error_msg']) && $domain_added) {
-            $_SESSION['ok_msg'] = _('WEB_DOMAIN_CREATED_OK',htmlentities($v_domain),htmlentities($v_domain));
+            $_SESSION['ok_msg'] = sprintf(_('WEB_DOMAIN_CREATED_OK'),htmlentities($v_domain),htmlentities($v_domain));
             $_SESSION['flash_error_msg'] = $_SESSION['error_msg'];
             $url = '/edit/web/?domain='.strtolower(preg_replace("/^www\./i", "", $v_domain));
             header('Location: ' . $url);
@@ -361,7 +361,7 @@ if (!empty($_POST['ok'])) {
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('WEB_DOMAIN_CREATED_OK',htmlentities($v_domain),htmlentities($v_domain));
+        $_SESSION['ok_msg'] = sprintf(_('WEB_DOMAIN_CREATED_OK'),htmlentities($v_domain),htmlentities($v_domain));
         unset($v_domain);
         unset($v_aliases);
         unset($v_ssl);

web/bulk/cron/index.php

@@ -25,7 +25,7 @@ if ($_SESSION['user'] == 'admin') {
             break;
         case 'delete-cron-reports': $cmd='v-delete-cron-reports';
             exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
-            $_SESSION['error_msg'] = _('Cronjob email reporting has been successfully diabled');
+            $_SESSION['error_msg'] = _('Cronjob email reporting has been successfully disabled');
             unset($output);
             header("Location: /list/cron/");
             exit;
@@ -45,7 +45,7 @@ if ($_SESSION['user'] == 'admin') {
             break;
         case 'delete-cron-reports': $cmd='v-delete-cron-reports';
             exec (HESTIA_CMD.$cmd." ".$user, $output, $return_var);
-            $_SESSION['error_msg'] = _('Cronjob email reporting has been successfully diabled');
+            $_SESSION['error_msg'] = _('Cronjob email reporting has been successfully disabled');
             unset($output);
             header("Location: /list/cron/");
             exit;

web/download/backup/index.php

@@ -21,7 +21,7 @@ if(!file_exists('/backup/'.$backup)){
     } else {
         $_SESSION['error_msg'] = implode('<br>', $output);
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['error_msg'] = _('Error: hestia did not return any output.');
+            $_SESSION['error_msg'] = _('Error: Hestia did not return any output.');
         }    
     }
     unset($output);

web/edit/mail/index.php

@@ -520,7 +520,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
         $to = $v_send_email;
         $subject = _("Email Credentials");
         $hostname = exec('hostname');
-        $from = _('MAIL_FROM', $hostname);
+        $from = sprintf(_('MAIL_FROM'), $hostname);
         $mailtext = $v_credentials;
         send_email($to, $subject, $mailtext, $from);
     }

web/edit/user/index.php

@@ -200,7 +200,7 @@ if (!empty($_POST['save'])) {
     // Change full name
     if ($v_name != $_POST['v_name']){
             if (empty($_POST['v_name'])) {
-                 $_SESSION['error_msg'] = __('Please enter a valid name');
+                 $_SESSION['error_msg'] = _('Please enter a valid name');
             }else{
                 $v_name = escapeshellarg($_POST['v_name']);
                 exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username). " ".$v_name, $output, $return_var);

web/edit/web/index.php

@@ -656,8 +656,8 @@ if (!empty($_POST['save'])) {
                         $to = $v_ftp_user_data['v_ftp_email'];
                         $subject = _("FTP login credentials");
                         $hostname = exec('hostname');
-                        $from = _('MAIL_FROM',$hostname);
-                        $mailtext = _('FTP_ACCOUNT_READY',escapeshellarg($_GET['domain']),$user,$v_ftp_username,$v_ftp_user_data['v_ftp_password']);
+                        $from = sprintf(_('MAIL_FROM'),$hostname);
+                        $mailtext = sprintf(_('FTP_ACCOUNT_READY'),escapeshellarg($_GET['domain']),$user,$v_ftp_username,$v_ftp_user_data['v_ftp_password']);
                         send_email($to, $subject, $mailtext, $from);
                         unset($v_ftp_email);
                     }

web/generate/ssl/index.php

@@ -56,7 +56,7 @@ if (!empty($errors[0])) {
             $error_msg = $error_msg.", ".$error;
         }
     }
-    $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+    $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);
     exit;
@@ -83,7 +83,7 @@ $v_org = $_POST['v_org'];
 // Check return code
 if ($return_var != 0) {
     $error = implode('<br>', $output);
-    if (empty($error)) $error = _('Error code:',$return_var);
+    if (empty($error)) $error = sprintf(_('Error code:'),$return_var);
     $_SESSION['error_msg'] = $error;
     render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);

web/inc/mail-wrapper.php

@@ -91,7 +91,7 @@ function check_error($return_var) {
 function check_return_code($return_var,$output) {
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = sprintf(_('Error code:'),$return_var);
         $_SESSION['error_msg'] = $error;
     }
 }

web/reset/index.php

@@ -28,16 +28,16 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) {
             $name = $data[$user]['NAME'];
             $contact = $data[$user]['CONTACT'];
             $to = $data[$user]['CONTACT'];
-            $subject = _('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
+            $subject = sprintf(_('MAIL_RESET_SUBJECT'),date("Y-m-d H:i:s"));
             $hostname = exec('hostname');
-            $from = _('MAIL_FROM',$hostname);
+            $from = sprintf(_('MAIL_FROM'),$hostname);
             if (!empty($name)) {
-                $mailtext = _('GREETINGS_GORDON',$name);
+                $mailtext = sprintf(_('GREETINGS_GORDON'),$name);
             } else {
                 $mailtext = _('GREETINGS');
             }
             if (in_array(str_replace(':'.$_SERVER['SERVER_PORT'],'.conf',$_SERVER['HTTP_HOST']), array_merge(scandir('/etc/nginx/conf.d'),scandir('/etc/nginx/conf.d/domains'),scandir('/etc/apache2/conf.d/domains'),scandir('/etc/apache2/conf.d')))){
-                $mailtext .= _('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
+                $mailtext .= sprintf(_('PASSWORD_RESET_REQUEST'),$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
                 if (!empty($rkey)) send_email($to, $subject, $mailtext, $from);
                 header("Location: /reset/?action=code&user=".$_POST['user']);
                 exit;

web/restart/system/index.php

@@ -27,7 +27,7 @@ if (isset($_GET['system_reset_token']) && is_numeric($_GET['system_reset_token']
     if ($_SESSION['user'] == 'admin') {
         if (!empty($_GET['hostname'])) {
             touch($reset_token_file);
-            $_SESSION['error_msg'] = 'The system is going down for reboot NOW!';
+            $_SESSION['error_msg'] = __('The system is going down for reboot NOW!');
             exec(HESTIA_CMD . "v-restart-system yes", $output, $return_var);
         }
         unset($output);

web/templates/admin/add_db.html

@@ -52,7 +52,8 @@
                             </tr>
                             <tr>
                                 <td class="step-top hint">
-                                    <?php print _('Prefix will be automaticaly added to database name and database user',"<b>".$user."_</b>");?>
+                                    <?php print sprintf(_('Prefix %s will be automatically added to database name and database user'),'<b>'.$user.'_</b>'); ?>
+                                </td>
                                 </td>
                             </tr>
                             <tr>
@@ -70,8 +71,7 @@
                                 <td class="vst-text input-label">
                                     <?php
                                         print _('Username');
-                                        // if (is_it_mysql_or_mariadb()=='mysql')
-                                        echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>("._('maximum characters length, including prefix', 32).")</small></em>";
+                                        echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".sprintf(_('maximum characters length, including prefix'), 32).")</small></em>";
                                     ?>
                                 </td>
                             </tr>

web/templates/admin/add_web.html

@@ -197,7 +197,7 @@
                             </tr>
                              <tr>
                                 <td class="vst-text step-top">
-                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"> <?php print __('Custom document root');?></label>
+                                    <label><input type="checkbox" size="20" class="vst-checkbox" name="v_custom_doc_root_check" <?php if (!empty($v_custom_doc_root)) echo "checked=yes" ?> onclick="javascript:elementHideShow('v_custom_doc_root');"><?php print _('Custom document root');?></label>
                                 </td>
                             </tr>
                             <tr>
@@ -205,7 +205,7 @@
                                     <table style="display:<?php if (empty($v_custom_doc_root)) { echo 'none';} else {echo 'block';}?> ;" id="v_custom_doc_root">
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('Point to');?>
+                                                <?php print _('Point to');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -233,7 +233,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print( __('Directory'));?> <span class="optional">(<?php print __('optional');?>)</span>
+                                                <?php print( _('Directory'));?> <span class="optional">(<?php print _('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -330,7 +330,7 @@
                                         <tr>
                                             <td class="vst-text step-left input-label">
                                                 <?php print _('Username');?><br>
-                                                <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -402,7 +402,7 @@
                 <tr>
                     <td class="vst-text step-left input-label">
                         <?php print _('Username');?><br>
-                        <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                        <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                     </td>
                 </tr>
                 <tr>

web/templates/admin/edit_db.html

@@ -67,9 +67,10 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-
-                                    <?php print __('Username');?>
-                                    <?php echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum characters length, including prefix', 32).")</small></em>"; ?>
+                                    <?php
+                                        print _('Username');
+                                        echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".sprintf(_('maximum characters length, including prefix'), 32).")</small></em>";
+                                    ?>
                                 </td>
                             </tr>
                             <tr>

web/templates/admin/edit_mail_acc.html

@@ -79,11 +79,11 @@
                         </tr>
                         <tr>
                             <td class="vst-text">
-                                <?php print __('Your password must have at least');?>
+                                <?php print _('Your password must have at least');?>
                                 <ul>
-                                    <li><?php print __('8 characters long');?></li>
-                                    <li><?php print __('1 uppercase & 1 lowercase character');?></li>
-                                    <li><?php print __('1 number');?></li>
+                                    <li><?php print _('8 characters long');?></li>
+                                    <li><?php print _('1 uppercase & 1 lowercase character');?></li>
+                                    <li><?php print _('1 number');?></li>
                                     </ul>
                             </td>
                         </tr>

web/templates/admin/edit_web.html

@@ -465,7 +465,7 @@
                                         <tr>
                                             <td class="vst-text step-left input-label">
                                                 <?php print _('Username');?><br>
-                                                <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -541,7 +541,7 @@
                 <tr>
                     <td class="vst-text step-left input-label">
                         <?php print _('Username');?><br>
-                        <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                        <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                     </td>
                 </tr>
                 <tr>

web/templates/admin/list_cron.html

@@ -72,12 +72,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_CRON_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_CRON_CONFIRMATION') ;
           }
       ?>
 
@@ -99,7 +99,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                     <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                      <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                     </div>
                   </a>
                 </div>
@@ -108,7 +108,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                     <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('DELETE_CRON_CONFIRMATION',$key)?></p>
+                      <p class="confirmation"><?=sprintf(_('DELETE_CRON_CONFIRMATION'),$key)?></p>
                     </div>
                   </a>
                 </div>

web/templates/admin/list_db.html

@@ -96,12 +96,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_DATABASE_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_DATABASE_CONFIRMATION') ;
           }
           if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
           if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
@@ -132,7 +132,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                                 <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                                  <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                                 </div>
                               </a>
                             </div>
@@ -141,7 +141,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                                 <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_('DELETE_DATABASE_CONFIRMATION',$key)?></p>
+                                  <p class="confirmation"><?=sprintf(_('DELETE_DATABASE_CONFIRMATION'),$key)?></p>
                                 </div>
                               </a>
                             </div>

web/templates/admin/list_dns.html

@@ -68,12 +68,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION';
+            $spnd_confirmation = _('UNSUSPEND_DOMAIN_CONFIRMATION');
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION');
           }
       ?>
 
@@ -102,7 +102,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                         <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                          <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                         </div>
                       </a>
                     </div>
@@ -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"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                              <p class="confirmation"><?=sprintf_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                             </div>
                           </a>
                         </div>

web/templates/admin/list_dns_rec.html

@@ -56,15 +56,6 @@
       <?php
         foreach ($data as $key => $value) {
           ++$i;
-          if ($data[$key]['SUSPENDED'] == 'yes') {
-            $status = 'suspended';
-            $spnd_action = 'unsuspend' ;
-            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-          } else {
-            $status = 'active';
-            $spnd_action = 'suspend' ;
-            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-          }
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?>"
@@ -84,7 +75,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
                       <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                       <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" />
                       <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                        <p class="confirmation"><?=_('DELETE_RECORD_CONFIRMATION',$key)?></p>
+                        <p class="confirmation"><?=sprintf(_('DELETE_RECORD_CONFIRMATION'),$key)?></p>
                       </div>
                     </a>
                   </div>

web/templates/admin/list_firewall.html

@@ -62,12 +62,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_RULE_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_RULE_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_RULE_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_RULE_CONFIRMATION') ;
           }
       ?>
 
@@ -106,7 +106,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
                       <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                       <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                       <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                        <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                        <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                       </div>
                     </a>
                   </div>
@@ -115,7 +115,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
                       <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                       <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                       <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                        <p class="confirmation"><?=_('DELETE_RULE_CONFIRMATION',$key)?></p>
+                        <p class="confirmation"><?=sprintf(_('DELETE_RULE_CONFIRMATION'),$key)?></p>
                       </div>
                     </a>
                   </div>

web/templates/admin/list_firewall_banlist.html

@@ -62,7 +62,7 @@
                           <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                           <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$value['CHAIN']?>&token=<?=$_SESSION['token']?>" />
                           <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                            <p class="confirmation"><?=_('DELETE_IP_CONFIRMATION',$key)?></p>
+                            <p class="confirmation"><?=sprintf(_('DELETE_IP_CONFIRMATION'),$key)?></p>
                           </div>
                         </a>
                       </div>

web/templates/admin/list_firewall_ipset.html

@@ -70,7 +70,7 @@
                           <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                           <input type="hidden" name="delete_url" value="/delete/firewall/ipset/?listname=<?=$listname?>&token=<?=$_SESSION['token']?>" />
                           <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                            <p class="confirmation"><?=_('DELETE_IPSET_CONFIRMATION', $key)?></p>
+                            <p class="confirmation"><?=sprintf(_('DELETE_IPSET_CONFIRMATION'), $key)?></p>
                           </div>
                         </a>
                       </div>

web/templates/admin/list_ip.html

@@ -82,7 +82,7 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
                               <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                               <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                <p class="confirmation"><?=_('DELETE_IP_CONFIRMATION',$key)?></p>
+                                <p class="confirmation"><?=sprintf(_('DELETE_IP_CONFIRMATION'),$key)?></p>
                               </div>
                             </a>
                           </div>

web/templates/admin/list_key.html

@@ -38,7 +38,7 @@
                     <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/key/?key=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('DELETE_KEY_CONFIRM',$key)?></p>
+                      <p class="confirmation"><?=sprintf(_('DELETE_KEY_CONFIRM'),$key)?></p>
                     </div>
                   </a>
                 </div>

web/templates/admin/list_mail.html

@@ -73,12 +73,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION');
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION');
           }
           if (empty($data[$key]['CATCHALL'])) {
             $data[$key]['CATCHALL'] = '/dev/null';
@@ -109,7 +109,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                                 <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                                  <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                                 </div>
                               </a>
                             </div>
@@ -118,7 +118,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                                 <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                                  <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                                 </div>
                               </a>
                             </div>

web/templates/admin/list_mail_acc.html

@@ -69,12 +69,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION';
+            $spnd_confirmation = _('UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION');
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION';
+            $spnd_confirmation = _('SUSPEND_MAIL_ACCOUNT_CONFIRMATION');
           }
       ?>
 
@@ -101,7 +101,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                         <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                          <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                         </div>
                       </a>
                     </div>
@@ -110,7 +110,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                       <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                         <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key)?></p>
+                          <p class="confirmation"><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
                         </div>
                       </a>
                     </div>

web/templates/admin/list_packages.html

@@ -59,15 +59,6 @@
     <?php
       foreach ($data as $key => $value) {
         ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
-          $status = 'suspended';
-          $spnd_action = 'unsuspend' ;
-          $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
-        } else {
-          $status = 'active';
-          $spnd_action = 'suspend' ;
-          $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
-        }
     ?>
 
     <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
@@ -89,7 +80,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                             <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                             <input type="hidden" name="delete_url" value="/delete/package/?package=<?=$key?>&token=<?=$_SESSION['token']?>" />
                             <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                              <p class="confirmation"><?=_('DELETE_PACKAGE_CONFIRMATION',$key)?></p>
+                              <p class="confirmation"><?=sprintf(_('DELETE_PACKAGE_CONFIRMATION'),$key)?></p>
                             </div>
                           </a>
                         </div>

web/templates/admin/list_services.html

@@ -12,7 +12,7 @@
                 <?=_('Restart')?>
                 <input type="hidden" name="servicerestart_url" value="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>&system_reset_token=<?php echo time(); ?>" />
                   <div class="confirmation-text-servicerestart hidden" title="<?=_('Confirmation')?>">
-                    <p class="confirmation"><?=_('RESTART_CONFIRMATION', 'Server')?></p>
+                    <p class="confirmation"><?php print sprintf(_('RESTART_CONFIRMATION'), 'Server')?></p>
                   </div>
               </a>
           </div>
@@ -136,7 +136,7 @@
                     <i class="do_servicerestart data-controls fas fa-undo status-icon highlight status-icon dim icon-large"></i>
                   <input type="hidden" name="servicerestart_url" value="/restart/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>" />
                   <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-servicerestart hidden" title="<?=_('Confirmation')?>">
-                    <p class="confirmation"><?=_('RESTART_CONFIRMATION',$key)?></p>
+                    <p class="confirmation"><?php print sprintf(_('RESTART_CONFIRMATION'),$key); ?></p>
                   </div>
                 </a>
               </div>
@@ -145,7 +145,7 @@
                   <i class="do_servicestop fas <?=$spnd_icon?> status-icon red status-icon dim icon-large"></i>
                   <input type="hidden" name="servicestop_url" value="/<?php echo $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-servicestop hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('Are you sure you want to stop service',$key)?></p>
+                      <p class="confirmation"><?php if($action == 'stop'){ echo sprintf(_('Are you sure you want to stop service'),$key); }else{ echo sprintf(_('Are you sure you want to start service'),$key); }?></p>
                     </div>
                 </a>
               </div>

web/templates/admin/list_user.html

@@ -85,12 +85,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION';
+            $spnd_confirmation = _('UNSUSPEND_USER_CONFIRMATION');
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION';
+            $spnd_confirmation = _('SUSPEND_USER_CONFIRMATION');
           }
       ?>
 
@@ -123,7 +123,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                               <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                               <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                                <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                                <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                               </div>
                             </a>
                           </div>
@@ -132,7 +132,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                               <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                               <input type="hidden" name="delete_url" value="/delete/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>" />
                               <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                <p class="confirmation"><?=_('DELETE_USER_CONFIRMATION',$key)?></p>
+                                <p class="confirmation"><?=sprintf(_('DELETE_USER_CONFIRMATION'),$key)?></p>
                               </div>
                             </a>
                           </div>

web/templates/admin/list_web.html

@@ -67,12 +67,12 @@
                             $status = 'suspended';
                             $spnd_action = 'unsuspend';
                             $spnd_icon = 'fa-play';
-                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION';
+                            $spnd_confirmation = _('UNSUSPEND_DOMAIN_CONFIRMATION');
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend';
                             $spnd_icon = 'fa-pause';
-                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION';
+                            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION');
                         }
                         if (!empty($data[$key]['SSL_HOME'])) {
                             if ($data[$key]['SSL_HOME'] == 'same') {
@@ -147,7 +147,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                      <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                     </div>
                   </a>
                 </div>
@@ -156,7 +156,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                      <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                     </div>
                   </a>
                 </div>

web/templates/admin/list_weblog.html

@@ -24,8 +24,8 @@
       <a href="/" class="l-logo"></a>
       <div class="l-menu clearfix">
         <div class="l-menu__item"><a href="/list/web/" title="<?=_('Back')?>"><i class="fas fa-arrow-alt-circle-left"></i>&nbsp;&nbsp;&nbsp;<?=_('Back')?></a></div>
-        <div class="l-menu__item <?php if($_GET['type'] == 'access') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access" title="<?=_('AccessLog')?>"><i class="fas fa-eye"></i>&nbsp;&nbsp;&nbsp;<?=_('AccessLog')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access"><i class="fas fa-download"></i></a></div>
-        <div class="l-menu__item <?php if($_GET['type'] == 'error') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error" title="<?=_('ErrorLog')?>"><i class="fas fa-exclamation-circle"></i>&nbsp;&nbsp;&nbsp;<?=_('ErrorLog')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error"><i class="fas fa-download"></i></a></div>
+        <div class="l-menu__item <?php if($_GET['type'] == 'access') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access" title="<?=_('Access Log')?>"><i class="fas fa-eye"></i>&nbsp;&nbsp;&nbsp;<?=_('Access Log')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=access"><i class="fas fa-download"></i></a></div>
+        <div class="l-menu__item <?php if($_GET['type'] == 'error') echo 'l-menu__item--active' ?>"><a href="/list/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error" title="<?=_('Error Log')?>"><i class="fas fa-exclamation-circle"></i>&nbsp;&nbsp;&nbsp;<?=_('Error Log')?></a><a href="/download/web-log/?domain=<?=htmlentities($_GET['domain'])?>&type=error"><i class="fas fa-download"></i></a></div>
       </div>
       <div class="l-profile">
         <div class="l-menu__item"><a href="javascript:location.reload();" title="<?=_('Refresh')?>"><i class="fas fa-redo"></i></a></div>

web/templates/admin/panel.html

@@ -12,7 +12,7 @@
 		<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/" title="<?=_('Records')?>"><i class="fas fa-tasks panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Records')?></a></div>
 			<?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
-				<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/" title="<?=_('Fm')?>"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Fm')?></a></div>
+				<div class="l-menu__item <?php if($TAB == 'FM' ) echo 'l-menu__item--active' ?>"><a href="/fm/" title="<?=_('Files')?>"><i class="fas fa-folder-open panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Files')?></a></div>
 			<?php } ?>
 			<div class="l-menu__item <?php if($TAB == 'LOG' ) echo 'l-menu__item--active' ?>"><a href="/list/log/" title="<?=_('Log')?>"><i class="fas fa-history panel-icon"></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/" title="<?=_('Statistics')?>"><i class="fas fa-chart-line panel-icon"></i>&nbsp;&nbsp;&nbsp;<?=_('Statistics')?></a></div>

web/templates/user/edit_web.html

@@ -479,7 +479,7 @@
                                         <tr>
                                             <td class="vst-text step-left input-label">
                                                 <?php print _('Username');?><br>
-                                                <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -555,7 +555,7 @@
                 <tr>
                     <td class="vst-text step-left input-label">
                         <?php print _('Username');?><br>
-                        <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                        <span style="font-size: 10pt; color:#777;"><?php print sprintf(_('Prefix %s will be added to username automatically'),$user."_");?></span>
                     </td>
                 </tr>
                 <tr>

web/templates/user/list_cron.html

@@ -72,12 +72,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_CRON_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_CRON_CONFIRMATION') ;
           }
       ?>
 
@@ -99,7 +99,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                     <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                      <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                     </div>
                   </a>
                 </div>
@@ -108,7 +108,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
                     <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('DELETE_CRON_CONFIRMATION',$key)?></p>
+                      <p class="confirmation"><?=sprintf(_('DELETE_CRON_CONFIRMATION'),$key)?></p>
                     </div>
                   </a>
                 </div>

web/templates/user/list_db.html

@@ -95,12 +95,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_DATABASE_CONFIRMATION');
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_DATABASE_CONFIRMATION') ;
           }
           if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
           if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
@@ -131,7 +131,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                                 <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                                  <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                                 </div>
                               </a>
                             </div>
@@ -140,7 +140,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
                                 <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_('DELETE_DATABASE_CONFIRMATION',$key)?></p>
+                                  <p class="confirmation"><?=sprintf(_('DELETE_DATABASE_CONFIRMATION'),$key)?></p>
                                 </div>
                               </a>
                             </div>

web/templates/user/list_dns.html

@@ -67,12 +67,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_DOMAIN_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION') ;
           }
       ?>
 
@@ -101,7 +101,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
                         <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/dns/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                          <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                         </div>
                       </a>
                     </div>
@@ -110,7 +110,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"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                              <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                             </div>
                           </a>
                         </div>

web/templates/user/list_dns_rec.html

@@ -54,16 +54,7 @@
       <?php
         foreach ($data as $key => $value) {
           ++$i;
-          if ($data[$key]['SUSPENDED'] == 'yes') {
-            $status = 'suspended';
-            $spnd_action = 'unsuspend';
-            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-          } else {
-            $status = 'active';
-            $spnd_action = 'suspend';
-            $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
-          }
-      ?>
+        ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS_REC'][$key] == 1) echo ' l-unit--starred';?>"
 v_unit_id="<?=$key?>" v_section="dns_rec">
@@ -82,7 +73,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
                       <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                       <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?=htmlspecialchars($_GET['domain'])?>&record_id=<?=$data[$key]['ID']?>&token=<?=$_SESSION['token']?>" />
                       <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                        <p class="confirmation"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                        <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                       </div>
                     </a>
                   </div>

web/templates/user/list_mail.html

@@ -72,12 +72,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION') ;
           }
           if (empty($data[$key]['CATCHALL'])) {
             $data[$key]['CATCHALL'] = '/dev/null';
@@ -108,7 +108,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                                 <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                                 <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                                  <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                                 </div>
                               </a>
                             </div>
@@ -117,7 +117,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
                                 <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                                 <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                                 <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                                  <p class="confirmation"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                                  <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                                 </div>
                               </a>
                             </div>

web/templates/user/list_mail_acc.html

@@ -69,12 +69,12 @@
             $status = 'suspended';
             $spnd_action = 'unsuspend';
             $spnd_icon = 'fa-play';
-            $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
+            $spnd_confirmation = _('UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION') ;
           } else {
             $status = 'active';
             $spnd_action = 'suspend';
             $spnd_icon = 'fa-pause';
-            $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
+            $spnd_confirmation = _('SUSPEND_MAIL_ACCOUNT_CONFIRMATION') ;
           }
       ?>
 
@@ -101,7 +101,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                         <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                         <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?php echo $key ?>&token=<?=$_SESSION['token']?>" />
                         <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                          <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                         </div>
                       </a>
                     </div>
@@ -110,7 +110,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
                       <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                         <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?=htmlspecialchars($_GET['domain'])?>&account=<?=$key?>&token=<?=$_SESSION['token']?>" />
                         <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                          <p class="confirmation"><?=_('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key)?></p>
+                          <p class="confirmation"><?=sprintf(_('DELETE_MAIL_ACCOUNT_CONFIRMATION'),$key)?></p>
                         </div>
                       </a>
                     </div>

web/templates/user/list_user.html

@@ -85,15 +85,6 @@
       <?php
         foreach ($data as $key => $value) {
           ++$i;
-          if ($data[$key]['SUSPENDED'] == 'yes') {
-            $status = 'suspended';
-            $spnd_action = 'unsuspend' ;
-            $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
-          } else {
-            $status = 'active';
-            $spnd_action = 'suspend' ;
-            $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
-          }
       ?>
 
       <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"

web/templates/user/list_web.html

@@ -72,12 +72,12 @@
                             $status = 'suspended';
                             $spnd_action = 'unsuspend';
                             $spnd_icon = 'fa-play';
-                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
+                            $spnd_confirmation = _('UNSUSPEND_DOMAIN_CONFIRMATION') ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend';
                             $spnd_icon = 'fa-pause';
-                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+                            $spnd_confirmation = _('SUSPEND_DOMAIN_CONFIRMATION') ;
                         }
                         if (!empty($data[$key]['SSL_HOME'])) {
                             if ($data[$key]['SSL_HOME'] == 'same') {
@@ -152,7 +152,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     <i class="fas <?=$spnd_icon?> status-icon highlight status-icon dim do_<?=$spnd_action?>"></i>
                     <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_($spnd_confirmation,$key)?></p>
+                      <p class="confirmation"><?=sprintf($spnd_confirmation,$key)?></p>
                     </div>
                   </a>
                 </div>
@@ -161,7 +161,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     <i class="fas fa-trash status-icon red status-icon dim do_delete"></i>
                     <input type="hidden" name="delete_url" value="/delete/web/?domain=<?=$key?>&token=<?=$_SESSION['token']?>" />
                     <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
-                      <p class="confirmation"><?=_('DELETE_DOMAIN_CONFIRMATION',$key)?></p>
+                      <p class="confirmation"><?=sprintf(_('DELETE_DOMAIN_CONFIRMATION'),$key)?></p>
                     </div>
                   </a>
                 </div>

web/update/hestia/index.php

@@ -19,7 +19,7 @@ if ($_SESSION['user'] == 'admin') {
 
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = 'Error: '.$v_pkg.' update failed';
+        if (empty($error)) $error = sprintf(_('Error: %s update failed',$v_pkg);
             $_SESSION['error_msg'] = $error;
     }
     unset($output);