Ver código fonte

i18n integration

Serghey Rodin 13 anos atrás
pai
commit
fb216fc3ee

+ 4 - 3
web/add/user/index.php

@@ -34,7 +34,7 @@ if ($_SESSION['user'] == 'admin') {
         $v_email = escapeshellarg($_POST['v_email']);
         $v_fname = escapeshellarg($_POST['v_fname']);
         $v_lname = escapeshellarg($_POST['v_lname']);
-        if (empty($_POST['v_notify'])) $v_notify = 'off';
+        $v_notify = $_POST['v_notify'];
 
         // Validate email
         if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) {
@@ -60,8 +60,8 @@ if ($_SESSION['user'] == 'admin') {
                 if (empty($error)) $error = _('Error: vesta did not return any output.');
                 $_SESSION['error_msg'] = $error;
             } else {
-                if (empty($v_notify)) {
-                    $to = $_POST['v_email'];
+                if (!empty($v_notify)) {
+                    $to = $_POST['v_notify'];
                     $subject = _("Welcome to Vesta Control Panel");
                     $hostname = exec('hostname');
                     $from = _('MAIL_FROM',$hostname);
@@ -80,6 +80,7 @@ if ($_SESSION['user'] == 'admin') {
                 unset($v_email);
                 unset($v_fname);
                 unset($v_lname);
+                unset($v_notify);
             }
             unset($output);
         }

+ 4 - 4
web/add/web/index.php

@@ -11,7 +11,7 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 
 // Panel
 top_panel($user,$TAB);
-
+$v_ftp_email = $panel[$user]['CONTACT'];
     if (!empty($_POST['ok'])) {
         // Check input
         if (empty($_POST['v_domain'])) $errors[] = _('domain');
@@ -91,7 +91,7 @@ top_panel($user,$TAB);
                 $_SESSION['error_msg'] = $error;
             }
             unset($output);
-        
+
             // Add DNS
             if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) {
                 exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var);
@@ -256,7 +256,7 @@ top_panel($user,$TAB);
                         $from = _('MAIL_FROM',$hostname);
                         $mailtext .= _('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
                         send_email($to, $subject, $mailtext, $from);
-                        unset($v_ftp_email);
+                        //unset($v_ftp_email);
                     }
                 }
                 unset($v_ftp);
@@ -283,7 +283,7 @@ top_panel($user,$TAB);
                     $_SESSION['error_msg'] = $error;
                 }
                 unset($output);
