changed tranlsate function name from _() to __()

web/add/cron/index.php

@@ -16,12 +16,12 @@ top_panel($user,$TAB);
 //if ($_SESSION['user'] == 'admin') {
     if (!empty($_POST['ok'])) {
         // Check input
-        if (empty($_POST['v_min'])) $errors[] = _('minute');
-        if (empty($_POST['v_hour'])) $errors[] = _('hour');
-        if (empty($_POST['v_day'])) $errors[] = _('day');
-        if (empty($_POST['v_month'])) $errors[] = _('month');
-        if (empty($_POST['v_wday'])) $errors[] = _('day of week');
-        if (empty($_POST['v_cmd'])) $errors[] = _('cmd');
+        if (empty($_POST['v_min'])) $errors[] = __('minute');
+        if (empty($_POST['v_hour'])) $errors[] = __('hour');
+        if (empty($_POST['v_day'])) $errors[] = __('day');
+        if (empty($_POST['v_month'])) $errors[] = __('month');
+        if (empty($_POST['v_wday'])) $errors[] = __('day of week');
+        if (empty($_POST['v_cmd'])) $errors[] = __('cmd');
 
         // Protect input
         $v_min = escapeshellarg($_POST['v_min']);
@@ -40,7 +40,7 @@ top_panel($user,$TAB);
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             // Add Cron Job
             exec (VESTA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
@@ -48,12 +48,12 @@ top_panel($user,$TAB);
             $v_charset = $_POST['v_charset'];
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
                 unset($v_password);
                 unset($output);
             } else {
-                $_SESSION['ok_msg'] = _('CRON_CREATED_OK');
+                $_SESSION['ok_msg'] = __('CRON_CREATED_OK');
                 unset($v_min);
                 unset($v_hour);
                 unset($v_day);

web/add/db/index.php

@@ -16,11 +16,11 @@ $v_db_email = $panel[$user]['CONTACT'];
 
 if (!empty($_POST['ok'])) {
     // Check input
-    if (empty($_POST['v_database'])) $errors[] = _('database');
-    if (empty($_POST['v_dbuser'])) $errors[] = _('username');
-    if (empty($_POST['v_password'])) $errors[] = _('password');
-    if (empty($_POST['v_type'])) $errors[] = _('type');
-    if (empty($_POST['v_charset'])) $errors[] = _('charset');
+    if (empty($_POST['v_database'])) $errors[] = __('database');
+    if (empty($_POST['v_dbuser'])) $errors[] = __('username');
+    if (empty($_POST['v_password'])) $errors[] = __('password');
+    if (empty($_POST['v_type'])) $errors[] = __('type');
+    if (empty($_POST['v_charset'])) $errors[] = __('charset');
 
     // Check for errors
     if (!empty($errors[0])) {
@@ -31,13 +31,13 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
     }
 
     // Validate email
     if (!empty($_POST['v_db_email'])) {
         if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
-            $_SESSION['error_msg'] = _('Please enter valid email address.');
+            $_SESSION['error_msg'] = __('Please enter valid email address.');
         }
     }
 
@@ -52,7 +52,7 @@ if (!empty($_POST['ok'])) {
     // Check password length
     if (empty($_SESSION['error_msg'])) {
         $pw_len = strlen($_POST['v_password']);
-        if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+        if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
     }
 
     if (empty($_SESSION['error_msg'])) {
@@ -64,7 +64,7 @@ if (!empty($_POST['ok'])) {
         $v_charset = $_POST['v_charset'];
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
             unset($v_password);
             unset($output);
@@ -74,13 +74,13 @@ if (!empty($_POST['ok'])) {
             if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
             if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
             $to = $v_db_email;
-            $subject = _("Database Credentials");
+            $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 = __('MAIL_FROM',$hostname);
+            $mailtext = __('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
             send_email($to, $subject, $mailtext, $from);
         }
-        $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
+        $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
         unset($v_database);
         unset($v_dbuser);
         unset($v_password);

web/add/dns/index.php

@@ -14,8 +14,8 @@ top_panel($user,$TAB);
 
 if (!empty($_POST['ok'])) {
     // Check input
-    if (empty($_POST['v_domain'])) $errors[] = _('domain');
-    if (empty($_POST['v_ip'])) $errors[] = _('ip');
+    if (empty($_POST['v_domain'])) $errors[] = __('domain');
+    if (empty($_POST['v_ip'])) $errors[] = __('ip');
 
     // Protect input
     $v_domain = preg_replace("/^www./i", "", $_POST['v_domain']);
@@ -41,13 +41,13 @@ if (!empty($_POST['ok'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
     } else {
         // Add DNS
         exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$ns4, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -58,7 +58,7 @@ if (!empty($_POST['ok'])) {
             exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -70,14 +70,14 @@ if (!empty($_POST['ok'])) {
             exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
         }
 
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+            $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
             unset($v_domain);
         }
     }
@@ -107,19 +107,19 @@ if (!empty($_POST['ok_rec'])) {
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
     } else {
         // Add DNS Record
         exec (VESTA_CMD."v-add-dns-domain-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var);
         $v_type = $_POST['v_type'];
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('DNS_RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
+            $_SESSION['ok_msg'] = __('DNS_RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
             unset($v_domain);
             unset($v_rec);
             unset($v_val);

web/add/ip/index.php

@@ -16,10 +16,10 @@ top_panel($user,$TAB);
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_POST['ok'])) {
         // Check input
-        if (empty($_POST['v_ip'])) $errors[] = _('ip address');
-        if (empty($_POST['v_netmask'])) $errors[] = _('netmask');
-        if (empty($_POST['v_interface'])) $errors[] = _('interface');
-        if (empty($_POST['v_owner'])) $errors[] = _('assigned user');
+        if (empty($_POST['v_ip'])) $errors[] = __('ip address');
+        if (empty($_POST['v_netmask'])) $errors[] = __('netmask');
+        if (empty($_POST['v_interface'])) $errors[] = __('interface');
+        if (empty($_POST['v_owner'])) $errors[] = __('assigned user');
 
         // Protect input
         $v_ip = escapeshellarg($_POST['v_ip']);
@@ -47,7 +47,7 @@ if ($_SESSION['user'] == 'admin') {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             // Add IP
             $v_interface = escapeshellarg($_POST['v_interface']);
@@ -57,12 +57,12 @@ if ($_SESSION['user'] == 'admin') {
             $v_interface = $_POST['v_interface'];
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
                 unset($v_password);
                 unset($output);
             } else {
-                $_SESSION['ok_msg'] = _('IP_CREATED_OK',$_POST['v_ip'],$_POST['v_ip']);
+                $_SESSION['ok_msg'] = __('IP_CREATED_OK',$_POST['v_ip'],$_POST['v_ip']);
                 unset($v_ip);
                 unset($v_netmask);
                 unset($v_name);

web/add/mail/index.php

@@ -16,7 +16,7 @@ top_panel($user,$TAB);
 //if ($_SESSION['user'] == 'admin') {
     // Mail Domain
     if (!empty($_POST['ok'])) {
-        if (empty($_POST['v_domain'])) $errors[] = _('domain');
+        if (empty($_POST['v_domain'])) $errors[] = __('domain');
         if (!empty($_POST['v_antispam'])) {
             $v_antispam = 'yes';
         } else {
@@ -48,20 +48,20 @@ top_panel($user,$TAB);
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
 
             // Add mail domain
             exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
 
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('MAIL_DOMAIN_CREATED_OK',$_POST['v_domain'],$_POST['v_domain']);
+                $_SESSION['ok_msg'] = __('MAIL_DOMAIN_CREATED_OK',$_POST['v_domain'],$_POST['v_domain']);
                 unset($v_domain);
             }
         }
@@ -71,9 +71,9 @@ top_panel($user,$TAB);
     // Mail Account
     if (!empty($_POST['ok_acc'])) {
         // Check input
-        if (empty($_POST['v_domain'])) $errors[] = _('domain');
-        if (empty($_POST['v_account'])) $errors[] = _('account');
-        if (empty($_POST['v_password'])) $errors[] = _('password');
+        if (empty($_POST['v_domain'])) $errors[] = __('domain');
+        if (empty($_POST['v_account'])) $errors[] = __('account');
+        if (empty($_POST['v_password'])) $errors[] = __('password');
 
         // Protect input
         $v_domain = escapeshellarg($_POST['v_domain']);
@@ -95,13 +95,13 @@ top_panel($user,$TAB);
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             // Add Mail Account
             exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
 
@@ -118,7 +118,7 @@ top_panel($user,$TAB);
                         exec (VESTA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var);
                         if ($return_var != 0) {
                             $error = implode('<br>', $output);
-                            if (empty($error)) $error = _('Error: vesta did not return any output.');
+                            if (empty($error)) $error = __('Error: vesta did not return any output.');
                             $_SESSION['error_msg'] = $error;
                         }
                     }
@@ -139,7 +139,7 @@ top_panel($user,$TAB);
                         exec (VESTA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var);
                         if ($return_var != 0) {
                             $error = implode('<br>', $output);
-                            if (empty($error)) $error = _('Error: vesta did not return any output.');
+                            if (empty($error)) $error = __('Error: vesta did not return any output.');
                             $_SESSION['error_msg'] = $error;
                         }
                     }
@@ -149,7 +149,7 @@ top_panel($user,$TAB);
 
             unset($output);
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('MAIL_ACCOUNT_CREATED_OK',$_POST['v_account'],$_POST[v_domain],$_POST['v_account'],$_POST[v_domain]);
+                $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',$_POST['v_account'],$_POST[v_domain],$_POST['v_account'],$_POST[v_domain]);
                 unset($v_account);
                 unset($v_password);
                 unset($v_password);

web/add/package/index.php

@@ -20,22 +20,22 @@ top_panel($user,$TAB);
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_POST['ok'])) {
         // Check input
-        if (empty($_POST['v_package'])) $errors[] = _('package');
-        if (empty($_POST['v_template'])) $errors[] = _('template');
-        if (empty($_POST['v_shell'])) $errrors[] = _('shell');
-        if (!isset($_POST['v_web_domains'])) $errors[] = _('web domains');
-        if (!isset($_POST['v_web_aliases'])) $errors[] = _('web aliases');
-        if (!isset($_POST['v_dns_domains'])) $errors[] = _('dns domains');
-        if (!isset($_POST['v_dns_records'])) $errors[] = _('dns records');
-        if (!isset($_POST['v_mail_domains'])) $errors[] = _('mail domains');
-        if (!isset($_POST['v_mail_accounts'])) $errors[] = _('mail accounts');
-        if (!isset($_POST['v_databases'])) $errors[] = _('databases');
-        if (!isset($_POST['v_cron_jobs'])) $errors[] = _('cron jobs');
-        if (!isset($_POST['v_backups'])) $errors[] = _('backups');
-        if (!isset($_POST['v_disk_quota'])) $errors[] = _('quota');
-        if (!isset($_POST['v_bandwidth'])) $errors[] = _('bandwidth');
-        if (empty($_POST['v_ns1'])) $errors[] = _('ns1');
-        if (empty($_POST['v_ns2'])) $errors[] = _('ns2');
+        if (empty($_POST['v_package'])) $errors[] = __('package');
+        if (empty($_POST['v_template'])) $errors[] = __('template');
+        if (empty($_POST['v_shell'])) $errrors[] = __('shell');
+        if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
+        if (!isset($_POST['v_web_aliases'])) $errors[] = __('web aliases');
+        if (!isset($_POST['v_dns_domains'])) $errors[] = __('dns domains');
+        if (!isset($_POST['v_dns_records'])) $errors[] = __('dns records');
+        if (!isset($_POST['v_mail_domains'])) $errors[] = __('mail domains');
+        if (!isset($_POST['v_mail_accounts'])) $errors[] = __('mail accounts');
+        if (!isset($_POST['v_databases'])) $errors[] = __('databases');
+        if (!isset($_POST['v_cron_jobs'])) $errors[] = __('cron jobs');
+        if (!isset($_POST['v_backups'])) $errors[] = __('backups');
+        if (!isset($_POST['v_disk_quota'])) $errors[] = __('quota');
+        if (!isset($_POST['v_bandwidth'])) $errors[] = __('bandwidth');
+        if (empty($_POST['v_ns1'])) $errors[] = __('ns1');
+        if (empty($_POST['v_ns2'])) $errors[] = __('ns2');
 
 
         // Protect input
@@ -73,7 +73,7 @@ if ($_SESSION['user'] == 'admin') {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             exec ('mktemp -d', $output, $return_var);
             $tmpdir = $output[0];
@@ -107,7 +107,7 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -119,7 +119,7 @@ if ($_SESSION['user'] == 'admin') {
 
             // Check output
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('PACKAGE_CREATED_OK',$_POST['v_package'],$_POST['v_package']);
+                $_SESSION['ok_msg'] = __('PACKAGE_CREATED_OK',$_POST['v_package'],$_POST['v_package']);
                 unset($v_package);
             }
 

web/add/user/index.php

@@ -19,12 +19,12 @@ top_panel($user,$TAB);
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_POST['ok'])) {
         // Check input
-        if (empty($_POST['v_username'])) $errors[] = _('user');
-        if (empty($_POST['v_password'])) $errors[] = _('password');
-        if (empty($_POST['v_package'])) $errrors[] = _('package');
-        if (empty($_POST['v_email'])) $errors[] = _('email');
-        if (empty($_POST['v_fname'])) $errors[] = _('first name');
-        if (empty($_POST['v_lname'])) $errors[] = _('last name');
+        if (empty($_POST['v_username'])) $errors[] = __('user');
+        if (empty($_POST['v_password'])) $errors[] = __('password');
+        if (empty($_POST['v_package'])) $errrors[] = __('package');
+        if (empty($_POST['v_email'])) $errors[] = __('email');
+        if (empty($_POST['v_fname'])) $errors[] = __('first name');
+        if (empty($_POST['v_lname'])) $errors[] = __('last name');
 
         // Protect input
         $v_username = escapeshellarg($_POST['v_username']);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
 
         // Validate email
         if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) {
-            $_SESSION['error_msg'] = _('Please enter valid email address.');
+            $_SESSION['error_msg'] = __('Please enter valid email address.');
         }
 
         // Check for errors
@@ -50,20 +50,20 @@ if ($_SESSION['user'] == 'admin') {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         }
 
         // Check password length
         if (empty($_SESSION['error_msg'])) {
             $pw_len = strlen($_POST['v_password']);
-            if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+            if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
         }
 
         if (empty($_SESSION['error_msg'])) {
             exec (VESTA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             } else {
                 exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
@@ -81,7 +81,7 @@ if ($_SESSION['user'] == 'admin') {
                     send_email($to, $subject, $mailtext, $from);
                 }
 
-                $_SESSION['ok_msg'] = _('USER_CREATED_OK',$_POST[v_username],$_POST[v_username]);
+                $_SESSION['ok_msg'] = __('USER_CREATED_OK',$_POST[v_username],$_POST[v_username]);
                 unset($v_username);
                 unset($v_password);
                 unset($v_email);

web/add/web/index.php

@@ -14,12 +14,12 @@ top_panel($user,$TAB);
 $v_ftp_email = $panel[$user]['CONTACT'];
     if (!empty($_POST['ok'])) {
         // Check input
-        if (empty($_POST['v_domain'])) $errors[] = _('domain');
-        if (empty($_POST['v_ip'])) $errors[] = _('ip');
-        if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = _('ssl certificate');
-        if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = _('ssl key');
-        if ((!empty($_POST['v_stats_user'])) && (empty($_POST['v_stats_password']))) $errors[] = _('stats user password');
-        if ((!empty($_POST['v_ftp_user'])) && (empty($_POST['v_ftp_password']))) $errors[] = _('ftp user password');
+        if (empty($_POST['v_domain'])) $errors[] = __('domain');
+        if (empty($_POST['v_ip'])) $errors[] = __('ip');
+        if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = __('ssl certificate');
+        if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = __('ssl key');
+        if ((!empty($_POST['v_stats_user'])) && (empty($_POST['v_stats_password']))) $errors[] = __('stats user password');
+        if ((!empty($_POST['v_ftp_user'])) && (empty($_POST['v_ftp_password']))) $errors[] = __('ftp user password');
 
         if ((!empty($_POST['v_aliases'])) && ($_POST['v_aliases'] != 'www.'.$_POST['v_domain'])) $v_adv = 'yes';
         if ((!empty($_POST['v_ssl'])) || (!empty($_POST['v_elog']))) $v_adv = 'yes';
@@ -67,14 +67,14 @@ $v_ftp_email = $panel[$user]['CONTACT'];
 
         // Validate email
         if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) {
-            $_SESSION['error_msg'] = _('Please enter valid email address.');
+            $_SESSION['error_msg'] = __('Please enter valid email address.');
         }
 
         // Check ftp password length
         if (empty($_SESSION['error_msg'])) {
             if (!empty($_POST['v_ftp_user'])) {
                 $pw_len = strlen($_POST['v_ftp_password']);
-                if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+                if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
             }
         }
 
@@ -82,7 +82,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
         if (empty($_SESSION['error_msg'])) {
             if (!empty($_POST['v_stats_user'])) {
                 $pw_len = strlen($_POST['v_stats_password']);
-                if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+                if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
             }
         }
 
@@ -95,7 +95,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         }
 
         if (empty($_SESSION['error_msg'])) {
@@ -103,7 +103,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
             exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -113,7 +113,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -124,7 +124,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -146,7 +146,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                             exec (VESTA_CMD."v-add-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
                             if ($return_var != 0) {
                                 $error = implode('<br>', $output);
-                                if (empty($error)) $error = _('Error code:',$return_var);
+                                if (empty($error)) $error = __('Error code:',$return_var);
                                 $_SESSION['error_msg'] = $error;
                             }
                         }
@@ -155,7 +155,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                             exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
                             if ($return_var != 0) {
                                 $error = implode('<br>', $output);
-                                if (empty($error)) $error = _('Error code:',$return_var);
+                                if (empty($error)) $error = __('Error code:',$return_var);
                                 $_SESSION['error_msg'] = $error;
                             }
                             unset($output);
@@ -170,7 +170,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-delete-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
             }
@@ -183,7 +183,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-web-domain-nginx ".$user." ".$v_domain." 'default' ".$ext." 'no'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -222,7 +222,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -234,7 +234,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -245,7 +245,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                     exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($v_stats_user);
@@ -262,15 +262,15 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 } else {
                     if (!empty($v_ftp_email)) {
                         $to = $_POST['v_ftp_email'];
-                        $subject = _("FTP login credentials");
+                        $subject = __("FTP login credentials");
                         $hostname = exec('hostname');
-                        $from = _('MAIL_FROM',$hostname);
-                        $mailtext .= _('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
+                        $from = __('MAIL_FROM',$hostname);
+                        $mailtext .= __('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
                         send_email($to, $subject, $mailtext, $from);
                         //unset($v_ftp_email);
                     }
@@ -285,7 +285,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-restart-dns", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -295,11 +295,11 @@ $v_ftp_email = $panel[$user]['CONTACT'];
                 exec (VESTA_CMD."v-restart-web", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
-                $_SESSION['ok_msg'] = _('WEB_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+                $_SESSION['ok_msg'] = __('WEB_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
                 unset($v_domain);
                 unset($v_aliases);
                 unset($v_ssl);

web/bulk/restore/index.php

@@ -26,14 +26,14 @@ if (!empty($_POST['udir'])) $udir = escapeshellarg(implode(",",$_POST['udir']));
 if ($action == 'restore') {
     exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
     if ($return_var == 0) {
-        $_SESSION['restore_msg'] = _('RESTORE_SCHEDULED');
+        $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
     } else {
         $_SESSION['restore_msg'] = implode('<br>', $output);
         if (empty($_SESSION['restore_msg'])) {
-            $_SESSION['restore_msg'] = _('Error: vesta did not return any output.');
+            $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
         }
         if ($return_var == 4) {
-            $_SESSION['restore_msg'] = _('RESTORE_EXISTS');
+            $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
         }
     }
 }

web/delete/backup/index.php

@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/cron/index.php

@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/db/index.php

@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/dns/index.php

@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -39,7 +39,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         exec (VESTA_CMD."v-delete-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);

web/delete/ip/index.php

@@ -12,8 +12,8 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
-        if ($return_var == 4) $error = _('IP address is in use');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
+        if ($return_var == 4) $error = __('IP address is in use');
         $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/mail/index.php

@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -38,7 +38,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
         exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
                 $_SESSION['error_msg'] = $error;
         }
         unset($output);

web/delete/package/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/user/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/delete/web/index.php

@@ -16,7 +16,7 @@ if (!empty($_GET['domain'])) {
     exec (VESTA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);
@@ -28,7 +28,7 @@ if (!empty($_GET['domain'])) {
             exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error: vesta did not return any output.');
+                if (empty($error)) $error = __('Error: vesta did not return any output.');
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -42,7 +42,7 @@ if (!empty($_GET['domain'])) {
             exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error: vesta did not return any output.');
+                    if (empty($error)) $error = __('Error: vesta did not return any output.');
                     $_SESSION['error_msg'] = $error;
             }
             unset($output);

web/edit/cron/index.php

@@ -28,7 +28,7 @@ $v_job = escapeshellarg($_GET['job']);
 exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
 if ($return_var != 0) {
     $error = implode('<br>', $output);
-    if (empty($error)) $error = _('Error code:',$return_var);
+    if (empty($error)) $error = __('Error code:',$return_var);
     $_SESSION['error_msg'] = $error;
 } else {
     $data = json_decode(implode('', $output), true);
@@ -64,14 +64,14 @@ if ($return_var != 0) {
             exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
             $v_cmd = $_POST['v_cmd'];
         }
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _("Changes has been saved.");
+            $_SESSION['ok_msg'] = __("Changes has been saved.");
         }
     }
 }

web/edit/db/index.php

@@ -27,7 +27,7 @@ $v_database = escapeshellarg($_GET['database']);
 exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
 if ($return_var != 0) {
     $error = implode('<br>', $output);
-    if (empty($error)) $error = _('Error code:',$return_var);
+    if (empty($error)) $error = __('Error code:',$return_var);
     $_SESSION['error_msg'] = $error;
 } else {
     $data = json_decode(implode('', $output), true);
@@ -57,14 +57,14 @@ if ($return_var != 0) {
             exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_password = "••••••••";
             unset($output);
         }
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
 }

web/edit/dns/index.php

@@ -30,7 +30,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -67,7 +67,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $restart_dns = 'yes';
@@ -80,7 +80,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -93,7 +93,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -106,7 +106,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -119,7 +119,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -131,13 +131,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-restart-dns", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
         }
 
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
 
     }
@@ -155,7 +155,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
     exec (VESTA_CMD."v-list-dns-domain-records ".$user." ".$v_domain." 'json'", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -187,7 +187,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             exec (VESTA_CMD."v-change-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
 
@@ -196,7 +196,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
             unset($output);
         }
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
 

web/edit/ip/index.php

@@ -26,7 +26,7 @@ if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -63,7 +63,7 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -73,7 +73,7 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -86,7 +86,7 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 $v_owner = $_POST['v_owner'];
@@ -99,7 +99,7 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -111,14 +111,14 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-change-sys-ip-nat ".$v_ip." ".$v_nat, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
             }
 
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('Changes has been saved.');
+                $_SESSION['ok_msg'] = __('Changes has been saved.');
             }
         }
     }

web/edit/mail/index.php

@@ -30,7 +30,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -59,7 +59,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_antispam = 'no';
@@ -69,7 +69,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_antispam = 'yes';
@@ -80,7 +80,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_antivirus = 'no';
@@ -90,14 +90,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_antivirus = 'yes';
             unset($output);
         }
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
 
         // DKIM
@@ -105,7 +105,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_dkim = 'no';
@@ -115,7 +115,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_dkim = 'yes';
@@ -127,7 +127,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_catchall = '';
@@ -139,7 +139,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                 exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -150,13 +150,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
         }
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
@@ -169,7 +169,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
     exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -210,7 +210,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_password = "••••••••";
@@ -227,7 +227,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -247,7 +247,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                     exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
@@ -259,7 +259,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                     exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
@@ -280,7 +280,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                     exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
@@ -292,7 +292,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                     exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
@@ -305,7 +305,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -319,7 +319,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
                 exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -327,14 +327,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
             }
         }
             if (($v_autoreply == 'no') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
-            if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = $_SESSION['error_msg'] = _('Field "%s" can not be blank.','atoreply');
+            if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = $_SESSION['error_msg'] = __('Field "%s" can not be blank.','atoreply');
             if (empty($_SESSION['error_msg'])) {
                 $v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']);
                 $v_autoreply_message = escapeshellarg($v_autoreply_message);
                 exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -344,7 +344,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
         }
 
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html');

web/edit/package/index.php

@@ -26,7 +26,7 @@ if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -70,22 +70,22 @@ if ($_SESSION['user'] == 'admin') {
         // Action
         if (!empty($_POST['save'])) {
             // Check input
-            if (empty($_POST['v_package'])) $errors[] = _('package');
-            if (empty($_POST['v_template'])) $errors[] = _('template');
-            if (empty($_POST['v_shell'])) $errrors[] = _('shell');
-            if (!isset($_POST['v_web_domains'])) $errors[] = _('web domains');
-            if (!isset($_POST['v_web_aliases'])) $errors[] = _('web aliases');
-            if (!isset($_POST['v_dns_domains'])) $errors[] = _('dns domains');
-            if (!isset($_POST['v_dns_records'])) $errors[] = _('dns records');
-            if (!isset($_POST['v_mail_domains'])) $errors[] = _('mail domains');
-            if (!isset($_POST['v_mail_accounts'])) $errors[] = _('mail accounts');
-            if (!isset($_POST['v_databases'])) $errors[] = _('databases');
-            if (!isset($_POST['v_cron_jobs'])) $errors[] = _('cron jobs');
-            if (!isset($_POST['v_backups'])) $errors[] = _('backups');
-            if (!isset($_POST['v_disk_quota'])) $errors[] = _('quota');
-            if (!isset($_POST['v_bandwidth'])) $errors[] = _('bandwidth');
-            if (empty($_POST['v_ns1'])) $errors[] = _('ns1');
-            if (empty($_POST['v_ns2'])) $errors[] = _('ns2');
+            if (empty($_POST['v_package'])) $errors[] = __('package');
+            if (empty($_POST['v_template'])) $errors[] = __('template');
+            if (empty($_POST['v_shell'])) $errrors[] = __('shell');
+            if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
+            if (!isset($_POST['v_web_aliases'])) $errors[] = __('web aliases');
+            if (!isset($_POST['v_dns_domains'])) $errors[] = __('dns domains');
+            if (!isset($_POST['v_dns_records'])) $errors[] = __('dns records');
+            if (!isset($_POST['v_mail_domains'])) $errors[] = __('mail domains');
+            if (!isset($_POST['v_mail_accounts'])) $errors[] = __('mail accounts');
+            if (!isset($_POST['v_databases'])) $errors[] = __('databases');
+            if (!isset($_POST['v_cron_jobs'])) $errors[] = __('cron jobs');
+            if (!isset($_POST['v_backups'])) $errors[] = __('backups');
+            if (!isset($_POST['v_disk_quota'])) $errors[] = __('quota');
+            if (!isset($_POST['v_bandwidth'])) $errors[] = __('bandwidth');
+            if (empty($_POST['v_ns1'])) $errors[] = __('ns1');
+            if (empty($_POST['v_ns2'])) $errors[] = __('ns2');
 
             // Protect input
             $v_package = escapeshellarg($_POST['v_package']);
@@ -122,7 +122,7 @@ if ($_SESSION['user'] == 'admin') {
                         $error_msg = $error_msg.", ".$error;
                     }
                 }
-                $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+                $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
             } else {
                 exec ('mktemp -d', $output, $return_var);
                 $tmpdir = $output[0];
@@ -156,7 +156,7 @@ if ($_SESSION['user'] == 'admin') {
                     exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
@@ -170,12 +170,12 @@ if ($_SESSION['user'] == 'admin') {
                 exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
 
                 if (empty($_SESSION['error_msg'])) {
-                    $_SESSION['ok_msg'] = _('Changes has been saved.');
+                    $_SESSION['ok_msg'] = __('Changes has been saved.');
                 }
             }
         }

web/edit/user/index.php

@@ -24,7 +24,7 @@ if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -80,7 +80,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_password = "••••••••";
@@ -93,7 +93,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-package ".$v_username." ".$v_package, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -105,7 +105,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             } else {
                 if ($_GET['user'] == 'admin')  $_SESSION['language'] = $_POST['v_language'];
@@ -119,7 +119,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-template ".$v_username." ".$v_template, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -131,7 +131,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-shell ".$v_username." ".$v_shell, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -141,13 +141,13 @@ if ($_SESSION['user'] == 'admin') {
         if (($v_email != $_POST['v_email']) && (empty($_SESSION['error_msg']))) {
             // Validate email
             if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) {
-                $_SESSION['error_msg'] = _('Please enter valid email address.');
+                $_SESSION['error_msg'] = __('Please enter valid email address.');
             } else {
                 $v_email = escapeshellarg($_POST['v_email']);
                 exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
             }
@@ -161,7 +161,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -179,14 +179,14 @@ if ($_SESSION['user'] == 'admin') {
             exec ($ns_cmd, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
         }
 
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
     // Panel
@@ -207,7 +207,7 @@ if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var);
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error code:',$return_var);
+        if (empty($error)) $error = __('Error code:',$return_var);
         $_SESSION['error_msg'] = $error;
     } else {
         $data = json_decode(implode('', $output), true);
@@ -249,7 +249,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_password = "••••••••";
@@ -262,7 +262,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             } else {
                 $_SESSION['language'] = $_POST['v_language'];
@@ -276,7 +276,7 @@ if ($_SESSION['user'] == 'admin') {
             exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -294,14 +294,14 @@ if ($_SESSION['user'] == 'admin') {
             exec ($ns_cmd, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
         }
 
         if (empty($_SESSION['error_msg'])) {
-            $_SESSION['ok_msg'] = _('Changes has been saved.');
+            $_SESSION['ok_msg'] = __('Changes has been saved.');
         }
     }
     // Panel

web/edit/web/index.php

@@ -30,7 +30,7 @@ $v_domain = escapeshellarg($_GET['domain']);
 exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
 if ($return_var != 0) {
     $error = implode('<br>', $output);
-    if (empty($error)) $error = _('Error code:',$return_var);
+    if (empty($error)) $error = __('Error code:',$return_var);
     $_SESSION['error_msg'] = $error;
 } else {
     $data = json_decode(implode('', $output), true);
@@ -95,7 +95,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         $restart_web = 'yes';
@@ -106,7 +106,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $restart_dns = 'yes';
@@ -118,7 +118,7 @@ if (!empty($_POST['save'])) {
                 exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 $restart_dns = 'yes';
@@ -133,7 +133,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -156,7 +156,7 @@ if (!empty($_POST['save'])) {
                 exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -165,7 +165,7 @@ if (!empty($_POST['save'])) {
                     exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     $restart_dns = 'yes';
@@ -182,7 +182,7 @@ if (!empty($_POST['save'])) {
                 exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                 if ($return_var != 0) {
                     $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error code:',$return_var);
+                    if (empty($error)) $error = __('Error code:',$return_var);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
@@ -190,7 +190,7 @@ if (!empty($_POST['save'])) {
                     exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
                     if ($return_var != 0) {
                         $error = implode('<br>', $output);
-                        if (empty($error)) $error = _('Error code:',$return_var);
+                        if (empty($error)) $error = __('Error code:',$return_var);
                         $_SESSION['error_msg'] = $error;
                     }
                     $restart_dns = 'yes';
@@ -205,7 +205,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-delete-web-domain-nginx ".$v_username." ".$v_domain." 'no'", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -223,7 +223,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-change-web-domain-nginx-tpl ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_nginx_ext = str_replace(',', ', ', $ext);
@@ -244,7 +244,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-add-web-domain-nginx ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -257,7 +257,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -296,7 +296,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -312,7 +312,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             $v_ssl_home = $_POST['v_ssl_home'];
@@ -332,7 +332,7 @@ if (!empty($_POST['save'])) {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             exec ('mktemp -d', $mktemp_output, $return_var);
             $tmpdir = $mktemp_output[0];
@@ -360,7 +360,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -378,7 +378,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -389,7 +389,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -399,7 +399,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -410,7 +410,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -418,8 +418,8 @@ if (!empty($_POST['save'])) {
         $v_stats_password = '';
     }
     if ((empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
-        if (empty($_POST['v_stats_user'])) $errors[] = _('stats username');
-        if (empty($_POST['v_stats_password'])) $errors[] = _('stats password');
+        if (empty($_POST['v_stats_user'])) $errors[] = __('stats username');
+        if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
         if (!empty($errors[0])) {
             foreach ($errors as $i => $error) {
                 if ( $i == 0 ) {
@@ -428,14 +428,14 @@ if (!empty($_POST['save'])) {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         } else {
             $v_stats_user = escapeshellarg($_POST['v_stats_user']);
             $v_stats_password = escapeshellarg($_POST['v_stats_password']);
             exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -443,8 +443,8 @@ if (!empty($_POST['save'])) {
         }
     }
     if ((!empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
-        if (empty($_POST['v_stats_user'])) $errors[] = _('stats user');
-        if (empty($_POST['v_stats_password'])) $errors[] = _('stats password');
+        if (empty($_POST['v_stats_user'])) $errors[] = __('stats user');
+        if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
         if (!empty($errors[0])) {
             foreach ($errors as $i => $error) {
                 if ( $i == 0 ) {
@@ -453,7 +453,7 @@ if (!empty($_POST['save'])) {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         }
         if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) {
             $v_stats_user = escapeshellarg($_POST['v_stats_user']);
@@ -461,7 +461,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -474,7 +474,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -485,8 +485,8 @@ if (!empty($_POST['save'])) {
 
     // Change FTP Account
     if ((!empty($v_ftp_user)) && (!empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) {
-        if (empty($_POST['v_ftp_user'])) $errors[] = _('ftp user');
-        if (empty($_POST['v_ftp_password'])) $errors[] = _('ftp user password');
+        if (empty($_POST['v_ftp_user'])) $errors[] = __('ftp user');
+        if (empty($_POST['v_ftp_password'])) $errors[] = __('ftp user password');
         if (!empty($errors[0])) {
             foreach ($errors as $i => $error) {
                 if ( $i == 0 ) {
@@ -495,7 +495,7 @@ if (!empty($_POST['save'])) {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         }
         if (($v_ftp_user != $_POST['v_ftp_user']) || ($_POST['v_ftp_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) {
             $v_ftp_user = preg_replace("/^".$user."_/", "", $_POST['v_ftp_user']);
@@ -504,7 +504,7 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
@@ -516,7 +516,7 @@ if (!empty($_POST['save'])) {
 
     // Add FTP Account
     if ((empty($v_ftp_user)) && (!empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) {
-        if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = _('Please enter valid email address.');
+        if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = __('Please enter valid email address.');
         if (empty($_POST['v_ftp_user'])) $errors[] = 'ftp user';
         if (empty($_POST['v_ftp_password'])) $errors[] = 'ftp user password';
         if (!empty($errors[0])) {
@@ -527,7 +527,7 @@ if (!empty($_POST['save'])) {
                     $error_msg = $error_msg.", ".$error;
                 }
             }
-            $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+            $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
         }
         if (empty($_SESSION['error_msg'])) {
             $v_ftp_user = escapeshellarg($_POST['v_ftp_user']);
@@ -535,15 +535,15 @@ if (!empty($_POST['save'])) {
             exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
             if ($return_var != 0) {
                 $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error code:',$return_var);
+                if (empty($error)) $error = __('Error code:',$return_var);
                 $_SESSION['error_msg'] = $error;
             } else {
                 if (!empty($_POST['v_ftp_email'])) {
                     $to = $_POST['v_ftp_email'];
-                    $subject = _("FTP login credentials");
+                    $subject = __("FTP login credentials");
                     $hostname = exec('hostname');
-                    $from = _('MAIL_FROM',$hostname);
-                    $mailtext .= _('FTP_ACCOUNT_READY',$_GET['domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
+                    $from = __('MAIL_FROM',$hostname);
+                    $mailtext .= __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
                     send_email($to, $subject, $mailtext, $from);
                     unset($v_ftp_email);
                 }
@@ -560,7 +560,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-restart-web", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
     }
@@ -570,13 +570,13 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-restart-dns", $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error code:',$return_var);
+            if (empty($error)) $error = __('Error code:',$return_var);
             $_SESSION['error_msg'] = $error;
         }
     }
 
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = _('Changes has been saved.');
+        $_SESSION['ok_msg'] = __('Changes has been saved.');
     }
 
 }

web/inc/main.php

@@ -18,7 +18,7 @@ if (isset($_SESSION['user'])) {
  * @return string Translated string
  * @see _translate()
  */
-function _() {
+function __() {
    $args = func_get_args();
    array_unshift($args,$_SESSION['language']);
    return call_user_func_array("_translate",$args);
@@ -120,23 +120,23 @@ function humanize_time($usage) {
              $usage = $usage / 24;
             $usage = number_format($usage);
             if ( $usage == 1 ) {
-                $usage = $usage." "._('day');
+                $usage = $usage." ".__('day');
             } else {
-                $usage = $usage." "._('days');
+                $usage = $usage." ".__('days');
             }
         } else {
             $usage = number_format($usage);
             if ( $usage == 1 ) {
-                $usage = $usage." "._('hour');
+                $usage = $usage." ".__('hour');
             } else {
-                $usage = $usage." "._('hours');
+                $usage = $usage." ".__('hours');
             }
         }
     } else {
         if ( $usage == 1 ) {
-            $usage = $usage." "._('minute');
+            $usage = $usage." ".__('minute');
         } else {
-            $usage = $usage." "._('minutes');
+            $usage = $usage." ".__('minutes');
         }
     }
     return $usage;
@@ -150,17 +150,17 @@ function humanize_usage($usage) {
                 if ( $usage > 1000 ) {
                     $usage = $usage / 1000 ;
                     $usage = number_format($usage, 2);
-                    $usage = $usage." "._('pb');
+                    $usage = $usage." ".__('pb');
                 } else {
                     $usage = number_format($usage, 2);
-                    $usage = $usage." "._('tb');
+                    $usage = $usage." ".__('tb');
                 }
         } else {
             $usage = number_format($usage, 2);
-            $usage = $usage." "._('gb');
+            $usage = $usage." ".__('gb');
         }
     } else {
-        $usage = $usage." "._('mb');
+        $usage = $usage." ".__('mb');
     }
     return $usage;
 }

web/login/index.php

@@ -32,7 +32,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
     $v_password = escapeshellarg($_POST['password']);
     exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'",  $output, $return_var);
     if ( $return_var > 0 ) {
-        $ERROR = "<a class=\"error\">"._('Invalid username or password')."</a>";
+        $ERROR = "<a class=\"error\">".__('Invalid username or password')."</a>";
         // Set system language
         exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
         $data = json_decode(implode('', $output), true);

web/reset/index.php

@@ -18,15 +18,15 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) {
         $lname = $data[$user]['LNAME'];
         $contact = $data[$user]['CONTACT'];
         $to = $data[$user]['CONTACT'];
-        $subject = _('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
+        $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
         $hostname = exec('hostname');
-        $from = _('MAIL_FROM',$hostname);
+        $from = __('MAIL_FROM',$hostname);
         if (!empty($fname)) {
-            $mailtext = _('GREETINGS_GORDON_FREEMAN',$fname,$lname);
+            $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname);
         } else {
-            $mailtext = _('GREETINGS');
+            $mailtext = __('GREETINGS');
         }
-        $mailtext .= _('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
+        $mailtext .= __('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
         if (!empty($rkey)) send_email($to, $subject, $mailtext, $from);
         unset($output);
     }
@@ -49,20 +49,20 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
                 $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password";
                 exec ($cmd." ".$v_user." ".$v_password, $output, $return_var);
                 if ( $return_var > 0 ) {
-                    $ERROR = "<a class=\"error\">"._('An internal error occurred')."</a>";
+                    $ERROR = "<a class=\"error\">".__('An internal error occurred')."</a>";
                 } else {
                     $_SESSION['user'] = $_POST['user'];
                     header("Location: /");
                     exit;
                 }
             } else {
-                $ERROR = "<a class=\"error\">"._('Invalid username or code')."</a>";
+                $ERROR = "<a class=\"error\">".__('Invalid username or code')."</a>";
             }
         } else {
-            $ERROR = "<a class=\"error\">"._('Invalid username or code')."</a>";
+            $ERROR = "<a class=\"error\">".__('Invalid username or code')."</a>";
         }
     } else {
-        $ERROR = "<a class=\"error\">"._('Passwords not match')."</a>";
+        $ERROR = "<a class=\"error\">".__('Passwords not match')."</a>";
     }
 }
 

web/restart/service/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error =  _('SERVICE_ACTION_FAILED',_('restart'),$v_service);
+        if (empty($error)) $error =  __('SERVICE_ACTION_FAILED',__('restart'),$v_service);
             $_SESSION['error_srv'] = $error;
     }
     unset($output);

web/schedule/backup/index.php

@@ -8,15 +8,15 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 $v_username = escapeshellarg($user);
 exec (VESTA_CMD."v-schedule-user-backup ".$v_username, $output, $return_var);
 if ($return_var == 0) {
-    $_SESSION['backup_msg'] = _('BACKUP_SCHEDULED');
+    $_SESSION['backup_msg'] = __('BACKUP_SCHEDULED');
 } else {
     $_SESSION['backup_msg'] = implode('<br>', $output);
     if (empty($_SESSION['backup_msg'])) {
-        $_SESSION['backup_msg'] = _('Error: vesta did not return any output.');
+        $_SESSION['backup_msg'] = __('Error: vesta did not return any output.');
     }
 
     if ($return_var == 4) {
-        $_SESSION['backup_msg'] = _('BACKUP_EXISTS');
+        $_SESSION['backup_msg'] = __('BACKUP_EXISTS');
     }
 
 }

web/schedule/restore/index.php

@@ -25,14 +25,14 @@ if ($_GET['type'] == 'udir') $udir = escapeshellarg($_GET['object']);
 if (!empty($_GET['type'])) {
     exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
     if ($return_var == 0) {
-        $_SESSION['restore_msg'] = _('RESTORE_SCHEDULED');
+        $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
     } else {
         $_SESSION['restore_msg'] = implode('<br>', $output);
         if (empty($_SESSION['restore_msg'])) {
-            $_SESSION['restore_msg'] = _('Error: vesta did not return any output.');
+            $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
         }
         if ($return_var == 4) {
-            $_SESSION['restore_msg'] = _('RESTORE_EXISTS');
+            $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
         }
     }
 }

web/start/service/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error =  _('SERVICE_ACTION_FAILED',_('start'),$v_service);;
+        if (empty($error)) $error =  __('SERVICE_ACTION_FAILED',__('start'),$v_service);;
             $_SESSION['error_srv'] = $error;
     }
     unset($output);

web/stop/service/index.php

@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('SERVICE_ACTION_FAILED',_('stop'),$v_service);
+        if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('stop'),$v_service);
             $_SESSION['error_srv'] = $error;
     }
     unset($output);

web/suspend/cron/index.php

@@ -16,7 +16,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/suspend/db/index.php

@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/suspend/dns/index.php

@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
         exec (VESTA_CMD."v-suspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
         exec (VESTA_CMD."v-suspend-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);

web/suspend/mail/index.php

@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
         exec (VESTA_CMD."v-suspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
         exec (VESTA_CMD."v-suspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
         if ($return_var != 0) {
             $error = implode('<br>', $output);
-            if (empty($error)) $error = _('Error: vesta did not return any output.');
+            if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
         }
         unset($output);

web/suspend/user/index.php

@@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/suspend/web/index.php

@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);

web/templates/admin/add_cron.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Cron Job');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -44,7 +44,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Minute');?>
+                                                <?php print __('Minute');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -54,7 +54,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Hour');?>
+                                                <?php print __('Hour');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -64,7 +64,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Day');?>
+                                                <?php print __('Day');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -74,7 +74,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Month');?>
+                                                <?php print __('Month');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -84,7 +84,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Day of week');?>
+                                                <?php print __('Day of week');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -94,7 +94,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Command');?>
+                                                <?php print __('Command');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -106,10 +106,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_db.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding database');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding database');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -63,12 +63,12 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td style="padding: 20px 0 0 2px; color:#777;" >
-                                                <?php print _('Prefix will be automaticaly added to database name and database user',$user."_");?>
+                                                <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Database');?> 
+                                                <?php print __('Database');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -78,7 +78,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('User');?> 
+                                                <?php print __('User');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -88,7 +88,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -98,7 +98,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Type');?> 
+                                                <?php print __('Type');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -116,7 +116,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Charset');?> 
+                                                <?php print __('Charset');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -162,7 +162,7 @@
                                             </td>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Send login credentials to email address') ?> 
+                                                <?php print __('Send login credentials to email address') ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -174,10 +174,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_dns.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding DNS Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -55,7 +55,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -65,7 +65,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP address');?>
+                                                <?php print __('IP address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -75,7 +75,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?></a>
+                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -83,7 +83,7 @@
                                                 <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Template');?>
+                                                            <?php print __('Template');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -106,7 +106,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('YYYY-MM-DD');?>)</span>
+                                                            <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -126,7 +126,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Name servers');?>
+                                                            <?php print __('Name servers');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -156,10 +156,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_dns_rec.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding DNS Record'); ?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -44,7 +44,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -54,7 +54,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Record');?>
+                                                <?php print __('Record');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -64,7 +64,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Type');?>
+                                                <?php print __('Type');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -87,7 +87,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP or Value');?>
+                                                <?php print __('IP or Value');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -97,7 +97,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -109,10 +109,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok_rec" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok_rec" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_ip.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding IP address');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -55,7 +55,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('IP address') ?> 
+                                                <?php print __('IP address') ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -65,7 +65,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Netmask');?>
+                                                <?php print __('Netmask');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -75,7 +75,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Interface');?>
+                                                <?php print __('Interface');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -93,7 +93,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Shared');?>
+                                                <?php print __('Shared');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -106,7 +106,7 @@
                                                 <table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 0 0 0 2px;">
-                                                            <?php print _('Assigned user');?>
+                                                            <?php print __('Assigned user');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -127,7 +127,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -137,7 +137,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -151,10 +151,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_mail.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Mail Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -44,7 +44,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -54,7 +54,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('AntiSpam Support');?>
+                                                <?php print __('AntiSpam Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -64,7 +64,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('AntiVirus Support');?>
+                                                <?php print __('AntiVirus Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -74,7 +74,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DKIM Support');?>
+                                                <?php print __('DKIM Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -86,10 +86,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_mail_acc.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Mail Account');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -65,7 +65,7 @@
                                 <table class="data-col2" width="600px">
                                     <tr>
                                         <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print _('Domain');?>
+                                            <?php print __('Domain');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -75,7 +75,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Account');?>
+                                            <?php print __('Account');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -85,7 +85,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                            <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                         </td>
                                     </tr>
                                     <tr>
@@ -95,7 +95,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print _('Advanced options');?></a>
+                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
                                         </td>
                                     </tr>
                                     <tr>
@@ -103,7 +103,7 @@
                                             <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 0 0 0 2px;">
-                                                        <?php print _('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('in megabytes');?>)</span>
+                                                        <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -113,7 +113,7 @@
                                                 </tr>
                                             <tr>
                                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                    <?php print _('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('use local-part');?>)</span>
+                                                    <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -123,7 +123,7 @@
                                             </tr>
                                             <tr>
                                                 <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                    <?php print _('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('one or more email addresses');?>)</span>
+                                                    <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -138,10 +138,10 @@
                             <table class="data-col2">
                                 <tr>
                                     <td style="padding: 24px 0 0 0;" width="116px">
-                                        <input type="submit" name="ok_acc" value="<?php print _('Add');?>" class="button">
+                                        <input type="submit" name="ok_acc" value="<?php print __('Add');?>" class="button">
                                     </td>
                                     <td style="padding: 24px 0 0 0;">
-                                        <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                        <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                     </td>
                                 </tr>
                             </table>

web/templates/admin/add_package.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Package');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -44,7 +44,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Package Name');?>
+                                                <?php print __('Package Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -54,7 +54,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Default Template');?>
+                                                <?php print __('Default Template');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -77,7 +77,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('SSH Access');?>
+                                                <?php print __('SSH Access');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -100,7 +100,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Domains');?>
+                                                <?php print __('Web Domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -110,7 +110,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -120,7 +120,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DNS domains');?>
+                                                <?php print __('DNS domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -130,7 +130,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -140,7 +140,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Mail Domains');?>
+                                                <?php print __('Mail Domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -150,7 +150,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -160,7 +160,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Databases');?>
+                                                <?php print __('Databases');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -170,7 +170,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Cron Jobs');?>
+                                                <?php print __('Cron Jobs');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -180,7 +180,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Backups');?>
+                                                <?php print __('Backups');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -190,7 +190,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('in megabytes');?>)</span>
+                                                <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -200,7 +200,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('in megabytes');?>)</span>
+                                                <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -210,7 +210,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Name servers');?>
+                                                <?php print __('Name servers');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -237,10 +237,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/add_user.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding User');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding User');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -64,7 +64,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Username');?>
+                                                <?php print __('Username');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -74,7 +74,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass" ><?php print _('generate');?></a>
+                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass" ><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -84,7 +84,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Email');?>
+                                                <?php print __('Email');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -94,7 +94,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" name="v_package">
-                                                <?php print _('Package');?>
+                                                <?php print __('Package');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -118,7 +118,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('Language');?>
+                                                <?php print __('Language');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -142,7 +142,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('First Name');?>
+                                                <?php print __('First Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -152,7 +152,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Last Name');?>
+                                                <?php print __('Last Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -162,7 +162,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Send login credentials to email address');?>
+                                                <?php print __('Send login credentials to email address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -175,10 +175,10 @@
                                 <table class="data-col2">
                                     <tr>
                                         <td style="padding: 24px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                         </td>
                                         <td style="padding: 24px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>

web/templates/admin/add_web.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -85,7 +85,7 @@
                                 <table class="data-col2" width="600px">
                                     <tr>
                                         <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print _('Domain');?>
+                                            <?php print __('Domain');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -95,7 +95,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('IP address');?>
+                                            <?php print __('IP address');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -117,7 +117,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('DNS Support');?>
+                                            <?php print __('DNS Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -127,7 +127,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Mail Support');?>
+                                            <?php print __('Mail Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -137,14 +137,14 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?></a>
+                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                         </td>
                                     </tr>
                                 </table>
                                 <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
                                         <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print _('Aliases');?>
+                                            <?php print __('Aliases');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -154,7 +154,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Apache template');?>
+                                            <?php print __('Apache template');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -177,7 +177,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Nginx Support');?>
+                                            <?php print __('Nginx Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -190,7 +190,7 @@
                                             <table style="display:<?php if ($v_nginx == 'off') { echo 'none';} else {echo 'block';}?>;" id="nginxtable" >
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('Nginx Extentions');?>
+                                                        <?php print __('Nginx Extentions');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -203,7 +203,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('SSL Support');?>
+                                            <?php print __('SSL Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -216,7 +216,7 @@
                                             <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('SSL Home Directory');?>
+                                                        <?php print __('SSL Home Directory');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -233,7 +233,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Certificate');?>
+                                                        <?php print __('SSL Certificate');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -243,7 +243,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Key');?>
+                                                        <?php print __('SSL Key');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -253,7 +253,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -266,7 +266,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Web Statistics');?>
+                                            <?php print __('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -280,7 +280,7 @@
                                                         if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                             echo ' selected' ;
                                                         }
-                                                        echo ">" . _($value) . "</option>\n";
+                                                        echo ">" . __($value) . "</option>\n";
                                                     }
                                                 ?> 
                                             </select>
@@ -288,7 +288,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statistics Authorization');?>
+                                            <?php print __('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -301,7 +301,7 @@
                                             <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('Username');?>
+                                                        <?php print __('Username');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -311,7 +311,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print _('generate');?></a>
+                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -324,7 +324,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Additional FTP Account');?>
+                                            <?php print __('Additional FTP Account');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -337,8 +337,8 @@
                                             <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Username');?><br>
-                                                        <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                        <?php print __('Username');?><br>
+                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -348,7 +348,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print _('generate');?></a>
+                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -358,7 +358,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                         <?php print _('Send FTP credentials to email');?>
+                                                         <?php print __('Send FTP credentials to email');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -373,10 +373,10 @@
                                 <table class="data-col2">
                                     <tr>
                                         <td style="padding: 33px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                         </td>
                                         <td style="padding: 33px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>

web/templates/admin/edit_cron.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Cron Job');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -38,7 +38,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -51,7 +51,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Minute');?>
+                                                <?php print __('Minute');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -61,7 +61,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Hour');?>
+                                                <?php print __('Hour');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -71,7 +71,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Day');?>
+                                                <?php print __('Day');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -81,7 +81,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Month');?>
+                                                <?php print __('Month');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Day of week');?>
+                                                <?php print __('Day of week');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -101,7 +101,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Command');?>
+                                                <?php print __('Command');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -113,10 +113,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_db.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Database');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -58,7 +58,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -70,7 +70,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Database');?>
+                                                <?php print __('Database');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -80,7 +80,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('User');?>
+                                                <?php print __('User');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -90,7 +90,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -100,7 +100,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Type');?>
+                                                <?php print __('Type');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -110,7 +110,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Host');?>
+                                                <?php print __('Host');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -120,7 +120,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Charset');?>
+                                                <?php print __('Charset');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -132,10 +132,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_dns.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing DNS Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,7 +37,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -49,7 +49,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -59,7 +59,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP Address');?>
+                                                <?php print __('IP Address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -69,7 +69,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Template');?>
+                                                <?php print __('Template');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -90,7 +90,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('YYYY-MM-DD');?>)</span>
+                                                <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -122,10 +122,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_dns_rec.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing DNS Record');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,7 +37,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -49,7 +49,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -60,7 +60,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Record');?>
+                                                <?php print __('Record');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -70,7 +70,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Type');?>
+                                                <?php print __('Type');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -80,7 +80,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP or Value');?>
+                                                <?php print __('IP or Value');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -90,7 +90,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('Priority');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -102,10 +102,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_ip.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing IP Address');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -49,7 +49,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -61,7 +61,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('IP address'); ?> 
+                                                <?php print __('IP address'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -71,7 +71,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Netmask');?> 
+                                                <?php print __('Netmask');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -81,7 +81,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Interface'); ?> 
+                                                <?php print __('Interface'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Shared'); ?> 
+                                                <?php print __('Shared'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -101,7 +101,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Assigned user'); ?> 
+                                                <?php print __('Assigned user'); ?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -119,7 +119,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('Assigned domain');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -129,7 +129,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                <?php print __('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -142,10 +142,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_mail.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Mail Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,7 +37,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status); ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -49,7 +49,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -59,7 +59,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('AntiSpam Support');?>
+                                                <?php print __('AntiSpam Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -69,7 +69,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('AntiVirus Support');?>
+                                                <?php print __('AntiVirus Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -79,7 +79,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DKIM Support');?>
+                                                <?php print __('DKIM Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -89,7 +89,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Catchall email');?>
+                                                <?php print __('Catchall email');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -101,10 +101,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_mail_acc.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Mail Account');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -70,7 +70,7 @@
                                 <table class="data-col2" width="600px">
                                     <tr>
                                         <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print _('Account');?>
+                                            <?php print __('Account');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -82,7 +82,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                            <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                         </td>
                                     </tr>
                                     <tr>
@@ -92,7 +92,7 @@
                                      </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('in megabytes');?>)</span>
+                                            <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -102,7 +102,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print _('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('use local-part');?>)</span>
+                                            <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -112,7 +112,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print _('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print _('one or more email addresses');?>)</span>
+                                            <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -122,7 +122,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Autoreply');?>
+                                            <?php print __('Autoreply');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -135,7 +135,7 @@
                                             <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                        <?php print _('Message');?>
+                                                        <?php print __('Message');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -150,10 +150,10 @@
                                 <table class="data-col2">
                                     <tr>
                                         <td style="padding: 24px 0 0 0;" width="116px">
-                                            <input type="submit" name="save" value="<?php print _('Save');?>" class="button">
+                                            <input type="submit" name="save" value="<?php print __('Save');?>" class="button">
                                         </td>
                                         <td style="padding: 24px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>

web/templates/admin/edit_package.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Package');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -49,7 +49,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Package Name');?>
+                                                <?php print __('Package Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -59,7 +59,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Default Template');?>
+                                                <?php print __('Default Template');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -82,7 +82,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('SSH Access');?>
+                                                <?php print __('SSH Access');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -105,7 +105,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Domains');?>
+                                                <?php print __('Web Domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -115,7 +115,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -125,7 +125,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DNS domains');?>
+                                                <?php print __('DNS domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -135,7 +135,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -145,7 +145,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Mail Domains');?>
+                                                <?php print __('Mail Domains');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -155,7 +155,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('per domain');?>)</span>
+                                                <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -165,7 +165,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Databases');?>
+                                                <?php print __('Databases');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -175,7 +175,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Cron Jobs');?>
+                                                <?php print __('Cron Jobs');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -185,7 +185,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Backups');?>
+                                                <?php print __('Backups');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -195,7 +195,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('in megabytes');?>)</span>
+                                                <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -205,7 +205,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('in megabytes');?>)</span>
+                                                <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -215,7 +215,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Name Servers');?>
+                                                <?php print __('Name Servers');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -242,10 +242,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_user.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing User');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing User');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -49,7 +49,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status); ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -62,7 +62,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Username');?>
+                                                <?php print __('Username');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -72,7 +72,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -82,7 +82,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Email');?>
+                                                <?php print __('Email');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -92,7 +92,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('Package');?>
+                                                <?php print __('Package');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -113,7 +113,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('Language');?>
+                                                <?php print __('Language');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -137,7 +137,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('First Name');?>
+                                                <?php print __('First Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -147,7 +147,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Last Name');?>
+                                                <?php print __('Last Name');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -157,7 +157,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('Default Template');?>
+                                                <?php print __('Default Template');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -178,7 +178,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('SSH Access');?>
+                                                <?php print __('SSH Access');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -199,7 +199,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Default Name Servers');?>
+                                                <?php print __('Default Name Servers');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -226,10 +226,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/edit_web.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -69,7 +69,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -81,7 +81,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP Address');?>
+                                                <?php print __('IP Address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -114,7 +114,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Aliases');?>
+                                                <?php print __('Aliases');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -124,7 +124,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Template');?>
+                                                <?php print __('Template');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -145,7 +145,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Nginx Support');?>
+                                                <?php print __('Nginx Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -158,7 +158,7 @@
                                                 <table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print _('Nginx Extensions');?>
+                                                            <?php print __('Nginx Extensions');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -171,7 +171,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('SSL Support');?>
+                                                <?php print __('SSL Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -184,7 +184,7 @@
                                                 <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print _('SSL Home Directory');?>
+                                                            <?php print __('SSL Home Directory');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -201,7 +201,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Certificate');?>
+                                                            <?php print __('SSL Certificate');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -211,7 +211,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Key');?>
+                                                            <?php print __('SSL Key');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -221,7 +221,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -234,7 +234,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Statistics');?>
+                                                <?php print __('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -248,7 +248,7 @@
                                                             if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                                 echo ' selected' ;
                                                             }
-                                                        echo ">". _($value) ."</option>\n";
+                                                        echo ">". __($value) ."</option>\n";
                                                         }
                                                 ?> 
                                                 </select>
@@ -256,7 +256,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Statistics Authorization');?>
+                                                <?php print __('Statistics Authorization');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -269,7 +269,7 @@
                                                 <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                            <?php print _('Username');?>
+                                                            <?php print __('Username');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -279,7 +279,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print _('generate');?></a>
+                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -292,7 +292,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Additional FTP Account');?>
+                                                <?php print __('Additional FTP Account');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -305,8 +305,8 @@
                                                 <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Username');?>
-                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . _('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                                            <?php print __('Username');?>
+                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -316,7 +316,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print _('generate');?></a>
+                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -330,7 +330,7 @@
                                                      ?> 
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Send FTP credentials to email');?>
+                                                            <?php print __('Send FTP credentials to email');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -348,10 +348,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/admin/list_backup.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/schedule/backup/'"> <?php print _('Create Backup');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/schedule/backup/'"> <?php print __('Create Backup');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/backup/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -36,7 +36,7 @@
                                                         });
                                                     });
                                                 </script>
-                                                <div id="dialog-message" title="<?php print _('Backup System') ?>">
+                                                <div id="dialog-message" title="<?php print __('Backup System') ?>">
                                                     <p><?php echo $_SESSION['backup_msg'] ?></p>
                                                 </div>
                                             </div>
@@ -57,19 +57,19 @@
                             <?php
                                 foreach ($data as $key => $value) {
                                     ++$i;
-                                    $web = _('no');
-                                    $dns = _('no');
-                                    $mail = _('no');
-                                    $db = _('no');
-                                    $cron = _('no');
-                                    $udir = _('no');
+                                    $web = __('no');
+                                    $dns = __('no');
+                                    $mail = __('no');
+                                    $db = __('no');
+                                    $cron = __('no');
+                                    $udir = __('no');
 
-                                    if (!empty($data[$key]['WEB'])) $web = _('yes').' ¨';
-                                    if (!empty($data[$key]['DNS'])) $dns = _('yes').' ¨';
-                                    if (!empty($data[$key]['MAIL'])) $mail = _('yes').' ¨';
-                                    if (!empty($data[$key]['DB'])) $db = _('yes').' ¨';
-                                    if (!empty($data[$key]['CRON'])) $cron = _('yes').' ¨';
-                                    if (!empty($data[$key]['UDIR'])) $udir = _('yes').' ¨';
+                                    if (!empty($data[$key]['WEB'])) $web = __('yes').' ¨';
+                                    if (!empty($data[$key]['DNS'])) $dns = __('yes').' ¨';
+                                    if (!empty($data[$key]['MAIL'])) $mail = __('yes').' ¨';
+                                    if (!empty($data[$key]['DB'])) $db = __('yes').' ¨';
+                                    if (!empty($data[$key]['CRON'])) $cron = __('yes').' ¨';
+                                    if (!empty($data[$key]['UDIR'])) $udir = __('yes').' ¨';
 
                             ?> 
 
@@ -78,30 +78,30 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="backup[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-active"><b><?php print _('active');?></b></td></tr>
+                                        <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/backup/?backup=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_BACKUP_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_BACKUP_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/list/backup/?backup=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print _('configure restore settings') ?>
+                                            <?php print __('configure restore settings') ?>
                                         </span>
                                     </a>
                                     <a href="/download/backup/?backup=<?php echo $key ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/download.png" width="8px" height="8px">
-                                            <?php print _('download');?> 
+                                            <?php print __('download');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -115,17 +115,17 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 0 0">
-                                                            <?php echo _($data[$key]['TYPE']) ?> 
+                                                            <?php echo __($data[$key]['TYPE']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1">
-                                                            <?php print _('Run Time');?>: <?php echo humanize_time($data[$key]['RUNTIME']) ?>
+                                                            <?php print __('Run Time');?>: <?php echo humanize_time($data[$key]['RUNTIME']) ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1">
-                                                            <?php print _('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
+                                                            <?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -134,7 +134,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" width="48">
-                                                            <?php print _('WEB');?>:
+                                                            <?php print __('WEB');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>">
@@ -144,7 +144,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name" width="48">
-                                                            <?php print _('DNS');?>:
+                                                            <?php print __('DNS');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DNS']) ?>"> 
@@ -154,7 +154,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name" width="48">
-                                                            <?php print _('MAIL');?>:
+                                                            <?php print __('MAIL');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['MAIL']) ?>"> 
@@ -168,7 +168,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" width="90">
-                                                            <?php print _('DB');?>:
+                                                            <?php print __('DB');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['DB']) ?>">
@@ -178,7 +178,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name" width="90">
-                                                            <?php print _('CRON');?>:
+                                                            <?php print __('CRON');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo $data[$key]['CRON'] ?>">
@@ -188,7 +188,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name" width="90">
-                                                            <?php print _('USER DIRS');?>:
+                                                            <?php print __('USER DIRS');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['UDIR']) ?>">
@@ -217,9 +217,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one archive');
+                                            echo __('one archive');
                                         } else {
-                                            echo _('%s archives',$i);
+                                            echo __('%s archives',$i);
                                         }
                                     ?>
                                 </td>

web/templates/admin/list_backup_detail.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/schedule/restore/'"> <?php print _('Restore All');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/schedule/restore/'"> <?php print __('Restore All');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/restore/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="restore"><?php print _('restore');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="restore"><?php print __('restore');?></option>
                                                 </select>
                                                 <input type="hidden" name="backup" value="<?php echo $_GET['backup'] ?>">
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
@@ -37,7 +37,7 @@
                                                         });
                                                     });
                                                 </script>
-                                                <div id="dialog-message" title="<?php print _('Backup System') ?>">
+                                                <div id="dialog-message" title="<?php print __('Backup System') ?>">
                                                     <p><?php echo $_SESSION['restore_msg'] ?></p>
                                                 </div>
                                             </div>
@@ -57,7 +57,7 @@
                         <table class="data" style="background: #ebe9dc;">
                             <tr>
                                 <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['backup'] ?> </b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['backup'] ?> </b></a>
                                 </td>
                             </tr>
                         </table>
@@ -82,13 +82,13 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=web&object=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'web ' . _('domain') ?> 
+                                                <?php echo 'web ' . __('domain') ?> 
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
                                                 <b><?php echo $key ?></b>
@@ -119,13 +119,13 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=dns&object=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'dns ' . _('domain') ?>
+                                                <?php echo 'dns ' . __('domain') ?>
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
                                                 <b><?php echo $key ?></b>
@@ -156,13 +156,13 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=mail&object=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo 'mail ' . _('domain') ?>
+                                                <?php echo 'mail ' . __('domain') ?>
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
                                                 <b><?php echo $key ?></b>
@@ -193,13 +193,13 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=db&object=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo _('database') ?>
+                                                <?php echo __('database') ?>
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
                                                 <b><?php echo $key ?></b>
@@ -230,16 +230,16 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=cron&object=records" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo _('cron') ?>
+                                                <?php echo __('cron') ?>
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
-                                                <b><?php echo 'cron ' . _('records') ?></b>
+                                                <b><?php echo 'cron ' . __('records') ?></b>
                                             </td>
                                         </tr>
                                     </table>
@@ -267,13 +267,13 @@
                                     <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=udir&object=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/restore.png" width="6px" height="8px">
-                                            <?php print _('restore');?> 
+                                            <?php print __('restore');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="cron" style="width: 170px; font-size: 14px;">
-                                                <?php echo _('user dir') ?>
+                                                <?php echo __('user dir') ?>
                                             </td>
                                             <td class="domain" style="padding: 0 0 0 4px;">
                                                 <b><?php echo $key ?></b>

web/templates/admin/list_cron.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print _('Add Cron Job');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/cron/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -50,34 +50,34 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_CRON_CONFIRMATION');?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>" width="80px">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="800px">
@@ -91,7 +91,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Min');?> 
+                                                            <?php print __('Min');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -105,7 +105,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Hour');?> 
+                                                            <?php print __('Hour');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -119,7 +119,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day');?> 
+                                                            <?php print __('Day');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -133,7 +133,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Month');?> 
+                                                            <?php print __('Month');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -147,7 +147,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day of week');?> 
+                                                            <?php print __('Day of week');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -174,9 +174,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 cron job');
+                                            echo __('1 cron job');
                                         } else {
-                                            echo _('%s cron jobs',$i);
+                                            echo __('%s cron jobs',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_db.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print _('Add Database');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/db/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -54,40 +54,40 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="database[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php echo _('delete') ?> 
+                                            <?php echo __('delete') ?> 
                                             <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DATABASE_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action) ?> 
+                                            <?php echo __($spnd_action) ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/db/?database=<?php echo "$key" ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open %s',$db_admin);?> 
+                                            <?php print __('open %s',$db_admin);?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -101,11 +101,11 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 4px 2px">
-                                                            [<?php echo $data[$key]['TYPE'] ?>] <?php print _('database');?>
+                                                            [<?php echo $data[$key]['TYPE'] ?>] <?php print __('database');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -117,7 +117,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('User');?>:
+                                                            <?php print __('User');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['DBUSER'] ?> 
@@ -125,7 +125,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Host');?>:
+                                                            <?php print __('Host');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['HOST'] ?> 
@@ -137,7 +137,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Charset');?>:
+                                                            <?php print __('Charset');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['CHARSET'] ?> 
@@ -161,9 +161,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 database');
+                                            echo __('1 database');
                                         } else {
-                                            echo _('%s databases',$i);
+                                            echo __('%s databases',$i);
                                         }
                                     ?>
                                 </td>

web/templates/admin/list_dns.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -48,46 +48,46 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status) ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print _('add record');?> 
+                                            <?php print __('add record');?> 
                                         </span>
                                     </a>
                                     <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print _('list records',$data[$key]['RECORDS']); ?> 
+                                            <?php print __('list records',$data[$key]['RECORDS']); ?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -105,7 +105,7 @@
                                                         </td>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 0 0 20px 2px">
-                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?> 
+                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print __('template');?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -113,11 +113,11 @@
                                             <td style="vertical-align:top;" width="250">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SOA') ?>:</td>
+                                                        <td class="counter-name"><?php print __('SOA') ?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('TTL') ?>:</td>
+                                                        <td class="counter-name"><?php print __('TTL') ?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
                                                     </tr>
                                                 </table>
@@ -125,11 +125,11 @@
                                             <td rowspan=4 style="vertical-align:top;" width="300">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Expire');?>:</td>
+                                                        <td class="counter-name"><?php print __('Expire');?>:</td>
                                                         <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Records');?>:</td>
+                                                        <td class="counter-name"><?php print __('Records');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
                                                     </tr>
                                                 </table>
@@ -150,9 +150,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_dns_rec.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add DNS Record');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -32,7 +32,7 @@
                             <table class="data" style="background: #ebe9dc;">
                                 <tr>
                                     <td style="padding: 8px 2px 8px 0;">
-                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                                     </td>
                                 </tr>
                             </table>
@@ -62,17 +62,17 @@
                                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                             <span class="do_delete">
                                                 <img src="/images/delete.png" width="7px" height="7px">
-                                                <?php print _('delete');?>
+                                                <?php print __('delete');?>
                                                 <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                    <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
                                                 </div>
                                             </span>
                                         </a>
                                         <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
                                             <span>
                                                 <img src="/images/edit.png" width="8px" height="8px">
-                                                <?php print _('edit');?> 
+                                                <?php print __('edit');?> 
                                             </span>
                                         </a>
                                         <table class="data-col5" width="780px">
@@ -97,9 +97,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 record');
+                                            echo __('1 record');
                                         } else {
-                                            echo _('%s records',$i);
+                                            echo __('%s records',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_ip.html

@@ -2,21 +2,21 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/ip/'"> <?php print _('Add IP');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/ip/'"> <?php print __('Add IP');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/ip/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="reread IP"><?php print _('reread IP');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="reread IP"><?php print __('reread IP');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -65,24 +65,24 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="ip[]" value="<?php echo $key ?>"></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-active"><b><?php print _('active');?></b></td></tr>
+                                        <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/ip/?ip=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_IP_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_IP_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/ip/?ip=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?>
+                                            <?php print __('edit');?>
                                         </span>
                                     </a>
 
@@ -113,7 +113,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Domains');?>:
+                                                            <?php print __('Domains');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?></a>
@@ -121,10 +121,10 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Status');?>:
+                                                            <?php print __('Status');?>:
                                                         </td>
                                                         <td>
-                                                            <a class="counter-value"> <?php echo _($data[$key]['STATUS']) ?></a>
+                                                            <a class="counter-value"> <?php echo __($data[$key]['STATUS']) ?></a>
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -133,15 +133,15 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Owner');?>:
+                                                            <?php print __('Owner');?>:
                                                         </td>
                                                         <td>
-                                                            <a class="counter-value"> <?php echo _($data[$key]['OWNER']) ?></a>
+                                                            <a class="counter-value"> <?php echo __($data[$key]['OWNER']) ?></a>
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Users');?>:
+                                                            <?php print __('Users');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"> <?php echo str_replace(',', ', ', $data[$key]['U_SYS_USERS']) ?></a>
@@ -167,9 +167,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 IP address');
+                                            echo __('1 IP address');
                                         } else {
-                                            echo _('%s IP addresses',$i);
+                                            echo __('%s IP addresses',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_log.html

@@ -4,7 +4,7 @@
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -53,9 +53,9 @@
                             <td>
                                 <?php
                                     if ( $i == 1) {
-                                        echo _('one log record');
+                                        echo __('one log record');
                                     } else {
-                                        echo _('%s log records',$i);
+                                        echo __('%s log records',$i);
                                     }
                                 ?>
                             </td>

web/templates/admin/list_mail.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                     <select class="submenu-select-dropdown" name="action">
-                                                        <option value=""><?php print _('apply to selected');?></option>
-                                                        <option value="suspend"><?php print _('suspend');?></option>
-                                                        <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                        <option value="delete"><?php print _('delete');?></option>
+                                                        <option value=""><?php print __('apply to selected');?></option>
+                                                        <option value="suspend"><?php print __('suspend');?></option>
+                                                        <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                        <option value="delete"><?php print __('delete');?></option>
                                                     </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -51,52 +51,52 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open webmail');?> 
+                                            <?php print __('open webmail');?> 
                                         </span>
                                     </a>
                                     <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print _('add account');?> 
+                                            <?php print __('add account');?> 
                                         </span>
                                     </a>
                                     <a href="?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print _('list accounts',$data[$key]['ACCOUNTS']); ?> 
+                                            <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -110,12 +110,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 2px 0">
-                                                            <?php print _('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?> 
+                                                            <?php print __('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1">
-                                                            <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -127,18 +127,18 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('AntiVirus Support');?>:
+                                                            <?php print __('AntiVirus Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['ANTIVIRUS']) ?> 
+                                                            <?php echo __($data[$key]['ANTIVIRUS']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('AntiSpam Support');?>:
+                                                            <?php print __('AntiSpam Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['ANTISPAM']) ?> 
+                                                            <?php echo __($data[$key]['ANTISPAM']) ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -147,15 +147,15 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DKIM Support');?>:
+                                                            <?php print __('DKIM Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['DKIM']) ?> 
+                                                            <?php echo __($data[$key]['DKIM']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Accounts');?>:
+                                                            <?php print __('Accounts');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['ACCOUNTS'] ?> 
@@ -178,9 +178,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_mail_acc.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add Mail Account');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -33,7 +33,7 @@
                         <table class="data" style="background: #ebe9dc;">
                             <tr>
                                 <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                                 </td>
                             </tr>
                         </table>
@@ -58,34 +58,34 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -98,7 +98,7 @@
                                                         </td>
                                                     <tr>
                                                         <td class="chart1" style="padding: 0 0 2px 0">
-                                                            <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -110,7 +110,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Quota');?>:
+                                                            <?php print __('Quota');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['QUOTA'] ?> 
@@ -118,10 +118,10 @@
                                                         </tr>
                                                         <tr>
                                                             <td class="counter-name">
-                                                                <?php print _('Autoreply');?>:
+                                                                <?php print __('Autoreply');?>:
                                                             </td>
                                                             <td class="counter-value">
-                                                                <?php echo _($data[$key]['AUTOREPLY']) ?> 
+                                                                <?php echo __($data[$key]['AUTOREPLY']) ?> 
                                                             </td>
                                                         </tr>
                                                 </table>
@@ -130,7 +130,7 @@
                                                 <table width="350">
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Forward to');?>:
+                                                            <?php print __('Forward to');?>:
                                                         </td>
                                                         <td class="counter-value" style="padding: 0 0 0 8px;" >
                                                             <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
@@ -154,9 +154,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 mail account');
+                                            echo __('1 mail account');
                                         } else {
-                                            echo _('%s mail accounts',$i);
+                                            echo __('%s mail accounts',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_packages.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/package/'"> <?php print _('Add Package');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/package/'"> <?php print __('Add Package');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/package/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -45,10 +45,10 @@
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px" >
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/package/?package=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_PACKAGE_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_PACKAGE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -56,7 +56,7 @@
                                     <a href="/edit/package/?package=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                        <?php print _('edit');?> 
+                                        <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -70,7 +70,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 4px 0px 0px 0;" >
-                                                            <?php print _('Template');?>:
+                                                            <?php print __('Template');?>:
                                                         </td>
                                                         <td class="counter-value" style="padding: 4px 0 0 6px;">
                                                             <?php echo $data[$key]['TEMPLATE'] ?> 
@@ -78,7 +78,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 0px 0px 6px 0;">
-                                                            <?php print _('SSH Access');?>:
+                                                            <?php print __('SSH Access');?>:
                                                         </td>
                                                         <td class="counter-value" width="58px">
                                                             <?php echo $data[$key]['SHELL'] ?> 
@@ -86,7 +86,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
+                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -94,7 +94,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
+                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -106,7 +106,7 @@
                                                 <table width="300">
                                                     <tr>
                                                         <td class="counter-name" width="37%">
-                                                            <?php print _('Web Domains');?>:
+                                                            <?php print __('Web Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['WEB_DOMAINS'] ?> 
@@ -114,15 +114,15 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Web Aliases');?>:
+                                                            <?php print __('Web Aliases');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo $data[$key]['WEB_ALIASES'] ?> <?php print _('per domain');?> 
+                                                            <?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS domains');?>:
+                                                            <?php print __('DNS domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['DNS_DOMAINS'] ?> 
@@ -130,15 +130,15 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS records');?>:
+                                                            <?php print __('DNS records');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo $data[$key]['DNS_RECORDS'] ?> <?php print _('per domain');?> 
+                                                            <?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Name Servers');?>:
+                                                            <?php print __('Name Servers');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo str_replace(',', ', ',$data[$key]['NS']) ?> 
@@ -150,7 +150,7 @@
                                                 <table class="data-col4" width="280">
                                                     <tr>
                                                         <td class="counter-name" width="48%">
-                                                            <?php print _('Mail Domains');?>:
+                                                            <?php print __('Mail Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['MAIL_DOMAINS'] ?> 
@@ -158,15 +158,15 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Mail Accounts');?>:
+                                                            <?php print __('Mail Accounts');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print _('per domain');?> 
+                                                            <?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Databases');?>:
+                                                            <?php print __('Databases');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['DATABASES'] ?> 
@@ -174,7 +174,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Cron Jobs');?>:
+                                                            <?php print __('Cron Jobs');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['CRON_JOBS'] ?> 
@@ -182,7 +182,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Backups');?>:
+                                                            <?php print __('Backups');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['BACKUPS'] ?> 
@@ -207,9 +207,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 package');
+                                            echo __('1 package');
                                         } else {
-                                            echo _('%s packages',$i);
+                                            echo __('%s packages',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_rrd.html

@@ -2,15 +2,15 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div style="submenu-button-block">
-                                                <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print _('Daily');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print _('Weekly');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'monthly')) echo "-selected" ?>" href="?period=monthly"><?php print _('Monthly');?></a>
-                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'yearly')) echo "-selected" ?>" href="?period=yearly"><?php print _('Yearly');?></a>
+                                                <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print __('Daily');?></a>
+                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print __('Weekly');?></a>
+                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'monthly')) echo "-selected" ?>" href="?period=monthly"><?php print __('Monthly');?></a>
+                                                <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'yearly')) echo "-selected" ?>" href="?period=yearly"><?php print __('Yearly');?></a>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -42,11 +42,11 @@
                                     <a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/download.png" width="8px" height="8px">
-                                            <?php print _('download');?> 
+                                            <?php print __('download');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
-                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo _($data[$key]['TITLE']); ?></b></td></tr>
+                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo __($data[$key]['TITLE']); ?></b></td></tr>
                                         <tr>
                                             <td style="vertical-align:top;" width="630px">
                                                 <table width="630px">

web/templates/admin/list_search.html

@@ -2,12 +2,12 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div style="submenu-button-block">
-                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print _('Search Results');?></b></a>
+                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -40,7 +40,7 @@
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
                                     <table class="data-col1" width="150">
                                         <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -69,10 +69,10 @@
                                     <a id="delete_link_<?php echo $i ?>" class="do_delete">
                                         <span class="data-controls do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                <p class="counter-value"><?php print _($cnfrm,_('delete'),$data[$key]['RESULT']);?></p>
+                                                <p class="counter-value"><?php print __($cnfrm,__('delete'),$data[$key]['RESULT']);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -103,10 +103,10 @@
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>">
                                         <span class="data-controls do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="<?php echo $spnd_lnk ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($cnfrm,_($spnd_action),$data[$key]['RESULT']);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($cnfrm,__($spnd_action),$data[$key]['RESULT']);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -131,7 +131,7 @@
                                     <a href="<?php echo $edit_lnk; ?>">
                                         <span class="data-controls">
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit'); ?> 
+                                            <?php print __('edit'); ?> 
                                         </span>
                                     </a>
 
@@ -141,7 +141,7 @@
                                     <a href="/login/?loginas=<?php echo $data[$key]['USER'] ?>">
                                         <span class="data-controls">
                                             <img src="/images/login-as.png" width="8px" height="8px">
-                                            <?php print _('login as'). ' ' . $data[$key]['USER'];?> 
+                                            <?php print __('login as'). ' ' . $data[$key]['USER'];?> 
                                         </span>
                                     </a>
                                     <?php
@@ -155,7 +155,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Object');?>:
+                                                            <?php print __('Object');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $object ?> 
@@ -167,7 +167,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Owner');?>:
+                                                            <?php print __('Owner');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['USER'] ?> 
@@ -179,10 +179,10 @@
                                                 <table >
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Status');?>:
+                                                            <?php print __('Status');?>:
                                                         </td>
                                                         <td class="counter-value" style="padding: 0 0 0 8px;">
-                                                            <?php echo _($status); ?> 
+                                                            <?php echo __($status); ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -203,9 +203,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1){
-                                            echo _('1 object');
+                                            echo __('1 object');
                                         } else {
-                                            echo _('%s objects',$i);
+                                            echo __('%s objects',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_services.html

@@ -4,17 +4,17 @@
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-button-block">
                                                 <form action="/bulk/service/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="stop"><?php print _('stop');?></option>
-                                                    <option value="start"><?php print _('start');?></option>
-                                                    <option value="restart"><?php print _('restart');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="stop"><?php print __('stop');?></option>
+                                                    <option value="start"><?php print __('start');?></option>
+                                                    <option value="restart"><?php print __('restart');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -73,20 +73,20 @@
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="service[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($data[$key]['STATE']); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($data[$key]['STATE']); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a href="/restart/service/?srv=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/reload.png" width="6px" height="7px">
-                                            <?php print _('restart'); ?> 
+                                            <?php print __('restart'); ?> 
                                         </span>
                                     </a>
                                     <a href="/<?php echo $action ?>/service/?srv=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/<?php echo $action ?>.png" width="7px" height="7px">
-                                            <?php print _($action); ?> 
+                                            <?php print __($action); ?> 
                                         </span>
                                     </a>
 
@@ -101,7 +101,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 0 0">
-                                                            <?php echo _($data[$key]['SYSTEM']) ?> 
+                                                            <?php echo __($data[$key]['SYSTEM']) ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -110,7 +110,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('CPU');?>:
+                                                            <?php print __('CPU');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"> <?php echo $cpu ?>%</a>
@@ -122,10 +122,10 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Memory');?>:
+                                                            <?php print __('Memory');?>:
                                                         </td>
                                                         <td>
-                                                            <a class="counter-value"><?php echo $data[$key]['MEM'] ?> <?php print _('mb');?></a>
+                                                            <a class="counter-value"><?php echo $data[$key]['MEM'] ?> <?php print __('mb');?></a>
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -134,7 +134,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Uptime');?>:
+                                                            <?php print __('Uptime');?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"><?php echo humanize_time($data[$key]['RTIME']) ?> </a>

web/templates/admin/list_stats.html

@@ -3,10 +3,10 @@
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
                                                 <form action="/list/stats/" method="get" id="objects">
-                                                <a class="vst<?php if (empty($_GET['user'])) echo "-selected"; ?>" href='/list/stats/'><?php print _('Overall Statistics');?></a>
+                                                <a class="vst<?php if (empty($_GET['user'])) echo "-selected"; ?>" href='/list/stats/'><?php print __('Overall Statistics');?></a>
                                                 <div class="submenu-select-block">
                                                 <select class="submenu-select-dropdown" name="user">
-                                                    <option value=""><?php print _('show per user');?></option>
+                                                    <option value=""><?php print __('show per user');?></option>
                                                 <?php
                                                     foreach ($users as $key => $value) {
                                                         echo "\t\t\t\t<option value=\"".$value."\"";
@@ -26,7 +26,7 @@
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -63,12 +63,12 @@
                                                 <table>
                                                     <tr>
                                                         <td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">
-                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?>
+                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                            <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -76,7 +76,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                            <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -87,12 +87,12 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
-                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
                                                                     </td>
                                                                 </tr>
                                                             </table>
@@ -104,7 +104,7 @@
                                                 <table width="280">
                                                     <tr>
                                                         <td class="counter-name" width="37%">
-                                                            <?php print _('Web Domains');?>:
+                                                            <?php print __('Web Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
@@ -112,7 +112,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('SSL Domains');?>:
+                                                            <?php print __('SSL Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_SSL'] ?> 
@@ -120,7 +120,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Web Aliases');?>:
+                                                            <?php print __('Web Aliases');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
@@ -128,7 +128,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS domains');?>:
+                                                            <?php print __('DNS domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
@@ -136,7 +136,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS records');?>:
+                                                            <?php print __('DNS records');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DNS_RECORDS'] ?>
@@ -148,7 +148,7 @@
                                                 <table class="data-col4" width="250">
                                                     <tr>
                                                         <td class="counter-name" width="50%">
-                                                            <?php print _('Mail Domains');?>:
+                                                            <?php print __('Mail Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
@@ -156,7 +156,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Mail Accounts');?>:
+                                                            <?php print __('Mail Accounts');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
@@ -164,7 +164,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Databases');?>:
+                                                            <?php print __('Databases');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DATABASES'] ?> 
@@ -172,7 +172,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Cron Jobs');?>:
+                                                            <?php print __('Cron Jobs');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_CRON_JOBS'] ?>
@@ -180,7 +180,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('IP Addresses');?>:
+                                                            <?php print __('IP Addresses');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['IP_OWNED'] ?> 
@@ -205,9 +205,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 month');
+                                            echo __('1 month');
                                         } else {
-                                            echo _('%s months',$i);
+                                            echo __('%s months',$i);
                                         }
                                     ?>
                                 </td>

web/templates/admin/list_updates.html

@@ -4,15 +4,15 @@
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-button-block">
                                                 <form action="/bulk/vesta/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected') ?></option>
-                                                    <option value="update"><?php print _('update') ?></option>
+                                                    <option value=""><?php print __('apply to selected') ?></option>
+                                                    <option value="update"><?php print __('update') ?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -56,10 +56,10 @@
                                     ++$i;
                                     if ($data[$key]['UPDATED'] == 'yes') {
                                         $status = 'active';
-                                        $upd_status = _('updated');
+                                        $upd_status = __('updated');
                                     } else {
                                         $status = 'suspended';
-                                        $upd_status = _('outdated');
+                                        $upd_status = __('outdated');
                                     }
                                 ?>
 
@@ -77,7 +77,7 @@
                                     <a href="/update/vesta/?pkg=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/update.png" width="6px" height="7px">
-                                            <?php print _('update') ?>
+                                            <?php print __('update') ?>
                                         </span>
                                     </a>
                                     <?php
@@ -96,7 +96,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 0 0">
-                                                            <?php echo _($data[$key]['DESCR']) ?> 
+                                                            <?php echo __($data[$key]['DESCR']) ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -105,7 +105,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Version') ?>:
+                                                            <?php print __('Version') ?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"> <?php echo $data[$key]['VERSION'] ?></a>
@@ -117,7 +117,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Release') ?>:
+                                                            <?php print __('Release') ?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"><?php echo $data[$key]['RELEASE'] ?></a>
@@ -129,7 +129,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Architecture') ?>:
+                                                            <?php print __('Architecture') ?>:
                                                         </td>
                                                         <td>
                                                             <a class="counter-value"><?php echo $data[$key]['ARCH'] ?> </a>

web/templates/admin/list_user.html

@@ -5,33 +5,33 @@
                                             <div class="submenu-button-block">
                                                 <?php
                                                     if ($user == 'admin') {
-                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/user/'\">" . _('Add User') . "</button>";
+                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/user/'\">" . __('Add User') . "</button>";
                                                     } else {
-                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/web/'\">" . _('Add Web Domain') . "</button>";
+                                                        echo "<button class=\"submenu-button\" onclick=\"location.href='/add/web/'\">" . __('Add Web Domain') . "</button>";
                                                     }
                                                 ?> 
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/user/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="rebuild"><?php print _('rebuild');?></option>
-                                                    <option value="rebuild web"><?php print _('rebuild web');?></option>
-                                                    <option value="rebuild dns"><?php print _('rebuild dns');?></option>
-                                                    <option value="rebuild mail"><?php print _('rebuild mail');?></option>
-                                                    <option value="rebuild db"><?php print _('rebuild db');?></option>
-                                                    <option value="rebuild cron"><?php print _('rebuild cron');?></option>
-                                                    <option value="update counters"><?php print _('update counters');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="rebuild"><?php print __('rebuild');?></option>
+                                                    <option value="rebuild web"><?php print __('rebuild web');?></option>
+                                                    <option value="rebuild dns"><?php print __('rebuild dns');?></option>
+                                                    <option value="rebuild mail"><?php print __('rebuild mail');?></option>
+                                                    <option value="rebuild db"><?php print __('rebuild db');?></option>
+                                                    <option value="rebuild cron"><?php print __('rebuild cron');?></option>
+                                                    <option value="update counters"><?php print __('update counters');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -62,34 +62,34 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="user[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/user/?user=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_USER_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_USER_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/user/?user=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/user/?user=<?php echo $key; ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit'); ?> 
+                                            <?php print __('edit'); ?> 
                                         </span>
                                     </a>
                                     <?php
@@ -98,7 +98,7 @@
                                     <a href="/logout" class="data-controls">
                                         <span>
                                             <img src="/images/login-as.png" width="7px" height="8px">
-                                            <?php print _('logout'); ?> 
+                                            <?php print __('logout'); ?> 
                                     <?php
                                             if (!empty($_SESSION['look_alert'])) {
                                     ?> 
@@ -115,8 +115,8 @@
                                                         });
                                                     });
                                                 </script>
-                                                <div id="dialog-message" title="<?php print _('Welcome') ?>">
-                                                    <p><?php print _('LOGGED_IN_AS',$key);?></p>
+                                                <div id="dialog-message" title="<?php print __('Welcome') ?>">
+                                                    <p><?php print __('LOGGED_IN_AS',$key);?></p>
                                                 </div>
                                     <?php
                                                 unset($_SESSION['look_alert']);
@@ -126,7 +126,7 @@
                                     <a href="/login/?loginas=<?php echo $key; ?>" class="data-controls">
                                         <span>
                                             <img src="/images/login-as.png" width="7px" height="8px">
-                                            <?php print _('login as') ." ".$key; ?> 
+                                            <?php print __('login as') ." ".$key; ?> 
                                     <?php
                                         }
                                      ?> 
@@ -141,16 +141,16 @@
                                             <td style="vertical-align:top;"  width="240">
                                                 <table>
                                                     <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?></td></tr>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                                     <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -161,12 +161,12 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
-                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
                                                                     </td>
                                                                 </tr>
                                                             </table>
@@ -177,31 +177,31 @@
                                             <td style="vertical-align:top;" width="320">
                                                 <table width="300">
                                                     <tr>
-                                                        <td class="counter-name" width="36%"><?php print _('Template');?>:</td>
+                                                        <td class="counter-name" width="36%"><?php print __('Template');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSL Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSL Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Aliases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('Web Aliases');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('DNS domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('DNS domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('DNS records');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('DNS records');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Name Servers');?>:<br></td>
+                                                        <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
                                                         <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
                                                     </tr>
                                                 </table>
@@ -209,31 +209,31 @@
                                             <td style="vertical-align:top;">
                                                 <table class="data-col4">
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Mail Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Mail Accounts');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Databases');?>:</td>
+                                                        <td class="counter-name"><?php print __('Databases');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Cron Jobs');?>:</td>
+                                                        <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSH Access');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSH Access');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('IP Addresses');?>:</td>
+                                                        <td class="counter-name"><?php print __('IP Addresses');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Backups');?>:</td>
+                                                        <td class="counter-name"><?php print __('Backups');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
                                                     </tr>
                                                 </table>
@@ -254,9 +254,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 account');
+                                            echo __('1 account');
                                         } else {
-                                            echo _('%s accounts',$i);
+                                            echo __('%s accounts',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/list_web.html

@@ -2,22 +2,22 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/web/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="suspend"><?php print _('suspend');?></option>
-                                                    <option value="unsuspend"><?php print _('unsuspend');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="suspend"><?php print __('suspend');?></option>
+                                                    <option value="unsuspend"><?php print __('unsuspend');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -79,34 +79,34 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                             <?php print _('delete');?> 
+                                             <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="data-controls do_<?php echo $spnd_action ?>">
                                         <span class="do_<?php echo $spnd_action ?>">
                                             <img src="/images/suspend.png" width="7px" height="8px">
-                                            <?php echo _($spnd_action); ?> 
+                                            <?php echo __($spnd_action); ?> 
                                             <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/web/?domain=<?php echo $key ?>" />
-                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _($spnd_confirmation,$key);?></p>
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __($spnd_confirmation,$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <?php
@@ -115,7 +115,7 @@
                                     <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open webstats');?> 
+                                            <?php print __('open webstats');?> 
                                         </span>
                                     </a>
                                     <?php
@@ -136,19 +136,19 @@
                                                         </td>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 0 0 8px 2px">
-                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?> 
+                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print __('template');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" style="padding: 0 0 0 2px">
-                                                            <?php print _('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0 0 0 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                        <td class="chart1" style="padding: 0 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                         </div>
@@ -159,19 +159,19 @@
                                             <td style="vertical-align:top;" width="300">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name" width="110"><?php print _('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php print _($data[$key]['SSL']) ?></td>
+                                                        <td class="counter-name" width="110"><?php print __('SSL Support');?>:</td>
+                                                        <td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSL Home Directory');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
                                                         <td class="counter-value"><?php echo $ssl_home ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Support');?>:</td>
-                                                        <td class="counter-value"><?php print _($nginx_support) ?></td>
+                                                        <td class="counter-name"><?php print __('Nginx Support');?>:</td>
+                                                        <td class="counter-value"><?php print __($nginx_support) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Extentions');?>:</td>
+                                                        <td class="counter-name"><?php print __('Nginx Extentions');?>:</td>
                                                         <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
                                                     </tr>
                                                 </table>
@@ -179,12 +179,12 @@
                                             <td rowspan=4 style="vertical-align:top;" width="240">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Statistics');?>: </td>
-                                                        <td class="counter-value"> <?php print _($web_stats) ?></td>
+                                                        <td class="counter-name"><?php print __('Web Statistics');?>: </td>
+                                                        <td class="counter-value"> <?php print __($web_stats) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"> <?php print _('Additional FTP Account');?>:</td>
-                                                        <td class="counter-value"> <?php print _($ftp_user) ?></td>
+                                                        <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
+                                                        <td class="counter-value"> <?php print __($ftp_user) ?></td>
                                                     </tr>
                                                 </table>
                                             </td>
@@ -204,9 +204,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/admin/panel.html

@@ -9,17 +9,17 @@
                                 <thead>
                                     <tr>
                                         <td>
-                                            <b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"> <?php print _('Packages') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"> <?php print _('IP') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print _('Graphics') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print _('Statistics') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print _('Log') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print _('Services') ?>  </a></b>
-                                            <b><a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print _('Updates') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/"> <?php print __('Packages') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/"> <?php print __('IP') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/"> <?php print __('Graphics') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/"> <?php print __('Services') ?>  </a></b>
+                                            <b><a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/"> <?php print __('Updates') ?> </a></b>
                                         </td>
                                         <td>
                                             <b><?php echo $user ?></b>
-                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print _('Log out') ?> </a>
+                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print __('Log out') ?> </a>
                                         </td>
                                     </tr>
                                 </thead>
@@ -32,79 +32,79 @@
                                             <a class="nav-lnk" href="/list/user/">
                                                 <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                        <?php print _('USER');?> 
+                                                        <?php print __('USER');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_USERS']?> 
+                                                        <?php print __('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_USERS']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/web/">
                                                 <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                        <?php print _('WEB');?> 
+                                                        <?php print __('WEB');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                        <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/dns/">
                                                 <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                        <?php print _('DNS');?> 
+                                                        <?php print __('DNS');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                        <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/mail/">
                                                 <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                        <?php print _('MAIL');?> 
+                                                        <?php print __('MAIL');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                        <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/db/">
                                                 <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                        <?php print _('DB');?> 
+                                                        <?php print __('DB');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                                                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/cron/">
                                                 <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                        <?php print _('CRON');?> 
+                                                        <?php print __('CRON');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                                                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/backup/">
                                                 <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                        <?php print _('BACKUP');?> 
+                                                        <?php print __('BACKUP');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                                                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
                                                     </p>
                                                 </span>
                                             </a>

web/templates/login.html

@@ -12,7 +12,7 @@
                                     <table class="login-box">
                                         <tr>
                                             <td style="padding: 12px 0 0 2px;">
-                                                <?php print _('Username');?>
+                                                <?php print __('Username');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -22,7 +22,7 @@
                                         </tr>
                                         <tr>
                                             <td style="padding: 12px 0 0 2px;">
-                                                <?php print _('Password');?> <a tabindex="5" class="genpass" href="/reset/" style="padding: 0 0 0 14px;" ><?php print _('forgot password');?></a>
+                                                <?php print __('Password');?> <a tabindex="5" class="genpass" href="/reset/" style="padding: 0 0 0 14px;" ><?php print __('forgot password');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -36,7 +36,7 @@
                                         </tr>
                                         <tr>
                                             <td style="padding: 0 0 12px 0;">
-                                                <input tabindex="3" type="submit" value="<?php print _('Log in');?>" class="button">
+                                                <input tabindex="3" type="submit" value="<?php print __('Log in');?>" class="button">
                                             </td>
                                         </tr>
                                     </table>

web/templates/reset_1.html

@@ -12,12 +12,12 @@
                                         <table class="login-box">
                                             <tr>
                                             <td style="padding: 12px 0 0 2px;">
-                                                <?php print _('RESET_NOTICE');?>
+                                                <?php print __('RESET_NOTICE');?>
                                             </td>
                                             </tr>
                                             <tr>
                                                 <td style="padding: 12px 0 0 2px;">
-                                                    <?php print _('Username');?>
+                                                    <?php print __('Username');?>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -27,7 +27,7 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input tabindex="2" type="submit" value="<?php print _('Submit');?>" class="button">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Submit');?>" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_2.html

@@ -12,11 +12,11 @@
                                         <table class="login-box">
                                             <tr>
                                                 <td style="padding: 12px 0 0 2px;">
-                                                    <?php print _('RESET_CODE_SENT');?>
+                                                    <?php print __('RESET_CODE_SENT');?>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td style="padding: 12px 0 0 2px;"><?php print _('Reset Code');?></td>
+                                                <td style="padding: 12px 0 0 2px;"><?php print __('Reset Code');?></td>
                                             </tr>
                                             <tr>
                                                 <td>
@@ -27,7 +27,7 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 20px 0 12px 0;">
-                                                    <input tabindex="2" type="submit" value="<?php print _('Confirm');?>" class="button">
+                                                    <input tabindex="2" type="submit" value="<?php print __('Confirm');?>" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/reset_3.html

@@ -15,7 +15,7 @@
                                                     <input type="hidden" name="action" value="confirm" >
                                                     <input type="hidden" name="user" value="<?php echo $_GET['user'];?>" >
                                                     <input type="hidden" name="code" value="<?php echo $_GET['code'];?>" >
-                                                    <?php print _('New Password');?>
+                                                    <?php print __('New Password');?>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -25,7 +25,7 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 12px 0 0 2px;">
-                                                    <?php print _('Confirm Password');?>
+                                                    <?php print __('Confirm Password');?>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -39,7 +39,7 @@
                                             </tr>
                                             <tr>
                                                 <td style="padding: 0 0 12px 0;">
-                                                    <input tabindex="3" type="submit" value="<?php print _('Reset');?>" class="button">
+                                                    <input tabindex="3" type="submit" value="<?php print __('Reset');?>" class="button">
                                                 </td>
                                             </tr>
                                         </table>

web/templates/user/add_dns.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding DNS Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -55,7 +55,7 @@
                                     <table class="data-col2" width="600px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -65,7 +65,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP address');?>
+                                                <?php print __('IP address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -75,7 +75,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?></a>
+                                                <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -83,7 +83,7 @@
                                                 <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('YYYY-MM-DD');?>)</span>
+                                                            <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -103,7 +103,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Name servers');?>
+                                                            <?php print __('Name servers');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -133,10 +133,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                                <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/user/add_web.html

@@ -10,7 +10,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Adding Web Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Adding Web Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -85,7 +85,7 @@
                                 <table class="data-col2" width="600px">
                                     <tr>
                                         <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                            <?php print _('Domain');?>
+                                            <?php print __('Domain');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -95,7 +95,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('IP address');?>
+                                            <?php print __('IP address');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -117,7 +117,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('DNS Support');?>
+                                            <?php print __('DNS Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -127,7 +127,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Mail Support');?>
+                                            <?php print __('Mail Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -137,14 +137,14 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?></a>
+                                            <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                         </td>
                                     </tr>
                                 </table>
                                 <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
                                         <td class="vst-text" style="padding: 10 0 0 2px;">
-                                            <?php print _('Aliases');?>
+                                            <?php print __('Aliases');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -154,7 +154,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Nginx Support');?>
+                                            <?php print __('Nginx Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -167,7 +167,7 @@
                                             <table style="display:<?php if ($v_nginx == 'off') { echo 'none';} else {echo 'block';}?>;" id="nginxtable" >
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('Nginx Extentions');?>
+                                                        <?php print __('Nginx Extentions');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -180,7 +180,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('SSL Support');?>
+                                            <?php print __('SSL Support');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -193,7 +193,7 @@
                                             <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('SSL Home Directory');?>
+                                                        <?php print __('SSL Home Directory');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -210,7 +210,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Certificate');?>
+                                                        <?php print __('SSL Certificate');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -220,7 +220,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Key');?>
+                                                        <?php print __('SSL Key');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -230,7 +230,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                        <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -243,7 +243,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Web Statistics');?>
+                                            <?php print __('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -257,7 +257,7 @@
                                                         if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                             echo ' selected' ;
                                                         }
-                                                        echo ">" . _($value) . "</option>\n";
+                                                        echo ">" . __($value) . "</option>\n";
                                                     }
                                                 ?> 
                                             </select>
@@ -265,7 +265,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statistics Authorization');?>
+                                            <?php print __('Statistics Authorization');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -278,7 +278,7 @@
                                             <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                        <?php print _('Username');?>
+                                                        <?php print __('Username');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -288,7 +288,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print _('generate');?></a>
+                                                        <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -301,7 +301,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Additional FTP Account');?>
+                                            <?php print __('Additional FTP Account');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -314,8 +314,8 @@
                                             <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Username');?><br>
-                                                        <span style="font-size: 10pt; color:#777;"><?php print _('Prefix will be automaticaly added to username',$user."_");?></span>
+                                                        <?php print __('Username');?><br>
+                                                        <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -325,7 +325,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                        <?php print _('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print _('generate');?></a>
+                                                        <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -335,7 +335,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                         <?php print _('Send FTP credentials to email');?>
+                                                         <?php print __('Send FTP credentials to email');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -350,10 +350,10 @@
                                 <table class="data-col2">
                                     <tr>
                                         <td style="padding: 33px 0 0 0;" width="116px">
-                                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                            <input type="submit" name="ok" value="<?php print __('Add');?>" class="button">
                                         </td>
                                         <td style="padding: 33px 0 0 0;">
-                                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                            <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                         </td>
                                     </tr>
                                 </table>

web/templates/user/edit_dns.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing DNS Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -49,7 +49,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -59,7 +59,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP Address');?>
+                                                <?php print __('IP Address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -69,7 +69,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('YYYY-MM-DD');?>)</span>
+                                                <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
                                         <tr>
@@ -99,8 +99,8 @@
                                         </tr>
                                         <tr>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/user/edit_user.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing User');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing User');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -49,7 +49,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -61,7 +61,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Username');?>
+                                                <?php print __('Username');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -71,7 +71,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                                <?php print __('Password');?> <a href="javascript:randomString();" class="genpass"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
@@ -81,7 +81,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Email');?> 
+                                                <?php print __('Email');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;" >
-                                                <?php print _('Language');?>
+                                                <?php print __('Language');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -115,7 +115,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Default Name Servers');?> 
+                                                <?php print __('Default Name Servers');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -142,10 +142,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/user/edit_web.html

@@ -9,7 +9,7 @@
 
                                 <table class="submenu">
                                     <tr>
-                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print _('Editing Domain');?></b></a>
+                                        <td style="padding: 0 2px 0 0;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -69,7 +69,7 @@
                                                 <a class="data-date" ?><?php echo $v_time?></a>
                                             </td>
                                         </tr>
-                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status) ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 18px;" class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -81,7 +81,7 @@
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td class="vst-text" style="padding: 20px 0 0 2px;">
-                                                <?php print _('Domain');?>
+                                                <?php print __('Domain');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -91,7 +91,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('IP Address');?>
+                                                <?php print __('IP Address');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -114,7 +114,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10 0 0 2px;">
-                                                <?php print _('Aliases');?>
+                                                <?php print __('Aliases');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -124,7 +124,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Nginx Support');?>
+                                                <?php print __('Nginx Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -137,7 +137,7 @@
                                                 <table style="display:<?php if (empty($v_nginx)) { echo 'none';} else {echo 'block';}?> ;" id="nginxtable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print _('Nginx Extensions');?>
+                                                            <?php print __('Nginx Extensions');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -150,7 +150,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('SSL Support');?>
+                                                <?php print __('SSL Support');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -163,7 +163,7 @@
                                                 <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 0;">
-                                                            <?php print _('SSL Home Directory');?>
+                                                            <?php print __('SSL Home Directory');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -180,7 +180,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Certificate');?>
+                                                            <?php print __('SSL Certificate');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -190,7 +190,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Key');?>
+                                                            <?php print __('SSL Key');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -200,7 +200,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
+                                                            <?php print __('SSL Certificate Authority / Intermediate');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('optional');?>)</span>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -213,7 +213,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Web Statistics');?>
+                                                <?php print __('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -227,7 +227,7 @@
                                                             if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                                 echo ' selected' ;
                                                             }
-                                                        echo ">". _($value) ."</option>\n";
+                                                        echo ">". __($value) ."</option>\n";
                                                         }
                                                 ?> 
                                                 </select>
@@ -235,7 +235,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Statistics Authorization');?>
+                                                <?php print __('Statistics Authorization');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -248,7 +248,7 @@
                                                 <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 9px 0 0 2px;">
-                                                            <?php print _('Username');?>
+                                                            <?php print __('Username');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -258,7 +258,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                            <?php print _('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print _('generate');?></a>
+                                                            <?php print __('Password');?> <a href="javascript:WEBrandom();" class="genpass"><?php print __('generate');?></a>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -271,7 +271,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Additional FTP Account');?>
+                                                <?php print __('Additional FTP Account');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -284,8 +284,8 @@
                                                 <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Username');?>
-                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . _('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
+                                                            <?php print __('Username');?>
+                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -295,7 +295,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print _('generate');?></a>
+                                                            <?php print __('Password');?> <a href="javascript:FTPrandom();" class="genpass" ><?php print __('generate');?></a>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -309,7 +309,7 @@
                                                      ?> 
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('Send FTP credentials to email');?>
+                                                            <?php print __('Send FTP credentials to email');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -327,10 +327,10 @@
                                     <table class="data-col2">
                                         <tr>
                                             <td style="padding: 24px 0 0 0;" width="116px">
-                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                                <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
                                             </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
+                                                <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>
                                     </table>

web/templates/user/list_cron.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print _('Add Cron Job');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/cron/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -46,24 +46,24 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="job[]" value="<?php echo $data[$key]['JOB'] ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_CRON_CONFIRMATION');?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_CRON_CONFIRMATION');?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="800px">
@@ -77,7 +77,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Min');?> 
+                                                            <?php print __('Min');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -91,7 +91,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Hour');?> 
+                                                            <?php print __('Hour');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -105,7 +105,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day');?> 
+                                                            <?php print __('Day');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -119,7 +119,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Month');?> 
+                                                            <?php print __('Month');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -133,7 +133,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="cron-counter-name">
-                                                            <?php print _('Day of week');?> 
+                                                            <?php print __('Day of week');?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -160,9 +160,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 cron job');
+                                            echo __('1 cron job');
                                         } else {
-                                            echo _('%s cron jobs',$i);
+                                            echo __('%s cron jobs',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_db.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print _('Add Database');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/db/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -50,30 +50,30 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="database[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php echo _('delete') ?> 
+                                            <?php echo __('delete') ?> 
                                             <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DATABASE_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DATABASE_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/db/?database=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="<?php echo $db_admin_link; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open %s',$db_admin);?> 
+                                            <?php print __('open %s',$db_admin);?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -87,11 +87,11 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 4px 2px">
-                                                            [<?php echo $data[$key]['TYPE'] ?>] <?php print _('database');?>
+                                                            [<?php echo $data[$key]['TYPE'] ?>] <?php print __('database');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                        <td class="chart1" style="padding: 0px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -103,7 +103,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('User');?>:
+                                                            <?php print __('User');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['DBUSER'] ?> 
@@ -111,7 +111,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Host');?>:
+                                                            <?php print __('Host');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['HOST'] ?> 
@@ -123,7 +123,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Charset');?>:
+                                                            <?php print __('Charset');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['CHARSET'] ?> 
@@ -147,9 +147,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 database');
+                                            echo __('1 database');
                                         } else {
-                                            echo _('%s databases',$i);
+                                            echo __('%s databases',$i);
                                         }
                                     ?>
                                 </td>

web/templates/user/list_dns.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -44,36 +44,36 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status) ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="/add/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print _('add record');?> 
+                                            <?php print __('add record');?> 
                                         </span>
                                     </a>
                                     <a href="/list/dns/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print _('list records',$data[$key]['RECORDS']); ?> 
+                                            <?php print __('list records',$data[$key]['RECORDS']); ?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -91,7 +91,7 @@
                                                         </td>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 0 0 20px 2px">
-                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?> 
+                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print __('template');?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -99,11 +99,11 @@
                                             <td style="vertical-align:top;" width="250">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SOA') ?>:</td>
+                                                        <td class="counter-name"><?php print __('SOA') ?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('TTL') ?>:</td>
+                                                        <td class="counter-name"><?php print __('TTL') ?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
                                                     </tr>
                                                 </table>
@@ -111,11 +111,11 @@
                                             <td rowspan=4 style="vertical-align:top;" width="300">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Expire');?>:</td>
+                                                        <td class="counter-name"><?php print __('Expire');?>:</td>
                                                         <td class="counter-value"><?php echo strftime("%d %b %Y", strtotime($data[$key]['EXP'])) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Records');?>:</td>
+                                                        <td class="counter-name"><?php print __('Records');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
                                                     </tr>
                                                 </table>
@@ -136,9 +136,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_dns_rec.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add DNS Record') ?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record') ?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/dns/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -30,7 +30,7 @@
                             <table class="data" style="background: #ebe9dc;">
                                 <tr>
                                     <td style="padding: 8px 2px 8px 0;">
-                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                                        <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                                     </td>
                                 </tr>
                             </table>
@@ -58,17 +58,17 @@
                                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                             <span class="do_delete">
                                                 <img src="/images/delete.png" width="7px" height="7px">
-                                                <?php print _('delete');?>
+                                                <?php print __('delete');?>
                                                 <input type="hidden" name="delete_url" value="/delete/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
+                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                    <p class="counter-value"><?php print __('DELETE_RECORD_CONFIRMATION',$data[$key]['RECORD']);?></p>
                                                 </div>
                                             </span>
                                         </a>
                                         <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" class="data-controls">
                                             <span>
                                                 <img src="/images/edit.png" width="8px" height="8px">
-                                                <?php print _('edit');?> 
+                                                <?php print __('edit');?> 
                                             </span>
                                         </a>
                                         <table class="data-col5" width="780px">
@@ -93,9 +93,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 record');
+                                            echo __('1 record');
                                         } else {
-                                            echo _('%s records',$i);
+                                            echo __('%s records',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_mail.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                     <select class="submenu-select-dropdown" name="action">
-                                                        <option value=""><?php print _('apply to selected');?></option>
-                                                        <option value="delete"><?php print _('delete');?></option>
+                                                        <option value=""><?php print __('apply to selected');?></option>
+                                                        <option value="delete"><?php print __('delete');?></option>
                                                     </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -48,42 +48,42 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/mail/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open webmail');?> 
+                                            <?php print __('open webmail');?> 
                                         </span>
                                     </a>
                                     <a href="/add/mail/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/add.png" width="8px" height="8px">
-                                            <?php print _('add account');?> 
+                                            <?php print __('add account');?> 
                                         </span>
                                     </a>
                                     <a href="?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/more.png" width="8px" height="8px">
-                                            <?php print _('list accounts',$data[$key]['RECORDS']); ?> 
+                                            <?php print __('list accounts',$data[$key]['RECORDS']); ?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -97,12 +97,12 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 2px 0">
-                                                            <?php print _('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?> 
+                                                            <?php print __('Catchall email');?> > <?php echo $data[$key]['CATCHALL'] ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1">
-                                                            <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -114,18 +114,18 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('AntiVirus Support');?>:
+                                                            <?php print __('AntiVirus Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['ANTIVIRUS']) ?> 
+                                                            <?php echo __($data[$key]['ANTIVIRUS']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('AntiSpam Support');?>:
+                                                            <?php print __('AntiSpam Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['ANTISPAM']) ?> 
+                                                            <?php echo __($data[$key]['ANTISPAM']) ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -134,15 +134,15 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DKIM Support');?>:
+                                                            <?php print __('DKIM Support');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo _($data[$key]['DKIM']) ?> 
+                                                            <?php echo __($data[$key]['DKIM']) ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Accounts');?>:
+                                                            <?php print __('Accounts');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['ACCOUNTS'] ?> 
@@ -165,9 +165,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_mail_acc.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print _('Add Mail Account');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/mail/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value="apply to selected"><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value="apply to selected"><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -32,7 +32,7 @@
                         <table class="data" style="background: #ebe9dc;">
                             <tr>
                                 <td style="padding: 8px 2px 8px 0;">
-                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print _('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
+                                    <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                                 </td>
                             </tr>
                         </table>
@@ -55,24 +55,24 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="account[]" value="<?php echo $key?>" ><input type="hidden" name="domain" value="<?php echo $_GET['domain'] ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="/delete/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_MAIL_ACCOUNT_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -86,7 +86,7 @@
                                                         </td>
                                                     <tr>
                                                         <td class="chart1" style="padding: 0 0 2px 0">
-                                                            <?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                            <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -98,7 +98,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Quota');?>:
+                                                            <?php print __('Quota');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['QUOTA'] ?> 
@@ -106,10 +106,10 @@
                                                         </tr>
                                                         <tr>
                                                             <td class="counter-name">
-                                                                <?php print _('Autoreply');?>:
+                                                                <?php print __('Autoreply');?>:
                                                             </td>
                                                             <td class="counter-value">
-                                                                <?php echo _($data[$key]['AUTOREPLY']) ?> 
+                                                                <?php echo __($data[$key]['AUTOREPLY']) ?> 
                                                             </td>
                                                         </tr>
                                                 </table>
@@ -118,7 +118,7 @@
                                                 <table width="350">
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Forward to');?>:
+                                                            <?php print __('Forward to');?>:
                                                         </td>
                                                         <td class="counter-value" style="padding: 0 0 0 8px;" >
                                                             <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
@@ -142,9 +142,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 mail account');
+                                            echo __('1 mail account');
                                         } else {
-                                            echo _('%s mail accounts',$i);
+                                            echo __('%s mail accounts',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_search.html

@@ -2,12 +2,12 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div style="submenu-button-block">
-                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print _('Search Results');?></b></a>
+                                                <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -40,7 +40,7 @@
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
                                     <table class="data-col1" width="150">
                                         <tr><td style="padding: 24 0 4 0;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
@@ -69,10 +69,10 @@
                                     <a id="delete_link_<?php echo $i ?>" class="do_delete">
                                         <span class="data-controls do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                            <?php print _('delete');?> 
+                                            <?php print __('delete');?> 
                                             <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
                                             <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                                <p class="counter-value"><?php print _($cnfrm,$data[$key]['RESULT']);?></p>
+                                                <p class="counter-value"><?php print __($cnfrm,$data[$key]['RESULT']);?></p>
                                             </div>
                                         </span>
                                     </a>
@@ -97,7 +97,7 @@
                                     <a href="<?php echo $edit_lnk; ?>">
                                         <span class="data-controls">
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit'); ?> 
+                                            <?php print __('edit'); ?> 
                                         </span>
                                     </a>
 
@@ -108,7 +108,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Object');?>:
+                                                            <?php print __('Object');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $object ?> 
@@ -120,7 +120,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Owner');?>:
+                                                            <?php print __('Owner');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['USER'] ?> 
@@ -132,10 +132,10 @@
                                                 <table >
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Status');?>:
+                                                            <?php print __('Status');?>:
                                                         </td>
                                                         <td class="counter-value" style="padding: 0 0 0 8px;">
-                                                            <?php echo _($status); ?> 
+                                                            <?php echo __($status); ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -156,9 +156,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1){
-                                            echo _('1 object');
+                                            echo __('1 object');
                                         } else {
-                                            echo _('%s objects',$i);
+                                            echo __('%s objects',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_stats.html

@@ -4,7 +4,7 @@
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                         </td>
@@ -46,12 +46,12 @@
                                                 <table>
                                                     <tr>
                                                         <td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">
-                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?>
+                                                            [<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                            <?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -59,7 +59,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
-                                                            <?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                            <?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -70,12 +70,12 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
-                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
                                                                     </td>
                                                                 </tr>
                                                             </table>
@@ -87,7 +87,7 @@
                                                 <table width="280">
                                                     <tr>
                                                         <td class="counter-name" width="37%">
-                                                            <?php print _('Web Domains');?>:
+                                                            <?php print __('Web Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_DOMAINS'] ?> 
@@ -95,7 +95,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('SSL Domains');?>:
+                                                            <?php print __('SSL Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_SSL'] ?> 
@@ -103,7 +103,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Web Aliases');?>:
+                                                            <?php print __('Web Aliases');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_WEB_ALIASES'] ?> 
@@ -111,7 +111,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS domains');?>:
+                                                            <?php print __('DNS domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
@@ -119,7 +119,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('DNS records');?>:
+                                                            <?php print __('DNS records');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DNS_RECORDS'] ?>
@@ -131,7 +131,7 @@
                                                 <table class="data-col4" width="250">
                                                     <tr>
                                                         <td class="counter-name" width="50%">
-                                                            <?php print _('Mail Domains');?>:
+                                                            <?php print __('Mail Domains');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
@@ -139,7 +139,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Mail Accounts');?>:
+                                                            <?php print __('Mail Accounts');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
@@ -147,7 +147,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Databases');?>:
+                                                            <?php print __('Databases');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_DATABASES'] ?> 
@@ -155,7 +155,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Cron Jobs');?>:
+                                                            <?php print __('Cron Jobs');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['U_CRON_JOBS'] ?>
@@ -163,7 +163,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('IP Addresses');?>:
+                                                            <?php print __('IP Addresses');?>:
                                                         </td>
                                                         <td class="counter-value">
                                                             <?php echo $data[$key]['IP_OWNED'] ?> 
@@ -188,9 +188,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 month');
+                                            echo __('1 month');
                                         } else {
-                                            echo _('%s months',$i);
+                                            echo __('%s months',$i);
                                         }
                                     ?>
                                 </td>

web/templates/user/list_user.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain') ?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain') ?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/user/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="update counters"><?php print _('update counters');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="update counters"><?php print __('update counters');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -45,14 +45,14 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="user[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a href="/edit/user/?user=<?php echo "$key" ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?> 
+                                            <?php print __('edit');?> 
                                         </span>
                                     </a>
                                     <table class="data-col2" width="830px">
@@ -63,16 +63,16 @@
                                             <td style="vertical-align:top;"  width="240">
                                                 <table>
                                                     <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print _('package');?></td></tr>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                                     <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print _('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print _('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
@@ -83,12 +83,12 @@
                                                             <table class="chart2">
                                                                 <tr>
                                                                     <td>
-                                                                        <?php print _('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                                                        <?php print _('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                        <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
                                                                     </td>
                                                                     <td style="padding: 0px 10px 0px 8px">
-                                                                        <?php print _('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                                                        <?php print _('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                        <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
                                                                     </td>
                                                                 </tr>
                                                             </table>
@@ -99,31 +99,31 @@
                                             <td style="vertical-align:top;" width="320">
                                                 <table width="300">
                                                     <tr>
-                                                        <td class="counter-name" width="36%"><?php print _('Template');?>:</td>
+                                                        <td class="counter-name" width="36%"><?php print __('Template');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSL Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSL Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Aliases');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('Web Aliases');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('DNS domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('DNS domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('DNS records');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('DNS records');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Name Servers');?>:<br></td>
+                                                        <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
                                                         <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
                                                     </tr>
                                                 </table>
@@ -131,31 +131,31 @@
                                             <td style="vertical-align:top;">
                                                 <table class="data-col4">
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Mail Domains');?>:</td>
+                                                        <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Mail Accounts');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print _('per domain');?></td>
+                                                        <td class="counter-name"><?php print __('Mail Accounts');?>:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> <?php print __('per domain');?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Databases');?>:</td>
+                                                        <td class="counter-name"><?php print __('Databases');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Cron Jobs');?>:</td>
+                                                        <td class="counter-name"><?php print __('Cron Jobs');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSH Access');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSH Access');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('IP Addresses');?>:</td>
+                                                        <td class="counter-name"><?php print __('IP Addresses');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Backups');?>:</td>
+                                                        <td class="counter-name"><?php print __('Backups');?>:</td>
                                                         <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
                                                     </tr>
                                                 </table>
@@ -176,9 +176,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 account');
+                                            echo __('1 account');
                                         } else {
-                                            echo _('%s accounts',$i);
+                                            echo __('%s accounts',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_web.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 2px 0 0 6px">
                                             <div class="submenu-button-block">
-                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain');?> </button>
+                                                <button class="submenu-button" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                                             </div>
                                             <div class="submenu-search-block">
                                                 <form action="/search/" method="get">
                                                     <input type="text" name="q" class="submenu-search-field">
-                                                    <input type="submit" value="<?php print _('Search');?>" class="submenu-button" style="width: 96px;">
+                                                    <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                                                 </form>
                                             </div>
                                             <div class="submenu-select-block">
                                                 <form action="/bulk/web/" method="post" id="objects">
-                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                                                 <select class="submenu-select-dropdown" name="action">
-                                                    <option value=""><?php print _('apply to selected');?></option>
-                                                    <option value="delete"><?php print _('delete');?></option>
+                                                    <option value=""><?php print __('apply to selected');?></option>
+                                                    <option value="delete"><?php print __('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                                             </div>
@@ -76,24 +76,24 @@
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                                         <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                         <span class="do_delete">
                                             <img src="/images/delete.png" width="7px" height="7px">
-                                             <?php print _('delete');?>
+                                             <?php print __('delete');?>
                                             <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
-                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                <p class="counter-value"><?php print _('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print __('Confirmation');?>">
+                                                <p class="counter-value"><?php print __('DELETE_DOMAIN_CONFIRMATION',$key);?></p>
                                             </div>
                                         </span>
                                     </a>
                                     <a href="/edit/web/?domain=<?php echo $key ?>" class="data-controls">
                                         <span>
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?>
+                                            <?php print __('edit');?>
                                         </span>
                                     </a>
                                     <?php
@@ -102,7 +102,7 @@
                                     <a href="http://<?php echo $key ?>/vstats/"  target="_blank" class="data-controls">
                                         <span>
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open webstats');?>
+                                            <?php print __('open webstats');?>
                                         </span>
                                     </a>
                                     <?php
@@ -123,19 +123,19 @@
                                                         </td>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 0 0 8px 2px">
-                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?> 
+                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print __('template');?> 
                                                         </td>
                                                 </tr>
                                                     <tr>
                                                         <td class="chart1" style="padding: 0 0 0 2px">
-                                                            <?php print _('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
+                                                            <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                             </div>
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="chart1" style="padding: 0 0 0 2px"><?php print _('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
+                                                        <td class="chart1" style="padding: 0 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
                                                             <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
                                                                 <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                         </div>
@@ -146,19 +146,19 @@
                                             <td style="vertical-align:top;" width="300">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name" width="110"><?php print _('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php print _($data[$key]['SSL']) ?></td>
+                                                        <td class="counter-name" width="110"><?php print __('SSL Support');?>:</td>
+                                                        <td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('SSL Home Directory');?>:</td>
+                                                        <td class="counter-name"><?php print __('SSL Home Directory');?>:</td>
                                                         <td class="counter-value"><?php echo $ssl_home ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Support');?>:</td>
-                                                        <td class="counter-value"><?php print _($nginx_support) ?></td>
+                                                        <td class="counter-name"><?php print __('Nginx Support');?>:</td>
+                                                        <td class="counter-value"><?php print __($nginx_support) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Extentions');?>:</td>
+                                                        <td class="counter-name"><?php print __('Nginx Extentions');?>:</td>
                                                         <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
                                                     </tr>
                                                 </table>
@@ -166,12 +166,12 @@
                                             <td rowspan=4 style="vertical-align:top;" width="240">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Web Statistics');?>: </td>
-                                                        <td class="counter-value"> <?php print _($web_stats) ?></td>
+                                                        <td class="counter-name"><?php print __('Web Statistics');?>: </td>
+                                                        <td class="counter-value"> <?php print __($web_stats) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"> <?php print _('Additional FTP Account');?>:</td>
-                                                        <td class="counter-value"> <?php print _($ftp_user) ?></td>
+                                                        <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
+                                                        <td class="counter-value"> <?php print __($ftp_user) ?></td>
                                                     </tr>
                                                 </table>
                                             </td>
@@ -191,9 +191,9 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('1 domain');
+                                            echo __('1 domain');
                                         } else {
-                                            echo _('%s domains',$i);
+                                            echo __('%s domains',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/panel.html

@@ -9,12 +9,12 @@
                                 <thead>
                                     <tr>
                                         <td>
-                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print _('Statistics') ?> </a></b>
-                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print _('Log') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"> <?php print __('Statistics') ?> </a></b>
+                                            <b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"> <?php print __('Log') ?> </a></b>
                                         </td>
                                         <td>
                                             <b><?php if(($_SESSION['user'] == 'admin') && ($user != 'admin')) echo 'admin / ' ?><?php echo $user ?></b>
-                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print _('Log out') ?> </a>
+                                            <a class="top-logout" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/"> <?php print __('Log out') ?> </a>
                                         </td>
                                     </tr>
                                 </thead>
@@ -27,79 +27,79 @@
                                             <a class="nav-lnk" href="/list/user/">
                                                 <span class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'USER' ) echo 'selected-' ?>header">
-                                                        <?php print _('USER');?> 
+                                                        <?php print __('USER');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
-                                                        <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?> 
+                                                        <?php print __('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
+                                                        <?php print __('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/web/">
                                                 <span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
-                                                        <?php print _('WEB');?> 
+                                                        <?php print __('WEB');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-                                                        <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                        <?php print __('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/dns/">
                                                 <span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
-                                                        <?php print _('DNS');?> 
+                                                        <?php print __('DNS');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-                                                        <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                        <?php print __('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/mail/">
                                                 <span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
-                                                        <?php print _('MAIL');?> 
+                                                        <?php print __('MAIL');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-                                                        <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                                                        <?php print __('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                        <?php print __('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/db/">
                                                 <span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
-                                                        <?php print _('DB');?> 
+                                                        <?php print __('DB');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                                                        <?php print __('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/cron/">
                                                 <span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
-                                                        <?php print _('CRON');?> 
+                                                        <?php print __('CRON');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                        <?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                                                        <?php print __('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                        <?php print __('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?> 
                                                     </p>
                                                 </span>
                                             </a>
                                             <a class="nav-lnk" href="/list/backup/">
                                                 <span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
                                                     <p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
-                                                        <?php print _('BACKUP');?> 
+                                                        <?php print __('BACKUP');?> 
                                                     </p>
                                                     <p class="nav-counters">
-                                                        <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
+                                                        <?php print __('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>
                                                     </p>
                                                 </span>
                                             </a>

web/unsuspend/cron/index.php

@@ -16,7 +16,7 @@ if ($_SESSION['user'] == 'admin') {
     }
     if ($return_var != 0) {
         $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
+        if (empty($error)) $error = __('Error: vesta did not return any output.');
             $_SESSION['error_msg'] = $error;
     }
     unset($output);