i18n user/web/dns/mail

web/add/dns/index.php

@@ -12,160 +12,155 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-// Are you admin?
-//if ($_SESSION['user'] == 'admin') {
-    if (!empty($_POST['ok'])) {
-        // Check input
-        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']);
-        $v_domain = escapeshellarg($v_domain);
-        $v_ip = escapeshellarg($_POST['v_ip']);
-        if ($_SESSION['user'] == 'admin') {
-            $v_template = escapeshellarg($_POST['v_template']);
-        } else {
-            $v_template = "''";
-        }
-        if (!empty($_POST['v_ns1'])) $v_ns1 = escapeshellarg($_POST['v_ns1']);
-        if (!empty($_POST['v_ns2'])) $v_ns2 = escapeshellarg($_POST['v_ns2']);
-        if (!empty($_POST['v_ns3'])) $v_ns3 = escapeshellarg($_POST['v_ns3']);
-        if (!empty($_POST['v_ns4'])) $v_ns4 = escapeshellarg($_POST['v_ns4']);
-
-        // Check for errors
-        if (!empty($errors[0])) {
-            foreach ($errors as $i => $error) {
-                if ( $i == 0 ) {
-                    $error_msg = $error;
-                } else {
-                    $error_msg = $error_msg.", ".$error;
-                }
+if (!empty($_POST['ok'])) {
+    // Check input
+    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']);
+    $v_domain = escapeshellarg($v_domain);
+    $v_ip = escapeshellarg($_POST['v_ip']);
+    if ($_SESSION['user'] == 'admin') {
+        $v_template = escapeshellarg($_POST['v_template']);
+    } else {
+        $v_template = "''";
+    }
+
+    if (!empty($_POST['v_ns1'])) $v_ns1 = escapeshellarg($_POST['v_ns1']);
+    if (!empty($_POST['v_ns2'])) $v_ns2 = escapeshellarg($_POST['v_ns2']);
+    if (!empty($_POST['v_ns3'])) $v_ns3 = escapeshellarg($_POST['v_ns3']);
+    if (!empty($_POST['v_ns4'])) $v_ns4 = escapeshellarg($_POST['v_ns4']);
+
+    // Check for errors
+    if (!empty($errors[0])) {
+        foreach ($errors as $i => $error) {
+            if ( $i == 0 ) {
+                $error_msg = $error;
+            } else {
+                $error_msg = $error_msg.", ".$error;
             }
-            $_SESSION['error_msg'] = _('Error: field "%s" can not be blank.',$error_msg);
-        } else {
+        }
+        $_SESSION['error_msg'] = _('Error: 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: vesta did not return any output.');
+            $_SESSION['error_msg'] = $error;
+        }
+        unset($output);
 
-            // 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);
+        // Change Expiriation date
+        if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
+            $v_exp = escapeshellarg($_POST['v_exp']);
+            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: vesta did not return any output.');
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
-
-            // Change Expiriation date
-            if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
-                $v_exp = escapeshellarg($_POST['v_exp']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-            }
-
-            // Change TTL
-            if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400')) {
-                $v_ttl = escapeshellarg($_POST['v_ttl']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-            }
-
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
-                unset($v_domain);
-            }
         }
-    }
 
-
-    // DNS Record
-    if (!empty($_POST['ok_rec'])) {
-        // Check input
-        if (empty($_POST['v_domain'])) $errors[] = 'domain';
-        if (empty($_POST['v_rec'])) $errors[] = 'record';
-        if (empty($_POST['v_type'])) $errors[] = 'type';
-        if (empty($_POST['v_val'])) $errors[] = 'value';
-
-        // Protect input
-        $v_domain = escapeshellarg($_POST['v_domain']);
-        $v_rec = escapeshellarg($_POST['v_rec']);
-        $v_type = escapeshellarg($_POST['v_type']);
-        $v_val = escapeshellarg($_POST['v_val']);
-        $v_priority = escapeshellarg($_POST['v_priority']);
-
-        // Check for errors
-        if (!empty($errors[0])) {
-            foreach ($errors as $i => $error) {
-                if ( $i == 0 ) {
-                    $error_msg = $error;
-                } else {
-                    $error_msg = $error_msg.", ".$error;
-                }
-            }
-            $_SESSION['error_msg'] = _('Error: 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'];
+        // Change TTL
+        if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400')) {
+            $v_ttl = escapeshellarg($_POST['v_ttl']);
+            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: vesta did not return any output.');
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
-                unset($v_domain);
-                unset($v_rec);
-                unset($v_val);
-                unset($v_priority);
-            }
         }
-    }
-
-
-    if ((empty($_GET['domain'])) && (empty($_POST['domain'])))  {
-        exec (VESTA_CMD."v-get-user-value ".$user." 'TEMPLATE'", $output, $return_var);
-        $template = $output[0] ;
-        unset($output);
 
-        exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
-        $templates = json_decode(implode('', $output), true);
-        unset($output);
-
-        if ((empty($v_ns1)) && (empty($v_ns2))) {
-            exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var);
-            $nameservers = json_decode(implode('', $output), true);
-            $v_ns1 = $nameservers[0];
-            $v_ns2 = $nameservers[1];
-            $v_ns3 = $nameservers[2];
-            $v_ns4 = $nameservers[3];
-            unset($output);
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+            unset($v_domain);
         }
-        if (empty($v_ttl)) $v_ttl = 14400;
-        if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
-        if ($_SESSION['user'] == 'admin') {
-            include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
-        } else {
-            include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
+    }
+}
+
+// DNS Record
+if (!empty($_POST['ok_rec'])) {
+    // Check input
+    if (empty($_POST['v_domain'])) $errors[] = 'domain';
+    if (empty($_POST['v_rec'])) $errors[] = 'record';
+    if (empty($_POST['v_type'])) $errors[] = 'type';
+    if (empty($_POST['v_val'])) $errors[] = 'value';
+
+    // Protect input
+    $v_domain = escapeshellarg($_POST['v_domain']);
+    $v_rec = escapeshellarg($_POST['v_rec']);
+    $v_type = escapeshellarg($_POST['v_type']);
+    $v_val = escapeshellarg($_POST['v_val']);
+    $v_priority = escapeshellarg($_POST['v_priority']);
+
+    // Check for errors
+    if (!empty($errors[0])) {
+        foreach ($errors as $i => $error) {
+            if ( $i == 0 ) {
+                $error_msg = $error;
+            } else {
+                $error_msg = $error_msg.", ".$error;
+            }
+        }
+        $_SESSION['error_msg'] = _('Error: 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: vesta did not return any output.');
+            $_SESSION['error_msg'] = $error;
+        }
+        unset($output);
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
+            unset($v_domain);
+            unset($v_rec);
+            unset($v_val);
+            unset($v_priority);
         }
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+    }
+}
+
+
+if ((empty($_GET['domain'])) && (empty($_POST['domain'])))  {
+    exec (VESTA_CMD."v-get-user-value ".$user." 'TEMPLATE'", $output, $return_var);
+    $template = $output[0] ;
+    unset($output);
+    exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
+    $templates = json_decode(implode('', $output), true);
+    unset($output);
+
+    if ((empty($v_ns1)) && (empty($v_ns2))) {
+        exec (VESTA_CMD."v-list-user-ns ".$user." json", $output, $return_var);
+        $nameservers = json_decode(implode('', $output), true);
+        $v_ns1 = $nameservers[0];
+        $v_ns2 = $nameservers[1];
+        $v_ns3 = $nameservers[2];
+        $v_ns4 = $nameservers[3];
+        unset($output);
+    }
+    if (empty($v_ttl)) $v_ttl = 14400;
+    if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
+    if ($_SESSION['user'] == 'admin') {
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
     } else {
-        $v_domain = $_GET['domain'];
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns_rec.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
     }
-//}
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+} else {
+    $v_domain = $_GET['domain'];
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns_rec.html');
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+}
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/edit/dns/index.php

@@ -13,198 +13,201 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-    // Check user argument?
-    if (empty($_GET['domain'])) {
-        header("Location: /list/dns/");
-        exit;
-    }
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
+// Check user argument?
+if (empty($_GET['domain'])) {
+    header("Location: /list/dns/");
+    exit;
+}
+
+// Edit as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=escapeshellarg($_GET['user']);
+}
+
+// Check domain
+if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
+    $v_domain = escapeshellarg($_GET['domain']);
+    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: vesta did not return any output.');
+        $_SESSION['error_msg'] = $error;
+    } else {
+        $data = json_decode(implode('', $output), true);
+        unset($output);
+
+        $v_username = $user;
+        $v_domain = $_GET['domain'];
+        $v_ip = $data[$v_domain]['IP'];
+        $v_template = $data[$v_domain]['TPL'];
+        $v_ttl = $data[$v_domain]['TTL'];
+        $v_exp = $data[$v_domain]['EXP'];
+        $v_soa = $data[$v_domain]['SOA'];
+        $v_date = $data[$v_domain]['DATE'];
+        $v_time = $data[$v_domain]['TIME'];
+        $v_suspended = $data[$v_domain]['SUSPENDED'];
+        if ( $v_suspended == 'yes' ) {
+            $v_status =  'suspended';
+        } else {
+            $v_status =  'active';
+        }
 
-    // Edit as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=escapeshellarg($_GET['user']);
+        exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
+        $templates = json_decode(implode('', $output), true);
+        unset($output);
     }
 
