i18n db

web/add/db/index.php

@@ -12,8 +12,8 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-// Are you admin?
-//if ($_SESSION['user'] == 'admin') {
+$v_db_email = $panel[$user]['CONTACT'];
+
 if (!empty($_POST['ok'])) {
     // Check input
     if (empty($_POST['v_database'])) $errors[] = _('database');
@@ -22,13 +22,18 @@ if (!empty($_POST['ok'])) {
     if (empty($_POST['v_type'])) $errors[] = _('type');
     if (empty($_POST['v_charset'])) $errors[] = _('charset');
 
-        // Protect input
-        $v_database = escapeshellarg($_POST['v_database']);
-        $v_dbuser = escapeshellarg($_POST['v_dbuser']);
-        $v_password = escapeshellarg($_POST['v_password']);
-        $v_type = $_POST['v_type'];
-        $v_charset = $_POST['v_charset'];
-        if (empty($_POST['v_notify'])) $v_notify = 'off';
+    // Validate email
+    if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
+        $_SESSION['error_msg'] = _('Please enter valid email address.');
+    }
+
+    // Protect input
+    $v_database = escapeshellarg($_POST['v_database']);
+    $v_dbuser = escapeshellarg($_POST['v_dbuser']);
+    $v_password = escapeshellarg($_POST['v_password']);
+    $v_type = $_POST['v_type'];
+    $v_charset = $_POST['v_charset'];
+    $v_db_email = $_POST['v_db_email'];
 
     // Check for errors
     if (!empty($errors[0])) {
@@ -53,48 +58,30 @@ if (!empty($_POST['ok'])) {
             $_SESSION['error_msg'] = $error;
             unset($v_password);
             unset($output);
-        } else {
-            // Add Database
-            $v_type = escapeshellarg($_POST['v_type']);
-            $v_charset = escapeshellarg($_POST['v_charset']);
-            exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var);
-            $v_type = $_POST['v_type'];
-            $v_charset = $_POST['v_charset'];
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                if (empty($error)) $error = _('Error: vesta did not return any output.');
-                $_SESSION['error_msg'] = $error;
-                unset($v_password);
-                unset($output);
-            }
-            else {
-            if (empty($v_notify)) {
-                list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
-                if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
-                if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
-
-                $to = $panel[$user]['CONTACT'];
-                $subject = _("Database Credentials");
-                $hostname = exec('hostname');
-                $from = _('MAIL_FROM',$hostname);
-                $mailtext = _('DATABASE_READY',$panel[$user]['FNAME'],$panel[$user]['LNAME'],$_POST['v_type'],$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
-                $mailtext .= $db_admin_link."\n\n";
-
-                $mailtext .= "--\n"._('Vesta Control Panel')."\n";
-                send_email($to, $subject, $mailtext, $from);
-                
-            }
-            $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
-            unset($v_database);
-            unset($v_dbuser);
-            unset($v_password);
-            unset($v_type);
-            unset($v_charset);
-            unset($output);
         }
+        if (!empty($v_db_email)) {
+            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
+            if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+            if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
+            $to = $v_db_email;
+            $subject = _("Database Credentials");
+            $hostname = exec('hostname');
+            $from = _('MAIL_FROM',$hostname);
+            $mailtext = _('DATABASE_READY',$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
+            $mailtext .= $db_admin_link."\n\n";
+            $mailtext .= "--\n"._('Vesta Control Panel')."\n";
+            send_email($to, $subject, $mailtext, $from);
+        }
+        $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
+        unset($v_database);
+        unset($v_dbuser);
+        unset($v_password);
+        unset($v_type);
+        unset($v_charset);
+        unset($output);
     }
 }
-}
+
 exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
 $db_types = json_decode(implode('', $output), true);
 unset($output);
@@ -102,8 +89,7 @@ unset($output);
 include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-//}
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-?>
+?>

web/edit/db/index.php

@@ -13,67 +13,68 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
-    // Check user argument?
-    if (empty($_GET['database'])) {
-        header("Location: /list/db/");
-        exit;
-    }
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
 
-    // Edit as someone else?
-    if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-        $user=escapeshellarg($_GET['user']);
-    }
+if (empty($_GET['database'])) {
+    header("Location: /list/db/");
+    exit;
+}
+
+// Edit as someone else?
+if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
+    $user=escapeshellarg($_GET['user']);
+}
 
