i18n user db

web/add/db/index.php

@@ -22,9 +22,23 @@ if (!empty($_POST['ok'])) {
     if (empty($_POST['v_type'])) $errors[] = _('type');
     if (empty($_POST['v_charset'])) $errors[] = _('charset');
 
+    // 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);
+    }
+
     // Validate email
-    if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
-        $_SESSION['error_msg'] = _('Please enter valid email address.');
+    if (!empty($_POST['v_db_email'])) {
+        if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
+            $_SESSION['error_msg'] = _('Please enter valid email address.');
+        }
     }
 
     // Protect input
@@ -35,17 +49,8 @@ if (!empty($_POST['ok'])) {
     $v_charset = $_POST['v_charset'];
     $v_db_email = $_POST['v_db_email'];
 
-    // 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 {
+
+    if (empty($_SESSION['error_msg'])) {
         // Add Database
         $v_type = escapeshellarg($_POST['v_type']);
         $v_charset = escapeshellarg($_POST['v_charset']);

web/inc/i18n/ru.php

@@ -205,8 +205,8 @@ $LANG = array(
     'Assigned user' => 'Пользователь',
     'Assigned domain' => 'Домен',
     'Adding Mail Domain' => 'Добавление почтового домена',
-    'AntiSpam Support' => 'Поддержка Анти-спама',
-    'AntiVirus Support' => 'Поддержка Антивируса',
+    'AntiSpam Support' => 'Поддержка анти-спама',
+    'AntiVirus Support' => 'Поддержка антивируса',
     'DKIM Support' => 'Поддержка DKIM',
     'Adding Mail Account' => 'Добавление почтового аккаунта',
     'Advanced options' => 'Дополнительные опции',
@@ -231,7 +231,7 @@ $LANG = array(
     'Nginx Extentions' => 'Обработка Nginx',
     'Nginx Template' => 'Шаблон для Nginx',
     'Statistics Authorization' => 'Ограниченный доступ к статистике',
-    'Additional FTP Account' => 'Отдельный ftp аккаунт',
+    'Additional FTP Account' => 'Дополнительный ftp',
     'Editing Cron Job' => 'Редактирование cron-задания',
     'Save' => 'Сохранить',
     'Editing Database' => 'Редактирование БД',

web/templates/user/list_db.html

@@ -49,26 +49,33 @@
                                 <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="database[]" 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><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="128px"><a href="<?php echo $db_admin_link; ?>" target="_blank"><img src="/images/new_window.png" width="8px" height="8px"> <?php print _('open %s',$db_admin);?> </a></td>
-                                            <td class="data-controls" width="50px"><a href="/edit/db/?database=<?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"> delete</a>
-                                                <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
-                                                <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('DATABASE_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 echo _('delete') ?> 
+                                            <input type="hidden" name="delete_url" value="/delete/db/?database=<?php echo "$key" ?>" />
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                                                <p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/db/?database=<?php echo $key ?>">
+                                        <span class="data-controls" width="50px">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+                                    <a href="<?php echo $db_admin_link; ?>" target="_blank">
+                                        <span class="data-controls" width="128px">
+                                            <img src="/images/new_window.png" width="8px" height="8px">
+                                            <?php print _('open %s',$db_admin);?> 
+                                        </span>
+                                    </a>
                                     <table class="data-col2" width="830px">
                                         <tr>
                                             <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
@@ -140,7 +147,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one database');
+                                            echo _('1 database');
                                         } else {
                                             echo _('%s databases',$i);
                                         }