-    // Check domain
-    if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
-        $v_domain = escapeshellarg($_GET['domain']);
-        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: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $data = json_decode(implode('', $output), true);
-            unset($output);
-
-            $v_username = $user;
-            $v_domain = $_GET['domain'];
-            $v_ip = $data[$v_domain]['IP'];
-            $v_template = $data[$v_domain]['TPL'];
-            $v_ttl = $data[$v_domain]['TTL'];
-            $v_exp = $data[$v_domain]['EXP'];
-            $v_soa = $data[$v_domain]['SOA'];
-            $v_date = $data[$v_domain]['DATE'];
-            $v_time = $data[$v_domain]['TIME'];
-            $v_suspended = $data[$v_domain]['SUSPENDED'];
-            if ( $v_suspended == 'yes' ) {
-                $v_status =  'suspended';
-            } else {
-                $v_status =  'active';
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_domain = escapeshellarg($_POST['v_domain']);
+
+        // IP
+        if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
+            $v_ip = escapeshellarg($_POST['v_ip']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-
-            exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
-            $templates = json_decode(implode('', $output), true);
+            $restart_dns = 'yes';
             unset($output);
         }
 
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_domain = escapeshellarg($_POST['v_domain']);
-
-            // IP
-            if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
-                $v_ip = escapeshellarg($_POST['v_ip']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $restart_dns = 'yes';
-                unset($output);
+        // Template
+        if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
+            $v_template = escapeshellarg($_POST['v_template']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
+            $restart_dns = 'yes';
+        }
 
-            // Template
-            if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
-                $v_template = escapeshellarg($_POST['v_template']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-                $restart_dns = 'yes';
+        // SOA
+        if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) {
+            $v_soa = escapeshellarg($_POST['v_soa']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
+            $restart_dns = 'yes';
+        }
 
-            // SOA
-            if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) {
-                $v_soa = escapeshellarg($_POST['v_soa']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-                $restart_dns = 'yes';
+        // EXP
+        if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) {
+            $v_exp = escapeshellarg($_POST['v_exp']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
+            $restart_dns = 'yes';
+        }
 
-            // EXP
-            if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) {
-                $v_exp = escapeshellarg($_POST['v_exp']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-                $restart_dns = 'yes';
+        // TTL
+        if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) {
+            $v_ttl = escapeshellarg($_POST['v_ttl']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
+            $restart_dns = 'yes';
+        }
 
-            // TTL
-            if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) {
-                $v_ttl = escapeshellarg($_POST['v_ttl']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
-                $restart_dns = 'yes';
-            }
-    
-            // Restart dns
-            if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
-                exec (VESTA_CMD."v-restart-dns", $output, $return_var);
-                if ($return_var != 0) {
-                    $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
+        // Restart dns
+        if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) {
+            exec (VESTA_CMD."v-restart-dns", $output, $return_var);
+            if ($return_var != 0) {
+                $error = implode('<br>', $output);
+                if (empty($error)) $error = _('Error: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-    
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
-            }
-
         }
-        if ($_SESSION['user'] == 'admin') {
-            include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
-        } else {
-            include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_dns.html');
+
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
         }
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+
+    }
+
+    if ($_SESSION['user'] == 'admin') {
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
+    } else {
+        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_dns.html');
+    }
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+} else {
+    $v_domain = escapeshellarg($_GET['domain']);
+    $v_record_id = escapeshellarg($_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: vesta did not return any output.');
+        $_SESSION['error_msg'] = $error;
     } else {
-        $v_domain = escapeshellarg($_GET['domain']);
-        $v_record_id = escapeshellarg($_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: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
+        $data = json_decode(implode('', $output), true);
+        unset($output);
+        $v_username = $user;
+        $v_domain = $_GET['domain'];
+        $v_record_id = $_GET['record_id'];
+        $v_rec = $data[$v_record_id]['RECORD'];
+        $v_type = $data[$v_record_id]['TYPE'];
+        $v_val = $data[$v_record_id]['VALUE'];
+        $v_priority = $data[$v_record_id]['PRIORITY'];
+        $v_suspended = $data[$v_record_id]['SUSPENDED'];
+        if ( $v_suspended == 'yes' ) {
+            $v_status =  'suspended';
         } else {
-            $data = json_decode(implode('', $output), true);
-            unset($output);
-            $v_username = $user;
-            $v_domain = $_GET['domain'];
-            $v_record_id = $_GET['record_id'];
-            $v_rec = $data[$v_record_id]['RECORD'];
-            $v_type = $data[$v_record_id]['TYPE'];
-            $v_val = $data[$v_record_id]['VALUE'];
-            $v_priority = $data[$v_record_id]['PRIORITY'];
-            $v_suspended = $data[$v_record_id]['SUSPENDED'];
-            if ( $v_suspended == 'yes' ) {
-                $v_status =  'suspended';
-            } else {
-                $v_status =  'active';
-            }
-            $v_date = $data[$v_record_id]['DATE'];
-            $v_time = $data[$v_record_id]['TIME'];
+            $v_status =  'active';
         }
+        $v_date = $data[$v_record_id]['DATE'];
+        $v_time = $data[$v_record_id]['TIME'];
+    }
 
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_domain = escapeshellarg($_POST['v_domain']);
-            $v_record_id = escapeshellarg($_POST['v_record_id']);
-
-            if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) {
-                $v_val = escapeshellarg($_POST['v_val']);
-                $v_priority = escapeshellarg($_POST['v_priority']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_val = $_POST['v_val'];
-                $restart_dns = 'yes';
-                unset($output);
-            }
-    
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_domain = escapeshellarg($_POST['v_domain']);
+        $v_record_id = escapeshellarg($_POST['v_record_id']);
+        if (($v_val != $_POST['v_val']) || ($v_priority != $_POST['v_priority']) && (empty($_SESSION['error_msg']))) {
+            $v_val = escapeshellarg($_POST['v_val']);
+            $v_priority = escapeshellarg($_POST['v_priority']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
 
+            $v_val = $_POST['v_val'];
+            $restart_dns = 'yes';
+            unset($output);
+        }
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
         }
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns_rec.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
     }
-//}
+
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns_rec.html');
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+}
+
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/edit/mail/index.php

@@ -13,146 +13,133 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-    // Check user argument?
-    if (empty($_GET['domain'])) {
-        header("Location: /list/mail/");
-        exit;
-    }
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
 
-    // Edit as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=escapeshellarg($_GET['user']);
-    }
+// Check user argument?
+if (empty($_GET['domain'])) {
+    header("Location: /list/mail/");
+    exit;
+}
+
+// Edit as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=escapeshellarg($_GET['user']);
+}
 
-    // Check domain
-    if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
-        $v_domain = escapeshellarg($_GET['domain']);
-        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: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
+// Check domain
+if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
+    $v_domain = escapeshellarg($_GET['domain']);
+    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: vesta did not return any output.');
+        $_SESSION['error_msg'] = $error;
+    } else {
+        $data = json_decode(implode('', $output), true);
+        unset($output);
+        $v_username = $user;
+        $v_domain = $_GET['domain'];
+        $v_antispam = $data[$v_domain]['ANTISPAM'];
+        $v_antivirus = $data[$v_domain]['ANTIVIRUS'];
+        $v_dkim = $data[$v_domain]['DKIM'];
+        $v_catchall = $data[$v_domain]['CATCHALL'];
+        $v_date = $data[$v_domain]['DATE'];
+        $v_time = $data[$v_domain]['TIME'];
+        $v_suspended = $data[$v_domain]['SUSPENDED'];
+        if ( $v_suspended == 'yes' ) {
+            $v_status =  'suspended';
         } else {
-            $data = json_decode(implode('', $output), true);
-            unset($output);
-            $v_username = $user;
-            $v_domain = $_GET['domain'];
-            $v_antispam = $data[$v_domain]['ANTISPAM'];
-            $v_antivirus = $data[$v_domain]['ANTIVIRUS'];
-            $v_dkim = $data[$v_domain]['DKIM'];
-            $v_catchall = $data[$v_domain]['CATCHALL'];
-            $v_date = $data[$v_domain]['DATE'];
-            $v_time = $data[$v_domain]['TIME'];
-            $v_suspended = $data[$v_domain]['SUSPENDED'];
-            if ( $v_suspended == 'yes' ) {
-                $v_status =  'suspended';
-            } else {
-                $v_status =  'active';
-            }
+            $v_status =  'active';
         }
+    }
 
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_domain = escapeshellarg($_POST['v_domain']);
-
-            // Antispam
-            if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_antispam = 'no';
-                unset($output);
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_domain = escapeshellarg($_POST['v_domain']);
+        // Antispam
+        if (($v_antispam == 'yes') && (empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-            if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_antispam = 'yes';
-                unset($output);
-            }
-
-            // Antivirus
-            if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_antivirus = 'no';
-                unset($output);
+            $v_antispam = 'no';
+            unset($output);
+        }
+        if (($v_antispam == 'no') && (!empty($_POST['v_antispam'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-            if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_antivirus = 'yes';
-                unset($output);
+            $v_antispam = 'yes';
+            unset($output);
+        }
+        // Antivirus
+        if (($v_antivirus == 'yes') && (empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+            $v_antivirus = 'no';
+            unset($output);
+        }
+        if (($v_antivirus == 'no') && (!empty($_POST['v_antivirus'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            $v_antivirus = 'yes';
+            unset($output);
+        }
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+        }
 
-            // DKIM
-            if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_dkim = 'no';
-                unset($output);
+        // DKIM
+        if (($v_dkim == 'yes') && (empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-            if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_dkim = 'yes';
-                unset($output);
-            }
-
-            // Catchall
-            if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_catchall = '';
-                unset($output);
+            $v_dkim = 'no';
+            unset($output);
+        }
+        if (($v_dkim == 'no') && (!empty($_POST['v_dkim'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            $v_dkim = 'yes';
+            unset($output);
+        }
 
-            if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
-                if ($v_catchall != $_POST['v_catchall']) {
-                    $v_catchall = escapeshellarg($_POST['v_catchall']);
-                    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: vesta did not return any output.');
-                        $_SESSION['error_msg'] = $error;
-                    }
-                    unset($output);
-                }
+        // Catchall
+        if ((!empty($v_catchall)) && (empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
-
-            if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
+            $v_catchall = '';
+            unset($output);
+        }
+        if ((!empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
+            if ($v_catchall != $_POST['v_catchall']) {
                 $v_catchall = escapeshellarg($_POST['v_catchall']);
-                exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
+                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: vesta did not return any output.');
@@ -160,211 +147,214 @@ top_panel($user,$TAB);
                 }
                 unset($output);
             }
-
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+        }
+        if ((empty($v_catchall)) && (!empty($_POST['v_catchall'])) && (empty($_SESSION['error_msg']))) {
+            $v_catchall = escapeshellarg($_POST['v_catchall']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
         }
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+        }
+    }
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+} else {
+    $v_username = $user;
+    $v_domain = escapeshellarg($_GET['domain']);
+    $v_account = escapeshellarg($_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: vesta did not return any output.');
+        $_SESSION['error_msg'] = $error;
     } else {
-
+        $data = json_decode(implode('', $output), true);
+        unset($output);
         $v_username = $user;
-        $v_domain = escapeshellarg($_GET['domain']);
-        $v_account = escapeshellarg($_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: vesta did not return any output.');
-            $_SESSION['error_msg'] = $error;
-        } else {
-            $data = json_decode(implode('', $output), true);
+        $v_domain = $_GET['domain'];
+        $v_account = $_GET['account'];
+        $v_password = "••••••••";
+        $v_aliases = str_replace(',', "\n", $data[$v_account]['ALIAS']);
+        $valiases = explode(",", $data[$v_account]['ALIAS']);
+        $v_fwd = str_replace(',', "\n", $data[$v_account]['FWD']);
+        $vfwd = explode(",", $data[$v_account]['FWD']);
+        $v_quota = $data[$v_account]['QUOTA'];
+        $v_autoreply = $data[$v_account]['AUTOREPLY'];
+        if ( $v_autoreply == 'yes' ) {
+            exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var);
+            $autoreply_str = json_decode(implode('', $output), true);
             unset($output);
-            $v_username = $user;
-            $v_domain = $_GET['domain'];
-            $v_account = $_GET['account'];
-            $v_password = "••••••••";
-            $v_aliases = str_replace(',', "\n", $data[$v_account]['ALIAS']);
-            $valiases = explode(",", $data[$v_account]['ALIAS']);
-            $v_fwd = str_replace(',', "\n", $data[$v_account]['FWD']);
-            $vfwd = explode(",", $data[$v_account]['FWD']);
-            $v_quota = $data[$v_account]['QUOTA'];
-            $v_autoreply = $data[$v_account]['AUTOREPLY'];
-            if ( $v_autoreply == 'yes' ) {
-                exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var);
-                $autoreply_str = json_decode(implode('', $output), true);
-                unset($output);
-                $v_autoreply_message = $autoreply_str[$v_account]['MSG'];
-            }
-            $v_suspended = $data[$v_account]['SUSPENDED'];
-            if ( $v_suspended == 'yes' ) {
-                $v_status =  'suspended';
-            } else {
-                $v_status =  'active';
-            }
-            $v_date = $data[$v_account]['DATE'];
-            $v_time = $data[$v_account]['TIME'];
+            $v_autoreply_message = $autoreply_str[$v_account]['MSG'];
         }
+        $v_suspended = $data[$v_account]['SUSPENDED'];
+        if ( $v_suspended == 'yes' ) {
+            $v_status =  'suspended';
+        } else {
+            $v_status =  'active';
+        }
+        $v_date = $data[$v_account]['DATE'];
+        $v_time = $data[$v_account]['TIME'];
+    }
 
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_domain = escapeshellarg($_POST['v_domain']);
-            $v_account = escapeshellarg($_POST['v_account']);
-
-            // Password
-            if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
-                $v_password = escapeshellarg($_POST['v_password']);
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_password = "••••••••";
-                unset($output);
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_domain = escapeshellarg($_POST['v_domain']);
+        $v_account = escapeshellarg($_POST['v_account']);
+        // Password
+        if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
+            $v_password = escapeshellarg($_POST['v_password']);
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            $v_password = "••••••••";
+            unset($output);
+        }
 
-            // Quota
-            if (($v_quota != $_POST['v_quota']) && (empty($_SESSION['error_msg']))) {
-                if (empty($_POST['v_quota'])) {
-                    $v_quota = 0; 
-                } else {
-                    $v_quota = escapeshellarg($_POST['v_quota']);
-                }
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                unset($output);
+        // Quota
+        if (($v_quota != $_POST['v_quota']) && (empty($_SESSION['error_msg']))) {
+            if (empty($_POST['v_quota'])) {
+                $v_quota = 0; 
+            } else {
+                $v_quota = escapeshellarg($_POST['v_quota']);
             }
-
-
-            // Aliases
-            if (empty($_SESSION['error_msg'])) {
-                $waliases = preg_replace("/\n/", " ", $_POST['v_aliases']);
-                $waliases = preg_replace("/,/", " ", $waliases);
-                $waliases = preg_replace('/\s+/', ' ',$waliases);
-                $waliases = trim($waliases);
-                $aliases = explode(" ", $waliases);
-                $v_aliases = str_replace(' ', "\n", $waliases);
-                $result = array_diff($valiases, $aliases);
-                foreach ($result as $alias) {
-                    if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
-                        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: vesta did not return any output.');
-                            $_SESSION['error_msg'] = $error;
-                        }
-                        unset($output);
-                    }
-                }
-                $result = array_diff($aliases, $valiases);
-                foreach ($result as $alias) {
-                    if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
-                        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: vesta did not return any output.');
-                            $_SESSION['error_msg'] = $error;
-                        }
-                        unset($output);
-                    }
-                }
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            unset($output);
+        }
 
-            // Forwarders
-            if (empty($_SESSION['error_msg'])) {
-                $wfwd = preg_replace("/\n/", " ", $_POST['v_fwd']);
-                $wfwd = preg_replace("/,/", " ", $wfwd);
-                $wfwd = preg_replace('/\s+/', ' ',$wfwd);
-                $wfwd = trim($wfwd);
-                $fwd = explode(" ", $wfwd);
-                $v_fwd = str_replace(' ', "\n", $wfwd);
-                $result = array_diff($vfwd, $fwd);
-                foreach ($result as $forward) {
-                    if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
-                        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: vesta did not return any output.');
-                            $_SESSION['error_msg'] = $error;
-                        }
-                        unset($output);
-                    }
-                }
-                $result = array_diff($fwd, $vfwd);
-                foreach ($result as $forward) {
-                    if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
-                        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: vesta did not return any output.');
-                            $_SESSION['error_msg'] = $error;
-                        }
-                        unset($output);
+        // Aliases
+        if (empty($_SESSION['error_msg'])) {
+            $waliases = preg_replace("/\n/", " ", $_POST['v_aliases']);
+            $waliases = preg_replace("/,/", " ", $waliases);
+            $waliases = preg_replace('/\s+/', ' ',$waliases);
+            $waliases = trim($waliases);
+            $aliases = explode(" ", $waliases);
+            $v_aliases = str_replace(' ', "\n", $waliases);
+            $result = array_diff($valiases, $aliases);
+            foreach ($result as $alias) {
+                if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
+                    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: vesta did not return any output.');
+                        $_SESSION['error_msg'] = $error;
                     }
+                    unset($output);
                 }
             }
-
-            // Autoreply
-            if (($v_autoreply == 'yes') && (empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
-                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: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
+            $result = array_diff($aliases, $valiases);
+            foreach ($result as $alias) {
+                if ((empty($_SESSION['error_msg'])) && (!empty($alias))) {
+                    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: vesta did not return any output.');
+                        $_SESSION['error_msg'] = $error;
+                    }
+                    unset($output);
                 }
-                unset($output);
-                $v_autoreply = 'no';
-		$v_autoreply_message = '';
             }
-            if (($v_autoreply == 'yes') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
-                if ( $v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) {
-                    $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);
+        }
+        // Forwarders
+        if (empty($_SESSION['error_msg'])) {
+            $wfwd = preg_replace("/\n/", " ", $_POST['v_fwd']);
+            $wfwd = preg_replace("/,/", " ", $wfwd);
+            $wfwd = preg_replace('/\s+/', ' ',$wfwd);
+            $wfwd = trim($wfwd);
+            $fwd = explode(" ", $wfwd);
+            $v_fwd = str_replace(' ', "\n", $wfwd);
+            $result = array_diff($vfwd, $fwd);
+            foreach ($result as $forward) {
+                if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
+                    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: vesta did not return any output.');
                         $_SESSION['error_msg'] = $error;
                     }
                     unset($output);
-                    $v_autoreply_message = $_POST['v_autoreply_message'];
                 }
             }
-
-            if (($v_autoreply == 'no') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
-                if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = "Error: field atoreply message  can not be blank.";
-                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);
+            $result = array_diff($fwd, $vfwd);
+            foreach ($result as $forward) {
+                if ((empty($_SESSION['error_msg'])) && (!empty($forward))) {
+                    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: vesta did not return any output.');
                         $_SESSION['error_msg'] = $error;
                     }
-	            unset($output);
-                    $v_autoreply = 'yes';
-                    $v_autoreply_message = $_POST['v_autoreply_message'];
+                    unset($output);
                 }
             }
+        }
 
-
+        // Autoreply
+        if (($v_autoreply == 'yes') && (empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
+            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: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
+            }
+            unset($output);
+            $v_autoreply = 'no';
+            $v_autoreply_message = '';
+        }
+        if (($v_autoreply == 'yes') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
+            if ( $v_autoreply_message != str_replace("\r\n", "\n", $_POST['v_autoreply_message'])) {
+                $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: vesta did not return any output.');
+                    $_SESSION['error_msg'] = $error;
+                }
+                unset($output);
+                $v_autoreply_message = $_POST['v_autoreply_message'];
+            }
+        }
+            if (($v_autoreply == 'no') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
+            if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = "Error: field atoreply message  can not be blank.";
             if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+                $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: vesta did not return any output.');
+                    $_SESSION['error_msg'] = $error;
+                }
+                unset($output);
+                $v_autoreply = 'yes';
+                $v_autoreply_message = $_POST['v_autoreply_message'];
             }
+        }
 
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
         }
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html');
-        unset($_SESSION['error_msg']);
-        unset($_SESSION['ok_msg']);
     }
-//}
+    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html');
+    unset($_SESSION['error_msg']);
+    unset($_SESSION['ok_msg']);
+}
+
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/inc/i18n/en.php