-                $_SESSION['ok_msg'] = _('HOSTING_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+                $_SESSION['ok_msg'] = _('WEB_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
                 unset($v_domain);
                 unset($v_aliases);
                 unset($v_ssl);

+ 5 - 1
web/edit/web/index.php

@@ -14,6 +14,8 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 // Panel
 top_panel($user,$TAB);
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
 
 // Check user argument?
 if (empty($_GET['domain'])) {
@@ -85,7 +87,9 @@ if ($return_var != 0) {
     unset($output);
 }
 
+
 // Action
+$v_ftp_email = $panel[$user]['CONTACT'];
 if (!empty($_POST['save'])) {
     $v_domain = escapeshellarg($_POST['v_domain']);
 
@@ -567,7 +571,7 @@ if (!empty($_POST['save'])) {
                     $subject = _("FTP login credentials");
                     $hostname = exec('hostname');
                     $from = _('MAIL_FROM',$hostname);
-                    $mailtext .= _('FTP_ACCOUNT_READY',$_GET['domain'],$user."_".$_POST['v_ftp_user'],$_POST['v_ftp_password']);
+                    $mailtext .= _('FTP_ACCOUNT_READY',$_GET['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
                     send_email($to, $subject, $mailtext, $from);
                     unset($v_ftp_email);
                 }

+ 29 - 25
web/inc/i18n/en.php

@@ -7,6 +7,8 @@
 if (!defined('LANGUAGE')) die('Direct access not allowed');
 
 $LANG = array(
+    'yes'=>'yes',
+    'no'=>'no',
     'Hour'=>'Hour',
     'Min'=>'Min',
     'pb'=>'pb',
@@ -32,22 +34,22 @@ $LANG = array(
     'type'=>'type',
     'charset'=>'charset',
     'edit'=>'edit',
-    'DATABASE_CREATED_OK'=>'Success: Database <a href="/edit/db/?database=%s"><b>%s</b></a> has been created.',
+    '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'=>'Success: Domain <a href="/list/dns/?domain=%s"><b>%s</b></a> has been created.',
-    'RECORD_CREATED_OK'=>'Success: Record <b>%s.%s</b> has been created.',
+    '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'=>'"Success: IP address <a href="/edit/ip/?ip=%s"><b>%s</b></a> has been created.',
-    'DOMAIN_MAIL_CREATED_OK'=>'Success: Mail for domain <a href="/list/mail/?domain=%s"><b>%s</b></a> has been created.',
+    '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'=>'Success: Mail account <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> has been created.',
+    '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',
@@ -77,7 +79,7 @@ $LANG = array(
     'Bandwidth'=>'Bandwidth',
     'ns1'=>'ns1',
     'ns2'=>'ns2',
-    'PACKAGE_CREATED_OK'=>'Success: Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created.',
+    'PACKAGE_CREATED_OK'=>'Package <a href="/edit/package/?package=%s"><b>%s</b></a> has been created successfully.',
     'user'=>'user',
     'email'=>'email',
     'Email'=>'Email',
@@ -89,7 +91,7 @@ $LANG = array(
     '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'=>'Success: User <a href="/edit/user/?user=%s"><b>%s</b></a> has been created.',
+    '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',
@@ -103,8 +105,8 @@ $LANG = array(
     'ftp user password'=>'FTP user password',
     'ftp user'=>'FTP user',
     'FTP login credentials'=>'FTP login credentials',
-    'FTP_ACCOUNT_READY'=>"Your FTP account has been created and ready for use.\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nVesta Control Panel\n",
-    'HOSTING_DOMAIN_CREATED_OK'=>'Success: Web domain <a href="/edit/web/?domain=%s"><b>%s</b></a> has been created.',
+    '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!',
@@ -156,6 +158,7 @@ $LANG = array(
     'Confirm Password'=>'Confirm Password',
     'Reset'=>'Reset',
     'Statistics'=>'Statistics',
+    'Web Statistics'=>'Statistics',
     'History Log'=>'History Log',
     'Vesta logo'=>'Vesta logo',
     'USER'=>'USER',
@@ -183,7 +186,7 @@ $LANG = array(
     'Disk'=>'Disk',
     'traffic'=>'traffic',
     'Database Credentials'=>'Database Credentials',
-    'DATABASE_READY'=>"Hello, %s %s,\nYour %s database has been created successfully.\n\nDatabase: %s_%s\nUser: %s_%s\nPassword: %s\n\n",
+    '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',
@@ -213,8 +216,9 @@ $LANG = array(
     'Adding User'=>'Adding User',
     'First Name'=>'First Name',
     'Last Name'=>'Last Name',
-    'SEND_CREDENTIALS_NOTICE'=>'Send fresh credentials to user by email?',
-    'Adding Domain for hosting'=>'Adding Domain for hosting',
+    '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',
@@ -249,7 +253,7 @@ $LANG = array(
     'Memory'=>'Memory',
     'stop'=>'stop',
     'Run Time'=>'Run Time',
-    'BACKUP_DELETE_CONFIRMATION'=>'Are you sure to delete <b>%s</b> backup?',
+    'BACKUP_DELETE_CONFIRMATION'=>'Are you sure to delete %s backup?',
     'Backup Size'=>'Backup Size',
     'SYS'=>'SYS',
     'one archive'=>'one archive',
@@ -259,45 +263,45 @@ $LANG = array(
     'open webmail'=>'open webmail',
     'suspend'=>'suspend',
     'unsuspend'=>'unsuspend',
-    'CRON_ACTION_CONFIRMATION'=>'Are you sure to <b>%s</b> cron job?',
+    '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 <b>%s</b> database <b>%s</b>?',
+    '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 <b>%s</b> domain <b>%s?</b>',
-    'one domain'=>'one domain',
+    '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 <b>%s</b> record <b>%s</b>?',
+    '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 <b>%s</b>?',
+    '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 <b>%s</b> mail for domain <b>%s</b>?',
+    '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 <b>%s</b> mail account <b>%s</b>?',
+    '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 <b>%s</b>?',
+    'PACKAGE_DELETE_CONFIRMATION'=>'Are you sure to delete package %s?',
     'one package'=>'one package',
     '%s packages'=>'%s packages',
     'Daily'=>'Daily',
@@ -326,8 +330,8 @@ $LANG = array(
     'rebuild db'=>'rebuild db',
     'rebuild cron'=>'rebuild cron',
     'update counters'=>'update counters',
-    'LOGGED_IN_AS'=>'Logged in as %s',
-    'USER_ACTION_CONFIRMATION'=>'Are you sure to <b>%s</b> user <b>%s</b>?',
+    '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',

+ 49 - 44
web/inc/i18n/ru.php

@@ -7,6 +7,9 @@
 if (!defined('LANGUAGE')) die('Direct access not allowed');
 
 $LANG = array(
+    'yes'=>'да',
+    'no'=>'нет',
+    'none'=>'нет',
     'Hour'=>'Час',
     'Min'=>'Мин',
     'pb'=>'пб',
@@ -25,18 +28,18 @@ $LANG = array(
     '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 успешно создано',
+    '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> успешно создана.',
+    '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> успешно создана.',
+    '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'=>'маска подсети',
@@ -44,11 +47,11 @@ $LANG = array(
     '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> подключена успешно',
+    '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> успешно создан.',
+    'MAIL_ACCOUNT_CREATED_OK'=>'почтовый аккаунт <a href="/edit/mail/?account=%s&domain=%s"><b>%s@%s</b></a> успешно создан.',
     'package'=>'пакет',
     'template'=>'шаблон',
     'shell'=>'SSH',
@@ -79,7 +82,7 @@ $LANG = array(
     'Bandwidth'=>'Трафик',
     'ns1'=>'DNS-сервер #1',
     'ns2'=>'DNS-сервер #2',
-    'PACKAGE_CREATED_OK'=>'Успех: Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успешно создан.',
+    'PACKAGE_CREATED_OK'=>'Пакет <a href="/edit/package/?package=%s"><b>%s</b></a> успешно создан.',
     'user'=>'пользователь',
     'email'=>'email',
     'Email'=>'Адрес электронной почты',
@@ -91,23 +94,23 @@ $LANG = array(
     '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> успешно создан.',
+    '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 Home Directory'=>'Директория SSL',
     'SSL Certificate'=>'SSL сертификат',
     'SSL Key'=>'Ключ SSL сертификата',
-    'SSL Certificate Authority / Intermediate'=>'Центр сертификации SSL CA / Intermediate',
+    '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",
-    'HOSTING_DOMAIN_CREATED_OK'=>'Успешно: хостинг для домена <a href="/edit/web/?domain=%s"><b>%s</b></a> был успешно создан.',
-    'OK: changes has been saved.'=>'Успешно: изменения были сохранены.',
+    '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'=>'Произошла внутренняя ошибка',
@@ -127,7 +130,7 @@ $LANG = array(
     'Back'=>'Назад',
     'Adding database'=>'Добавление базы данных',
     'DB_PREFIX_WILL_BE_ADDED'=>'Префикс %s будет автоматически добавлен к БД и пользователю БД',
-    'FTP_PREFIX_WILL_BE_ADDED'=>'Префикс %s будет автоматически добавлен к имени пользователя',
+    'FTP_PREFIX_WILL_BE_ADDED'=>'Префикс %s будет автоматически добавлен к названию акккаунта',
     'Database'=>'База данных',
     'Username'=>'Аккаунт',
     'Password'=>'Пароль',
@@ -154,10 +157,11 @@ $LANG = array(
     'Submit'=>'Отправить',
     'RESET_CODE_SENT'=>'Код сброса пароля выслан на ваш email<br/>Пожалуйста, введите код в располженное ниже поле для продолжения',
     'Confirm'=>'Подтвердить',
-    'New Password'=>'Новый Пароль',
-    'Confirm Password'=>'Подтверждение Пароля',
+    'New Password'=>'Новый пароль',
+    'Confirm Password'=>'Подтверждение пароля',
     'Reset'=>'Сбросить',
     'Statistics'=>'Статистика',
+    'Web Statistics'=>'Статистика сайта',
     'History Log'=>'Журнал',
     'Vesta logo'=>'Логотип Vesta',
     'USER'=>'USER',
@@ -215,14 +219,15 @@ $LANG = array(
     'Adding User'=>'Добавление аккаунта',
     'First Name'=>'Имя',
     'Last Name'=>'Фамилия',
-    'SEND_CREDENTIALS_NOTICE'=>'Отправить данные пользователю по эл. почте?',
-    'Adding Domain for hosting'=>'Добавление домена для хостинга',
-    'Apache template'=>'Шаблон веб-сервера Apache',
-    'Nginx Support'=>'Поддержка веб-сервера Nginx',
-    'Nginx Extentions'=>'Расширения Nginx',
+    '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-аккаунт',
+    'Statistics Authorization'=>'Ограниченный доступ к статистике',
+    'Additional FTP Account'=>'Отдельный ftp аккаунт',
     'Editing Cron Job'=>'Редактирование cron-задания',
     'Save'=>'Сохранить',
     'Editing Database'=>'Редактирование БД',
@@ -251,7 +256,7 @@ $LANG = array(
     'Memory'=>'Память',
     'stop'=>'остановить',
     'Run Time'=>'Время запуска',
-    'BACKUP_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить <b>%s</b> бэкап?',
+    'BACKUP_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить %s бэкап?',
     'Backup Size'=>'Размер Бэкапа',
     'SYS'=>'Системное',
     'one archive'=>'один архив',
@@ -261,45 +266,45 @@ $LANG = array(
     'open webmail'=>'открыть веб-интерфейс',
     'suspend'=>'заблокировать',
     'unsuspend'=>'активировать',
-    'CRON_ACTION_CONFIRMATION'=>'Вы уверены, что хотите <b>%s</b> cron-задание?',
+    'CRON_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s cron-задание?',
     'Confirmation'=>'Подтверждение',
     'one cron job'=>'одно cron-задание',
     '%s cron jobs'=>'%s cron-заданя(ий)',
     'Add Database'=>'Добавить БД',
     'open %s'=>'открыть %s',
-    'DATABASE_ACTION_CONFIRMATION'=>'Вы уверены, что хотите <b>%s</b> базу данных <b>%s</b>?',
+    'DATABASE_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s базу данных %s?',
     'one database'=>'одна БД',
     '%s databases'=>'%s БД',
     'Add DNS Domain'=>'Добавить DNS для домена',
     'Search'=>'Поиск',
     'LIST_DOMAIN_RECORDS'=>'Посмотреть %s записей',
     'add record'=>'добавить запись',
-    'DOMAIN_ACTION_CONFIRMATION'=>'Вы уверены, что хотите <b>%s</b> домен <b>%s?</b>',
-    'one domain'=>'Один домен',
-    '%s domains'=>'%s домена(ов)',
+    'DOMAIN_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s домен %s?',
+    '1 domain'=>'доменов на странице: 1',
+    '%s domains'=>'доменов на странице: %s',
     'Add DNS Record'=>'Добавить DNS запись',
     'Listing'=>'Просмотр',
     'list'=>'посмотреть',
-    'RECORD_ACTION_CONFIRMATION'=>'Вы уверены, что хотите <b>%s</b> запись <b>%s</b>?',
+    'RECORD_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s запись %s?',
     'one DNS record'=>'одна DNS-запись',
     '%s DNS records'=>'%s DNS-записи(ей)',
     'Add IP'=>'Добавить IP адрес',
-    'IP_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить IP адрес <b>%s</b>?',
+    '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'=>'Вы уверены, что хотите <b>%s</b> почту для домена <b>%s</b>?',
+    'MAIL_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s почту для домена %s?',
     'one domain with email'=>'один домен с почтой',
     '%s domains with email'=>'%s домена(ов) с почтой',
     'Add Mail Account'=>'Добавить почтовый аккаунт',
-    'MAIL_ACCOUNT_ACTION_CONFIRMATION'=>'Вы уверены, что хотите <b>%s</b> почтовый ящик <b>%s</b>?',
+    'MAIL_ACCOUNT_ACTION_CONFIRMATION'=>'Вы уверены, что хотите %s почтовый ящик %s?',
     'one mail account'=>'один почтовый ящик',
     '%s mail accounts'=>'%s почтовых ящика(ов)',
     'Add Package'=>'Добавить пакет',
-    'PACKAGE_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить пакет <b>%s</b>?',
+    'PACKAGE_DELETE_CONFIRMATION'=>'Вы уверены, что хотите удалить пакет %s?',
     'one package'=>'один пакет',
     '%s packages'=>'%s пакета(ов)',
     'Daily'=>'Ежедневый',
@@ -321,19 +326,19 @@ $LANG = array(
     '%s months'=>'%s месяца(ев)',
     'Add User'=>'Добавить аккаунт',
     'Add Domain'=>'Добавить домен',
-    'rebuild'=>'перестроить',
-    'rebuild web'=>'перестроить WEB',
-    'rebuild DNS'=>'перестроить DNS',
-    'rebuild mail'=>'перестроить MAIL',
-    'rebuild db'=>'перестроить DB',
-    'rebuild cron'=>'перестроить CRON',
+    '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 Domain for hosting'=>'Добавить Домен для хостинга',
-    'open webstats'=>'открыть ститистику',
+    'Add Web Domain'=>'Добавить домен',
+    'open webstats'=>'открыть отчет веб-аналитики',
     'Error Log'=>'Лог Ошибок',
     'CGI Support'=>'Поддержка CGI',
     'Statistics Auth'=>'Авторизация Статистики',
@@ -346,4 +351,4 @@ $LANG = array(
 );
 
 /*error_reporting(E_ALL);
-ini_set('display_errors',true);*/
+ini_set('display_errors',true);*/

+ 3 - 3
web/js/events.js

@@ -60,7 +60,7 @@ VE.callbacks.click.do_suspend = function(evt, elm) {
      var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
      var url = $('input[name="suspend_url"]', ref).val();
      var dialog_elm = ref.find('.confirmation-text-suspention');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, '', url);
 }
 
 /*
@@ -70,7 +70,7 @@ VE.callbacks.click.do_unsuspend = function(evt, elm) {
      var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
      var url = $('input[name="unsuspend_url"]', ref).val();
      var dialog_elm = ref.find('.confirmation-text-suspention');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, '', url);
 }
 
 /*
@@ -80,7 +80,7 @@ VE.callbacks.click.do_delete = function(evt, elm) {
      var ref = elm.hasClass('data-controls') ? elm : elm.parents('.data-controls');
      var url = $('input[name="delete_url"]', ref).val();
      var dialog_elm = ref.find('.confirmation-text-delete');
-     VE.helpers.createConfirmationDialog(dialog_elm, 'Confirm action', url);
+     VE.helpers.createConfirmationDialog(dialog_elm, '', url);
 }
 
 

+ 3 - 0
web/list/web/index.php

@@ -9,6 +9,9 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 // Header
 include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 
+$lang = 'ru_RU.utf8';
+setlocale(LC_ALL, $lang);
+
 // Panel
 top_panel($user,$TAB);
 

+ 19 - 8
web/templates/admin/add_user.html

@@ -29,6 +29,12 @@
 
                     <form id="vstobjects" name="v_add_user" method="post">
                         <script type="text/javascript">
+                            $(function() {
+                                $("#v_email").change(function() {
+                                    document.getElementById('v_notify').value = document.getElementById('v_email').value;
+                                });
+                            });
+
                             function randomString() {
                                 var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
                                 var string_length = 10;
@@ -83,7 +89,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_email" id='v_email' <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
                                             </td>
                                         </tr>
                                         <tr>
@@ -133,16 +139,21 @@
                                         </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 ?>">
+                                                <input type="text"  class="vst-input" name="v_notify" id="v_notify" <?php if (!empty($v_notify)) echo "value=".$v_notify; ?>>
                                             </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>

+ 12 - 10
web/templates/admin/add_web.html

@@ -10,7 +10,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding Domain for hosting');?></b></a>
+                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding Web Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -66,7 +66,7 @@
                                 }
                             }
                         </script>
-    
+
                         <table class='data'>
                             <tr class="data-add">
                             <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
@@ -264,7 +264,7 @@
                                     </tr>
                                     <tr>
                                         <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                            <?php print _('Statistics');?>
+                                            <?php print _('Web Statistics');?>
                                         </td>
                                     </tr>
                                     <tr>
@@ -278,7 +278,7 @@
                                                         if (( $value == $v_stats ) || ($svalue == $v_stats )){
                                                             echo ' selected' ;
                                                         }
-                                                        echo ">".$value."</option>\n";
+                                                        echo ">" . _($value) . "</option>\n";
                                                     }
                                                 ?> 
                                             </select>
@@ -341,7 +341,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>
@@ -351,27 +351,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>

+ 6 - 2
web/templates/admin/edit_user.html

@@ -45,7 +45,7 @@
                                     <table class="data-col1">
                                         <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;">
@@ -194,9 +194,13 @@
                                                 <input type="text" size="20" class="vst-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
                                             </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>

+ 15 - 11
web/templates/admin/edit_web.html

@@ -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;">
@@ -178,7 +178,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>
@@ -228,7 +228,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print _('Statisitcs');?>
+                                                <?php print _('Web Statistics');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -242,15 +242,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>
@@ -300,7 +300,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>
@@ -324,7 +324,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>
@@ -338,9 +338,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>
@@ -349,4 +353,4 @@
                             </tr>
                         </table>
                     </form>
-                                            
+

+ 1 - 1
web/templates/admin/list_user.html

@@ -7,7 +7,7 @@
                                                     if ($user == 'admin') {
                                                         echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/user/'\">" . _('Add User') . "</button>";
                                                     } else {
-                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/web/'\">" . _('Add Domain') . "</button>";
+                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/web/'\">" . _('Add Web Domain') . "</button>";
                                                     }
                                                 ?> 
                                             </div>

+ 47 - 38
web/templates/admin/list_web.html

@@ -3,7 +3,7 @@
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> <?php print _('Add Domain for hosting');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain');?> </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
                                                 <form action="/search/" method="get" >
@@ -77,41 +77,50 @@
                             <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 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;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <?php
-                                                if (!empty($data[$key]['STATS'])) {
-                                                    echo '                                                <td class="data-controls" width="114px">';
-                                                    echo "<a href='http://".$key."/vstats/' target='_blank'>";
-        	                                    echo '<img src="/images/new_window.png" width="8px" height="8px"> '._('open webstats').' </a></td>';
-                                                }
-                                             ?> 
-                                            <td class="data-controls" width="50px"><a href="/edit/web/?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 ?>/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>
-                                                </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/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>
-                                                </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" class="do_delete">
+                                             <?php print _('delete');?>
+                                            <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                                                <p class="counter-value"><?php print _('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" class="do_<?php echo $spnd_action ?>">
+                                            <?php echo _($spnd_action); ?>
+                                            <input type="hidden" name="<?php echo $spnd_action ?>_url" value="/<?php echo $spnd_action ?>/web/?domain=<?php echo $key ?>" />
+                                            <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" class="confirmation-text-suspention hidden" title="<?php print _('Confirmation');?>">
+                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_($spnd_action),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/web/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?>
+                                        </span>
+                                    </a>
+                                    <?php
+                                        if (!empty($data[$key]['STATS'])) {
+                                    ?> 
+                                    <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');?>
+                                        </span>
+                                    </a>
+                                    <?php
+                                            }
+                                     ?> 
 
                                     <table class="data-col2" width="830px">
                                         <tr>
@@ -152,7 +161,7 @@
                                                 <table>
                                                     <tr>
                                                         <td class="counter-name" width="110"><?php print _('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SSL'] ?></td>
+                                                        <td class="counter-value"><?php print _($data[$key]['SSL']) ?></td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name"><?php print _('SSL Home Directory');?>:</td>
@@ -160,7 +169,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name"><?php print _('Nginx Support');?>:</td>
-                                                        <td class="counter-value"><?php echo $nginx_support ?></td>
+                                                        <td class="counter-value"><?php print _($nginx_support) ?></td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name"><?php print _('Nginx Extentions');?>:</td>
@@ -171,12 +180,12 @@
                                             <td rowspan=4 style="vertical-align:top;" width="240">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Statistics');?>: </td>
-                                                        <td class="counter-value"> <?php echo $web_stats ?></td>
+                                                        <td class="counter-name"><?php print _('Web Statistics');?>: </td>
+                                                        <td class="counter-value"> <?php print _($web_stats) ?></td>
                                                     </tr>
                                                     <tr>
                                                         <td class="counter-name"> <?php print _('Additional FTP Account');?>:</td>
-                                                        <td class="counter-value"> <?php echo $ftp_user ?></td>
+                                                        <td class="counter-value"> <?php print _($ftp_user) ?></td>
                                                     </tr>
                                                 </table>
                                             </td>
@@ -196,7 +205,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one domain');
+                                            echo _('1 domain');
                                         } else {
                                             echo _('%s domains',$i);
                                         }

+ 1 - 1
web/templates/footer.html

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

+ 5 - 5
web/templates/header.html

@@ -22,7 +22,7 @@
 
             .main {
                 background: #ffffff;
-                padding: 0 0 28px 0;
+                padding: 0 0 18px 0;
                 box-shadow: 0 0 2px 2px #d7d7d7;
                 border-bottom: 1px solid #cccccc;
                 border-left: 1px solid #cccccc;
@@ -477,7 +477,7 @@
                 border-radius: 3px 3px 3px 3px;
                 color: #555;
                 font-size: 18px;
-                padding: 6px;
+                padding: 5px;
                 width: 360px;
                 height: 120px;
             }
@@ -496,7 +496,7 @@
                 border-radius: 3px 3px 3px 3px;
                 color: #555;
                 font-size: 14pt;
-                padding: 6px;
+                padding: 5px;
                 width: 360px;
                 height: 36px;
             }
@@ -510,7 +510,7 @@
             }
 
             .vst-list {
-                padding: 4px;
+                padding: 5px;
                 font-size: 12pt;
                 color: #555;
                 border-radius: 3px 3px 3px 3px;
@@ -522,7 +522,7 @@
             }
 
             .vst-checkbox {
-                padding: 4px;
+                padding: 5px;
                 font-size: 12pt;
             }
 

+ 1 - 1
web/templates/user/add_web.html

@@ -9,7 +9,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding Domain for hosting');?></b></a>
+                                        <td style="padding: 10px 2px 10px 0;" ><a class="name"><b><?php print _('Adding Web Domain');?></b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";

+ 20 - 16
web/templates/user/list_user.html

@@ -3,13 +3,7 @@
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
-                                                <?php
-                                                    if ($user == 'admin') {
-                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/user/'\"> <?php print _('Add User');?> </button>";
-                                                    } else {
-                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/web/'\"> <?php print _('Add Domain');?> </button>";
-                                                    }
-                                                ?> 
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain') ?> </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
                                                 <form action="/search/" method="get">
@@ -22,7 +16,16 @@
                                                 <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>
@@ -51,17 +54,19 @@
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px">
                                     <table class="data-col1">
                                         <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="user[]" value="<?php echo $key ?>" ></td></tr>
-                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a><td></tr>
                                         <tr><td class="data-<?php echo $status ?>"><b><?php echo _($status); ?></b></td></tr>
                                     </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/user/?user=<?php echo "$key" ?>"><img src="/images/edit.png" width="8px" height="8px"> edit</a></td>
-                                        </tr>
-                                    </table>
+
+                                    <a href="/edit/user/?user=<?php echo "$key" ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?> 
+                                        </span>
+                                    </a>
+
 
                                     <table class="data-col2" width="830px">
                                         <tr>
@@ -184,7 +189,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one account');
+                                            echo _('1 account');
                                         } else {
                                             echo _('%s accounts',$i);
                                         }
@@ -193,4 +198,3 @@
                             </tr>
                         </table>
                     </div>
-

+ 63 - 51
web/templates/user/list_web.html

@@ -3,10 +3,10 @@
                                     <tr>
                                         <td style="padding: 12px 0 8px 6px">
                                             <div style="float:left">
-                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> <?php print _('Add Domain for hosting');?> </button>
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> <?php print _('Add Web Domain');?> </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <form action="/search/" method="get">
+                                                <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>
@@ -16,6 +16,8 @@
                                                 <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;">
@@ -48,6 +50,18 @@
                                     } else {
                                         $ssl_home = '';
                                     }
+                                    $web_stats='no';
+                                    if (!empty($data[$key]['STATS'])) {
+                                        $web_stats=$data[$key]['STATS'];
+                                    }
+                                    $ftp_user='no';
+                                    if (!empty($data[$key]['FTP_USER'])) {
+                                        $ftp_user=$data[$key]['FTP_USER'];
+                                    }
+                                    $nginx_support='no';
+                                    if (!empty($data[$key]['NGINX'])) {
+                                        $nginx_support='yes';
+                                    }
                                     if (strlen($data[$key]['NGINX_EXT']) > 16 ) {
                                         $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']);
                                         $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16);
@@ -63,33 +77,40 @@
                             <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 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;">
-                                    <table width="830px">
-                                        <tr>
-                                            <td></td>
-                                            <?php
-                                                if (!empty($data[$key]['STATS'])) {
-                                                    echo '                                                <td class="data-controls" width="114px">';
-                                                    echo "<a href='http://".$key."/vstats/' target='_blank'>";
-        	                                    echo '<img src="/images/new_window.png" width="8px" height="8px"> '._('open webstats').' </a></td>';
-                                                }
-                                             ?> 
-                                            <td class="data-controls" width="50px"><a href="/edit/web/?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/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>
-                                                </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" class="do_delete">
+                                             <?php print _('delete');?>
+                                            <input type="hidden" name="delete_url" value="/delete/web/?domain=<?php echo $key ?>" />
+                                            <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="<?php print _('Confirmation');?>">
+                                                <p class="counter-value"><?php print _('DOMAIN_ACTION_CONFIRMATION',_('delete'),$key);?></p>
+                                            </div>
+                                        </span>
+                                    </a>
+                                    <a href="/edit/web/?domain=<?php echo $key ?>">
+                                        <span class="data-controls">
+                                            <img src="/images/edit.png" width="8px" height="8px">
+                                            <?php print _('edit');?>
+                                        </span>
+                                    </a>
+                                    <?php
+                                        if (!empty($data[$key]['STATS'])) {
+                                    ?> 
+                                    <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');?>
+                                        </span>
+                                    </a>
+                                    <?php
+                                            }
+                                     ?> 
 
                                     <table class="data-col2" width="830px">
                                         <tr>
@@ -126,43 +147,35 @@
                                                     </tr>
                                                 </table>
                                             </td>
-                                            <td style="vertical-align:top;" width="250">
+                                            <td style="vertical-align:top;" width="300">
                                                 <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('CGI Support');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['CGI'] ?></td>
+                                                        <td class="counter-name" width="110"><?php print _('SSL Support');?>:</td>
+                                                        <td class="counter-value"><?php print _($data[$key]['SSL']) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Error Log');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['ELOG'] ?></td>
+                                                        <td class="counter-name"><?php print _('SSL Home Directory');?>:</td>
+                                                        <td class="counter-value"><?php echo $ssl_home ?></td>
                                                     </tr>
-                                                <tr>
-                                                        <td class="counter-name"><?php print _('Statistics');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['STATS'] ?></td>
+                                                    <tr>
+                                                        <td class="counter-name"><?php print _('Nginx Support');?>:</td>
+                                                        <td class="counter-value"><?php print _($nginx_support) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Statistics Auth');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['STATS_AUTH'] ?></td>
+                                                        <td class="counter-name"><?php print _('Nginx Extentions');?>:</td>
+                                                        <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
                                                     </tr>
                                                 </table>
                                             </td>
-                                            <td rowspan=4 style="vertical-align:top;" width="300">
-                                                <table width="300">
-                                                    <tr>
-                                                        <td class="counter-name" width="40%"><?php print _('SSL Support');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['SSL'] ?></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="counter-name"><?php print _('SSL Home Directory');?>:</td>
-                                                        <td class="counter-value"><?php echo $ssl_home ?></td>
-                                                    </tr>
+                                            <td rowspan=4 style="vertical-align:top;" width="240">
+                                                <table>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Template');?>:</td>
-                                                        <td class="counter-value"><?php echo $data[$key]['NGINX'] ?></td>
+                                                        <td class="counter-name"><?php print _('Web Statistics');?>: </td>
+                                                        <td class="counter-value"> <?php print _($web_stats) ?></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="counter-name"><?php print _('Nginx Extentions');?>:</td>
-                                                        <td class="counter-value" <?php if (!empty($nginx_ext_title)) echo "title='".$nginx_ext_title."'" ?>><?php echo $nginx_ext ?></td>
+                                                        <td class="counter-name"> <?php print _('Additional FTP Account');?>:</td>
+                                                        <td class="counter-value"> <?php print _($ftp_user) ?></td>
                                                     </tr>
                                                 </table>
                                             </td>
@@ -182,7 +195,7 @@
                                 <td>
                                     <?php
                                         if ( $i == 1) {
-                                            echo _('one domain');
+                                            echo _('1 domain');
                                         } else {
                                             echo _('%s domains',$i);
                                         }
@@ -191,4 +204,3 @@
                             </tr>
                         </table>
                     </div>
-