-    $v_database = escapeshellarg($_GET['database']);
-    exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
-    if ($return_var != 0) {
-        $error = implode('<br>', $output);
-        if (empty($error)) $error = _('Error: vesta did not return any output.');
-        $_SESSION['error_msg'] = $error;
+$v_database = escapeshellarg($_GET['database']);
+exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
+if ($return_var != 0) {
+    $error = implode('<br>', $output);
+    if (empty($error)) $error = _('Error: vesta did not return any output.');
+    $_SESSION['error_msg'] = $error;
+} else {
+    $data = json_decode(implode('', $output), true);
+    unset($output);
+    $v_username = $user;
+    $v_database = $_GET['database'];
+    $v_dbuser = $data[$v_database]['DBUSER'];
+    $v_password = "••••••••";
+    $v_host = $data[$v_database]['HOST'];
+    $v_type = $data[$v_database]['TYPE'];
+    $v_charset = $data[$v_database]['CHARSET'];
+    $v_date = $data[$v_database]['DATE'];
+    $v_time = $data[$v_database]['TIME'];
+    $v_suspended = $data[$v_database]['SUSPENDED'];
+    if ( $v_suspended == 'yes' ) {
+        $v_status =  'suspended';
     } else {
-        $data = json_decode(implode('', $output), true);
-        unset($output);
-        $v_username = $user;
-        $v_database = $_GET['database'];
-        $v_dbuser = $data[$v_database]['DBUSER'];
-        $v_password = "••••••••";
-        $v_host = $data[$v_database]['HOST'];
-        $v_type = $data[$v_database]['TYPE'];
-        $v_charset = $data[$v_database]['CHARSET'];
-        $v_date = $data[$v_database]['DATE'];
-        $v_time = $data[$v_database]['TIME'];
-        $v_suspended = $data[$v_database]['SUSPENDED'];
-        if ( $v_suspended == 'yes' ) {
-            $v_status =  'suspended';
-        } else {
-            $v_status =  'active';
-        }
+        $v_status =  'active';
+    }
 
-        // Action
-        if (!empty($_POST['save'])) {
-            $v_username = $user;
-            // Change password
-            if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
-                $v_password = escapeshellarg($_POST['v_password']);
-                exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
-                if ($return_var != 0) {
-                    $error = implode('<br>', $output);
-                    if (empty($error)) $error = _('Error: vesta did not return any output.');
-                    $_SESSION['error_msg'] = $error;
-                }
-                $v_password = "••••••••";
-                unset($output);
-            }
-            if (empty($_SESSION['error_msg'])) {
-                $_SESSION['ok_msg'] = _('OK: changes has been saved.');
+    // Action
+    if (!empty($_POST['save'])) {
+        $v_username = $user;
+        // Change password
+        if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
+            $v_password = escapeshellarg($_POST['v_password']);
+            exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
+            if ($return_var != 0) {
+                $error = implode('<br>', $output);
+                if (empty($error)) $error = _('Error: vesta did not return any output.');
+                $_SESSION['error_msg'] = $error;
             }
+            $v_password = "••••••••";
+            unset($output);
+        }
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['ok_msg'] = _('OK: changes has been saved.');
         }
     }
+}
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_db.html');
-    unset($_SESSION['error_msg']);
-    unset($_SESSION['ok_msg']);
-//}
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_db.html');
+unset($_SESSION['error_msg']);
+unset($_SESSION['ok_msg']);
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

web/inc/i18n/en.php