@@ -1,350 +1,356 @@
 <?php
 /**
  * Vesta CP language file
- * Translated by ZonD80 (zond80@gmail.com)
+ * ZonD80 (zond80@gmail.com)
+ * skid (skid@vestacp.com)
  */
 
 if (!defined('LANGUAGE')) die('Direct access not allowed');
 
 $LANG = array(
-    'yes'=>'yes',
-    'no'=>'no',
-    'Hour'=>'Hour',
-    'Min'=>'Min',
-    'pb'=>'pb',
-    'tb'=>'tb',
-    'gb'=>'gb',
-    'mb'=>'mb',
-    'Error'=>'Error',
-    'minute'=>'minute',
-    'hour'=>'hour',
-    'day'=>'day',
-    'days'=>'days',
-    'hours'=>'hours',
-    'minutes'=>'minutes',
-    'month'=>'month',
-    'day of week'=>'day of week',
-    'cmd'=>'cmd',
-    'Error: field "%s" can not be blank.'=>'Error: Field "%s" can not be blank.',
+    'yes' => 'да',
+    'no' => 'нет',
+    'none' => 'нет',
+    'yes' => 'yes',
+    'no' => 'no',
+    'Hour' => 'Hour',
+    'Min' => 'Min',
+    'pb' => 'pb',
+    'tb' => 'tb',
+    'gb' => 'gb',
+    'mb' => 'mb',
+    'Error' => 'Error',
+    'minute' => 'minute',
+    'hour' => 'hour',
+    'day' => 'day',
+    'days' => 'days',
+    'hours' => 'hours',
+    'minutes' => 'minutes',
+    'month' => 'month',
+    'day of week' => 'day of week',
+    'cmd' => 'cmd',
+    'Error: field "%s" can not be blank.' => 'Error: Field "%s" can not be blank.',
     _('Error: vesta did not return any output.')=>'Error: Vesta did not return any output',
-    'OK: cron job has been created successfully.'=>'Success: Cron Job has been created',
-    'database'=>'database',
-    'username'=>'username',
-    'password'=>'password',
-    'type'=>'type',
-    'charset'=>'charset',
-    'edit'=>'edit',
-    'DATABASE_CREATED_OK'=>'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully.',
-    'domain'=>'domain',
-    'ip'=>'IP',
-    'DOMAIN_CREATED_OK'=>'Domain <a href="/list/dns/?domain=%s"><b>%s</b></a> has been created successfully.',
-    'RECORD_CREATED_OK'=>'Record <b>%s.%s</b> has been created successfully.',
-    'ip address'=>'IP-address',
-    'netmask'=>'netmask',
-    'Netmask'=>'Netmask',
-    'interface'=>'interface',
-    'Interface'=>'Interface',
-    'assigned user'=>'assigned user',
-    'IP_CREATED_OK'=>'"IP address <a href="/edit/ip/?ip=%s"><b>%s</b></a> has been created successfully.',
-    'DOMAIN_MAIL_CREATED_OK'=>'Mail for domain <a href="/list/mail/?domain=%s"><b>%s</b></a> has been created successfully.',
-    'account'=>'account',
-    'Account'=>'Account',
-    'MAIL_ACCOUNT_CREATED_OK'=>'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully.',
-    'package'=>'package',
-    'template'=>'template',
-    'shell'=>'SSH',
-    'web domains'=>'web domains',
-    'Web Domains'=>'Web Domains',
-    'Web Aliases'=>'Web Aliases',
-    'per domain'=>'per domain',
-    'DNS domains'=>'DNS domains',
-    'DNS records count'=>'DNS records count',
-    'DNS Support'=>'DNS Support',
-    'Mail Support'=>'Mail Support',
-    'web aliases'=>'web aliases',
-    'dns records'=>'DNS records',
-    'mail domains'=>'mail domains',
-    'mail accounts'=>'mail accounts',
-    'Mail Domains'=>'Mail Domains',
-    'Mail Accounts'=>'Mail Accounts',
-    'accounts'=>'accounts',
-    'databases'=>'databases',
-    'Databases'=>'Databases',
-    'cron jobs'=>'cron jobs',
-    'Cron Jobs'=>'Cron Jobs',
-    'Backups'=>'Backups',
-    'backups'=>'backups',
-    'quota'=>'disk quota',
-    'bandwidth'=>'bandwidth',
-    'Bandwidth'=>'Bandwidth',
-    'ns1'=>'ns1',
-    'ns2'=>'ns2',
-    'PACKAGE_CREATED_OK'=>'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
-    'user'=>'user',
-    'email'=>'email',
-    'Email'=>'Email',
-    'first name'=>'first name',
-    'last name'=>'last name',
-    'Please enter valid email address.'=>'Please enter valid email address.',
-    'Welcome to Vesta Control Panel'=>'Welcome to Vesta Control Panel',
-    'MAIL_FROM'=>'Vesta Control Panel <noreply@%s>',
+    'OK: cron job has been created successfully.' => 'Success: Cron Job has been created',
+    'database' => 'database',
+    'username' => 'username',
+    'password' => 'password',
+    'type' => 'type',
+    'charset' => 'charset',
+    'edit' => 'edit',
+    'DATABASE_CREATED_OK' => 'Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created successfully.',
+    'domain' => 'domain',
+    'ip' => 'IP',
+    'DOMAIN_CREATED_OK' => 'Domain <a href="/list/dns/?domain=%s"><b>%s</b></a> has been created successfully.',
+    'RECORD_CREATED_OK' => 'Record <b>%s.%s</b> has been created successfully.',
+    'ip address' => 'IP-address',
+    'netmask' => 'netmask',
+    'Netmask' => 'Netmask',
+    'interface' => 'interface',
+    'Interface' => 'Interface',
+    'assigned user' => 'assigned user',
+    'IP_CREATED_OK' => '"IP address <a href="/edit/ip/?ip=%s"><b>%s</b></a> has been created successfully.',
+    'DOMAIN_MAIL_CREATED_OK' => 'Mail for domain <a href="/list/mail/?domain=%s"><b>%s</b></a> has been created successfully.',
+    'account' => 'account',
+    'Account' => 'Account',
+    'MAIL_ACCOUNT_CREATED_OK' => 'Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created successfully.',
+    'package' => 'package',
+    'template' => 'template',
+    'shell' => 'SSH',
+    'web domains' => 'web domains',
+    'Web Domains' => 'Web Domains',
+    'Web Aliases' => 'Web Aliases',
+    'per domain' => 'per domain',
+    'DNS domains' => 'DNS domains',
+    'DNS records count' => 'DNS records count',
+    'DNS Support' => 'DNS Support',
+    'Mail Support' => 'Mail Support',
+    'web aliases' => 'web aliases',
+    'dns records' => 'DNS records',
+    'mail domains' => 'mail domains',
+    'mail accounts' => 'mail accounts',
+    'Mail Domains' => 'Mail Domains',
+    'Mail Accounts' => 'Mail Accounts',
+    'accounts' => 'accounts',
+    'databases' => 'databases',
+    'Databases' => 'Databases',
+    'cron jobs' => 'cron jobs',
+    'Cron Jobs' => 'Cron Jobs',
+    'Backups' => 'Backups',
+    'backups' => 'backups',
+    'quota' => 'disk quota',
+    'bandwidth' => 'bandwidth',
+    'Bandwidth' => 'Bandwidth',
+    'ns1' => 'ns1',
+    'ns2' => 'ns2',
+    'PACKAGE_CREATED_OK' => 'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
+    'user' => 'user',
+    'email' => 'email',
+    'Email' => 'Email',
+    'first name' => 'first name',
+    'last name' => 'last name',
+    'Please enter valid email address.' => 'Please enter valid email address.',
+    'Welcome to Vesta Control Panel' => 'Welcome to Vesta Control Panel',
+    'MAIL_FROM' => 'Vesta Control Panel <noreply@%s>',
     'GREETINGS_GORDON_FREEMAN'=>"Hello, %s %s,\n",
     'GREETINGS'=>"Hello,\n",
     'ACCOUNT_READY'=>"You account has been created and ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nVesta Control Panel\n",
-    'ACCOUNT_CREATED_OK'=>'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully.',
-    'ssl certificate'=>'SSL certificate',
-    'ssl key'=>'SSL key',
-    'SSL Support'=>'SSL Support',
-    'SSL Home Directory'=>'SSL Home Directory',
-    'SSL Certificate'=>'SSL Certificate',
-    'SSL Key'=>'SSL Key',
-    'SSL Certificate Authority / Intermediate'=>'SSL Certificate Authority / Intermediate',
-    'stats user password'=>'stats user password',
-    'stats username'=>'stats username',
-    'stats password'=>'stats password',
-    'ftp user password'=>'FTP user password',
-    'ftp user'=>'FTP user',
-    'FTP login credentials'=>'FTP login credentials',
+    'ACCOUNT_CREATED_OK' => 'User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created successfully.',
+    'ssl certificate' => 'SSL certificate',
+    'ssl key' => 'SSL key',
+    'SSL Support' => 'SSL Support',
+    'SSL Home Directory' => 'SSL Home Directory',
+    'SSL Certificate' => 'SSL Certificate',
+    'SSL Key' => 'SSL Key',
+    'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate',
+    'stats user password' => 'stats user password',
+    'stats username' => 'stats username',
+    'stats password' => 'stats password',
+    'ftp user password' => 'FTP user password',
+    'ftp user' => 'FTP user',
+    'FTP login credentials' => 'FTP login credentials',
     'FTP_ACCOUNT_READY'=>"FTP account has been created and ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
-    'WEB_DOMAIN_CREATED_OK'=>'Web domain <a href="/edit/web/?domain=%s"><b>%s</b></a> has been created successfully.',
-    'OK: changes has been saved.'=>'Success: Changes have been saved.',
-    'FTP login credentials'=>'FTP login credentials',
-    '505'=>'505 &mdash; oops, internal error. Call an Ambulance!',
-    'An internal error occurred'=>'An internal error occurred',
-    'GO_BACK_LINK'=>'Try to go back to <a href="/">main page</a> or go to <a href="javascript:history.go(-1)">previous page</a>',
-    'ERROR: Invalid username or password'=>'Error: Invalid username or password',
-    'ERROR: Invalid username or code'=>'Error: Invalid username or reset code',
-    'MAIL_RESET_SUBJECT'=>'Password Reset at %s',
+    'WEB_DOMAIN_CREATED_OK' => 'Web domain <a href="/edit/web/?domain=%s"><b>%s</b></a> has been created successfully.',
+    'OK: changes has been saved.' => 'Success: Changes have been saved.',
+    'FTP login credentials' => 'FTP login credentials',
+    '505' => '505 &mdash; oops, internal error. Call an Ambulance!',
+    'An internal error occurred' => 'An internal error occurred',
+    'GO_BACK_LINK' => 'Try to go back to <a href="/">main page</a> or go to <a href="javascript:history.go(-1)">previous page</a>',
+    'ERROR: Invalid username or password' => 'Error: Invalid username or password',
+    'ERROR: Invalid username or code' => 'Error: Invalid username or reset code',
+    'MAIL_RESET_SUBJECT' => 'Password Reset at %s',
     'PASSWORD_RESET_REQUEST'=>"You recently requested a password reset.\nTo coutinue to reset your password, visit this link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, you can visit this link: https://%s/reset/?action=code&user=%s and enter the following reset code:\n%s\n\nIf you did not request password reset, please ignore this message and take out apologies.\n\n--\nVesta Control Panel\n",
-    'ERROR: Passwords not match'=>'Error: Passwords did not match',
-    'Adding Cron Job'=>'Adding Cron Job',
-    'Minute'=>'Minute',
-    'Day'=>'Day',
-    'Month'=>'Month',
-    'Day of week'=>'Day of week',
-    'Command'=>'Command',
-    'Add'=>'Add',
-    'Back'=>'Back',
-    'Adding database'=>'Adding database',
-    'DB_PREFIX_WILL_BE_ADDED'=>'Prefix %s will be automatically added to Database and User name',
-    'FTP_PREFIX_WILL_BE_ADDED'=>'Prefix %s will be automatically added to User name',
-    'Database'=>'Database',
-    'Username'=>'Username',
-    'Password'=>'Password',
-    'generate'=>'generate',
-    'Type'=>'Type',
-    'Charset'=>'Charset',
-    'Adding DNS Domain'=>'Adding DNS Domain',
-    'Domain'=>'Domain',
-    'IP-Address'=>'IP-Address',
-    'Advanced options'=>'Advanced options',
-    'Template'=>'Template',
-    'Expiration date'=>'Expiration date',
-    'Expire'=>'Expire',
-    'YYYY-MM-DD'=>'YYYY-MM-DD',
-    'Name servers'=>'Name servers',
-    'Name Servers'=>'Name Servers',
-    'Powered by Vesta Control Panel'=>'Powered by Vesta Control Panel',
-    'Vesta Control Panel'=>'Vesta Control Panel',
-    'Translation by ZonD80'=>'Translation by ZonD80',
-    'Forgot Password?'=>'Forgot Password?',
-    'Log in'=>'Log in',
-    'Log out'=>'Log out',
+    'ERROR: Passwords not match' => 'Error: Passwords did not match',
+    'Adding Cron Job' => 'Adding Cron Job',
+    'Minute' => 'Minute',
+    'Day' => 'Day',
+    'Month' => 'Month',
+    'Day of week' => 'Day of week',
+    'Command' => 'Command',
+    'Add' => 'Add',
+    'Back' => 'Back',
+    'Adding database' => 'Adding database',
+    'DB_PREFIX_WILL_BE_ADDED' => 'Prefix %s will be automatically added to Database and User name',
+    'FTP_PREFIX_WILL_BE_ADDED' => 'Prefix %s will be automatically added to User name',
+    'Database' => 'Database',
+    'Username' => 'Username',
+    'Password' => 'Password',
+    'generate' => 'generate',
+    'Type' => 'Type',
+    'Charset' => 'Charset',
+    'Adding DNS Domain' => 'Adding DNS Domain',
+    'Domain' => 'Domain',
+    'IP-Address' => 'IP-Address',
+    'Advanced options' => 'Advanced options',
+    'Template' => 'Template',
+    'Expiration date' => 'Expiration date',
+    'Expire' => 'Expire',
+    'YYYY-MM-DD' => 'YYYY-MM-DD',
+    'Name servers' => 'Name servers',
+    'Name Servers' => 'Name Servers',
+    'Powered by Vesta Control Panel' => 'Powered by Vesta Control Panel',
+    'Vesta Control Panel' => 'Vesta Control Panel',
+    'Translation by ZonD80' => 'Translation by ZonD80',
+    'Forgot Password?' => 'Forgot Password?',
+    'Log in' => 'Log in',
+    'Log out' => 'Log out',
     "RESET_NOTICE"=>"Please enter you username to continue.",
-    'Submit'=>'Submit',
-    'RESET_CODE_SENT'=>'Password reset code has been sent to your email address<br/>Please enter the code into field located below',
-    'Confirm'=>'Confirm',
-    'New Password'=>'New Password',
-    'Confirm Password'=>'Confirm Password',
-    'Reset'=>'Reset',
-    'Statistics'=>'Statistics',
-    'Web Statistics'=>'Statistics',
-    'History Log'=>'History Log',
-    'Vesta logo'=>'Vesta logo',
-    'USER'=>'USER',
-    'logout'=>'logout',
-    'users'=>'users',
-    'Users'=>'Users',
-    'suspended'=>'suspended',
-    'WEB'=>'WEB',
-    'domains'=>'domains',
-    'aliases'=>'aliases',
-    'Aliases'=>'Aliases',
-    'DNS'=>'DNS',
-    'records'=>'records',
-    'Records'=>'Records',
-    'MAIL'=>'MAIL',
-    'DB'=>'DB',
-    'CRON'=>'CRON',
-    'BACKUP'=>'BACKUP',
-    'Packages'=>'Packages',
-    'IP Addresses'=>'IP Addresses',
-    'RRD Graphics'=>'RRD Graphics',
-    'jobs'=>'jobs',
-    'Reset Code'=>'Reset Code',
-    'disk'=>'disk',
-    'Disk'=>'Disk',
-    'traffic'=>'traffic',
-    'Database Credentials'=>'Database Credentials',
+    'Submit' => 'Submit',
+    'RESET_CODE_SENT' => 'Password reset code has been sent to your email address<br/>Please enter the code into field located below',
+    'Confirm' => 'Confirm',
+    'New Password' => 'New Password',
+    'Confirm Password' => 'Confirm Password',
+    'Reset' => 'Reset',
+    'Statistics' => 'Statistics',
+    'Web Statistics' => 'Statistics',
+    'History Log' => 'History Log',
+    'Vesta logo' => 'Vesta logo',
+    'USER' => 'USER',
+    'logout' => 'logout',
+    'users' => 'users',
+    'Users' => 'Users',
+    'spnd' => 'suspended',
+    'suspended' => 'suspended',
+    'WEB' => 'WEB',
+    'domains' => 'domains',
+    'aliases' => 'aliases',
+    'Aliases' => 'Aliases',
+    'DNS' => 'DNS',
+    'records' => 'records',
+    'Records' => 'Records',
+    'MAIL' => 'MAIL',
+    'DB' => 'DB',
+    'CRON' => 'CRON',
+    'BACKUP' => 'BACKUP',
+    'Packages' => 'Packages',
+    'IP Addresses' => 'IP Addresses',
+    'RRD Graphics' => 'RRD Graphics',
+    'jobs' => 'jobs',
+    'Reset Code' => 'Reset Code',
+    'disk' => 'disk',
+    'Disk' => 'Disk',
+    'traffic' => 'traffic',
+    'Database Credentials' => 'Database Credentials',
     'DATABASE_READY'=>"Hello, %s %s,\nDatabase %s has been created successfully.\n\nDatabase: %s_%s\nUser: %s_%s\nPassword: %s\n\n",
-    'Send credentials to'=>'Send credentials to',
-    'Adding DNS Record'=>'Adding DNS Record',
-    'Record'=>'Record',
-    'IP or Value'=>'IP-address or Valie',
-    'Priority'=>'Priority',
-    'optional'=>'optional',
-    'Adding IP Address'=>'Adding IP Address',
-    'Shared'=>'Shared',
-    'Assigned user'=>'Assigned user',
-    'Assigned domain'=>'Assigned domain',
-    'Adding Mail Domain'=>'Creatin Mail Domain',
-    'AntiSpam Support'=>'AntiSpam Support',
-    'AntiVirus Support'=>'AntiVirus Support',
-    'DKIM Support'=>'DKIM Support',
-    'Adding Mail Account'=>'Adding Mail Account',
-    'Advanced options'=>'Advanced options',
-    'Quota'=>'Quota',
-    'in megabytes'=>'in megabytes',
-    'use local-part'=>'use local-part',
-    'Forward to'=>'Forward to',
-    'one or more email addresses'=>'one or more email addresses',
-    'Adding Package'=>'Adding Package',
-    'Package Name'=>'Package Name',
-    'Package'=>'Package',
-    'Default Template'=>'Default Template',
-    'SSH Access'=>'SSH Access',
-    'Adding User'=>'Adding User',
-    'First Name'=>'First Name',
-    'Last Name'=>'Last Name',
-    'SEND_CREDENTIALS_NOTICE'=>'Send login credentials to',
+    'Send credentials to' => 'Send credentials to',
+    'Adding DNS Record' => 'Adding DNS Record',
+    'Record' => 'Record / Subdomain',
+    'IP or Value' => 'IP-address or Valie',
+    'Priority' => 'Priority',
+    'optional' => 'optional',
+    'Adding IP Address' => 'Adding IP Address',
+    'Shared' => 'Shared',
+    'Assigned user' => 'Assigned user',
+    'Assigned domain' => 'Assigned domain',
+    'Adding Mail Domain' => 'Creatin Mail Domain',
+    'AntiSpam Support' => 'AntiSpam Support',
+    'AntiVirus Support' => 'AntiVirus Support',
+    'DKIM Support' => 'DKIM Support',
+    'Adding Mail Account' => 'Adding Mail Account',
+    'Advanced options' => 'Advanced options',
+    'Quota' => 'Quota',
+    'in megabytes' => 'in megabytes',
+    'use local-part' => 'use local-part',
+    'Forward to' => 'Forward to',
+    'one or more email addresses' => 'one or more email addresses',
+    'Adding Package' => 'Adding Package',
+    'Package Name' => 'Package Name',
+    'Package' => 'Package',
+    'Default Template' => 'Default Template',
+    'SSH Access' => 'SSH Access',
+    'Adding User' => 'Adding User',
+    'First Name' => 'First Name',
+    'Last Name' => 'Last Name',
+    'SEND_CREDENTIALS_NOTICE' => 'Send login credentials to',
     'SEND_FTP_CREDENTIALS' => 'Send FTP credentials to'
-    'Adding Web Domain'=>'Adding Web Domain',
-    'Apache template'=>'Apache template',
-    'Nginx Support'=>'Nginx Support',
-    'Nginx Extentions'=>'Nginx Extentions',
-    'Nginx Template'=>'Nginx Template',
-    'Statistics Authorization'=>'Statistics Authorization',
-    'Additional FTP Account'=>'Additional FTP Account',
-    'Editing Cron Job'=>'Editing Cron Job',
-    'Save'=>'Save',
-    'Editing Database'=>'Editing Database',
-    'Editing DNS Domain'=>'Editing DNS Domain',
-    'Editing DNS Record'=>'Editing DNS Record',
-    'Editing IP Address'=>'Editing IP Address',
-    'Editing Mail Domain'=>'Editing Mail Domain',
-    'Catchall email'=>'Catchall email',
-    'Editing Mail Account'=>'Editing Mail Account',
-    'Autoreply'=>'Autoreply',
-    'Message'=>'Message',
-    'Editing Package'=>'Editing Package',
-    'Editing User'=>'Editing User',
-    'Default Name Servers'=>'Default Name Servers',
-    'Editing Domain'=>'Editing Domain',
-    'Create Backup'=>'Create Backup',
-    'apply to selected'=>'apply to selected',
-    'toggle all'=>'toggle all',
-    'delete'=>'delete',
-    'active'=>'active',
-    'download'=>'download',
-    'Owner'=>'Owner',
-    'restore'=>'restore',
-    'restart'=>'restart',
-    'CPU'=>'CPU',
-    'Memory'=>'Memory',
-    'stop'=>'stop',
-    'Run Time'=>'Run Time',
-    'BACKUP_DELETE_CONFIRMATION'=>'Are you sure to delete %s backup?',
-    'Backup Size'=>'Backup Size',
-    'SYS'=>'SYS',
-    'one archive'=>'one archive',
-    '%s archives'=>'%s archives',
-    'Add Cron Job'=>'Add Cron Job',
-    'add account'=>'add account',
-    'open webmail'=>'open webmail',
-    'suspend'=>'suspend',
-    'unsuspend'=>'unsuspend',
-    'CRON_ACTION_CONFIRMATION'=>'Are you sure to %s cron job?',
-    'Confirmation'=>'Confirmation',
-    'one cron job'=>'one cron job',
-    '%s cron jobs'=>'%s cron jobs',
-    'Add Database'=>'Add Database',
-    'open %s'=>'open %s',
-    'DATABASE_ACTION_CONFIRMATION'=>'Are you sure to %s database %s?',
-    'one database'=>'ne database',
-    '%s databases'=>'%s databases',
-    'Add DNS Domain'=>'Add DNS Domain',
-    'Search'=>'Search',
-    'LIST_DOMAIN_RECORDS'=>'Show %s records',
-    'add record'=>'add record',
-    'DOMAIN_ACTION_CONFIRMATION'=>'Are you sure to %s domain %s?',
-    '1 domain'=>'1 domain',
-    '%s domains'=>'%s domains',
-    'Add DNS Record'=>'Add DNS Record',
-    'Listing'=>'Listing',
-    'list'=>'list',
-    'RECORD_ACTION_CONFIRMATION'=>'Are you sure to %s record %s?',
-    'one DNS record'=>'one DNS record',
-    '%s DNS records'=>'%s DNS records',
-    'Add IP'=>'Add IP',
-    'IP_DELETE_CONFIRMATION'=>'Are you sure to delere IP-address %s?',
-    'Status'=>'Status',
-    'one IP address'=>'one IP address',
-    '%s IP addresses'=>'%s IP addresses',
-    'one log record'=>'one log record',
-    '%s log records'=>'%s log records',
-    'Add Mail Domain'=>'Add Mail Domain',
-    'MAIL_ACTION_CONFIRMATION'=>'Are you sure to %s mail for domain %s?',
-    'one domain with email'=>'one domain with email',
-    '%s domains with email'=>'%s domains with email',
-    'Add Mail Account'=>'Add Mail Account',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION'=>'Are you sure to %s mail account %s?',
-    'one mail account'=>'one mail account',
-    '%s mail accounts'=>'%s mail accounts',
-    'Add Package'=>'Add Package',
-    'PACKAGE_DELETE_CONFIRMATION'=>'Are you sure to delete package %s?',
-    'one package'=>'one package',
-    '%s packages'=>'%s packages',
-    'Daily'=>'Daily',
-    'Weekly'=>'Weekly',
-    'Monthly'=>'Monthly',
-    'Yearly'=>'Yearly',
-    'Search Results'=>'Search Results',
-    'login as'=>'login as',
-    'Object'=>'Object',
-    'one object'=>'one object',
-    '%s objects'=>'%s objects',
-    'Overall Statistics'=>'Overall Statistics',
-    'show per user'=>'show per user',
-    'Web'=>'Web',
-    'Mail'=>'Mail',
-    'User Directories'=>'Папки User Directories',
-    'Web SSL Domains'=>'Web SSL Domains',
-    'one month'=>'one month',
-    '%s months'=>'%s months',
-    'Add User'=>'Add User',
-    'Add Domain'=>'Add Domain',
-    'rebuild'=>'rebuild',
-    'rebuild web'=>'rebuild web',
-    'rebuild DNS'=>'rebuild DNS',
-    'rebuild mail'=>'rebuild mail',
-    'rebuild db'=>'rebuild db',
-    'rebuild cron'=>'rebuild cron',
-    'update counters'=>'update counters',
-    'LOGGED_IN_AS'=>'Logged in as user %s',
-    'USER_ACTION_CONFIRMATION'=>'Are you sure to %s user %s?',
-    'one account'=>'one account',
-    '%s accounts'=>'%s accounts',
-    'Add Domain for hosting'=>'Add Domain for hosting',
-    'open webstats'=>'open webstats',
-    'Error Log'=>'Error Log',
-    'CGI Support'=>'CGI Support',
-    'Statistics Auth'=>'Statistics Auth',
-    'running'=>'running',
-    'SERVICE_ACTION_FAILED'=>'Error: Oparaion "%s" for service "%s" has been failed',
-    'Memory Usage'=>'Memory Usage',
-    'Bandwidth Usage'=>'Bandwidth Usage',
-    'IP Address'=>'IP Address',
-    'Accounts'=>'Accounts',
+    'Adding Web Domain' => 'Adding Web Domain',
+    'Apache template' => 'Apache template',
+    'Nginx Support' => 'Nginx Support',
+    'Nginx Extentions' => 'Nginx Extentions',
+    'Nginx Template' => 'Nginx Template',
+    'Statistics Authorization' => 'Statistics Authorization',
+    'Additional FTP Account' => 'Additional FTP Account',
+    'Editing Cron Job' => 'Editing Cron Job',
+    'Save' => 'Save',
+    'Editing Database' => 'Editing Database',
+    'Editing DNS Domain' => 'Editing DNS Domain',
+    'Editing DNS Record' => 'Editing DNS Record',
+    'Editing IP Address' => 'Editing IP Address',
+    'Editing Mail Domain' => 'Editing Mail Domain',
+    'Catchall email' => 'Catchall email',
+    'Editing Mail Account' => 'Editing Mail Account',
+    'Autoreply' => 'Autoreply',
+    'Message' => 'Message',
+    'Editing Package' => 'Editing Package',
+    'Editing User' => 'Editing User',
+    'Default Name Servers' => 'Default Name Servers',
+    'Editing Domain' => 'Editing Domain',
+    'Create Backup' => 'Create Backup',
+    'apply to selected' => 'apply to selected',
+    'toggle all' => 'toggle all',
+    'delete' => 'delete',
+    'active' => 'active',
+    'download' => 'download',
+    'Owner' => 'Owner',
+    'restore' => 'restore',
+    'restart' => 'restart',
+    'CPU' => 'CPU',
+    'Memory' => 'Memory',
+    'stop' => 'stop',
+    'Run Time' => 'Run Time',
+    'BACKUP_DELETE_CONFIRMATION' => 'Are you sure to delete %s backup?',
+    'Backup Size' => 'Backup Size',
+    'SYS' => 'SYS',
+    'one archive' => 'one archive',
+    '%s archives' => '%s archives',
+    'Add Cron Job' => 'Add Cron Job',
+    'add account' => 'add account',
+    'open webmail' => 'open webmail',
+    'suspend' => 'suspend',
+    'unsuspend' => 'unsuspend',
+    'CRON_ACTION_CONFIRMATION' => 'Are you sure to %s cron job?',
+    'Confirmation' => 'Confirmation',
+    'one cron job' => 'one cron job',
+    '%s cron jobs' => '%s cron jobs',
+    'Add Database' => 'Add Database',
+    'open %s' => 'open %s',
+    'DATABASE_ACTION_CONFIRMATION' => 'Are you sure to %s database %s?',
+    'one database' => 'ne database',
+    '%s databases' => '%s databases',
+    'Add DNS Domain' => 'Add DNS Domain',
+    'Search' => 'Search',
+    'LIST_DOMAIN_RECORDS' => 'List %s records',
+    'LIST_MAIL_ACCOUNTS' => 'List %s accounts',
+    'add record' => 'add record',
+    'DOMAIN_ACTION_CONFIRMATION' => 'Are you sure to %s domain %s?',
+    '1 domain' => '1 domain',
+    '%s domains' => '%s domains',
+    'Add DNS Record' => 'Add DNS Record',
+    'Listing' => 'Listing',
+    'list' => 'list',
+    'RECORD_ACTION_CONFIRMATION' => 'Are you sure to %s record %s?',
+    'one DNS record' => 'one DNS record',
+    '%s DNS records' => '%s DNS records',
+    'Add IP' => 'Add IP',
+    'IP_DELETE_CONFIRMATION' => 'Are you sure to delere IP-address %s?',
+    'Status' => 'Status',
+    'one IP address' => 'one IP address',
+    '%s IP addresses' => '%s IP addresses',
+    'one log record' => 'one log record',
+    '%s log records' => '%s log records',
+    'Add Mail Domain' => 'Add Mail Domain',
+    'MAIL_ACTION_CONFIRMATION' => 'Are you sure to %s mail for domain %s?',
+    'one domain with email' => 'one domain with email',
+    '%s domains with email' => '%s domains with email',
+    'Add Mail Account' => 'Add Mail Account',
+    'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Are you sure to %s mail account %s?',
+    'one mail account' => 'one mail account',
+    '%s mail accounts' => '%s mail accounts',
+    'Add Package' => 'Add Package',
+    'PACKAGE_DELETE_CONFIRMATION' => 'Are you sure to delete package %s?',
+    'one package' => 'one package',
+    '%s packages' => '%s packages',
+    'Daily' => 'Daily',
+    'Weekly' => 'Weekly',
+    'Monthly' => 'Monthly',
+    'Yearly' => 'Yearly',
+    'Search Results' => 'Search Results',
+    'login as' => 'login as',
+    'Object' => 'Object',
+    'one object' => 'one object',
+    '%s objects' => '%s objects',
+    'Overall Statistics' => 'Overall Statistics',
+    'show per user' => 'show per user',
+    'Web' => 'Web',
+    'Mail' => 'Mail',
+    'User Directories' => 'Папки User Directories',
+    'Web SSL Domains' => 'Web SSL Domains',
+    'one month' => 'one month',
+    '%s months' => '%s months',
+    'Add User' => 'Add User',
+    'Add Domain' => 'Add Domain',
+    'rebuild' => 'rebuild',
+    'rebuild web' => 'rebuild web',
+    'rebuild DNS' => 'rebuild DNS',
+    'rebuild mail' => 'rebuild mail',
+    'rebuild db' => 'rebuild db',
+    'rebuild cron' => 'rebuild cron',
+    'update counters' => 'update counters',
+    'LOGGED_IN_AS' => 'Logged in as user %s',
+    'USER_ACTION_CONFIRMATION' => 'Are you sure to %s user %s?',
+    'one account' => 'one account',
+    '%s accounts' => '%s accounts',
+    'Add Domain for hosting' => 'Add Domain for hosting',
+    'open webstats' => 'open webstats',
+    'Error Log' => 'Error Log',
+    'CGI Support' => 'CGI Support',
+    'Statistics Auth' => 'Statistics Auth',
+    'running' => 'running',
+    'SERVICE_ACTION_FAILED' => 'Error: Oparaion "%s" for service "%s" has been failed',
+    'Memory Usage' => 'Memory Usage',
+    'Bandwidth Usage' => 'Bandwidth Usage',
+    'IP Address' => 'IP Address',
+    'Accounts' => 'Accounts',
 );
 
 /*error_reporting(E_ALL);

web/inc/i18n/ru.php

@@ -1,352 +1,354 @@
 <?php
 /**
  * Vesta CP language file
- * Translated by ZonD80 (zond80@gmail.com)
+ * ZonD80 (zond80@gmail.com)
+ * skid (skid@vestacp.com)
  */
 
 if (!defined('LANGUAGE')) die('Direct access not allowed');
 
 $LANG = array(
-    'yes'=>'да',
-    'no'=>'нет',
-    'none'=>'нет',
-    'Hour'=>'Час',
-    'Min'=>'Мин',
-    'pb'=>'пб',
-    'tb'=>'тб',
-    'gb'=>'гб',
-    'mb'=>'мб',
-    'Error'=>'Ошибка',
-    'minute'=>'минута',
-    'hour'=>'час',
-    'day'=>'день',
-    'days'=>'дня(ей)',
-    'hours'=>'часа(ов)',
-    'minutes'=>'минут(ы)',
-    'month'=>'месяц',
-    'day of week'=>'день недели',
-    'cmd'=>'командная строка',
-    'Error: field "%s" can not be blank.'=>'Ошибка: Поле "%s" не может быть пустым.',
+    'yes' => 'да',
+    'no' => 'нет',
+    'none' => 'нет',
+    'Hour' => 'Час',
+    'Min' => 'Мин',
+    'pb' => 'пб',
+    'tb' => 'тб',
+    'gb' => 'гб',
+    'mb' => 'мб',
+    'Error' => 'Ошибка',
+    'minute' => 'минута',
+    'hour' => 'час',
+    'day' => 'день',
+    'days' => 'дня(ей)',
+    'hours' => 'часа(ов)',
+    'minutes' => 'минут(ы)',
+    'month' => 'месяц',
+    'day of week' => 'день недели',
+    'cmd' => 'командная строка',
+    'Error: field "%s" can not be blank.' => 'Ошибка: Поле "%s" не может быть пустым.',
     _('Error: vesta did not return any output.')=>'Ошибка: Vesta не отвечает',
-    'OK: cron job has been created successfully.'=>'Задание Cron успешно создано',
-    'database'=>'база данных',
-    'username'=>'аккаунт',
-    'password'=>'пароль',
-    'type'=>'тип',
-    'charset'=>'кодировка',
-    'edit'=>'редактировать',
-    'DATABASE_CREATED_OK'=>'База данных <a href="/edit/db/?database=%s"><b>%s</b></a> успешно создана.',
-    'domain'=>'домен',
-    'ip'=>'IP',
-    'DOMAIN_CREATED_OK'=>'Домен <a href="/list/dns/?domain=%s"><b>%s</b></a> успешно создан.',
-    'RECORD_CREATED_OK'=>'Запись <b>%s.%s</b> успешно создана.',
-    'ip address'=>'IP-адрес',
-    'IP Address'=>'IP-адрес',
-    'netmask'=>'маска подсети',
-    'Netmask'=>'Маска подсети',
-    'interface'=>'интерфейс',
-    'Interface'=>'Интерфейс',
-    'assigned user'=>'назначенный пользователь',
-    'IP_CREATED_OK'=>'"ip-адрес <a href="/edit/ip/?ip=%s"><b>%s</b></a> успешно создан.',
-    'DOMAIN_MAIL_CREATED_OK'=>'почта для домена <a href="/list/mail/?domain=%s"><b>%s</b></a> подключена успешно',
-    'account'=>'аккаунт',
-    'Account'=>'Аккаунт',
-    'MAIL_ACCOUNT_CREATED_OK'=>'почтовый аккаунт <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> успешно создан.',
-    'package'=>'пакет',
-    'template'=>'шаблон',
-    'shell'=>'SSH',
-    'web domains'=>'веб домены',
-    'Web Domains'=>'Веб домены',
-    'Web Aliases'=>'Веб алиасы',
-    'per domain'=>'на домен',
-    'DNS domains'=>'DNS домены',
-    'DNS records count'=>'DNS записи',
-    'DNS Support'=>'Поддержка DNS',
-    'Mail Support'=>'Поддержка почты',
-    'web aliases'=>'алиасы хостов',
-    'dns records'=>'DNS записи',
-    'mail domains'=>'почтовые домены',
-    'mail accounts'=>'почтовые аккаунты',
-    'Accounts'=>'Аккаунты',
-    'Mail Domains'=>'Почтовые домены',
-    'Mail Accounts'=>'Почтовые аккаунты',
-    'accounts'=>'аккаунты',
-    'databases'=>'базы данных',
-    'Databases'=>'Базы данных',
-    'cron jobs'=>'cron задания',
-    'Cron Jobs'=>'Cron задания',
-    'Backups'=>'Резервные копии',
-    'backups'=>'архивы',
-    'quota'=>'квота диска',
-    'bandwidth'=>'ширина канала',
-    'Bandwidth'=>'Трафик',
-    'ns1'=>'DNS-сервер #1',
-    'ns2'=>'DNS-сервер #2',
-    'PACKAGE_CREATED_OK'=>'Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успешно создан.',
-    'user'=>'пользователь',
-    'email'=>'email',
-    'Email'=>'Адрес электронной почты',
-    'first name'=>'Имя',
-    'last name'=>'Фамилия',
-    'Please enter valid email address.'=>'Пожалуйста, введите реальный email адрес.',
-    'Welcome to Vesta Control Panel'=>'Добро пожаловать в панель управления Vesta',
-    'MAIL_FROM'=>'Vesta Control Panel <noreply@%s>',
+    'OK: cron job has been created successfully.' => 'Задание Cron успешно создано',
+    'database' => 'база данных',
+    'username' => 'аккаунт',
+    'password' => 'пароль',
+    'type' => 'тип',
+    'charset' => 'кодировка',
+    'edit' => 'редактировать',
+    'DATABASE_CREATED_OK' => 'База данных <a href="/edit/db/?database=%s"><b>%s</b></a> успешно создана.',
+    'domain' => 'домен',
+    'ip' => 'IP',
+    'DOMAIN_CREATED_OK' => 'Домен <a href="/list/dns/?domain=%s"><b>%s</b></a> успешно создан.',
+    'RECORD_CREATED_OK' => 'Запись <b>%s.%s</b> успешно создана.',
+    'ip address' => 'IP-адрес',
+    'IP Address' => 'IP-адрес',
+    'netmask' => 'маска подсети',
+    'Netmask' => 'Маска подсети',
+    'interface' => 'интерфейс',
+    'Interface' => 'Интерфейс',
+    'assigned user' => 'назначенный пользователь',
+    'IP_CREATED_OK' => '"ip-адрес <a href="/edit/ip/?ip=%s"><b>%s</b></a> успешно создан.',
+    'DOMAIN_MAIL_CREATED_OK' => 'Домен <a href="/list/mail/?domain=%s"><b>%s</b></a> успешно создан.',
+    'account' => 'аккаунт',
+    'Account' => 'Аккаунт',
+    'MAIL_ACCOUNT_CREATED_OK' => 'Аккаунт <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> успешно создан.',
+    'package' => 'пакет',
+    'template' => 'шаблон',
+    'shell' => 'SSH',
+    'web domains' => 'веб домены',
+    'Web Domains' => 'Веб домены',
+    'Web Aliases' => 'Веб алиасы',
+    'per domain' => 'на домен',
+    'DNS domains' => 'DNS домены',
+    'DNS records count' => 'DNS записи',
+    'DNS Support' => 'Поддержка DNS',
+    'Mail Support' => 'Поддержка почты',
+    'web aliases' => 'алиасы хостов',
+    'dns records' => 'DNS записи',
+    'mail domains' => 'почтовые домены',
+    'mail accounts' => 'почтовые аккаунты',
+    'Accounts' => 'Аккаунты',
+    'Mail Domains' => 'Почтовые домены',
+    'Mail Accounts' => 'Почтовые аккаунты',
+    'accounts' => 'аккаунты',
+    'databases' => 'базы данных',
+    'Databases' => 'Базы данных',
+    'cron jobs' => 'cron задания',
+    'Cron Jobs' => 'Cron задания',
+    'Backups' => 'Резервные копии',
+    'backups' => 'архивы',
+    'quota' => 'квота диска',
+    'bandwidth' => 'ширина канала',
+    'Bandwidth' => 'Трафик',
+    'ns1' => 'DNS-сервер #1',
+    'ns2' => 'DNS-сервер #2',
+    'PACKAGE_CREATED_OK' => 'Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успешно создан.',
+    'user' => 'пользователь',
+    'email' => 'email',
+    'Email' => 'Адрес электронной почты',
+    'first name' => 'Имя',
+    'last name' => 'Фамилия',
+    'Please enter valid email address.' => 'Пожалуйста, введите реальный email адрес.',
+    'Welcome to Vesta Control Panel' => 'Добро пожаловать в панель управления Vesta',
+    'MAIL_FROM' => 'Vesta Control Panel <noreply@%s>',
     'GREETINGS_GORDON_FREEMAN'=>"Здравствуйте, %s %s,\n",
     'GREETINGS'=>"Здравствуйте,\n",
     'ACCOUNT_READY'=>"Ваш аккаунт успешно создан и готов к использованию.\n\nhttps://%s/login/\nИмя пользователя: %s\nПароль: %s\n\n--\nПанель управления Vesta\n",
-    'ACCOUNT_CREATED_OK'=>'Аккаунт <a href="/edit/user/?user=%s"><b>%s</b></a> успешно создан.',
-    'ssl certificate'=>'SSL сертификат',
-    'ssl key'=>'ключ SSL сертификата',
-    'SSL Support'=>'Поддержка SSL',
-    'SSL Home Directory'=>'Директория SSL',
-    'SSL Certificate'=>'SSL сертификат',
-    'SSL Key'=>'Ключ SSL сертификата',
-    'SSL Certificate Authority / Intermediate'=>'Центр сертификации SSL / Intermediate',
-    'stats user password'=>'пароль для доступа к статистике',
-    'stats username'=>'имя пользователя статистики',
-    'stats password'=>'пароль пользователя статистики',
-    'ftp user password'=>'пароль для доступа к FTP',
-    'ftp user'=>'пользователь FTP',
-    'FTP login credentials'=>'Данные для доступа к FTP',
+    'ACCOUNT_CREATED_OK' => 'Аккаунт <a href="/edit/user/?user=%s"><b>%s</b></a> успешно создан.',
+    'ssl certificate' => 'SSL сертификат',
+    'ssl key' => 'ключ SSL сертификата',
+    'SSL Support' => 'Поддержка SSL',
+    'SSL Home Directory' => 'Директория SSL',
+    'SSL Certificate' => 'SSL сертификат',
+    'SSL Key' => 'Ключ SSL сертификата',
+    'SSL Certificate Authority / Intermediate' => 'Центр сертификации SSL / Intermediate',
+    'stats user password' => 'пароль для доступа к статистике',
+    'stats username' => 'имя пользователя статистики',
+    'stats password' => 'пароль пользователя статистики',
+    'ftp user password' => 'пароль для доступа к FTP',
+    'ftp user' => 'пользователь FTP',
+    'FTP login credentials' => 'Данные для доступа к FTP',
     'FTP_ACCOUNT_READY'=>"FTP аккаунт успешно создан и готов к использованию.\n\nХост: %s\nИмя пользователя: %s_%s\nПароль: %s\n\n--\nПанель управления Vesta\n",
-    'WEB_DOMAIN_CREATED_OK'=>'<a href="/edit/web/?domain=%s"><b>%s</b></a> был успешно создан.',
-    'OK: changes has been saved.'=>'Изменения сохранены.',
-    'FTP login credentials'=>'Данные для доступа к FTP',
-    '505'=>'505 &mdash; внутренняя ошибка',
-    'An internal error occurred'=>'Произошла внутренняя ошибка',
-    'GO_BACK_LINK'=>'Попробуйте вернуться на <a href="/">главную страницу</a> или вернитесь на <a href="javascript:history.go(-1)">предыдущую страницу</a>',
-    'ERROR: Invalid username or password'=>'Ошибка: Неверный логин или пароль',
-    'ERROR: Invalid username or code'=>'Ошибка: Неверный логин или код сброса пароля',
-    'MAIL_RESET_SUBJECT'=>'Сброс пароля %s',
+    'WEB_DOMAIN_CREATED_OK' => '<a href="/edit/web/?domain=%s"><b>%s</b></a> был успешно создан.',
+    'OK: changes has been saved.' => 'Изменения сохранены.',
+    'FTP login credentials' => 'Данные для доступа к FTP',
+    '505' => '505 &mdash; внутренняя ошибка',
+    'An internal error occurred' => 'Произошла внутренняя ошибка',
+    'GO_BACK_LINK' => 'Попробуйте вернуться на <a href="/">главную страницу</a> или вернитесь на <a href="javascript:history.go(-1)">предыдущую страницу</a>',
+    'ERROR: Invalid username or password' => 'Ошибка: Неверный логин или пароль',
+    'ERROR: Invalid username or code' => 'Ошибка: Неверный логин или код сброса пароля',
+    'MAIL_RESET_SUBJECT' => 'Сброс пароля %s',
     'PASSWORD_RESET_REQUEST'=>"Вы недавно запросили смену пароля.\nЧтобы произвести смену пароля, пройдите по этой ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете пойти по ссылке https://%s/reset/?action=code&user=%s и ввести следующий код для сброса пароля:\n%s\n\nЕсли вы не создавали запрос на сброс пароля, пожалуйста проигнорируйте это письмо и примите наши извиниения.\n\n--\nПанель управления Vesta\n",
-    'ERROR: Passwords not match'=>'Ошибка: Пароли не совпадают',
-    'Adding Cron Job'=>'Добавление cron задания',
-    'Minute'=>'Минута',
-    'Day'=>'День',
-    'Month'=>'Месяц',
-    'Day of week'=>'День недели',
-    'Command'=>'Команда',
-    'Add'=>'Добавить',
-    'Back'=>'Назад',
-    'Adding database'=>'Добавление базы данных',
-    'DB_PREFIX_WILL_BE_ADDED'=>'Префикс %s будет автоматически добавлен к БД и пользователю БД',
-    'FTP_PREFIX_WILL_BE_ADDED'=>'Префикс %s будет автоматически добавлен к названию акккаунта',
-    'Database'=>'База данных',
-    'Username'=>'Аккаунт',
-    'Password'=>'Пароль',
-    'generate'=>'сгенерировать',
-    'Type'=>'Тип',
-    'Charset'=>'Кодировка',
-    'Adding DNS Domain'=>'Добавление доменного имени',
-    'Domain'=>'Домен',
-    'IP-Address'=>'IP-адрес',
-    'Advanced options'=>'Расширенные опции',
-    'Template'=>'Шаблон',
-    'Expiration date'=>'Дата окончания делегирования',
-    'Expire'=>'Конец',
-    'YYYY-MM-DD'=>'ГГГГ-ММ-ДД',
-    'Name servers'=>'Серверы имен',
-    'Name Servers'=>'Серверы имен',
-    'Powered by Vesta Control Panel'=>'Работает на Панели Управления Vesta',
-    'Vesta Control Panel'=>'Панель Управления Vesta',
-    'Translation by ZonD80'=>'Перевод ZonD80',
-    'Forgot Password?'=>'Забыли пароль?',
-    'Log in'=>'Войти',
-    'Log out'=>'Выйти',
+    'ERROR: Passwords not match' => 'Ошибка: Пароли не совпадают',
+    'Adding Cron Job' => 'Добавление cron задания',
+    'Minute' => 'Минута',
+    'Day' => 'День',
+    'Month' => 'Месяц',
+    'Day of week' => 'День недели',
+    'Command' => 'Команда',
+    'Add' => 'Добавить',
+    'Back' => 'Назад',
+    'Adding database' => 'Добавление базы данных',
+    'DB_PREFIX_WILL_BE_ADDED' => 'Префикс %s будет автоматически добавлен к БД и пользователю БД',
+    'FTP_PREFIX_WILL_BE_ADDED' => 'Префикс %s будет автоматически добавлен к названию акккаунта',
+    'Database' => 'База данных',
+    'Username' => 'Аккаунт',
+    'Password' => 'Пароль',
+    'generate' => 'сгенерировать',
+    'Type' => 'Тип',
+    'Charset' => 'Кодировка',
+    'Adding DNS Domain' => 'Добавление DNS домена',
+    'Domain' => 'Домен',
+    'IP-Address' => 'IP-адрес',
+    'Advanced options' => 'Расширенные опции',
+    'Template' => 'Шаблон',
+    'Expiration date' => 'Зарегистрирован до',
+    'Expiration Date' => 'Зарегистрирован до',
+    'Expire' => 'Регистрация до',
+    'YYYY-MM-DD' => 'ГГГГ-ММ-ДД',
+    'Name servers' => 'Серверы имен',
+    'Name Servers' => 'Серверы имен',
+    'Powered by Vesta Control Panel' => 'Работает на Панели Управления Vesta',
+    'Vesta Control Panel' => 'Панель Управления Vesta',
+    'Translation by ZonD80' => 'Перевод ZonD80',
+    'Forgot Password?' => 'Забыли пароль?',
+    'Log in' => 'Войти',
+    'Log out' => 'Выйти',
     "RESET_NOTICE"=>"Для сброса пароля введите ваше имя пользователя, и мы расскажем, что нужно делать дальше.",
-    'Submit'=>'Отправить',
-    'RESET_CODE_SENT'=>'Код сброса пароля выслан на ваш email<br/>Пожалуйста, введите код в располженное ниже поле для продолжения',
-    'Confirm'=>'Подтвердить',
-    'New Password'=>'Новый пароль',
-    'Confirm Password'=>'Подтверждение пароля',
-    'Reset'=>'Сбросить',
-    'Statistics'=>'Статистика',
-    'Web Statistics'=>'Статистика сайта',
-    'History Log'=>'Журнал',
-    'Vesta logo'=>'Логотип Vesta',
-    'USER'=>'USER',
-    'logout'=>'выйти',
-    'users'=>'пользователи',
-    'Users'=>'Пользователи',
-    'suspended'=>'заблокирован',
-    'WEB'=>'WEB',
-    'domains'=>'домены',
-    'aliases'=>'алиасы',
-    'Aliases'=>'Алиасы',
-    'DNS'=>'DNS',
-    'records'=>'записи',
-    'Records'=>'Записи',
-    'MAIL'=>'MAIL',
-    'DB'=>'DB',
-    'CRON'=>'CRON',
-    'BACKUP'=>'BACKUP',
-    'Packages'=>'Пакеты',
-    'IP Addresses'=>'IP адреса',
-    'RRD Graphics'=>'RRD Графики',
-    'jobs'=>'задания',
-    'Reset Code'=>'Код сброса',
-    'disk'=>'диск',
-    'Disk'=>'Диск',
-    'traffic'=>'трафик',
-    'Database Credentials'=>'Данные для доступа к БД',
+    'Submit' => 'Отправить',
+    'RESET_CODE_SENT' => 'Код сброса пароля выслан на ваш email<br/>Пожалуйста, введите код в располженное ниже поле для продолжения',
+    'Confirm' => 'Подтвердить',
+    'New Password' => 'Новый пароль',
+    'Confirm Password' => 'Подтверждение пароля',
+    'Reset' => 'Сбросить',
+    'Statistics' => 'Статистика',
+    'Web Statistics' => 'Статистика сайта',
+    'History Log' => 'Журнал',
+    'Vesta logo' => 'Логотип Vesta',
+    'USER' => 'USER',
+    'logout' => 'выйти',
+    'users' => 'пользователи',
+    'Users' => 'Пользователи',
+    'spnd' => 'заблокировано',
+    'suspended' => 'заблокирован',
+    'WEB' => 'WEB',
+    'domains' => 'домены',
+    'aliases' => 'алиасы',
+    'Aliases' => 'Алиасы',
+    'DNS' => 'DNS',
+    'records' => 'записи',
+    'Records' => 'DNS записи',
+    'MAIL' => 'MAIL',
+    'DB' => 'DB',
+    'CRON' => 'CRON',
+    'BACKUP' => 'BACKUP',
+    'Packages' => 'Пакеты',
+    'IP Addresses' => 'IP адреса',
+    'RRD Graphics' => 'RRD Графики',
+    'jobs' => 'задания',
+    'Reset Code' => 'Код сброса',
+    'disk' => 'диск',
+    'Disk' => 'Диск',
+    'traffic' => 'трафик',
+    'Database Credentials' => 'Данные для доступа к БД',
     'DATABASE_READY'=>"Здравствуйте %s %s,\nВаша %s база данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n",
-    'Send credentials to'=>'Отправить данные для доступа к ',
-    'Adding DNS Record'=>'Добавление записи DNS',
-    'Record'=>'Запись',
-    'IP or Value'=>'IP-адрес или значение',
-    'Priority'=>'Приоритет',
-    'optional'=>'опционально',
-    'Adding IP Address'=>'Добавление IP-адреса',
-    'Shared'=>'Общий',
-    'Assigned user'=>'Пользователь',
-    'Assigned domain'=>'Домен',
-    'Adding Mail Domain'=>'Создание почты для домена',
-    'AntiSpam Support'=>'Поддержка Анти-спама',
-    'AntiVirus Support'=>'Поддержка Антивируса',
-    'DKIM Support'=>'Поддержка DKIM',
-    'Adding Mail Account'=>'Создание почтового ящика',
-    'Advanced options'=>'Дополнительные опции',
-    'Quota'=>'Квота',
-    'in megabytes'=>'в мегабайтах',
-    'use local-part'=>'используйте локальные записи',
-    'Forward to'=>'Перенаправление',
-    'one or more email addresses'=>'один или несколько email-адресов',
-    'Adding Package'=>'Создание пакета',
-    'Package Name'=>'Название пакета',
-    'Package'=>'Пакет',
-    'Default Template'=>'Шаблон по умолчанию',
-    'SSH Access'=>'Доступ по SSH',
-    'Adding User'=>'Добавление аккаунта',
-    'First Name'=>'Имя',
-    'Last Name'=>'Фамилия',
-    'SEND_CREDENTIALS_NOTICE'=>'Отправить данные аккаунта по адресу',
-    'SEND_FTP_CREDENTIALS'=>'Отправить данные ftp аккаунта по адресу',
-    'Adding Web Domain'=>'Добавление домена',
-    'Apache template'=>'Шаблон Apache',
-    'Nginx Support'=>'Поддержка Nginx',
-    'Nginx Extentions'=>'Обработка Nginx',
-    'Nginx Template'=>'Шаблон для Nginx',
-    'Statistics Authorization'=>'Ограниченный доступ к статистике',
-    'Additional FTP Account'=>'Отдельный ftp аккаунт',
-    'Editing Cron Job'=>'Редактирование cron-задания',
-    'Save'=>'Сохранить',
-    'Editing Database'=>'Редактирование БД',
-    'Editing DNS Domain'=>'Редактирование DNS для домена',
-    'Editing DNS Record'=>'Редактирование DNS записи',
-    'Editing IP Address'=>'Редактирование IP-адреса',
-    'Editing Mail Domain'=>'Редактирование почты для домена',
-    'Catchall email'=>'Отправить почту в',
-    'Editing Mail Account'=>'Редактирование почтового акканунта',
-    'Autoreply'=>'Автоответчик',
-    'Message'=>'Сообщение',
-    'Editing Package'=>'Редактирование пакета',
-    'Editing User'=>'Редактирование аккаунта',
-    'Default Name Servers'=>'Серверы имен',
-    'Editing Domain'=>'Редактирование хостинга',
-    'Create Backup'=>'Создать Бэкап',
-    'apply to selected'=>'применить к выбранным',
-    'toggle all'=>'выделить все',
-    'delete'=>'удалить',
-    'active'=>'активен',
-    'download'=>'скачать',
-    'Owner'=>'Владелец',
-    'restore'=>'восстановить',
-    'restart'=>'перезапустить',
-    'CPU'=>'Процессор',
-    'Memory'=>'Память',
-    'stop'=>'остановить',
-    'Run Time'=>'Время запуска',
-    'BACKUP_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить %s бэкап?',
-    'Backup Size'=>'Размер Бэкапа',
-    'SYS'=>'Системное',
-    'one archive'=>'один архив',
-    '%s archives'=>'%s архивов',
-    'Add Cron Job'=>'Добавить новое Cron-задание',
-    'add account'=>'добавить аккаунт',
-    'open webmail'=>'открыть веб-интерфейс',
-    'suspend'=>'заблокировать',
-    'unsuspend'=>'активировать',
-    'CRON_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s cron-задание?',
-    'Confirmation'=>'Подтверждение',
-    'one cron job'=>'одно cron-задание',
-    '%s cron jobs'=>'%s cron-заданя(ий)',
-    'Add Database'=>'Добавить БД',
-    'open %s'=>'открыть %s',
-    'DATABASE_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s базу данных %s?',
-    'one database'=>'одна БД',
-    '%s databases'=>'%s БД',
-    'Add DNS Domain'=>'Добавить DNS для домена',
-    'Search'=>'Поиск',
-    'LIST_DOMAIN_RECORDS'=>'Посмотреть %s записей',
-    'add record'=>'добавить запись',
-    'DOMAIN_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s домен %s?',
-    '1 domain'=>'доменов на странице: 1',
-    '%s domains'=>'доменов на странице: %s',
-    'Add DNS Record'=>'Добавить DNS запись',
-    'Listing'=>'Просмотр',
-    'list'=>'посмотреть',
-    'RECORD_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s запись %s?',
-    'one DNS record'=>'одна DNS-запись',
-    '%s DNS records'=>'%s DNS-записи(ей)',
-    'Add IP'=>'Добавить IP адрес',
-    'IP_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить IP адрес %s?',
-    'Status'=>'Статус',
-    'one IP address'=>'один IP',
-    '%s IP addresses'=>'%s IP адреса(ов)',
-    'one log record'=>'одна запись',
-    '%s log records'=>'%s записи(ей)',
-    'Add Mail Domain'=>'Добавить почту для домена',
-    'MAIL_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s почту для домена %s?',
-    'one domain with email'=>'один домен с почтой',
-    '%s domains with email'=>'%s домена(ов) с почтой',
-    'Add Mail Account'=>'Добавить почтовый аккаунт',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s почтовый ящик %s?',
-    'one mail account'=>'один почтовый ящик',
-    '%s mail accounts'=>'%s почтовых ящика(ов)',
-    'Add Package'=>'Добавить пакет',
-    'PACKAGE_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить пакет %s?',
-    'one package'=>'один пакет',
-    '%s packages'=>'%s пакета(ов)',
-    'Daily'=>'Ежедневый',
-    'Weekly'=>'Еженедельный',
-    'Monthly'=>'Ежемесячный',
-    'Yearly'=>'Ежегодный',
-    'Search Results'=>'Результаты Поиска',
-    'login as'=>'войти как',
-    'Object'=>'Объект',
-    'one object'=>'один объект',
-    '%s objects'=>'%s объекта(ов)',
-    'Overall Statistics'=>'Вся Статистика',
-    'show per user'=>'показать для пользователя',
-    'Web'=>'Веб',
-    'Mail'=>'Почта',
-    'User Directories'=>'Папки пользователя',
-    'Web SSL Domains'=>'SSL домены',
-    'one month'=>'один месяц',
-    '%s months'=>'%s месяца(ев)',
-    'Add User'=>'Добавить аккаунт',
-    'Add Domain'=>'Добавить домен',
-    'rebuild'=>'пересоздать',
-    'rebuild web'=>'пересоздать WEB',
-    'rebuild DNS'=>'пересоздать DNS',
-    'rebuild mail'=>'пересоздать MAIL',
-    'rebuild db'=>'пересоздать DB',
-    'rebuild cron'=>'пересоздать CRON',
-    'update counters'=>'пересчитать счетчики',
-    'LOGGED_IN_AS'=>'Вы вошли как пользователь %s',
-    'USER_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s пользователя %s?',
-    '1 account'=>' пользователей на странице: 1',
-    '%s accounts'=>'пользователей на странице: %s',
-    'Add Web Domain'=>'Добавить домен',
-    'open webstats'=>'открыть отчет веб-аналитики',
-    'Error Log'=>'Лог Ошибок',
-    'CGI Support'=>'Поддержка CGI',
-    'Statistics Auth'=>'Авторизация Статистики',
-    'running'=>'работает',
-    'SERVICE_ACTION_FAILED'=>'Ошибка: Операция "%s" для сервиса "%s" не удалась',
-    'Load Average'=>'Нагрузка',
-    'Memory Usage'=>'Использование Памяти',
-    'Bandwidth Usage'=>'Использование Сети',
+    'Send credentials to' => 'Отправить данные для доступа к ',
+    'Adding DNS Record' => 'Добавление DNS записи',
+    'Record' => 'Запись / Поддомен',
+    'IP or Value' => 'IP-адрес или значение',
+    'Priority' => 'Приоритет',
+    'optional' => 'опционально',
+    'Adding IP Address' => 'Добавление IP-адреса',
+    'Shared' => 'Общий',
+    'Assigned user' => 'Пользователь',
+    'Assigned domain' => 'Домен',
+    'Adding Mail Domain' => 'Добавление почтового домена',
+    'AntiSpam Support' => 'Поддержка Анти-спама',
+    'AntiVirus Support' => 'Поддержка Антивируса',
+    'DKIM Support' => 'Поддержка DKIM',
+    'Adding Mail Account' => 'Добавление почтового аккаунта',
+    'Advanced options' => 'Дополнительные опции',
+    'Quota' => 'Квота',
+    'in megabytes' => 'в мегабайтах',
+    'use local-part' => 'используйте только имена аккаунтов',
+    'Forward to' => 'Пересылка',
+    'one or more email addresses' => 'один или несколько email-адресов',
+    'Adding Package' => 'Создание пакета',
+    'Package Name' => 'Название пакета',
+    'Package' => 'Пакет',
+    'Default Template' => 'Шаблон по умолчанию',
+    'SSH Access' => 'Доступ по SSH',
+    'Adding User' => 'Добавление аккаунта',
+    'First Name' => 'Имя',
+    'Last Name' => 'Фамилия',
+    'SEND_CREDENTIALS_NOTICE' => 'Отправить данные аккаунта по адресу',
+    'SEND_FTP_CREDENTIALS' => 'Отправить данные ftp аккаунта по адресу',
+    'Adding Web Domain' => 'Добавление домена',
+    'Apache template' => 'Шаблон Apache',
+    'Nginx Support' => 'Поддержка Nginx',
+    'Nginx Extentions' => 'Обработка Nginx',
+    'Nginx Template' => 'Шаблон для Nginx',
+    'Statistics Authorization' => 'Ограниченный доступ к статистике',
+    'Additional FTP Account' => 'Отдельный ftp аккаунт',
+    'Editing Cron Job' => 'Редактирование cron-задания',
+    'Save' => 'Сохранить',
+    'Editing Database' => 'Редактирование БД',
+    'Editing DNS Domain' => 'Редактирование DNS домена',
+    'Editing DNS Record' => 'Редактирование DNS записи',
+    'Editing IP Address' => 'Редактирование IP-адреса',
+    'Editing Mail Domain' => 'Редактирование почты для домена',
+    'Catchall email' => 'Ловушка почты',
+    'Editing Mail Account' => 'Редактирование почтового акканунта',
+    'Autoreply' => 'Автоответчик',
+    'Message' => 'Сообщение',
+    'Editing Package' => 'Редактирование пакета',
+    'Editing User' => 'Редактирование аккаунта',
+    'Default Name Servers' => 'Серверы имен',
+    'Editing Domain' => 'Редактирование хостинга',
+    'Create Backup' => 'Создать Бэкап',
+    'apply to selected' => 'применить к выбранным',
+    'toggle all' => 'выделить все',
+    'delete' => 'удалить',
+    'active' => 'активен',
+    'download' => 'скачать',
+    'Owner' => 'Владелец',
+    'restore' => 'восстановить',
+    'restart' => 'перезапустить',
+    'CPU' => 'Процессор',
+    'Memory' => 'Память',
+    'stop' => 'остановить',
+    'Run Time' => 'Время запуска',
+    'BACKUP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить %s бэкап?',
+    'Backup Size' => 'Размер Бэкапа',
+    'SYS' => 'Системное',
+    '1 archive' => 'резервных копий на странице: 1',
+    '%s archives' => 'резервных копий на странице: %s',
+    'Add Cron Job' => 'Добавить задание',
+    'add account' => 'добавить аккаунт',
+    'open webmail' => 'открыть веб-почту',
+    'suspend' => 'заблокировать',
+    'unsuspend' => 'активировать',
+    'CRON_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s cron-задание?',
+    'Confirmation' => 'Подтверждение',
+    '1 cron job' => 'заданий на странице: 1',
+    '%s cron jobs' => 'заданий на странице: %s',
+    'Add Database' => 'Добавить БД',
+    'open %s' => 'открыть %s',
+    'DATABASE_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s базу данных %s?',
+    '1 database' => 'баз данных на странице: 1',
+    '%s databases' => ',баз данных на странице: %s',
+    'Add DNS Domain' => 'Добавить домен',
+    'Search' => 'Поиск',
+    'LIST_DOMAIN_RECORDS' => 'показать dns записи',
+    'add record' => 'добавить запись',
+    'LIST_MAIL_ACCOUNTS' => 'показать аккаунты',
+    'DOMAIN_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s домен %s?',
+    '1 domain' => 'доменов на странице: 1',
+    '%s domains' => 'доменов на странице: %s',
+    'Add DNS Record' => 'Добавить запись',
+    'Listing' => 'Просмотр',
+    'list' => 'посмотреть',
+    'RECORD_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s запись %s?',
+    '1 DNS record' => 'записей на странице: 1',
+    '%s DNS records' => 'записей на странице %s',
+    'Add IP' => 'Добавить IP адрес',
+    'IP_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить IP адрес %s?',
+    'Status' => 'Статус',
+    '1 IP address' => 'IP адресов на странице: 1',
+    '%s IP addresses' => 'IP адресов на странице: %s',
+    '1 log record' => 'записей на странице: 1',
+    '%s log records' => 'записей на странице %s',
+    'Add Mail Domain' => 'Добавить домен',
+    'MAIL_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почту для домена %s?',
+    'Add Mail Account' => 'Добавить аккаунт',
+    'MAIL_ACCOUNT_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s почтовый ящик %s?',
+    '1 mail account' => 'почтовых акаунтов на странице: 1',
+    '%s mail accounts' => 'почтовых акаунтов на странице: %s',
+    'Add Package' => 'Добавить пакет',
+    'PACKAGE_DELETE_CONFIRMATION' => 'Вы уверены, что хотите удалить пакет %s?',
+    '1 package' => 'пакетов на странице: 1',
+    '%s packages' => 'пакетов на странице: %s',
+    'Daily' => 'Ежедневый',
+    'Weekly' => 'Еженедельный',
+    'Monthly' => 'Ежемесячный',
+    'Yearly' => 'Ежегодный',
+    'Search Results' => 'Результаты Поиска',
+    'login as' => 'войти как',
+    'Object' => 'Объект',
+    '1 object' => 'объектов на странице: 1',
+    '%s objects' => 'объектов на странице :%s',
+    'Overall Statistics' => 'Вся Статистика',
+    'show per user' => 'показать для пользователя',
+    'Web' => 'Веб',
+    'Mail' => 'Почта',
+    'User Directories' => 'Папки пользователя',
+    'Web SSL Domains' => 'SSL домены',
+    'one month' => 'один месяц',
+    '%s months' => '%s месяца(ев)',
+    'Add User' => 'Добавить аккаунт',
+    'Add Domain' => 'Добавить домен',
+    'rebuild' => 'пересоздать',
+    'rebuild web' => 'пересоздать WEB',
+    'rebuild DNS' => 'пересоздать DNS',
+    'rebuild mail' => 'пересоздать MAIL',
+    'rebuild db' => 'пересоздать DB',
+    'rebuild cron' => 'пересоздать CRON',
+    'update counters' => 'пересчитать счетчики',
+    'LOGGED_IN_AS' => 'Вы вошли как пользователь %s',
+    'USER_ACTION_CONFIRMATION' => 'Вы уверены, что хотите %s пользователя %s?',
+    '1 account' => ' пользователей на странице: 1',
+    '%s accounts' => 'пользователей на странице: %s',
+    'Add Web Domain' => 'Добавить домен',
+    'open webstats' => 'открыть отчет веб-аналитики',
+    'Error Log' => 'Лог Ошибок',
+    'CGI Support' => 'Поддержка CGI',
+    'Statistics Auth' => 'Авторизация Статистики',
+    'running' => 'работает',
+    'SERVICE_ACTION_FAILED' => 'Ошибка: Операция "%s" для сервиса "%s" не удалась',
+    'Load Average' => 'Нагрузка',
+    'Memory Usage' => 'Использование Памяти',
+    'Bandwidth Usage' => 'Использование Сети',
     
 );
 

web/list/dns/index.php

@@ -12,6 +12,10 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
+
 // Data
 if ($_SESSION['user'] == 'admin') {
     if (empty($_GET['domain'])){

web/list/mail/index.php

@@ -12,6 +12,9 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Data
 if ($_SESSION['user'] == 'admin') {
 

web/templates/admin/add_dns.html

@@ -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>
@@ -152,9 +152,13 @@
                                                 </table>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/admin/add_dns_rec.html

@@ -105,9 +105,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/admin/add_mail.html

@@ -82,9 +82,13 @@
                                                 <input type="checkbox" size="20" class="vst-checkbox" name="v_dkim" <?php if (isset($v_dkim)&&$v_dkim == 'yes') echo "checked=yes"; ?>>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/admin/add_mail_acc.html

@@ -134,14 +134,18 @@
                                         </table>
                                     </td>
                                 </tr>
+                            </table>
+                            <table class="data-col2">
                                 <tr>
-                                    <td style="padding: 24px 0 0 0;">
+                                    <td style="padding: 24px 0 0 0;" width="116px">
                                         <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 ?>">
                                     </td>
                                 </tr>
                             </table>
                         </td>
                     </tr>
-                </table>
-            </form>
+            </table>
+        </form>

web/templates/admin/edit_dns.html

@@ -31,9 +31,9 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" 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;">
@@ -114,9 +114,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/admin/edit_dns_rec.html

@@ -31,9 +31,9 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" 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;">
@@ -94,13 +94,18 @@
                                                 <input type="text" size="20" class="vst-input" name="v_priority" <?php if (!empty($v_priority)) echo "value=".$v_priority; ?>>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>
                                     </table>
+
                                 </td>
                             </tr>
                         </table>

web/templates/admin/edit_mail.html

@@ -31,7 +31,7 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
                                         <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo _($v_status); ?></b></td></tr>
                                     </table>
@@ -93,9 +93,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_catchall" <?php if (!empty($v_catchall)) echo "value=".$v_catchall;  ?> >
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/admin/edit_mail_acc.html

@@ -52,7 +52,7 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
                                         <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                                     </table>
@@ -142,9 +142,13 @@
                                             </table>
                                         </td>
                                     </tr>
+                                </table>
+                                <table class="data-col2">
                                     <tr>
-                                        <td style="padding: 24px 0 0 0;">
+                                        <td style="padding: 24px 0 0 0;" width="116px">
                                             <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 ?>">
                                         </td>
                                     </tr>

web/templates/admin/list_dns.html

@@ -1,146 +1,159 @@
-<table class="sub-menu" style="background: white;">
-    <tr>
-        <td style="padding: 12px 0 8px 6px">
-            <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
-            </div>
-            <div style="text-align: right; float: right;">
-                <form action="/search/" method="get">
-                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                </form>
-            </div>
-            <div style="float:left; padding-left: 26px;">
-                <form action="/bulk/dns/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                    <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('suspend');?></option>
-                        <option><?php print _('unsuspend');?></option>
-                        <option><?php print _('delete');?></option>
-                    </select>
-                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-            </div>
-        </td>
-    </tr>
-</table>
-</td>
-</tr>
-</table>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <form action="/search/" method="get">
+                                                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                </form>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <form action="/bulk/dns/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
+                                                    <option><?php print _('apply to selected');?></option>
+                                                    <option><?php print _('suspend');?></option>
+                                                    <option><?php print _('unsuspend');?></option>
+                                                    <option><?php print _('delete');?></option>
+                                                </select>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-<div id="vstobjects">
-    <table class="data">
-        <?php
+                    <div id="vstobjects">
+                        <table class="data">
+                            <?php
                                 foreach ($data as $key => $value) {
-        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-        } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-        }
-        ?>
-
-        <tr class="data-row">
-            <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="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></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;">
-                <table width="830px">
-                    <tr>
-                        <td></td>
-                        <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> </a></td>
-                        <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add record');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <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 _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                            </div>
-                        </td>
-                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <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 _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-                <table class="data-col2" width="830px">
-                    <tr>
-                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                            <b><?php echo $key ?></b>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align:top;" >
-                            <table>
-                                <tr>
-                                    <td class="counter-name" style="padding: 2px 0 0 2px;">
-                                        <?php echo $data[$key]['IP'] ?>
-                                    </td>
-                                <tr>
-                                    <td class="counter-name" style="padding: 0 0 20px 2px">
-                                        [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="vertical-align:top;" width="250">
-                            <table>
-                                <tr>
-                                    <td class="counter-name">SOA:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
-                                </tr>
-                                <tr>
-                                    <td class="counter-name">TTL:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td rowspan=4 style="vertical-align:top;" width="300">
-                            <table>
-                                <tr>
-                                    <td class="counter-name"><?php print _('Expire');?>:</td>
-                                    <td class="counter-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></td>
-                                </tr>
-                                <tr>
-                                    <td class="counter-name"><?php print _('Records');?>:</td>
-                                    <td class="counter-value"><?php echo $data[$key]['RECORDS'] ?></td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-        <?php
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                            ?> 
+                            <tr class="data-row">
+                                <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="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>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <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');?> 
+                                            <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 _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <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); ?> 
+                                            <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 _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/add/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/add.png" width="8px" height="8px">
+                                            <?php print _('add record');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/list/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/more.png" width="8px" height="8px">
+                                            <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> 
+                                        </span>
+                                    </a>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 0 2px;">
+                                                            <?php echo $data[$key]['IP'] ?> 
+                                                        </td>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 0 0 20px 2px">
+                                                            [<?php echo $data[$key]['TPL'] ?>] <?php print _('template');?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">SOA:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SOA'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">TTL:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['TTL'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                                <table>
+                                                    <tr>
+                                                        <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-value"><?php echo $data[$key]['RECORDS'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
                                 }
-                            ?>
-    </table>
-    </form>
+                            ?> 
+                        </table>
+                        </form>
 
-    <table class="data-count">
-        <tr>
-            <td width="160px"></td>
-            <td>
-                <?php
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
                                         if ( $i == 1) {
-                                            echo _('one domain');
+                                            echo _('1 domain');
                                         } else {
                                             echo _('%s domains',$i);
                                         }
-                                    ?>
-            </td>
-        </tr>
-    </table>
-</div>
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </div>

web/templates/admin/list_dns_rec.html

@@ -27,89 +27,91 @@
                             </td>
                         </tr>
                     </table>
-<div id="vstobjects">
-    <div style="height:10px; font-size:0;"></div>
-    <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>
-            </td>
-        </tr>
-    </table>
-    <div style="height:10px; font-size:0;"></div>
-    <table class="data">
-        <?php
-
-                                foreach ($data as $key => $value) {
-        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-        } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-        }
-        ?>
-
-        <tr class="data-row">
-            <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="record[]" value="<?php echo $data[$key]['ID']?>" > <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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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;">
-                <table width="830px">
-                    <tr>
-                        <td></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
-                            <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 _('RECORD_ACTION_CONFIRMATION',_($spnd_action),$data[$key]['RECORD']);?></p>
-                            </div>
-                        </td>
-                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <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 _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-                <table class="data-col5" width="780px">
-                    <tr>
-                        <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                        <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                        <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                        <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-        <?php
-                            }
-                        ?>
-    </table>
-    </form>
-
-    <table class="data-count">
-        <tr>
-            <td width="160px">
-            <td>
-                <?php
-                                    if ( $i == 1) {
-                                        echo _('one DNS record');
-                                    } else {
-                                        echo _('%s DNS records',$i);
+                    <div id="vstobjects">
+                        <div style="height:10px; font-size:0;"></div>
+                            <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>
+                                    </td>
+                                </tr>
+                            </table>
+                            <div style="height:10px; font-size:0;"></div>
+                            <table class="data">
+                                <?php
+                                    foreach ($data as $key => $value) {
+                                        ++$i;
+                                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                                            $status = 'suspended';
+                                            $spnd_action = 'unsuspend' ;
+                                        } else {
+                                            $status = 'active';
+                                            $spnd_action = 'suspend' ;
+                                        }
+                                ?> 
+                                <tr class="data-row">
+                                    <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="record[]" value="<?php echo $data[$key]['ID']?>" > <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>
+                                        </table>
+                                    </td>
+                                    <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                        <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');?>
+                                                <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 _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
+                                                </div>
+                                            </span>
+                                        </a>
+                                        <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); ?> 
+                                                <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>" />
+                                                <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 _('RECORD_ACTION_CONFIRMATION',_($spnd_action),$data[$key]['RECORD']);?></p>
+                                                </div>
+                                            </span>
+                                        </a>
+                                        <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>">
+                                            <span class="data-controls">
+                                                <img src="/images/edit.png" width="8px" height="8px">
+                                                <?php print _('edit');?> 
+                                            </span>
+                                        </a>
+                                        <table class="data-col5" width="780px">
+                                            <tr>
+                                                <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                                <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <?php
                                     }
                                 ?>