@@ -8,11 +8,9 @@
 if (!defined('LANGUAGE')) die('Direct access not allowed');
 
 $LANG = array(
-    'yes' => 'да',
-    'no' => 'нет',
-    'none' => 'нет',
     'yes' => 'yes',
     'no' => 'no',
+    'none' => 'нет',
     'Hour' => 'Hour',
     'Min' => 'Min',
     'pb' => 'pb',
@@ -192,7 +190,6 @@ $LANG = array(
     '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 / Subdomain',
     'IP or Value' => 'IP-address or Valie',

web/inc/i18n/ru.php

@@ -37,6 +37,8 @@ $LANG = array(
     'charset' => 'кодировка',
     'edit' => 'редактировать',
     'DATABASE_CREATED_OK' => 'База данных <a href="/edit/db/?database=%s"><b>%s</b></a> успешно создана.',
+    'User' => 'Пользователь',
+    'Host' => 'Хост',
     'domain' => 'домен',
     'ip' => 'IP',
     'DOMAIN_CREATED_OK' => 'Домен <a href="/list/dns/?domain=%s"><b>%s</b></a> успешно создан.',
@@ -192,8 +194,7 @@ $LANG = array(
     'Disk' => 'Диск',
     'traffic' => 'трафик',
     'Database Credentials' => 'Данные для доступа к БД',
-    'DATABASE_READY'=>"Здравствуйте %s %s,\nВаша %s база данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n",
-    'Send credentials to' => 'Отправить данные для доступа к ',
+    'DATABASE_READY'=>"База данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n",
     'Adding DNS Record' => 'Добавление DNS записи',
     'Record' => 'Запись / Поддомен',
     'IP or Value' => 'IP-адрес или значение',
@@ -349,7 +350,6 @@ $LANG = array(
     'Load Average' => 'Нагрузка',
     'Memory Usage' => 'Использование Памяти',
     'Bandwidth Usage' => 'Использование Сети',
-    
 );
 
 /*error_reporting(E_ALL);

web/list/db/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') {
     exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);

web/templates/admin/add_db.html

@@ -1,184 +1,187 @@
-<?php
+                                <?php
                                     $back = $_SESSION['back'];
                                     if (empty($back)) {
                                         $back = "location.href='/list/db/'";
                                     } else {
                                         $back = "location.href='".$back."'";
                                     }
-                                ?>
+                                ?> 
 
-<table class="sub-menu" style="background: white;">
-    <tr>
-        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding database');?></b></a>
-            <?php
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding database');?></b></a>
+                                            <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-            } else {
-            if (!empty($_SESSION['ok_msg'])) {
-            echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-            }
-            }
-            ?>
-        </td>
-    </tr>
-</table>
-</td>
-</tr>
-</table>
-
-<form id="vstobjects" name="v_add_db" method="post">
-    <script type="text/javascript">
-        function elementHideShow(elementToHideOrShow) {
-            var el = document.getElementById(elementToHideOrShow);
-            if (el.style.display == "block") {
-                el.style.display = "none";
-            } else {
-                el.style.display = "block";
-            }
-        }
-        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_db.v_password.value = randomstring;
-        }
-    </script>
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                                    }
+                                                }
+                                            ?> 
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-    <table class='data'>
-        <tr class="data-add">
-            <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-                <table class="data-col1">
-                    <tr><td style="padding: 18 0 4 18;"></td></tr>
-                </table>
-            </td>
-            <td class="data-dotted" width="830px" style="vertical-align:top;">
-                <table width="830px">
-                    <tr>
-                        <td></td>
-                    </tr>
-                </table>
-                <table class="data-col2" width="600px">
-                    <tr>
-                        <td style="padding: 10 0 0 2px; color:99a7af;" >
-                            <?php print _('DB_PREFIX_WILL_BE_ADDED',$user."_");?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Database');?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Username');?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <input type="text" size="20" class="vst-input" name="v_password">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Type');?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <select class="vst-list" name="v_type">
-                                <?php
-                                                        foreach ($db_types as $key => $value) {
-                                echo "\t\t\t\t<option value=\"".$value."\"";
-                                if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
-                                echo ">".$value."</option>\n";
+                    <form id="vstobjects" name="v_add_db" method="post">
+                        <script type="text/javascript">
+                            function elementHideShow(elementToHideOrShow) {
+                                var el = document.getElementById(elementToHideOrShow);
+                                if (el.style.display == "block") {
+                                    el.style.display = "none";
+                                } else {
+                                    el.style.display = "block";
+                                }
+                            }
+                            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);
                                 }
-                                ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="vst-text" style="padding: 10 0 0 2px;">
-                            <?php print _('Charset');?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <select class="vst-list" name="v_charset">
-                                <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
-                                <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
-                                <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
-                                <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
-                                <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
-                                <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
-                                <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
-                                <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
-                                <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
-                                <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
-                                <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
-                                <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
-                                <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
-                                <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
-                                <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
-                                <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
-                                <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
-                                <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
-                                <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
-                                <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
-                                <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
-                                <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
-                                <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
-                                <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
-                                <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
-                                <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
-                                <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
-                                <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
-                                <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
-                                <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
-                                <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
-                                <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
-                                <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
-                                <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
-                                <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
-                                <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
-                            </select>
-                        </td>
-                    <tr>
-                        <td class="vst-text" style="padding: 10px 0 0 2px;">
-                            <?php print _('Send credentials to'); echo $panel[$user]['CONTACT'] ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <input type="checkbox" size="20" class="vst-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="padding: 24px 0 0 0;">
-                            <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
-                            <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
-</form>
+                                document.v_add_db.v_password.value = randomstring;
+                            }
+                        </script>
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="600px">
+                                        <tr>
+                                            <td style="padding: 10 0 0 2px; color:99a7af;" >
+                                                <?php print _('DB_PREFIX_WILL_BE_ADDED',$user."_");?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                                                <?php print _('Database');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_database" <?php if (!empty($v_database)) echo "value=".$v_database; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print _('User');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_dbuser" <?php if (!empty($v_dbuser)) echo "value=".$v_dbuser; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print _('Password');?> <a href="javascript:randomString();" class="genpass"><?php print _('generate');?></a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="vst-input" name="v_password">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                                                <?php print _('Type');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="vst-list" name="v_type">
+                                                    <?php
+                                                        foreach ($db_types as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                                                <?php print _('Charset');?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="vst-list" name="v_charset">
+                                                    <option value=big5 <?php if ((!empty($v_charset)) && ( $v_charset == 'big5')) echo 'selected';?> >big5</option>
+                                                    <option value=dec8 <?php if ((!empty($v_charset)) && ( $v_charset == 'dec8')) echo 'selected';?> >dec8</option>
+                                                    <option value=cp850 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp850')) echo 'selected';?> >cp850</option>
+                                                    <option value=hp8 <?php if ((!empty($v_charset)) && ( $v_charset == 'hp8')) echo 'selected';?> >hp8</option>
+                                                    <option value=koi8r <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8r')) echo 'selected';?> >koi8r</option>
+                                                    <option value=latin1 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin1')) echo 'selected';?> >latin1</option>
+                                                    <option value=latin2 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin2')) echo 'selected';?> >latin2</option>
+                                                    <option value=swe7 <?php if ((!empty($v_charset)) && ( $v_charset == 'swe7')) echo 'selected';?> >swe7</option>
+                                                    <option value=ascii <?php if ((!empty($v_charset)) && ( $v_charset == 'ascii')) echo 'selected';?> >ascii</option>
+                                                    <option value=ujis <?php if ((!empty($v_charset)) && ( $v_charset == 'ujis')) echo 'selected';?> >ujis</option>
+                                                    <option value=sjis <?php if ((!empty($v_charset)) && ( $v_charset == 'sjis')) echo 'selected';?> >sjis</option>
+                                                    <option value=hebrew <?php if ((!empty($v_charset)) && ( $v_charset == 'hebrew')) echo 'selected';?> >hebrew</option>
+                                                    <option value=tis620 <?php if ((!empty($v_charset)) && ( $v_charset == 'tis620')) echo 'selected';?> >tis620</option>
+                                                    <option value=euckr <?php if ((!empty($v_charset)) && ( $v_charset == 'euckr')) echo 'selected';?> >euckr</option>
+                                                    <option value=koi8u <?php if ((!empty($v_charset)) && ( $v_charset == 'koi8u')) echo 'selected';?> >koi8u</option>
+                                                    <option value=gb2312 <?php if ((!empty($v_charset)) && ( $v_charset == 'gb2312')) echo 'selected';?> >gb2312</option>
+                                                    <option value=greek <?php if ((!empty($v_charset)) && ( $v_charset == 'greek')) echo 'selected';?> >greek</option>
+                                                    <option value=cp1250 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1250')) echo 'selected';?> >cp1250</option>
+                                                    <option value=gbk <?php if ((!empty($v_charset)) && ( $v_charset == 'gbk')) echo 'selected';?> >gbk</option>
+                                                    <option value=latin5 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin5')) echo 'selected';?> >latin5</option>
+                                                    <option value=armscii8 <?php if ((!empty($v_charset)) && ( $v_charset == 'armscii8')) echo 'selected';?> >armscii8</option>
+                                                    <option value=utf8 <?php if ((!empty($v_charset)) && ( $v_charset == 'utf8')) echo 'selected';?> <?php if (empty($v_charset)) echo 'selected';?> >utf8</option>
+                                                    <option value=ucs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'ucs2')) echo 'selected';?> >ucs2</option>
+                                                    <option value=cp866 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp866')) echo 'selected';?> >cp866</option>
+                                                    <option value=keybcs2 <?php if ((!empty($v_charset)) && ( $v_charset == 'keybcs2')) echo 'selected';?> >keybcs2</option>
+                                                    <option value=macce <?php if ((!empty($v_charset)) && ( $v_charset == 'macce')) echo 'selected';?> >macce</option>
+                                                    <option value=macroman <?php if ((!empty($v_charset)) && ( $v_charset == 'macroman')) echo 'selected';?> >macroman</option>
+                                                    <option value=cp852 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp852')) echo 'selected';?> >cp852</option>
+                                                    <option value=latin7 <?php if ((!empty($v_charset)) && ( $v_charset == 'latin7')) echo 'selected';?> >latin7</option>
+                                                    <option value=cp1251 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1251')) echo 'selected';?> >cp1251</option>
+                                                    <option value=cp1256 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1256')) echo 'selected';?> >cp1256</option>
+                                                    <option value=cp1257 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp1257')) echo 'selected';?> >cp1257</option>
+                                                    <option value=binary <?php if ((!empty($v_charset)) && ( $v_charset == 'binary')) echo 'selected';?> >binary</option>
+                                                    <option value=geostd8 <?php if ((!empty($v_charset)) && ( $v_charset == 'geostd8')) echo 'selected';?> >geostd8</option>
+                                                    <option value=cp932 <?php if ((!empty($v_charset)) && ( $v_charset == 'cp932')) echo 'selected';?> >cp932</option>
+                                                    <option value=eucjpms <?php if ((!empty($v_charset)) && ( $v_charset == 'eucjpms')) echo 'selected';?> >eucjpms</option>
+                                                </select>
+                                            </td>
+                                        <tr>
+                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                                <?php print _('SEND_CREDENTIALS_NOTICE') ?> 
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text"  class="vst-input" name="v_db_email" <?php if (!empty($v_db_email)) echo "value=".$v_db_email; ?>>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2">
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;" width="116px">
+                                                <input type="submit" name="ok" value="<?php print _('Add');?>" class="button">
+                                            </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>

web/templates/admin/edit_db.html

@@ -52,9 +52,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;">
@@ -76,7 +76,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Username');?>
+                                                <?php print _('User');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -124,9 +124,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_charset" <?php if (!empty($v_charset)) echo "value=".$v_charset; ?> disabled>
                                             </td>
                                         </tr>
+                                    </table>
+                                    <table class="data-col2">
                                         <tr>
+                                            <td style="padding: 24px 0 0 0;" width="116px">
+                                                <input type="submit" class="button" name="save" value="<?php print _('Save');?>">
+                                            </td>
                                             <td style="padding: 24px 0 0 0;">
-                                                <input type="submit" name="save" value="<?php print _('Save');?>" class="button">
                                                 <input type="button" class="button" value="<?php print _('Back');?>" onclick="<?php echo $back ?>">
                                             </td>
                                         </tr>

web/templates/admin/list_db.html

@@ -51,34 +51,43 @@
                                 <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_<?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 ?>/db/?database=<?php echo "$key" ?>" />
-                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
-                                                    <p class="counter-value"><?php print _('DATABASE_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"> 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 id="<?php echo $spnd_action ?>_link_<?php echo $i ?>" class="do_<?php echo $spnd_action ?>">
+                                        <span class="data-controls do_<?php echo $spnd_action ?>" width="80px">
+                                            <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 ?>/db/?database=<?php echo "$key" ?>" />
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                                                <p class="counter-value"><?php print _('DATABASE_ACTION_CONFIRMATION',_($spnd_action),$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;">
@@ -150,7 +159,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one database');
+                                            echo _('1 database');
                                         } else {
                                             echo _('%s databases',$i);
                                         }