-            </td>
-        </tr>
-    </table>
-</div>
+                            </table>
+                        </form>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px">
+                                </td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo _('1 DNS record');
+                                        } else {
+                                            echo _('%s DNS records',$i);
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </div>

web/templates/admin/list_mail.html

@@ -1,173 +1,188 @@
-<table class="sub-menu" style="background: white;">
-    <tr>
-        <td style="padding: 12px 0 8px 6px">
-            <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
-            </div>
-            <div style="text-align: right; float: right;">
-                <form action="/search/" method="get" >
-                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
-                </form>
-            </div>
-            <div style="float:left; padding-left: 26px;">
-                <form action="/bulk/mail/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                    <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('suspend');?></option>
-                        <option><?php print _('unsuspend');?></option>
-                        <option><?php print _('delete');?></option>
-                    </select>
-                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
-            </div>
-        </td>
-    </tr>
-</table>
-</td>
-</tr>
-</table>
-
-<div id="vstobjects">
-    <table class="data">
-        <?php
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <form action="/search/" method="get" >
+                                                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                </form>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <form action="/bulk/mail/" method="post" id="objects">
+                                                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                    <select style="margin:0 2px 0 0px;" name="action">
+                                                        <option><?php print _('apply to selected');?></option>
+                                                        <option><?php print _('suspend');?></option>
+                                                        <option><?php print _('unsuspend');?></option>
+                                                        <option><?php print _('delete');?></option>
+                                                    </select>
+                                                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                    <div id="vstobjects">
+                        <table class="data">
+                            <?php
                                 list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
                                 foreach ($data as $key => $value) {
-        ++$i;
-        if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-        } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-        }
-        if (empty($data[$key]['CATCHALL'])) {
-        $data[$key]['CATCHALL'] = '/dev/null';
-        }
-        ?>
-
-        <tr class="data-row">
-            <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="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                    <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></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;">
-                <table width="830px">
-                    <tr>
-                        <td></td>
-                        <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('list');?> <?php echo $data[$key]['ACCOUNTS'] ?> <?php print _('accounts');?></a></td>
-                        <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add account');?></a></td>
-                        <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open webmail');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                        <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                            <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                            <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                            <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 _('MAIL_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                            </div>
-                        </td>
-                        <td class="data-controls do_delete" width="70px">
-                            <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                            <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 _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                            </div>
-                        </td>
-                    </tr>
-                </table>
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                                    if (empty($data[$key]['CATCHALL'])) {
+                                        $data[$key]['CATCHALL'] = '/dev/null';
+                                    }
+                            ?> 
+                            <tr class="data-row">
+                                <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="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>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <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');?> 
+                                            <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 _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <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); ?> 
+                                            <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 _('MAIL_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/mail/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank">
+                                        <span class="data-controls"><img src="/images/new_window.png" width="8px" height="8px">
+                                            <?php print _('open webmail');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/add/mail/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/add.png" width="8px" height="8px">
+                                            <?php print _('add account');?> 
+                                        </span>
+                                    </a>
+                                    <a href="?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/more.png" width="8px" height="8px">
+                                            <?php print _('LIST_MAIL_ACCOUNTS',$data[$key]['RECORDS']); ?> 
+                                        </span>
+                                    </a>
 
-                <table class="data-col2" width="830px">
-                    <tr>
-                        <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                            <b><?php echo $key ?></b>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align:top;" >
-                            <table>
-                                <tr>
-                                    <td class="counter-name" style="padding: 2px 0 2px 0">
-                                        <?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']) ?>
-                                        <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>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td style="vertical-align:top;" width="250">
-                            <table>
-                                <tr>
-                                    <td class="counter-name">
-                                        <?php print _('AntiVirus Support');?>:
-                                    </td>
-                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ANTIVIRUS'] ?>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="counter-name">
-                                        <?php print _('AntiSpam Support');?>:
-                                    </td>
-                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ANTISPAM'] ?>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td rowspan=4 style="vertical-align:top;" width="300">
-                            <table>
-                                <tr>
-                                    <td class="counter-name">
-                                        <?php print _('DKIM Support');?>:
-                                    </td>
-                                    <td class="counter-value">
-                                        <?php echo $data[$key]['DKIM'] ?>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="counter-name">
-                                        <?php print _('Accounts');?>:
-                                    </td>
-                                    <td class="counter-value">
-                                        <?php echo $data[$key]['ACCOUNTS'] ?>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
 
-        <?php
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $key ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 2px 0 2px 0">
+                                                            <?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']) ?> 
+                                                            <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>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('AntiVirus Support');?>:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo _($data[$key]['ANTIVIRUS']) ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('AntiSpam Support');?>:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo _($data[$key]['ANTISPAM']) ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="300">
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('DKIM Support');?>:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo _($data[$key]['DKIM']) ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('Accounts');?>:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['ACCOUNTS'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
                                 }
-                            ?>
-    </table>
-    </form>
-
-    <table class="data-count">
-        <tr>
-            <td width="160px"></td>
-            <td>
-                <?php
+                            ?> 
+                        </table>
+                        </form>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
                                         if ( $i == 1) {
-                                            echo _('one domain with email');
+                                            echo _('1 domain');
                                         } else {
-                                            echo _('%s domains with email',$i);
+                                            echo _('%s domains',$i);
                                         }
-                                    ?>
-            </td>
-        </tr>
-    </table>
-</div>
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </div>

web/templates/admin/list_mail_acc.html

@@ -1,4 +1,4 @@
-<table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
@@ -55,108 +55,110 @@
                                 <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="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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <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');?> 
+                                            <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <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); ?> 
+                                            <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>">
+                                        <span class="data-controls" width="50px">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <table class="data-col2" width="830px">
+                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                                         <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_<?php echo $spnd_action ?>" width="80px">
-                                                <img src="/images/suspend.png" width="7px" height="8px" class="do_<?php echo $spnd_action ?>">
-                                                <a id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>"> <?php echo _($spnd_action); ?></a>
-                                                <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
-                                                </div>
-                                            </td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                </table>
-
-                                <table class="data-col2" width="830px">
-                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-                                    <tr>
-                                        <td style="vertical-align:top;" >
-                                            <table>
-                                                <tr>
-                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                        <?php echo $data[$key]['IP'] ?>
-                                                    </td>
-                                                <tr>
-                                                    <td class="chart1" style="padding: 0 0 2px 0">
-                                                        <?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>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td style="vertical-align:top;" width="200">
-                                            <table>
-                                                <tr>
-                                                    <td class="counter-name">
-                                                        <?php print _('Quota');?>:
-                                                    </td>
-                                                    <td class="counter-value">
-                                                        <?php echo $data[$key]['QUOTA'] ?>
-                                                    </td>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 4px 0 0 0;">
+                                                            <?php echo $data[$key]['IP'] ?> 
+                                                        </td>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 2px 0">
+                                                            <?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>
+                                                        </td>
                                                     </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="200">
+                                                <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Autoreply');?>:
+                                                            <?php print _('Quota');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
+                                                            <?php echo $data[$key]['QUOTA'] ?> 
+                                                        </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td class="counter-name">
+                                                                <?php print _('Autoreply');?>:
+                                                            </td>
+                                                            <td class="counter-value">
+                                                                <?php echo _($data[$key]['AUTOREPLY']) ?> 
+                                                            </td>
+                                                        </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="350">
+                                                <table width="350">
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('Forward to');?>:
+                                                        </td>
+                                                        <td class="counter-value" style="padding: 0 0 0 8px;" >
+                                                            <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
                                                         </td>
                                                     </tr>
-                                            </table>
-                                        </td>
-                                        <td rowspan=4 style="vertical-align:top;" width="350">
-                                            <table width="350">
-                                                <tr>
-                                                    <td class="counter-name">
-                                                        <?php print _('Forward to');?>:
-                                                    </td>
-                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
-                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-
-                        <?php
-                            }
-                        ?>
-                    </table>
-                    </form>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
+                                }
+                            ?> 
+                        </table>
+                        </form>
 
-                    <table class="data-count">
-                        <tr>
-                            <td width="160px"></td>
-                            <td>
-                                <?php
-                                    if ( $i == 1) {
-                                        echo _('one mail account');
-                                    } else {
-                                        echo _('%s mail accounts',$i);
-                                    }
-                                ?>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo _('1 mail account');
+                                        } else {
+                                            echo _('%s mail accounts',$i);
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </div>

web/templates/admin/list_user.html

@@ -54,8 +54,7 @@
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
                                     }
-                                ?>
-
+                                ?> 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px">
                                     <table class="data-col1">
@@ -68,7 +67,7 @@
 
                                     <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" class="do_delete">
+                                            <img src="/images/delete.png" width="7px" height="7px">
                                             <?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');?>">
@@ -79,8 +78,8 @@
 
                                     <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" class="do_<?php echo $spnd_action ?>"> 
-                                            <?php echo _($spnd_action); ?>
+                                            <img src="/images/suspend.png" width="7px" height="8px">
+                                            <?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 _('USER_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
@@ -125,7 +124,7 @@
                                             unset($_SESSION['look_alert']);
                                             }
                                         } else {
-                                    ?>
+                                    ?> 
                                     <a href="/login/?loginas=<?php echo $key; ?>">
                                         <span class="data-controls">
                                             <img src="/images/login-as.png" width="7px" height="8px">
@@ -136,7 +135,6 @@
                                         </span>
                                     </a>
 
-
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>

web/templates/admin/list_web.html

@@ -72,8 +72,7 @@
                                         $nginx_ext_title = '';
                                         $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
                                     }
-                                ?>
-
+                                ?> 
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
@@ -85,8 +84,8 @@
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <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" class="do_delete">
-                                             <?php print _('delete');?>
+                                            <img src="/images/delete.png" width="7px" height="7px">
+                                             <?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 _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
@@ -95,8 +94,8 @@
                                     </a>
                                     <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" class="do_<?php echo $spnd_action ?>">
-                                            <?php echo _($spnd_action); ?>
+                                            <img src="/images/suspend.png" width="7px" height="8px">
+                                            <?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 _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
@@ -106,7 +105,7 @@
                                     <a href="/edit/web/?domain=<?php echo $key ?>">
                                         <span class="data-controls">
                                             <img src="/images/edit.png" width="8px" height="8px">
-                                            <?php print _('edit');?>
+                                            <?php print _('edit');?> 
                                         </span>
                                     </a>
                                     <?php
@@ -115,13 +114,12 @@
                                     <a href="http://<?php echo $key ?>/vstats/"  target="_blank">
                                         <span class="data-controls">
                                             <img src="/images/new_window.png" width="8px" height="8px">
-                                            <?php print _('open webstats');?>
+                                            <?php print _('open webstats');?> 
                                         </span>
                                     </a>
                                     <?php
                                             }
                                      ?> 
-
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
@@ -137,19 +135,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>
                                                     <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>

web/templates/admin/panel.html

@@ -1,4 +1,4 @@
-<center>
+    <center>
     <table class="main">
         <tr>
             <td>
@@ -20,86 +20,79 @@
                                         <span class="nav-logo">
                                             <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
                                         </span>
-
                                         <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" style="decoration: none;">
                                                     <?php print _('users');?>: <? echo $panel[$user]['U_USERS'] ?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_USERS']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
                                                     <?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
                                                     <?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
                                                     <?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
+                                                    <?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" style="decoration: none;">
                                                     <?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>

web/templates/footer.html

@@ -1,4 +1,4 @@
-                <br>
+                    <br>
                 </td>
             </tr>
         </table>

web/templates/header.html

@@ -681,9 +681,9 @@
 
                 #vstobjects{
                     padding-top: 187px;
-                    min-height: 370px;
+                    min-height: 557px;
                     height: auto !important;
-                    height: 370px;
+                    height: 557px;
                     width: 996px;
                 }
 

web/templates/user/add_dns.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
@@ -64,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>
@@ -128,9 +129,13 @@
                                                 </table>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>

web/templates/user/add_web.html

@@ -1,3 +1,4 @@
+
                                 <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
@@ -54,22 +55,8 @@
                                     ftprandomstring += chars.substring(rnum,rnum+1);
                                 }
                                 document.v_add_web.v_ftp_password.value = ftprandomstring;
-                                document.v_add_web.v_stats_password.value = randomstring;
-                            }
-
-                            function randomString() {
-                                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                                var string_length = 10;
-                                var randomstring = '';
-                                for (var i=0; i<string_length; i++) {
-                                    var rnum = Math.floor(Math.random() * chars.length);
-                                    randomstring += chars.substring(rnum,rnum+1);
-                                }
-                                document.v_add_web.v_ftp_password.value = randomstring;
                             }
-                        </script>
 
-                        <script language="javascript">
                             function elementHideShow(elementToHideOrShow){
                                 var el = document.getElementById(elementToHideOrShow);
                                 if (el.style.display == "block") {
@@ -79,7 +66,7 @@
                                 }
                             }
                         </script>
-    
+
                         <table class='data'>
                             <tr class="data-add">
                             <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
@@ -254,7 +241,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statistics');?>
+                                            <?php print _('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -268,7 +255,7 @@
                                                         if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                             echo ' selected' ;
                                                         }
-                                                        echo ">".$value."</option>\n";
+                                                        echo ">" . _($value) . "</option>\n";
                                                     }
                                                 ?> 
                                             </select>
@@ -331,7 +318,7 @@
                                                 </tr>
                                                 <tr>
                                                     <td>
-                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                                        <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user; ?>>
                                                     </td>
                                                 </tr>
                                                 <tr>
@@ -341,27 +328,29 @@
                                                 </tr>
                                                 <tr>
                                                     <td>
-                                                        <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                                        <input type="text" class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password; ?>>
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                         <?php print _('SEND_CREDENTIALS_NOTICE');?>
+                                                         <?php print _('SEND_FTP_CREDENTIALS');?>
                                                     </td>
                                                 </tr>
                                                 <tr>
                                                     <td>
-                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email;  ?>>
+                                                        <input type="text"  class="vst-input" name="v_ftp_email" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
                                                     </td>
                                                 </tr>
                                             </table>
                                         </td>
                                     </tr>
                                 </table>
-                                <table class="data-col2" width="600px">
+                                <table class="data-col2">
                                     <tr>
-                                        <td style="padding: 33px 0 0 0;">
+                                        <td style="padding: 33px 0 0 0;" width="116px">
                                             <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 ?>">
                                         </td>
                                     </tr>

web/templates/user/edit_web.html

@@ -12,10 +12,10 @@
                                         <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Editing Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
-                                                    echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                    echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
                                                 } else {
                                                     if (!empty($_SESSION['ok_msg'])) {
-                                                        echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                                     }
                                                 }
                                             ?>
@@ -63,9 +63,9 @@
                             <tr class="data-add">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a></td></tr>
                                         <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" 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;">
@@ -157,7 +157,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 _('SSH Home Directory');?>
+                                                            <?php print _('SSL Home Directory');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -207,7 +207,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Statisitcs');?>
+                                                <?php print _('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -221,15 +221,15 @@
                                                             if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                                 echo ' selected' ;
                                                             }
-        	                                            echo ">".$value."</option>\n";
+                                                        echo ">". _($value) ."</option>\n";
                                                         }
-        	                                    ?> 
+                                                ?> 
                                                 </select>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Statistic Authorization');?>
+                                                <?php print _('Statistics Authorization');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -279,7 +279,7 @@
                                                     <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:#555;">Prefix '.$user.'_ will be automaticaly added to username</span>' ?> 
+                                                            <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#555;">' . _('FTP_PREFIX_WILL_BE_ADDED',$user."_") . '</span>' ?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -303,7 +303,7 @@
                                                      ?> 
                                                     <tr>
                                                         <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                            <?php print _('SEND_CREDENTIALS_NOTICE');?>
+                                                            <?php print _('SEND_FTP_CREDENTIALS');?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -317,9 +317,13 @@
                                                 </table>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
-                                            <td style="padding: 24px 0 0 0;">
+                                            <td style="padding: 24px 0 0 0;" width="116px">
                                                 <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 ?>">
                                             </td>
                                         </tr>
@@ -328,4 +332,4 @@
                             </tr>
                         </table>
                     </form>
-                                            
+

web/templates/user/list_dns.html

@@ -2,20 +2,20 @@
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/dns/'"> <?php print _('Add DNS Domain');?> </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                <form action="/search/" method="get">
+                                                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
                                                 </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
                                                 <form action="/bulk/dns/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
                                                 <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('delete');?></option>
+                                                    <option><?php print _('apply to selected');?></option>
+                                                    <option><?php print _('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
                                             </div>
@@ -38,33 +38,44 @@
                                         $status = 'active';
                                         $spnd_action = 'suspend' ;
                                     }
-                            ?>
-
+                            ?> 
                             <tr class="data-row">
                                 <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="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status) ?></b></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>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                        <td class="data-controls" width="108px"><a href="/list/dns/?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> </a></td>
-                        <td class="data-controls" width="92px"><a href="/add/dns/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add record');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <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');?> 
+                                            <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 _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/add/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/add.png" width="8px" height="8px">
+                                            <?php print _('add record');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/list/dns/?domain=<?php echo $key ?>">
+                                        <span class="data-controls" >
+                                            <img src="/images/more.png" width="8px" height="8px">
+                                            <?php print _('LIST_DOMAIN_RECORDS',$data[$key]['RECORDS']); ?> 
+                                        </span>
+                                    </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
@@ -76,11 +87,11 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" style="padding: 2px 0 0 2px;">
-                                                            <?php echo $data[$key]['IP'] ?>
+                                                            <?php echo $data[$key]['IP'] ?> 
                                                         </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>
@@ -100,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-value"><?php echo date("Y M d", strtotime($data[$key]['EXP'])) ?></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>
@@ -115,7 +126,7 @@
                             </tr>
                             <?php
                                 }
-                            ?>
+                            ?> 
                         </table>
                         </form>
 
@@ -125,7 +136,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one domain');
+                                            echo _('1 domain');
                                         } else {
                                             echo _('%s domains',$i);
                                         }

web/templates/user/list_dns_rec.html

@@ -1,4 +1,4 @@
-<table class="sub-menu" style="background: white;">
+                               <table class="sub-menu" style="background: white;">
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
@@ -25,78 +25,78 @@
                             </td>
                         </tr>
                     </table>
-
                     <div id="vstobjects">
                         <div style="height:10px; font-size:0;"></div>
-                        <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>
-                                </td>
-                            </tr>
-                        </table>
-                        <div style="height:10px; font-size:0;"></div>
-                        <table class="data">
-                            <?php
-                                foreach ($data as $key => $value) {
-                                    ++$i;
-                                    if ($data[$key]['SUSPENDED'] == 'yes') {
-                                        $status = 'suspended';
-                                        $spnd_action = 'unsuspend' ;
-                                    } else {
-                                        $status = 'active';
-                                        $spnd_action = 'suspend' ;
-                                    }
-                            ?>
-
-                            <tr class="data-row">
-                                <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="record[]" value="<?php echo $data[$key]['ID']?>" ><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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                        <td class="data-controls" width="50px"><a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
+                            <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>
+                                    </td>
+                                </tr>
+                            </table>
+                            <div style="height:10px; font-size:0;"></div>
+                            <table class="data">
+                                <?php
+                                    foreach ($data as $key => $value) {
+                                        ++$i;
+                                        if ($data[$key]['SUSPENDED'] == 'yes') {
+                                            $status = 'suspended';
+                                            $spnd_action = 'unsuspend' ;
+                                        } else {
+                                            $status = 'active';
+                                            $spnd_action = 'suspend' ;
+                                        }
+                                ?> 
+                                <tr class="data-row">
+                                    <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="record[]" value="<?php echo $data[$key]['ID']?>" > <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>
+                                        </table>
+                                    </td>
+                                    <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                        <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');?>
                                                 <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 _('RECORD_ACTION_CONFIRMATION',_('delete'),$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 _('RECORD_ACTION_CONFIRMATION',_('delete'),$data[$key]['RECORD']);?></p>
                                                 </div>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <table class="data-col5" width="780px">
-                                        <tr>
-                                            <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                            <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
-                                            <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
-                                        </tr>
-                                    </table>
-                                </td>
-                            </tr>
-                            <?php
-                                }
-                            ?>
-                        </table>
+                                            </span>
+                                        </a>
+                                        <a href="/edit/dns/?domain=<?php echo $_GET['domain'] ?>&record_id=<?php echo $data[$key]['ID'] ?>">
+                                            <span class="data-controls">
+                                                <img src="/images/edit.png" width="8px" height="8px">
+                                                <?php print _('edit');?> 
+                                            </span>
+                                        </a>
+                                        <table class="data-col5" width="780px">
+                                            <tr>
+                                                <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
+                                                <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                                <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <?php
+                                    }
+                                ?>
+                            </table>
                         </form>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px">
+                                </td>
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                        echo _('one DNS record');
+                                            echo _('1 DNS record');
                                         } else {
-                                        echo _('%s DNS records',$i);
+                                            echo _('%s DNS records',$i);
                                         }
                                     ?> 
                                 </td>

web/templates/user/list_mail.html

@@ -1,23 +1,23 @@
-<table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
-                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/mail/'"> <?php print _('Add Mail Domain');?> </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
                                                 <form action="/search/" method="get" >
-                                                <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
-                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
+                                                    <input type="text" name="q" style="margin: 2px 2px 0px 0px; width: 250px; padding: 3px;" size="30">
+                                                    <input type="submit" value="<?php print _('Search');?>" class="button" style="font-size: 12px; height: 24px;">
                                                 </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
                                                 <form action="/bulk/mail/" method="post" id="objects">
-                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
-                                                <select style="margin:0 2px 0 0px;" name="action">
-                        <option><?php print _('apply to selected');?></option>
-                        <option><?php print _('delete');?></option>
-                                                </select>
-                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
+                                                    <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
+                                                    <select style="margin:0 2px 0 0px;" name="action">
+                                                        <option><?php print _('apply to selected');?></option>
+                                                        <option><?php print _('delete');?></option>
+                                                    </select>
+                                                    <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
                                             </div>
                                         </td>
                                     </tr>
@@ -25,7 +25,6 @@
                             </td>
                         </tr>
                     </table>
-
                     <div id="vstobjects">
                         <table class="data">
                             <?php
@@ -43,38 +42,54 @@
                                         $data[$key]['CATCHALL'] = '/dev/null';
                                     }
                             ?> 
-
                             <tr class="data-row">
                                 <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="domain[]" value="<?php echo "$key" ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-                    <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></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>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                        <td class="data-controls" width="112px"><a href="?domain=<?php echo $key ?>"><img src="/images/more.png" width="8px" height="8px"> <?php print _('list');?> <?php echo $data[$key]['ACCOUNTS'] ?> <?php print _('accounts');?></a></td>
-                        <td class="data-controls" width="98px"><a href="/add/mail/?domain=<?php echo $key ?>"><img src="/images/add.png" width="8px" height="8px"> <?php print _('add account');?></a></td>
-                        <td class="data-controls" width="104px"><a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open webmail');?></a></td>
-                        <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                            <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <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');?> 
+                                            <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 _('MAIL_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/mail/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <a href="<?php echo "http://".$http_host."/webmail/"; ?>" target="_blank">
+                                        <span class="data-controls"><img src="/images/new_window.png" width="8px" height="8px">
+                                            <?php print _('open webmail');?> 
+                                        </span>
+                                    </a>
+                                    <a href="/add/mail/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/add.png" width="8px" height="8px">
+                                            <?php print _('add account');?> 
+                                        </span>
+                                    </a>
+                                    <a href="?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/more.png" width="8px" height="8px">
+                                            <?php print _('LIST_MAIL_ACCOUNTS',$data[$key]['RECORDS']); ?> 
+                                        </span>
+                                    </a>
+
 
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-        	                                <b><?php echo $key ?></b>
+                                                <b><?php echo $key ?></b>
                                             </td>
                                         </tr>
                                         <tr>
@@ -82,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>
@@ -99,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>
@@ -119,18 +134,18 @@
                                                 <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'] ?>
+                                                            <?php echo $data[$key]['ACCOUNTS'] ?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -139,24 +154,22 @@
                                     </table>
                                 </td>
                             </tr>
-
                             <?php
                                 }
-                            ?>
+                            ?> 
                         </table>
                         </form>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one domain with email');
+                                            echo _('1 domain');
                                         } else {
-                                            echo _('%s domains with email',$i);
+                                            echo _('%s domains',$i);
                                         }
-                                    ?>
+                                    ?> 
                                 </td>
                             </tr>
                         </table>

web/templates/user/list_mail_acc.html

@@ -1,4 +1,4 @@
-<table class="sub-menu" style="background: white;">
+                                <table class="sub-menu" style="background: white;">
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
@@ -53,100 +53,100 @@
                                 <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="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 date("d M Y", strtotime($data[$key]['DATE'])) ?></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>
                                     </table>
                                 </td>
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
-                                    <table width="830px">
+                                    <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');?> 
+                                            <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>">
+                                        <span class="data-controls" width="50px">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <table class="data-col2" width="830px">
+                                        <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                                         <tr>
-                                            <td></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/mail/?domain=<?php echo $_GET['domain'] ?>&account=<?php echo $key ?>"><img src="/images/edit.png" width="8px" height="8px"> <?php print _('edit');?></a></td>
-                                            <td class="data-controls do_delete" width="70px">
-                                                <img src="/images/delete.png" width="7px" height="7px" class="do_delete">
-                                                <a id="delete_link_<?php echo $i ?>" class="do_delete"> <?php print _('delete');?></a>
-                                                <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 _('MAIL_ACCOUNT_ACTION_CONFIRMATION',_('delete'),$key);?></p>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                </table>
-
-                                <table class="data-col2" width="830px">
-                                    <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
-                                    <tr>
-                                        <td style="vertical-align:top;" >
-                                            <table>
-                                                <tr>
-                                                    <td class="counter-name" style="padding: 4px 0 0 0;">
-                                                        <?php echo $data[$key]['IP'] ?>
-                                                    </td>
-                                                <tr>
-                                                    <td class="chart1" style="padding: 0 0 2px 0">
-                                                        <?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>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td style="vertical-align:top;" width="200">
-                                            <table>
-                                                <tr>
-                                                    <td class="counter-name">
-                                                        <?php print _('Quota');?>:
-                                                    </td>
-                                                    <td class="counter-value">
-                                                        <?php echo $data[$key]['QUOTA'] ?>
-                                                    </td>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td class="counter-name" style="padding: 4px 0 0 0;">
+                                                            <?php echo $data[$key]['IP'] ?> 
+                                                        </td>
+                                                    <tr>
+                                                        <td class="chart1" style="padding: 0 0 2px 0">
+                                                            <?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>
+                                                        </td>
                                                     </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="200">
+                                                <table>
                                                     <tr>
                                                         <td class="counter-name">
-                                                            <?php print _('Autoreply');?>:
+                                                            <?php print _('Quota');?>:
                                                         </td>
                                                         <td class="counter-value">
-                                                            <?php echo $data[$key]['AUTOREPLY'] ?>
+                                                            <?php echo $data[$key]['QUOTA'] ?> 
+                                                        </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td class="counter-name">
+                                                                <?php print _('Autoreply');?>:
+                                                            </td>
+                                                            <td class="counter-value">
+                                                                <?php echo _($data[$key]['AUTOREPLY']) ?> 
+                                                            </td>
+                                                        </tr>
+                                                </table>
+                                            </td>
+                                            <td rowspan=4 style="vertical-align:top;" width="350">
+                                                <table width="350">
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            <?php print _('Forward to');?>:
+                                                        </td>
+                                                        <td class="counter-value" style="padding: 0 0 0 8px;" >
+                                                            <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
                                                         </td>
                                                     </tr>
-                                            </table>
-                                        </td>
-                                        <td rowspan=4 style="vertical-align:top;" width="350">
-                                            <table width="350">
-                                                <tr>
-                                                    <td class="counter-name">
-                                                        <?php print _('Forward to');?>:
-                                                    </td>
-                                                    <td class="counter-value" style="padding: 0 0 0 8px;" >
-                                                        <?php echo str_replace(',', ', ', $data[$key]['FWD']) ?> 
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-
-                        <?php
-                            }
-                        ?>
-                    </table>
-                    </form>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
+                                }
+                            ?> 
+                        </table>
+                        </form>
 
-                    <table class="data-count">
-                        <tr>
-                            <td width="160px"></td>
-                            <td>
-                                <?php
-                                    if ( $i == 1) {
-                                        echo _('one mail account');
-                                    } else {
-                                        echo _('%s mail accounts',$i);
-                                    }
-                                ?>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo _('1 mail account');
+                                        } else {
+                                            echo _('%s mail accounts',$i);
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </div>

web/templates/user/list_user.html

@@ -16,16 +16,7 @@
                                                 <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
                                                 <select style="margin:0 2px 0 0px;" name="action">
                                                     <option><?php print _('apply to selected');?></option>
-                                                    <option><?php print _('rebuild');?></option>
-                                                    <option><?php print _('rebuild web');?></option>
-                                                    <option><?php print _('rebuild DNS');?></option>
-                                                    <option><?php print _('rebuild mail');?></option>
-                                                    <option><?php print _('rebuild db');?></option>
-                                                    <option><?php print _('rebuild cron');?></option>
                                                     <option><?php print _('update counters');?></option>
-                                                    <option><?php print _('suspend');?></option>
-                                                    <option><?php print _('unsuspend');?></option>
-                                                    <option><?php print _('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="button" style="width: 37px; height: 24px;font-size: 12px;">
                                             </div>

web/templates/user/list_web.html

@@ -16,8 +16,6 @@
                                                 <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> <?php print _('toggle all');?> </a>
                                                 <select style="margin:0 2px 0 0px;" name="action">
                                                     <option><?php print _('apply to selected');?></option>
-                                                    <option><?php print _('suspend');?></option>
-                                                    <option><?php print _('unsuspend');?></option>
                                                     <option><?php print _('delete');?></option>
                                                 </select>
                                                 <input type="submit" name="ok" value="›" class="button" style="width: 37px;font-size: 12px; height: 24px;">
@@ -85,7 +83,7 @@
                                 <td class="data-dotted" width="830px" style="vertical-align:top;">
                                     <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" class="do_delete">
+                                            <img src="/images/delete.png" width="7px" height="7px">
                                              <?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');?>">
@@ -127,19 +125,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>

web/templates/user/panel.html

@@ -1,41 +1,37 @@
     <center>
-        <table class="main">
-            <tr>
-                <td>
-                    <table class="fixed" >
-                        <tr>
-                            <td>
-                                <table class="top">
-                                    <tr>
-<td width="174px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="118px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
-                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
-                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
-                                        <td width="228px" style="border-bottom: 1px solid #d6d6d6; height: 26px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
-                                   
-                                    </tr>
-                                    <tr>
-                                        <td colspan="7" style="background: #fff;">
-
-                                            <span class="nav-logo">
-                                                <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
-                                            </span>
-
-                                            <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');?>
-                                                </p>
-                                                <p class="nav-counters" style="decoration: none;">
-                                                    <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
-                                                    <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
-                                                    <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED']?>
-                                                </p>
-                                            </span>
-                                            </a>
-
+    <table class="main">
+        <tr>
+            <td>
+                <table class="fixed" >
+                    <tr>
+                        <td>
+                            <table class="top">
+                                <tr>
+                                <td width="174px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
+                                    <td width="118px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/"><b><?php print _('Statistics');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/"><b><?php print _('History Log');?></a></b></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
+                                    <td width="120px" style="border-bottom: 1px solid #d6d6d6; height: 26px;"></td>
+                                    <td width="228px" style="border-bottom: 1px solid #d6d6d6; height: 26px; padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/"><?php print _('Log out');?></a></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="7" style="background: #fff;">
+                                        <span class="nav-logo">
+                                            <img style="margin: 22px 0 0 4px;" src="/images/logo.png">
+                                        </span>
+                                        <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');?> 
+                                            </p>
+                                            <p class="nav-counters" style="decoration: none;">
+                                                <?php print _('disk');?>: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
+                                                <?php print _('traffic');?>: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
+                                                <?php print _('suspended');?>: <? echo $panel[$user]['SUSPENDED']?>
+                                            </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">